diff --git a/src/knx.h b/src/knx.h
index 6be29da..59fcc01 100644
--- a/src/knx.h
+++ b/src/knx.h
@@ -245,4 +245,4 @@ knx-->Platform
 @enduml
 
  */
-#include "knx_facade.h"
+#include "knx/knx_facade.h"
diff --git a/src/knx/apdu.cpp b/src/knx/app_layer/apdu.cpp
similarity index 100%
rename from src/knx/apdu.cpp
rename to src/knx/app_layer/apdu.cpp
diff --git a/src/knx/apdu.h b/src/knx/app_layer/apdu.h
similarity index 100%
rename from src/knx/apdu.h
rename to src/knx/app_layer/apdu.h
diff --git a/src/knx/application_layer.cpp b/src/knx/app_layer/application_layer.cpp
similarity index 100%
rename from src/knx/application_layer.cpp
rename to src/knx/app_layer/application_layer.cpp
diff --git a/src/knx/application_layer.h b/src/knx/app_layer/application_layer.h
similarity index 100%
rename from src/knx/application_layer.h
rename to src/knx/app_layer/application_layer.h
diff --git a/src/knx/bau.cpp b/src/knx/bau/bau.cpp
similarity index 100%
rename from src/knx/bau.cpp
rename to src/knx/bau/bau.cpp
diff --git a/src/knx/bau.h b/src/knx/bau/bau.h
similarity index 100%
rename from src/knx/bau.h
rename to src/knx/bau/bau.h
diff --git a/src/knx/bau07B0.cpp b/src/knx/bau/bau07B0.cpp
similarity index 100%
rename from src/knx/bau07B0.cpp
rename to src/knx/bau/bau07B0.cpp
diff --git a/src/knx/bau07B0.h b/src/knx/bau/bau07B0.h
similarity index 100%
rename from src/knx/bau07B0.h
rename to src/knx/bau/bau07B0.h
diff --git a/src/knx/bau091A.cpp b/src/knx/bau/bau091A.cpp
similarity index 100%
rename from src/knx/bau091A.cpp
rename to src/knx/bau/bau091A.cpp
diff --git a/src/knx/bau091A.h b/src/knx/bau/bau091A.h
similarity index 100%
rename from src/knx/bau091A.h
rename to src/knx/bau/bau091A.h
diff --git a/src/knx/bau27B0.cpp b/src/knx/bau/bau27B0.cpp
similarity index 100%
rename from src/knx/bau27B0.cpp
rename to src/knx/bau/bau27B0.cpp
diff --git a/src/knx/bau27B0.h b/src/knx/bau/bau27B0.h
similarity index 100%
rename from src/knx/bau27B0.h
rename to src/knx/bau/bau27B0.h
diff --git a/src/knx/bau2920.cpp b/src/knx/bau/bau2920.cpp
similarity index 100%
rename from src/knx/bau2920.cpp
rename to src/knx/bau/bau2920.cpp
diff --git a/src/knx/bau2920.h b/src/knx/bau/bau2920.h
similarity index 100%
rename from src/knx/bau2920.h
rename to src/knx/bau/bau2920.h
diff --git a/src/knx/bau57B0.cpp b/src/knx/bau/bau57B0.cpp
similarity index 100%
rename from src/knx/bau57B0.cpp
rename to src/knx/bau/bau57B0.cpp
diff --git a/src/knx/bau57B0.h b/src/knx/bau/bau57B0.h
similarity index 100%
rename from src/knx/bau57B0.h
rename to src/knx/bau/bau57B0.h
diff --git a/src/knx/bau_systemB.cpp b/src/knx/bau/bau_systemB.cpp
similarity index 100%
rename from src/knx/bau_systemB.cpp
rename to src/knx/bau/bau_systemB.cpp
diff --git a/src/knx/bau_systemB.h b/src/knx/bau/bau_systemB.h
similarity index 100%
rename from src/knx/bau_systemB.h
rename to src/knx/bau/bau_systemB.h
diff --git a/src/knx/bau_systemB_coupler.cpp b/src/knx/bau/bau_systemB_coupler.cpp
similarity index 100%
rename from src/knx/bau_systemB_coupler.cpp
rename to src/knx/bau/bau_systemB_coupler.cpp
diff --git a/src/knx/bau_systemB_coupler.h b/src/knx/bau/bau_systemB_coupler.h
similarity index 100%
rename from src/knx/bau_systemB_coupler.h
rename to src/knx/bau/bau_systemB_coupler.h
diff --git a/src/knx/bau_systemB_device.cpp b/src/knx/bau/bau_systemB_device.cpp
similarity index 100%
rename from src/knx/bau_systemB_device.cpp
rename to src/knx/bau/bau_systemB_device.cpp
diff --git a/src/knx/bau_systemB_device.h b/src/knx/bau/bau_systemB_device.h
similarity index 100%
rename from src/knx/bau_systemB_device.h
rename to src/knx/bau/bau_systemB_device.h
diff --git a/src/knx/cemi_server.cpp b/src/knx/cemi_server/cemi_server.cpp
similarity index 100%
rename from src/knx/cemi_server.cpp
rename to src/knx/cemi_server/cemi_server.cpp
diff --git a/src/knx/cemi_server.h b/src/knx/cemi_server/cemi_server.h
similarity index 100%
rename from src/knx/cemi_server.h
rename to src/knx/cemi_server/cemi_server.h
diff --git a/src/knx/cemi_server_object.cpp b/src/knx/cemi_server/cemi_server_object.cpp
similarity index 100%
rename from src/knx/cemi_server_object.cpp
rename to src/knx/cemi_server/cemi_server_object.cpp
diff --git a/src/knx/cemi_server_object.h b/src/knx/cemi_server/cemi_server_object.h
similarity index 100%
rename from src/knx/cemi_server_object.h
rename to src/knx/cemi_server/cemi_server_object.h
diff --git a/src/knx/usb_tunnel_interface.cpp b/src/knx/cemi_server/usb_tunnel_interface.cpp
similarity index 100%
rename from src/knx/usb_tunnel_interface.cpp
rename to src/knx/cemi_server/usb_tunnel_interface.cpp
diff --git a/src/knx/usb_tunnel_interface.h b/src/knx/cemi_server/usb_tunnel_interface.h
similarity index 100%
rename from src/knx/usb_tunnel_interface.h
rename to src/knx/cemi_server/usb_tunnel_interface.h
diff --git a/src/knx/secure_application_layer.cpp b/src/knx/data_secure/secure_application_layer.cpp
similarity index 100%
rename from src/knx/secure_application_layer.cpp
rename to src/knx/data_secure/secure_application_layer.cpp
diff --git a/src/knx/secure_application_layer.h b/src/knx/data_secure/secure_application_layer.h
similarity index 100%
rename from src/knx/secure_application_layer.h
rename to src/knx/data_secure/secure_application_layer.h
diff --git a/src/knx/security_interface_object.cpp b/src/knx/data_secure/security_interface_object.cpp
similarity index 100%
rename from src/knx/security_interface_object.cpp
rename to src/knx/data_secure/security_interface_object.cpp
diff --git a/src/knx/security_interface_object.h b/src/knx/data_secure/security_interface_object.h
similarity index 100%
rename from src/knx/security_interface_object.h
rename to src/knx/data_secure/security_interface_object.h
diff --git a/src/knx/cemi_frame.cpp b/src/knx/datalink_layer/cemi_frame.cpp
similarity index 100%
rename from src/knx/cemi_frame.cpp
rename to src/knx/datalink_layer/cemi_frame.cpp
diff --git a/src/knx/cemi_frame.h b/src/knx/datalink_layer/cemi_frame.h
similarity index 100%
rename from src/knx/cemi_frame.h
rename to src/knx/datalink_layer/cemi_frame.h
diff --git a/src/knx/data_link_layer.cpp b/src/knx/datalink_layer/data_link_layer.cpp
similarity index 100%
rename from src/knx/data_link_layer.cpp
rename to src/knx/datalink_layer/data_link_layer.cpp
diff --git a/src/knx/data_link_layer.h b/src/knx/datalink_layer/data_link_layer.h
similarity index 100%
rename from src/knx/data_link_layer.h
rename to src/knx/datalink_layer/data_link_layer.h
diff --git a/src/knx/datapoint_types.cpp b/src/knx/group_object/datapoint_types.cpp
similarity index 100%
rename from src/knx/datapoint_types.cpp
rename to src/knx/group_object/datapoint_types.cpp
diff --git a/src/knx/datapoint_types.h b/src/knx/group_object/datapoint_types.h
similarity index 100%
rename from src/knx/datapoint_types.h
rename to src/knx/group_object/datapoint_types.h
diff --git a/src/knx/dpt.cpp b/src/knx/group_object/dpt.cpp
similarity index 100%
rename from src/knx/dpt.cpp
rename to src/knx/group_object/dpt.cpp
diff --git a/src/knx/dpt.h b/src/knx/group_object/dpt.h
similarity index 100%
rename from src/knx/dpt.h
rename to src/knx/group_object/dpt.h
diff --git a/src/knx/dptconvert.cpp b/src/knx/group_object/dptconvert.cpp
similarity index 100%
rename from src/knx/dptconvert.cpp
rename to src/knx/group_object/dptconvert.cpp
diff --git a/src/knx/dptconvert.h b/src/knx/group_object/dptconvert.h
similarity index 100%
rename from src/knx/dptconvert.h
rename to src/knx/group_object/dptconvert.h
diff --git a/src/knx/group_object.cpp b/src/knx/group_object/group_object.cpp
similarity index 100%
rename from src/knx/group_object.cpp
rename to src/knx/group_object/group_object.cpp
diff --git a/src/knx/group_object.h b/src/knx/group_object/group_object.h
similarity index 100%
rename from src/knx/group_object.h
rename to src/knx/group_object/group_object.h
diff --git a/src/knx/knx_value.cpp b/src/knx/group_object/knx_value.cpp
similarity index 100%
rename from src/knx/knx_value.cpp
rename to src/knx/group_object/knx_value.cpp
diff --git a/src/knx/knx_value.h b/src/knx/group_object/knx_value.h
similarity index 100%
rename from src/knx/knx_value.h
rename to src/knx/group_object/knx_value.h
diff --git a/src/knx/address_table_object.cpp b/src/knx/interface_object/address_table_object.cpp
similarity index 100%
rename from src/knx/address_table_object.cpp
rename to src/knx/interface_object/address_table_object.cpp
diff --git a/src/knx/address_table_object.h b/src/knx/interface_object/address_table_object.h
similarity index 100%
rename from src/knx/address_table_object.h
rename to src/knx/interface_object/address_table_object.h
diff --git a/src/knx/application_program_object.cpp b/src/knx/interface_object/application_program_object.cpp
similarity index 100%
rename from src/knx/application_program_object.cpp
rename to src/knx/interface_object/application_program_object.cpp
diff --git a/src/knx/application_program_object.h b/src/knx/interface_object/application_program_object.h
similarity index 100%
rename from src/knx/application_program_object.h
rename to src/knx/interface_object/application_program_object.h
diff --git a/src/knx/association_table_object.cpp b/src/knx/interface_object/association_table_object.cpp
similarity index 100%
rename from src/knx/association_table_object.cpp
rename to src/knx/interface_object/association_table_object.cpp
diff --git a/src/knx/association_table_object.h b/src/knx/interface_object/association_table_object.h
similarity index 100%
rename from src/knx/association_table_object.h
rename to src/knx/interface_object/association_table_object.h
diff --git a/src/knx/callback_property.h b/src/knx/interface_object/callback_property.h
similarity index 100%
rename from src/knx/callback_property.h
rename to src/knx/interface_object/callback_property.h
diff --git a/src/knx/data_property.cpp b/src/knx/interface_object/data_property.cpp
similarity index 100%
rename from src/knx/data_property.cpp
rename to src/knx/interface_object/data_property.cpp
diff --git a/src/knx/data_property.h b/src/knx/interface_object/data_property.h
similarity index 100%
rename from src/knx/data_property.h
rename to src/knx/interface_object/data_property.h
diff --git a/src/knx/device_object.cpp b/src/knx/interface_object/device_object.cpp
similarity index 100%
rename from src/knx/device_object.cpp
rename to src/knx/interface_object/device_object.cpp
diff --git a/src/knx/device_object.h b/src/knx/interface_object/device_object.h
similarity index 100%
rename from src/knx/device_object.h
rename to src/knx/interface_object/device_object.h
diff --git a/src/knx/function_property.h b/src/knx/interface_object/function_property.h
similarity index 100%
rename from src/knx/function_property.h
rename to src/knx/interface_object/function_property.h
diff --git a/src/knx/group_object_table_object.cpp b/src/knx/interface_object/group_object_table_object.cpp
similarity index 100%
rename from src/knx/group_object_table_object.cpp
rename to src/knx/interface_object/group_object_table_object.cpp
diff --git a/src/knx/group_object_table_object.h b/src/knx/interface_object/group_object_table_object.h
similarity index 100%
rename from src/knx/group_object_table_object.h
rename to src/knx/interface_object/group_object_table_object.h
diff --git a/src/knx/interface_object.cpp b/src/knx/interface_object/interface_object.cpp
similarity index 100%
rename from src/knx/interface_object.cpp
rename to src/knx/interface_object/interface_object.cpp
diff --git a/src/knx/interface_object.h b/src/knx/interface_object/interface_object.h
similarity index 100%
rename from src/knx/interface_object.h
rename to src/knx/interface_object/interface_object.h
diff --git a/src/knx/property.cpp b/src/knx/interface_object/property.cpp
similarity index 100%
rename from src/knx/property.cpp
rename to src/knx/interface_object/property.cpp
diff --git a/src/knx/property.h b/src/knx/interface_object/property.h
similarity index 100%
rename from src/knx/property.h
rename to src/knx/interface_object/property.h
diff --git a/src/knx/router_object.cpp b/src/knx/interface_object/router_object.cpp
similarity index 100%
rename from src/knx/router_object.cpp
rename to src/knx/interface_object/router_object.cpp
diff --git a/src/knx/router_object.h b/src/knx/interface_object/router_object.h
similarity index 100%
rename from src/knx/router_object.h
rename to src/knx/interface_object/router_object.h
diff --git a/src/knx/table_object.cpp b/src/knx/interface_object/table_object.cpp
similarity index 100%
rename from src/knx/table_object.cpp
rename to src/knx/interface_object/table_object.cpp
diff --git a/src/knx/table_object.h b/src/knx/interface_object/table_object.h
similarity index 100%
rename from src/knx/table_object.h
rename to src/knx/interface_object/table_object.h
diff --git a/src/knx_facade.cpp b/src/knx/knx_facade.cpp
similarity index 100%
rename from src/knx_facade.cpp
rename to src/knx/knx_facade.cpp
diff --git a/src/knx_facade.h b/src/knx/knx_facade.h
similarity index 100%
rename from src/knx_facade.h
rename to src/knx/knx_facade.h
diff --git a/src/knx/network_layer.cpp b/src/knx/network_layer/network_layer.cpp
similarity index 100%
rename from src/knx/network_layer.cpp
rename to src/knx/network_layer/network_layer.cpp
diff --git a/src/knx/network_layer.h b/src/knx/network_layer/network_layer.h
similarity index 100%
rename from src/knx/network_layer.h
rename to src/knx/network_layer/network_layer.h
diff --git a/src/knx/network_layer_coupler.cpp b/src/knx/network_layer/network_layer_coupler.cpp
similarity index 100%
rename from src/knx/network_layer_coupler.cpp
rename to src/knx/network_layer/network_layer_coupler.cpp
diff --git a/src/knx/network_layer_coupler.h b/src/knx/network_layer/network_layer_coupler.h
similarity index 100%
rename from src/knx/network_layer_coupler.h
rename to src/knx/network_layer/network_layer_coupler.h
diff --git a/src/knx/network_layer_device.cpp b/src/knx/network_layer/network_layer_device.cpp
similarity index 100%
rename from src/knx/network_layer_device.cpp
rename to src/knx/network_layer/network_layer_device.cpp
diff --git a/src/knx/network_layer_device.h b/src/knx/network_layer/network_layer_device.h
similarity index 100%
rename from src/knx/network_layer_device.h
rename to src/knx/network_layer/network_layer_device.h
diff --git a/src/knx/network_layer_entity.cpp b/src/knx/network_layer/network_layer_entity.cpp
similarity index 100%
rename from src/knx/network_layer_entity.cpp
rename to src/knx/network_layer/network_layer_entity.cpp
diff --git a/src/knx/network_layer_entity.h b/src/knx/network_layer/network_layer_entity.h
similarity index 100%
rename from src/knx/network_layer_entity.h
rename to src/knx/network_layer/network_layer_entity.h
diff --git a/src/knx/npdu.cpp b/src/knx/network_layer/npdu.cpp
similarity index 100%
rename from src/knx/npdu.cpp
rename to src/knx/network_layer/npdu.cpp
diff --git a/src/knx/npdu.h b/src/knx/network_layer/npdu.h
similarity index 100%
rename from src/knx/npdu.h
rename to src/knx/network_layer/npdu.h
diff --git a/src/knx/platform.cpp b/src/knx/platform/platform.cpp
similarity index 100%
rename from src/knx/platform.cpp
rename to src/knx/platform/platform.cpp
diff --git a/src/knx/platform.h b/src/knx/platform/platform.h
similarity index 100%
rename from src/knx/platform.h
rename to src/knx/platform/platform.h
diff --git a/src/knx/tp_frame.cpp b/src/knx/tp/tp_frame.cpp
similarity index 100%
rename from src/knx/tp_frame.cpp
rename to src/knx/tp/tp_frame.cpp
diff --git a/src/knx/tp_frame.h b/src/knx/tp/tp_frame.h
similarity index 100%
rename from src/knx/tp_frame.h
rename to src/knx/tp/tp_frame.h
diff --git a/src/knx/tpuart_data_link_layer.cpp b/src/knx/tp/tpuart_data_link_layer.cpp
similarity index 100%
rename from src/knx/tpuart_data_link_layer.cpp
rename to src/knx/tp/tpuart_data_link_layer.cpp
diff --git a/src/knx/tpuart_data_link_layer.h b/src/knx/tp/tpuart_data_link_layer.h
similarity index 100%
rename from src/knx/tpuart_data_link_layer.h
rename to src/knx/tp/tpuart_data_link_layer.h
diff --git a/src/knx/tpdu.cpp b/src/knx/transport_layer/tpdu.cpp
similarity index 100%
rename from src/knx/tpdu.cpp
rename to src/knx/transport_layer/tpdu.cpp
diff --git a/src/knx/tpdu.h b/src/knx/transport_layer/tpdu.h
similarity index 100%
rename from src/knx/tpdu.h
rename to src/knx/transport_layer/tpdu.h
diff --git a/src/knx/transport_layer.cpp b/src/knx/transport_layer/transport_layer.cpp
similarity index 100%
rename from src/knx/transport_layer.cpp
rename to src/knx/transport_layer/transport_layer.cpp
diff --git a/src/knx/transport_layer.h b/src/knx/transport_layer/transport_layer.h
similarity index 100%
rename from src/knx/transport_layer.h
rename to src/knx/transport_layer/transport_layer.h
diff --git a/src/knx/memory.cpp b/src/knx/util/memory.cpp
similarity index 100%
rename from src/knx/memory.cpp
rename to src/knx/util/memory.cpp
diff --git a/src/knx/memory.h b/src/knx/util/memory.h
similarity index 100%
rename from src/knx/memory.h
rename to src/knx/util/memory.h
diff --git a/src/knx/save_restore.h b/src/knx/util/save_restore.h
similarity index 100%
rename from src/knx/save_restore.h
rename to src/knx/util/save_restore.h