diff --git a/examples/knx-linux-coupler/main.cpp b/examples/knx-linux-coupler/main.cpp
index 64a09b0..004215d 100644
--- a/examples/knx-linux-coupler/main.cpp
+++ b/examples/knx-linux-coupler/main.cpp
@@ -1,7 +1,7 @@
-#include "knx_facade.h"
+#include "knx/knx_facade.h"
 
-#include "knx/bau091A.h"
-#include "knx/bau2920.h"
+#include "knx/coupler/bau091A.h"
+#include "knx/coupler/bau2920.h"
 
 #include "knx/bits.h"
 #include <time.h>
diff --git a/examples/knx-linux/main.cpp b/examples/knx-linux/main.cpp
index 8c8f5fa..6d855dd 100644
--- a/examples/knx-linux/main.cpp
+++ b/examples/knx-linux/main.cpp
@@ -1,10 +1,10 @@
 #include <knx.h>
 
-#include "knx/bau57B0.h"
-#include "knx/bau27B0.h"
-#include "knx/bau07B0.h"
+#include "knx/ip/bau57B0.h"
+#include "knx/rf/bau27B0.h"
+#include "knx/tp/bau07B0.h"
 
-#include "knx/group_object_table_object.h"
+#include "knx/interface_object/group_object_table_object.h"
 #include "knx/bits.h"
 #include <time.h>
 #include <stdlib.h>
diff --git a/examples/knxPython/knxmodule.cpp b/examples/knxPython/knxmodule.cpp
index 1255d00..c774cb4 100644
--- a/examples/knxPython/knxmodule.cpp
+++ b/examples/knxPython/knxmodule.cpp
@@ -16,8 +16,8 @@ namespace py = pybind11;
 
 #include "knx/bits.h"
 #include "knx/platform/linux_platform.h"
