diff --git a/src/arch_config.h b/platform/arduino/arch_config.h
similarity index 100%
rename from src/arch_config.h
rename to platform/arduino/arch_config.h
diff --git a/src/button.cpp b/platform/arduino/button.cpp
similarity index 100%
rename from src/button.cpp
rename to platform/arduino/button.cpp
diff --git a/src/button.h b/platform/arduino/button.h
similarity index 100%
rename from src/button.h
rename to platform/arduino/button.h
diff --git a/src/esp_platform.cpp b/platform/arduino/esp_platform.cpp
similarity index 100%
rename from src/esp_platform.cpp
rename to platform/arduino/esp_platform.cpp
diff --git a/src/esp_platform.h b/platform/arduino/esp_platform.h
similarity index 100%
rename from src/esp_platform.h
rename to platform/arduino/esp_platform.h
diff --git a/src/knx.h b/platform/arduino/knx.h
similarity index 100%
rename from src/knx.h
rename to platform/arduino/knx.h
diff --git a/src/knx_facade.cpp b/platform/arduino/knx_facade.cpp
similarity index 100%
rename from src/knx_facade.cpp
rename to platform/arduino/knx_facade.cpp
diff --git a/src/knx_facade.h b/platform/arduino/knx_facade.h
similarity index 100%
rename from src/knx_facade.h
rename to platform/arduino/knx_facade.h
diff --git a/src/knx_facade_samd.cpp b/platform/arduino/knx_facade_samd.cpp
similarity index 100%
rename from src/knx_facade_samd.cpp
rename to platform/arduino/knx_facade_samd.cpp
diff --git a/src/led.cpp b/platform/arduino/led.cpp
similarity index 100%
rename from src/led.cpp
rename to platform/arduino/led.cpp
diff --git a/src/led.h b/platform/arduino/led.h
similarity index 100%
rename from src/led.h
rename to platform/arduino/led.h
diff --git a/src/nowifistate.cpp b/platform/arduino/nowifistate.cpp
similarity index 100%
rename from src/nowifistate.cpp
rename to platform/arduino/nowifistate.cpp
diff --git a/src/nowifistate.h b/platform/arduino/nowifistate.h
similarity index 100%
rename from src/nowifistate.h
rename to platform/arduino/nowifistate.h
diff --git a/src/programmingmodestate.cpp b/platform/arduino/programmingmodestate.cpp
similarity index 100%
rename from src/programmingmodestate.cpp
rename to platform/arduino/programmingmodestate.cpp
diff --git a/src/programmingmodestate.h b/platform/arduino/programmingmodestate.h
similarity index 100%
rename from src/programmingmodestate.h
rename to platform/arduino/programmingmodestate.h
diff --git a/src/runningstate.cpp b/platform/arduino/runningstate.cpp
similarity index 100%
rename from src/runningstate.cpp
rename to platform/arduino/runningstate.cpp
diff --git a/src/runningstate.h b/platform/arduino/runningstate.h
similarity index 100%
rename from src/runningstate.h
rename to platform/arduino/runningstate.h
diff --git a/src/samd_platform.cpp b/platform/arduino/samd_platform.cpp
similarity index 100%
rename from src/samd_platform.cpp
rename to platform/arduino/samd_platform.cpp
diff --git a/src/samd_platform.h b/platform/arduino/samd_platform.h
similarity index 100%
rename from src/samd_platform.h
rename to platform/arduino/samd_platform.h
diff --git a/src/state.cpp b/platform/arduino/state.cpp
similarity index 100%
rename from src/state.cpp
rename to platform/arduino/state.cpp
diff --git a/src/state.h b/platform/arduino/state.h
similarity index 100%
rename from src/state.h
rename to platform/arduino/state.h
diff --git a/src/wpsstate.cpp b/platform/arduino/wpsstate.cpp
similarity index 100%
rename from src/wpsstate.cpp
rename to platform/arduino/wpsstate.cpp
diff --git a/src/wpsstate.h b/platform/arduino/wpsstate.h
similarity index 100%
rename from src/wpsstate.h
rename to platform/arduino/wpsstate.h
diff --git a/src/knx/address_table_object.cpp b/src/address_table_object.cpp
similarity index 100%
rename from src/knx/address_table_object.cpp
rename to src/address_table_object.cpp
diff --git a/src/knx/address_table_object.h b/src/address_table_object.h
similarity index 100%
rename from src/knx/address_table_object.h
rename to src/address_table_object.h
diff --git a/src/knx/apdu.cpp b/src/apdu.cpp
similarity index 100%
rename from src/knx/apdu.cpp
rename to src/apdu.cpp
diff --git a/src/knx/apdu.h b/src/apdu.h
similarity index 100%
rename from src/knx/apdu.h
rename to src/apdu.h
diff --git a/src/knx/application_layer.cpp b/src/application_layer.cpp
similarity index 100%
rename from src/knx/application_layer.cpp
rename to src/application_layer.cpp
diff --git a/src/knx/application_layer.h b/src/application_layer.h
similarity index 100%
rename from src/knx/application_layer.h
rename to src/application_layer.h
diff --git a/src/knx/application_program_object.cpp b/src/application_program_object.cpp
similarity index 100%
rename from src/knx/application_program_object.cpp
rename to src/application_program_object.cpp
diff --git a/src/knx/application_program_object.h b/src/application_program_object.h
similarity index 100%
rename from src/knx/application_program_object.h
rename to src/application_program_object.h
diff --git a/src/knx/association_table_object.cpp b/src/association_table_object.cpp
similarity index 100%
rename from src/knx/association_table_object.cpp
rename to src/association_table_object.cpp
diff --git a/src/knx/association_table_object.h b/src/association_table_object.h
similarity index 100%
rename from src/knx/association_table_object.h
rename to src/association_table_object.h
diff --git a/src/knx/bau.cpp b/src/bau.cpp
similarity index 100%
rename from src/knx/bau.cpp
rename to src/bau.cpp
diff --git a/src/knx/bau.h b/src/bau.h
similarity index 100%
rename from src/knx/bau.h
rename to src/bau.h
diff --git a/src/knx/bau07B0.cpp b/src/bau07B0.cpp
similarity index 100%
rename from src/knx/bau07B0.cpp
rename to src/bau07B0.cpp
diff --git a/src/knx/bau07B0.h b/src/bau07B0.h
similarity index 100%
rename from src/knx/bau07B0.h
rename to src/bau07B0.h
diff --git a/src/knx/bau57B0.cpp b/src/bau57B0.cpp
similarity index 100%
rename from src/knx/bau57B0.cpp
rename to src/bau57B0.cpp
diff --git a/src/knx/bau57B0.h b/src/bau57B0.h
similarity index 100%
rename from src/knx/bau57B0.h
rename to src/bau57B0.h
diff --git a/src/knx/bau_systemB.cpp b/src/bau_systemB.cpp
similarity index 100%
rename from src/knx/bau_systemB.cpp
rename to src/bau_systemB.cpp
diff --git a/src/knx/bau_systemB.h b/src/bau_systemB.h
similarity index 100%
rename from src/knx/bau_systemB.h
rename to src/bau_systemB.h
diff --git a/src/knx/bits.cpp b/src/bits.cpp
similarity index 100%
rename from src/knx/bits.cpp
rename to src/bits.cpp
diff --git a/src/knx/bits.h b/src/bits.h
similarity index 100%
rename from src/knx/bits.h
rename to src/bits.h
diff --git a/src/knx/cemi_frame.cpp b/src/cemi_frame.cpp
similarity index 100%
rename from src/knx/cemi_frame.cpp
rename to src/cemi_frame.cpp
diff --git a/src/knx/cemi_frame.h b/src/cemi_frame.h
similarity index 100%
rename from src/knx/cemi_frame.h
rename to src/cemi_frame.h
diff --git a/src/knx/data_link_layer.cpp b/src/data_link_layer.cpp
similarity index 100%
rename from src/knx/data_link_layer.cpp
rename to src/data_link_layer.cpp
diff --git a/src/knx/data_link_layer.h b/src/data_link_layer.h
similarity index 100%
rename from src/knx/data_link_layer.h
rename to src/data_link_layer.h
diff --git a/src/knx/datapoint_types.cpp b/src/datapoint_types.cpp
similarity index 100%
rename from src/knx/datapoint_types.cpp
rename to src/datapoint_types.cpp
diff --git a/src/knx/datapoint_types.h b/src/datapoint_types.h
similarity index 100%
rename from src/knx/datapoint_types.h
rename to src/datapoint_types.h
diff --git a/src/knx/device_object.cpp b/src/device_object.cpp
similarity index 100%
rename from src/knx/device_object.cpp
rename to src/device_object.cpp
diff --git a/src/knx/device_object.h b/src/device_object.h
similarity index 100%
rename from src/knx/device_object.h
rename to src/device_object.h
diff --git a/src/knx/group_object.cpp b/src/group_object.cpp
similarity index 100%
rename from src/knx/group_object.cpp
rename to src/group_object.cpp
diff --git a/src/knx/group_object.h b/src/group_object.h
similarity index 100%
rename from src/knx/group_object.h
rename to src/group_object.h
diff --git a/src/knx/group_object_table_object.cpp b/src/group_object_table_object.cpp
similarity index 100%
rename from src/knx/group_object_table_object.cpp
rename to src/group_object_table_object.cpp
diff --git a/src/knx/group_object_table_object.h b/src/group_object_table_object.h
similarity index 100%
rename from src/knx/group_object_table_object.h
rename to src/group_object_table_object.h
diff --git a/src/knx/interface_object.cpp b/src/interface_object.cpp
similarity index 100%
rename from src/knx/interface_object.cpp
rename to src/interface_object.cpp
diff --git a/src/knx/interface_object.h b/src/interface_object.h
similarity index 100%
rename from src/knx/interface_object.h
rename to src/interface_object.h
diff --git a/src/knx/ip_data_link_layer.cpp b/src/ip_data_link_layer.cpp
similarity index 100%
rename from src/knx/ip_data_link_layer.cpp
rename to src/ip_data_link_layer.cpp
diff --git a/src/knx/ip_data_link_layer.h b/src/ip_data_link_layer.h
similarity index 100%
rename from src/knx/ip_data_link_layer.h
rename to src/ip_data_link_layer.h
diff --git a/src/knx/ip_parameter_object.cpp b/src/ip_parameter_object.cpp
similarity index 100%
rename from src/knx/ip_parameter_object.cpp
rename to src/ip_parameter_object.cpp
diff --git a/src/knx/ip_parameter_object.h b/src/ip_parameter_object.h
similarity index 100%
rename from src/knx/ip_parameter_object.h
rename to src/ip_parameter_object.h
diff --git a/src/knx/knx_types.h b/src/knx_types.h
similarity index 100%
rename from src/knx/knx_types.h
rename to src/knx_types.h
diff --git a/src/knx/memory.cpp b/src/memory.cpp
similarity index 100%
rename from src/knx/memory.cpp
rename to src/memory.cpp
diff --git a/src/knx/memory.h b/src/memory.h
similarity index 100%
rename from src/knx/memory.h
rename to src/memory.h
diff --git a/src/knx/network_layer.cpp b/src/network_layer.cpp
similarity index 100%
rename from src/knx/network_layer.cpp
rename to src/network_layer.cpp
diff --git a/src/knx/network_layer.h b/src/network_layer.h
similarity index 100%
rename from src/knx/network_layer.h
rename to src/network_layer.h
diff --git a/src/knx/npdu.cpp b/src/npdu.cpp
similarity index 100%
rename from src/knx/npdu.cpp
rename to src/npdu.cpp
diff --git a/src/knx/npdu.h b/src/npdu.h
similarity index 100%
rename from src/knx/npdu.h
rename to src/npdu.h
diff --git a/src/knx/platform.cpp b/src/platform.cpp
similarity index 100%
rename from src/knx/platform.cpp
rename to src/platform.cpp
diff --git a/src/knx/platform.h b/src/platform.h
similarity index 100%
rename from src/knx/platform.h
rename to src/platform.h
diff --git a/src/knx/property_types.h b/src/property_types.h
similarity index 100%
rename from src/knx/property_types.h
rename to src/property_types.h
diff --git a/src/knx/save_restore.h b/src/save_restore.h
similarity index 100%
rename from src/knx/save_restore.h
rename to src/save_restore.h
diff --git a/src/knx/table_object.cpp b/src/table_object.cpp
similarity index 100%
rename from src/knx/table_object.cpp
rename to src/table_object.cpp
diff --git a/src/knx/table_object.h b/src/table_object.h
similarity index 100%
rename from src/knx/table_object.h
rename to src/table_object.h
diff --git a/src/knx/tpdu.cpp b/src/tpdu.cpp
similarity index 100%
rename from src/knx/tpdu.cpp
rename to src/tpdu.cpp
diff --git a/src/knx/tpdu.h b/src/tpdu.h
similarity index 100%
rename from src/knx/tpdu.h
rename to src/tpdu.h
diff --git a/src/knx/tpuart_data_link_layer.cpp b/src/tpuart_data_link_layer.cpp
similarity index 100%
rename from src/knx/tpuart_data_link_layer.cpp
rename to src/tpuart_data_link_layer.cpp
diff --git a/src/knx/tpuart_data_link_layer.h b/src/tpuart_data_link_layer.h
similarity index 100%
rename from src/knx/tpuart_data_link_layer.h
rename to src/tpuart_data_link_layer.h
diff --git a/src/knx/transport_layer.cpp b/src/transport_layer.cpp
similarity index 100%
rename from src/knx/transport_layer.cpp
rename to src/transport_layer.cpp
diff --git a/src/knx/transport_layer.h b/src/transport_layer.h
similarity index 100%
rename from src/knx/transport_layer.h
rename to src/transport_layer.h