-#include "knx/bau57B0.h"
-#include "knx/group_object_table_object.h"
+#include "knx/ip/bau57B0.h"
+#include "knx/interface_object/group_object_table_object.h"
 
 LinuxPlatform* platform = 0;
 Bau57B0* bau = 0;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0bec88f..461e283 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -147,24 +147,10 @@ set(SOURCES
 ./knx/network_layer/network_layer_entity.h
 ./knx/network_layer/npdu.cpp
 ./knx/network_layer/npdu.h
-./knx/platform/arduino_platform.cpp
-./knx/platform/arduino_platform.h
-./knx/platform/cc1310_platform.cpp
-./knx/platform/cc1310_platform.h
-./knx/platform/esp32_platform.cpp
-./knx/platform/esp32_platform.h
-./knx/platform/esp_platform.cpp
-./knx/platform/esp_platform.h
 ./knx/platform/linux_platform.cpp
 ./knx/platform/linux_platform.h
 ./knx/platform/platform.cpp
 ./knx/platform/platform.h
-./knx/platform/rp2040_arduino_platform.cpp
-./knx/platform/rp2040_arduino_platform.h
-./knx/platform/samd_platform.cpp
-./knx/platform/samd_platform.h
-./knx/platform/stm32_platform.cpp
-./knx/platform/stm32_platform.h
 ./knx/rf/bau27B0.cpp
 ./knx/rf/bau27B0.h
 ./knx/rf/rf_data_link_layer.cpp
diff --git a/src/knx/coupler/bau091A.cpp b/src/knx/coupler/bau091A.cpp
index e21c64c..15f1614 100644
--- a/src/knx/coupler/bau091A.cpp
+++ b/src/knx/coupler/bau091A.cpp
@@ -1,6 +1,6 @@
 #include "bau091A.h"
 
-#include "bits.h"
+#include "../bits.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/src/knx/coupler/bau091A.h b/src/knx/coupler/bau091A.h
index 0a3f48e..c9ddc0d 100644
--- a/src/knx/coupler/bau091A.h
+++ b/src/knx/coupler/bau091A.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "bau_systemB_coupler.h"
+#include "router_object.h"
 #include "../config.h"
-#include "../interface_object/router_object.h"
 #include "../ip/ip_parameter_object.h"
 #include "../ip/ip_data_link_layer.h"
 #include "../tp/tpuart_data_link_layer.h"
diff --git a/src/knx/coupler/bau2920.h b/src/knx/coupler/bau2920.h
index 42f1d37..15c3bc4 100644
--- a/src/knx/coupler/bau2920.h
+++ b/src/knx/coupler/bau2920.h
@@ -3,7 +3,7 @@
 #include "../config.h"
 
 #include "bau_systemB_coupler.h"
-#include "tpuart_data_link_layer.h"
+#include "../tp/tpuart_data_link_layer.h"
 #if defined(DeviceFamily_CC13X0)
     #include "../rf/rf_physical_layer_cc1310.h"
 #else
diff --git a/src/knx/coupler/network_layer_coupler.h b/src/knx/coupler/network_layer_coupler.h
index 2ca0a66..1475822 100644
--- a/src/knx/coupler/network_layer_coupler.h
+++ b/src/knx/coupler/network_layer_coupler.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "../knx_types.h"
-#include "network_layer.h"
-#include "transport_layer.h"
+#include "../network_layer/network_layer.h"
+#include "../transport_layer/transport_layer.h"
 
 #include <stdint.h>
 
diff --git a/src/knx/group_object/group_object.cpp b/src/knx/group_object/group_object.cpp
index af70b0b..05dc9c6 100644
--- a/src/knx/group_object/group_object.cpp
+++ b/src/knx/group_object/group_object.cpp
@@ -1,7 +1,7 @@
 #include "group_object.h"
 
 #include "datapoint_types.h"
-#include "../interface_objects/group_object_table_object.h"
+#include "../interface_object/group_object_table_object.h"
 #include "../bits.h"
 
 #include <cstring>
diff --git a/src/knx/ip/ip_parameter_object.h b/src/knx/ip/ip_parameter_object.h
index c4f5f7b..7cbfab4 100644
--- a/src/knx/ip/ip_parameter_object.h
+++ b/src/knx/ip/ip_parameter_object.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../inteface_object/device_object.h"
+#include "../interface_object/device_object.h"
 #include "../platform/platform.h"
 
 #define KNXIP_MULTICAST_PORT 3671
diff --git a/src/knx/ip/knx_ip_tunneling_request.h b/src/knx/ip/knx_ip_tunneling_request.h
index 14989fc..05f8b05 100644
--- a/src/knx/ip/knx_ip_tunneling_request.h
+++ b/src/knx/ip/knx_ip_tunneling_request.h
@@ -1,9 +1,8 @@
 #pragma once
 
 #include "knx_ip_frame.h"
-#include "../cemi_frame.h"
 #include "knx_ip_ch.h"
-
+#include "../datalink_layer/cemi_frame.h"
 class KnxIpTunnelingRequest : public KnxIpFrame
 {
     public:
diff --git a/src/knx/platform/arduino_platform.h b/src/knx/platform/arduino_platform.h
index 124c884..9e2e993 100644
--- a/src/knx/platform/arduino_platform.h
+++ b/src/knx/platform/arduino_platform.h
@@ -1,4 +1,4 @@
-#include "../platform.h"
+#include "platform.h"
 
 #include "Arduino.h"
 
diff --git a/src/knx/platform/cc1310_platform.h b/src/knx/platform/cc1310_platform.h
index 020dafa..05f23d5 100644
--- a/src/knx/platform/cc1310_platform.h
+++ b/src/knx/platform/cc1310_platform.h
@@ -6,7 +6,7 @@
 #include <ti/drivers/UART.h>
 #include <ti/drivers/dpl/ClockP.h>
 
-#include "../platform.h"
+#include ".platform.h"
 
 class CC1310Platform : public Platform
 {
diff --git a/src/knx/platform/linux_platform.cpp b/src/knx/platform/linux_platform.cpp
index c78a05a..78969af 100644
--- a/src/knx/platform/linux_platform.cpp
+++ b/src/knx/platform/linux_platform.cpp
@@ -28,11 +28,11 @@
 #include <poll.h>             // Needed for GPIO edge detection
 #include <sys/time.h>         // Needed for delayMicroseconds()
 
-#include "../device_object.h"
-#include "../address_table_object.h"
-#include "../association_table_object.h"
-#include "../group_object_table_object.h"
-#include "../application_program_object.h"
+#include "../interface_object/device_object.h"
+#include "../interface_object/address_table_object.h"
+#include "../interface_object/association_table_object.h"
+#include "../interface_object/group_object_table_object.h"
+#include "../interface_object/application_program_object.h"
 #include "../ip/ip_parameter_object.h"
 #include "../bits.h"
 #include "../ip/ip_host_protocol_address_information.h"
diff --git a/src/knx/platform/linux_platform.h b/src/knx/platform/linux_platform.h
index 2eb48a5..a9f05de 100644
--- a/src/knx/platform/linux_platform.h
+++ b/src/knx/platform/linux_platform.h
@@ -2,7 +2,7 @@
 
 #ifdef __linux__
 
-#include "../platform.h"
+#include "platform.h"
 #include <string>
 
 extern int gpio_direction(int pin, int dir);
diff --git a/src/knx/platform/platform.cpp b/src/knx/platform/platform.cpp
index a98d2e9..79dd90d 100644
--- a/src/knx/platform/platform.cpp
+++ b/src/knx/platform/platform.cpp
@@ -1,6 +1,6 @@
 #include "platform.h"
 
-#include "bits.h"
+#include "../bits.h"
 
 #include <cstring>
 #include <cstdlib>
diff --git a/src/knx/platform/platform.h b/src/knx/platform/platform.h
index d60af19..b4666b0 100644
--- a/src/knx/platform/platform.h
+++ b/src/knx/platform/platform.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include "save_restore.h"
+#include "../util/save_restore.h"
 
 #ifndef KNX_FLASH_CALLBACK
     #ifndef KNX_FLASH_SIZE
diff --git a/src/knx/rf/bau27B0.cpp b/src/knx/rf/bau27B0.cpp
index 99ddd6f..0afe806 100644
--- a/src/knx/rf/bau27B0.cpp
+++ b/src/knx/rf/bau27B0.cpp
@@ -1,6 +1,6 @@
 #include "bau27B0.h"
 
-#include "bits.h"
+#include "../bits.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/src/knx/rf/rf_data_link_layer.h b/src/knx/rf/rf_data_link_layer.h
index 3f21f6f..3c846d6 100644
--- a/src/knx/rf/rf_data_link_layer.h
+++ b/src/knx/rf/rf_data_link_layer.h
@@ -1,8 +1,14 @@
 #pragma once
 
-#include "../config.h"
+#if defined(DeviceFamily_CC13X0)
+        #include "rf_physical_layer_cc1310.h"
+#else
+        #include "rf_physical_layer_cc1101.h"
+#endif
+
+#include "../config.h"
+#include "../datalink_layer/data_link_layer.h"
 
-#include "..datalink_layer/data_link_layer.h"
 
 #include <cstdint>
 
diff --git a/src/knx/rf/rf_physical_layer_cc1101.cpp b/src/knx/rf/rf_physical_layer_cc1101.cpp
index 0c6fbb8..2c4e069 100644
--- a/src/knx/rf/rf_physical_layer_cc1101.cpp
+++ b/src/knx/rf/rf_physical_layer_cc1101.cpp
@@ -4,7 +4,7 @@
 
 #include "rf_data_link_layer.h"
 #include "../bits.h"
-#include "../platform.h"
+#include "../platform/platform.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/knx/tp/bau07B0.cpp b/src/knx/tp/bau07B0.cpp
index 1c7a226..9b0576d 100644
--- a/src/knx/tp/bau07B0.cpp
+++ b/src/knx/tp/bau07B0.cpp
@@ -1,6 +1,6 @@
 #include "bau07B0.h"
 
-#include "bits.h"
+#include "../bits.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/src/knx/tp/tp_frame.cpp b/src/knx/tp/tp_frame.cpp
index ce49df3..101376a 100644
--- a/src/knx/tp/tp_frame.cpp
+++ b/src/knx/tp/tp_frame.cpp
@@ -1,27 +1,27 @@
 #include "tp_frame.h"
 
-#include "bits.h"
+#include "../bits.h"
 
-        void TpFrame::printIt() const
-        {
-            print_ia(source());
-            print(" -> ");
+void TpFrame::printIt() const
+{
+    print_ia(source());
+    print(" -> ");
 
-            if (isGroupAddress())
-                print_ga(destination());
-            else
-                print_ia(destination());
+    if (isGroupAddress())
+        print_ga(destination());
+    else
+        print_ia(destination());
 
-            print(" [");
-            print((flags() & TP_FRAME_FLAG_INVALID) ? 'I' : '_');   // Invalid
-            print((flags() & TP_FRAME_FLAG_EXTENDED) ? 'E' : '_');  // Extended
-            print((flags() & TP_FRAME_FLAG_REPEATED) ? 'R' : '_');  // Repeat
-            print((flags() & TP_FRAME_FLAG_ECHO) ? 'T' : '_');      // Send by me
-            print((flags() & TP_FRAME_FLAG_ADDRESSED) ? 'D' : '_'); // Recv for me
-            print((flags() & TP_FRAME_FLAG_ACK_NACK) ? 'N' : '_');  // ACK + NACK
-            print((flags() & TP_FRAME_FLAG_ACK_BUSY) ? 'B' : '_');  // ACK + BUSY
-            print((flags() & TP_FRAME_FLAG_ACK) ? 'A' : '_');       // ACK
-            print("] ");
-            printHex("( ", data(), size(), false);
-            print(")");
-        }
\ No newline at end of file
+    print(" [");
+    print((flags() & TP_FRAME_FLAG_INVALID) ? 'I' : '_');   // Invalid
+    print((flags() & TP_FRAME_FLAG_EXTENDED) ? 'E' : '_');  // Extended
+    print((flags() & TP_FRAME_FLAG_REPEATED) ? 'R' : '_');  // Repeat
+    print((flags() & TP_FRAME_FLAG_ECHO) ? 'T' : '_');      // Send by me
+    print((flags() & TP_FRAME_FLAG_ADDRESSED) ? 'D' : '_'); // Recv for me
+    print((flags() & TP_FRAME_FLAG_ACK_NACK) ? 'N' : '_');  // ACK + NACK
+    print((flags() & TP_FRAME_FLAG_ACK_BUSY) ? 'B' : '_');  // ACK + BUSY
+    print((flags() & TP_FRAME_FLAG_ACK) ? 'A' : '_');       // ACK
+    print("] ");
+    printHex("( ", data(), size(), false);
+    print(")");
+}
\ No newline at end of file
diff --git a/src/knx/transport_layer/tpdu.cpp b/src/knx/transport_layer/tpdu.cpp
index 90ccbe0..f5f0c98 100644
--- a/src/knx/transport_layer/tpdu.cpp
+++ b/src/knx/transport_layer/tpdu.cpp
@@ -1,6 +1,6 @@
 #include "tpdu.h"
 
-#include "cemi_frame.h"
+#include "../datalink_layer/cemi_frame.h"
 #include "../bits.h"
 
 TPDU::TPDU(uint8_t* data, CemiFrame& frame): _data(data), _frame(frame)
diff --git a/src/knx/transport_layer/transport_layer.cpp b/src/knx/transport_layer/transport_layer.cpp
index 421a019..a622d1b 100644
--- a/src/knx/transport_layer/transport_layer.cpp
+++ b/src/knx/transport_layer/transport_layer.cpp
@@ -4,7 +4,7 @@
 #include "../network_layer/network_layer.h"
 #include "../platform/platform.h"
 #include "../util/logger.h"
-#include "bits.h"
+#include "../bits.h"
 
 #include <stdio.h>