diff --git a/src/knxold/address_table_object.cpp b/src/knx/address_table_object.cpp similarity index 100% rename from src/knxold/address_table_object.cpp rename to src/knx/address_table_object.cpp diff --git a/src/knxold/address_table_object.h b/src/knx/address_table_object.h similarity index 100% rename from src/knxold/address_table_object.h rename to src/knx/address_table_object.h diff --git a/src/knxold/aes.c b/src/knx/aes.c similarity index 100% rename from src/knxold/aes.c rename to src/knx/aes.c diff --git a/src/knxold/aes.h b/src/knx/aes.h similarity index 100% rename from src/knxold/aes.h rename to src/knx/aes.h diff --git a/src/knxold/aes.hpp b/src/knx/aes.hpp similarity index 100% rename from src/knxold/aes.hpp rename to src/knx/aes.hpp diff --git a/src/knxold/apdu.cpp b/src/knx/apdu.cpp similarity index 100% rename from src/knxold/apdu.cpp rename to src/knx/apdu.cpp diff --git a/src/knxold/apdu.h b/src/knx/apdu.h similarity index 100% rename from src/knxold/apdu.h rename to src/knx/apdu.h diff --git a/src/knxold/application_layer.cpp b/src/knx/application_layer.cpp similarity index 100% rename from src/knxold/application_layer.cpp rename to src/knx/application_layer.cpp diff --git a/src/knxold/application_layer.h b/src/knx/application_layer.h similarity index 100% rename from src/knxold/application_layer.h rename to src/knx/application_layer.h diff --git a/src/knxold/application_program_object.cpp b/src/knx/application_program_object.cpp similarity index 100% rename from src/knxold/application_program_object.cpp rename to src/knx/application_program_object.cpp diff --git a/src/knxold/application_program_object.h b/src/knx/application_program_object.h similarity index 100% rename from src/knxold/application_program_object.h rename to src/knx/application_program_object.h diff --git a/src/knxold/association_table_object.cpp b/src/knx/association_table_object.cpp similarity index 100% rename from src/knxold/association_table_object.cpp rename to src/knx/association_table_object.cpp diff --git a/src/knxold/association_table_object.h b/src/knx/association_table_object.h similarity index 100% rename from src/knxold/association_table_object.h rename to src/knx/association_table_object.h diff --git a/src/knxold/bau.cpp b/src/knx/bau.cpp similarity index 100% rename from src/knxold/bau.cpp rename to src/knx/bau.cpp diff --git a/src/knxold/bau.h b/src/knx/bau.h similarity index 100% rename from src/knxold/bau.h rename to src/knx/bau.h diff --git a/src/knxold/bau07B0.cpp b/src/knx/bau07B0.cpp similarity index 100% rename from src/knxold/bau07B0.cpp rename to src/knx/bau07B0.cpp diff --git a/src/knxold/bau07B0.h b/src/knx/bau07B0.h similarity index 100% rename from src/knxold/bau07B0.h rename to src/knx/bau07B0.h diff --git a/src/knxold/bau091A.cpp b/src/knx/bau091A.cpp similarity index 100% rename from src/knxold/bau091A.cpp rename to src/knx/bau091A.cpp diff --git a/src/knxold/bau091A.h b/src/knx/bau091A.h similarity index 100% rename from src/knxold/bau091A.h rename to src/knx/bau091A.h diff --git a/src/knxold/bau27B0.cpp b/src/knx/bau27B0.cpp similarity index 100% rename from src/knxold/bau27B0.cpp rename to src/knx/bau27B0.cpp diff --git a/src/knxold/bau27B0.h b/src/knx/bau27B0.h similarity index 100% rename from src/knxold/bau27B0.h rename to src/knx/bau27B0.h diff --git a/src/knxold/bau2920.cpp b/src/knx/bau2920.cpp similarity index 100% rename from src/knxold/bau2920.cpp rename to src/knx/bau2920.cpp diff --git a/src/knxold/bau2920.h b/src/knx/bau2920.h similarity index 100% rename from src/knxold/bau2920.h rename to src/knx/bau2920.h diff --git a/src/knxold/bau57B0.cpp b/src/knx/bau57B0.cpp similarity index 100% rename from src/knxold/bau57B0.cpp rename to src/knx/bau57B0.cpp diff --git a/src/knxold/bau57B0.h b/src/knx/bau57B0.h similarity index 100% rename from src/knxold/bau57B0.h rename to src/knx/bau57B0.h diff --git a/src/knxold/bau_systemB.cpp b/src/knx/bau_systemB.cpp similarity index 100% rename from src/knxold/bau_systemB.cpp rename to src/knx/bau_systemB.cpp diff --git a/src/knxold/bau_systemB.h b/src/knx/bau_systemB.h similarity index 100% rename from src/knxold/bau_systemB.h rename to src/knx/bau_systemB.h diff --git a/src/knxold/bau_systemB_coupler.cpp b/src/knx/bau_systemB_coupler.cpp similarity index 100% rename from src/knxold/bau_systemB_coupler.cpp rename to src/knx/bau_systemB_coupler.cpp diff --git a/src/knxold/bau_systemB_coupler.h b/src/knx/bau_systemB_coupler.h similarity index 100% rename from src/knxold/bau_systemB_coupler.h rename to src/knx/bau_systemB_coupler.h diff --git a/src/knxold/bau_systemB_device.cpp b/src/knx/bau_systemB_device.cpp similarity index 100% rename from src/knxold/bau_systemB_device.cpp rename to src/knx/bau_systemB_device.cpp diff --git a/src/knxold/bau_systemB_device.h b/src/knx/bau_systemB_device.h similarity index 100% rename from src/knxold/bau_systemB_device.h rename to src/knx/bau_systemB_device.h diff --git a/src/knxold/bits.cpp b/src/knx/bits.cpp similarity index 100% rename from src/knxold/bits.cpp rename to src/knx/bits.cpp diff --git a/src/knxold/bits.h b/src/knx/bits.h similarity index 100% rename from src/knxold/bits.h rename to src/knx/bits.h diff --git a/src/knxold/callback_property.h b/src/knx/callback_property.h similarity index 100% rename from src/knxold/callback_property.h rename to src/knx/callback_property.h diff --git a/src/knxold/cemi_frame.cpp b/src/knx/cemi_frame.cpp similarity index 100% rename from src/knxold/cemi_frame.cpp rename to src/knx/cemi_frame.cpp diff --git a/src/knxold/cemi_frame.h b/src/knx/cemi_frame.h similarity index 100% rename from src/knxold/cemi_frame.h rename to src/knx/cemi_frame.h diff --git a/src/knxold/cemi_server.cpp b/src/knx/cemi_server.cpp similarity index 100% rename from src/knxold/cemi_server.cpp rename to src/knx/cemi_server.cpp diff --git a/src/knxold/cemi_server.h b/src/knx/cemi_server.h similarity index 100% rename from src/knxold/cemi_server.h rename to src/knx/cemi_server.h diff --git a/src/knxold/cemi_server_object.cpp b/src/knx/cemi_server_object.cpp similarity index 100% rename from src/knxold/cemi_server_object.cpp rename to src/knx/cemi_server_object.cpp diff --git a/src/knxold/cemi_server_object.h b/src/knx/cemi_server_object.h similarity index 100% rename from src/knxold/cemi_server_object.h rename to src/knx/cemi_server_object.h diff --git a/src/knxold/config.h b/src/knx/config.h similarity index 100% rename from src/knxold/config.h rename to src/knx/config.h diff --git a/src/knxold/data_link_layer.cpp b/src/knx/data_link_layer.cpp similarity index 100% rename from src/knxold/data_link_layer.cpp rename to src/knx/data_link_layer.cpp diff --git a/src/knxold/data_link_layer.h b/src/knx/data_link_layer.h similarity index 100% rename from src/knxold/data_link_layer.h rename to src/knx/data_link_layer.h diff --git a/src/knxold/data_property.cpp b/src/knx/data_property.cpp similarity index 100% rename from src/knxold/data_property.cpp rename to src/knx/data_property.cpp diff --git a/src/knxold/data_property.h b/src/knx/data_property.h similarity index 100% rename from src/knxold/data_property.h rename to src/knx/data_property.h diff --git a/src/knxold/datapoint_types.cpp b/src/knx/datapoint_types.cpp similarity index 100% rename from src/knxold/datapoint_types.cpp rename to src/knx/datapoint_types.cpp diff --git a/src/knxold/datapoint_types.h b/src/knx/datapoint_types.h similarity index 100% rename from src/knxold/datapoint_types.h rename to src/knx/datapoint_types.h diff --git a/src/knxold/device_object.cpp b/src/knx/device_object.cpp similarity index 100% rename from src/knxold/device_object.cpp rename to src/knx/device_object.cpp diff --git a/src/knxold/device_object.h b/src/knx/device_object.h similarity index 100% rename from src/knxold/device_object.h rename to src/knx/device_object.h diff --git a/src/knxold/dpt.cpp b/src/knx/dpt.cpp similarity index 100% rename from src/knxold/dpt.cpp rename to src/knx/dpt.cpp diff --git a/src/knxold/dpt.h b/src/knx/dpt.h similarity index 100% rename from src/knxold/dpt.h rename to src/knx/dpt.h diff --git a/src/knxold/dptconvert.cpp b/src/knx/dptconvert.cpp similarity index 100% rename from src/knxold/dptconvert.cpp rename to src/knx/dptconvert.cpp diff --git a/src/knxold/dptconvert.h b/src/knx/dptconvert.h similarity index 100% rename from src/knxold/dptconvert.h rename to src/knx/dptconvert.h diff --git a/src/knxold/function_property.h b/src/knx/function_property.h similarity index 100% rename from src/knxold/function_property.h rename to src/knx/function_property.h diff --git a/src/knxold/group_object.cpp b/src/knx/group_object.cpp similarity index 100% rename from src/knxold/group_object.cpp rename to src/knx/group_object.cpp diff --git a/src/knxold/group_object.h b/src/knx/group_object.h similarity index 100% rename from src/knxold/group_object.h rename to src/knx/group_object.h diff --git a/src/knxold/group_object_table_object.cpp b/src/knx/group_object_table_object.cpp similarity index 100% rename from src/knxold/group_object_table_object.cpp rename to src/knx/group_object_table_object.cpp diff --git a/src/knxold/group_object_table_object.h b/src/knx/group_object_table_object.h similarity index 100% rename from src/knxold/group_object_table_object.h rename to src/knx/group_object_table_object.h diff --git a/src/knxold/interface_object.cpp b/src/knx/interface_object.cpp similarity index 100% rename from src/knxold/interface_object.cpp rename to src/knx/interface_object.cpp diff --git a/src/knxold/interface_object.h b/src/knx/interface_object.h similarity index 100% rename from src/knxold/interface_object.h rename to src/knx/interface_object.h diff --git a/src/knxold/ip_data_link_layer.cpp b/src/knx/ip_data_link_layer.cpp similarity index 100% rename from src/knxold/ip_data_link_layer.cpp rename to src/knx/ip_data_link_layer.cpp diff --git a/src/knxold/ip_data_link_layer.h b/src/knx/ip_data_link_layer.h similarity index 100% rename from src/knxold/ip_data_link_layer.h rename to src/knx/ip_data_link_layer.h diff --git a/src/knxold/ip_host_protocol_address_information.cpp b/src/knx/ip_host_protocol_address_information.cpp similarity index 100% rename from src/knxold/ip_host_protocol_address_information.cpp rename to src/knx/ip_host_protocol_address_information.cpp diff --git a/src/knxold/ip_host_protocol_address_information.h b/src/knx/ip_host_protocol_address_information.h similarity index 100% rename from src/knxold/ip_host_protocol_address_information.h rename to src/knx/ip_host_protocol_address_information.h diff --git a/src/knxold/ip_parameter_object.cpp b/src/knx/ip_parameter_object.cpp similarity index 100% rename from src/knxold/ip_parameter_object.cpp rename to src/knx/ip_parameter_object.cpp diff --git a/src/knxold/ip_parameter_object.h b/src/knx/ip_parameter_object.h similarity index 100% rename from src/knxold/ip_parameter_object.h rename to src/knx/ip_parameter_object.h diff --git a/src/knxold/knx_ip_device_information_dib.cpp b/src/knx/knx_ip_device_information_dib.cpp similarity index 100% rename from src/knxold/knx_ip_device_information_dib.cpp rename to src/knx/knx_ip_device_information_dib.cpp diff --git a/src/knxold/knx_ip_device_information_dib.h b/src/knx/knx_ip_device_information_dib.h similarity index 100% rename from src/knxold/knx_ip_device_information_dib.h rename to src/knx/knx_ip_device_information_dib.h diff --git a/src/knxold/knx_ip_dib.cpp b/src/knx/knx_ip_dib.cpp similarity index 100% rename from src/knxold/knx_ip_dib.cpp rename to src/knx/knx_ip_dib.cpp diff --git a/src/knxold/knx_ip_dib.h b/src/knx/knx_ip_dib.h similarity index 100% rename from src/knxold/knx_ip_dib.h rename to src/knx/knx_ip_dib.h diff --git a/src/knxold/knx_ip_frame.cpp b/src/knx/knx_ip_frame.cpp similarity index 100% rename from src/knxold/knx_ip_frame.cpp rename to src/knx/knx_ip_frame.cpp diff --git a/src/knxold/knx_ip_frame.h b/src/knx/knx_ip_frame.h similarity index 100% rename from src/knxold/knx_ip_frame.h rename to src/knx/knx_ip_frame.h diff --git a/src/knxold/knx_ip_routing_indication.cpp b/src/knx/knx_ip_routing_indication.cpp similarity index 100% rename from src/knxold/knx_ip_routing_indication.cpp rename to src/knx/knx_ip_routing_indication.cpp diff --git a/src/knxold/knx_ip_routing_indication.h b/src/knx/knx_ip_routing_indication.h similarity index 100% rename from src/knxold/knx_ip_routing_indication.h rename to src/knx/knx_ip_routing_indication.h diff --git a/src/knxold/knx_ip_search_request.cpp b/src/knx/knx_ip_search_request.cpp similarity index 100% rename from src/knxold/knx_ip_search_request.cpp rename to src/knx/knx_ip_search_request.cpp diff --git a/src/knxold/knx_ip_search_request.h b/src/knx/knx_ip_search_request.h similarity index 100% rename from src/knxold/knx_ip_search_request.h rename to src/knx/knx_ip_search_request.h diff --git a/src/knxold/knx_ip_search_response.cpp b/src/knx/knx_ip_search_response.cpp similarity index 100% rename from src/knxold/knx_ip_search_response.cpp rename to src/knx/knx_ip_search_response.cpp diff --git a/src/knxold/knx_ip_search_response.h b/src/knx/knx_ip_search_response.h similarity index 100% rename from src/knxold/knx_ip_search_response.h rename to src/knx/knx_ip_search_response.h diff --git a/src/knxold/knx_ip_supported_service_dib.cpp b/src/knx/knx_ip_supported_service_dib.cpp similarity index 100% rename from src/knxold/knx_ip_supported_service_dib.cpp rename to src/knx/knx_ip_supported_service_dib.cpp diff --git a/src/knxold/knx_ip_supported_service_dib.h b/src/knx/knx_ip_supported_service_dib.h similarity index 100% rename from src/knxold/knx_ip_supported_service_dib.h rename to src/knx/knx_ip_supported_service_dib.h diff --git a/src/knxold/knx_types.h b/src/knx/knx_types.h similarity index 100% rename from src/knxold/knx_types.h rename to src/knx/knx_types.h diff --git a/src/knxold/knx_value.cpp b/src/knx/knx_value.cpp similarity index 100% rename from src/knxold/knx_value.cpp rename to src/knx/knx_value.cpp diff --git a/src/knxold/knx_value.h b/src/knx/knx_value.h similarity index 100% rename from src/knxold/knx_value.h rename to src/knx/knx_value.h diff --git a/src/knxold/memory.cpp b/src/knx/memory.cpp similarity index 100% rename from src/knxold/memory.cpp rename to src/knx/memory.cpp diff --git a/src/knxold/memory.h b/src/knx/memory.h similarity index 100% rename from src/knxold/memory.h rename to src/knx/memory.h diff --git a/src/knxold/network_layer.cpp b/src/knx/network_layer.cpp similarity index 100% rename from src/knxold/network_layer.cpp rename to src/knx/network_layer.cpp diff --git a/src/knxold/network_layer.h b/src/knx/network_layer.h similarity index 100% rename from src/knxold/network_layer.h rename to src/knx/network_layer.h diff --git a/src/knxold/network_layer_coupler.cpp b/src/knx/network_layer_coupler.cpp similarity index 100% rename from src/knxold/network_layer_coupler.cpp rename to src/knx/network_layer_coupler.cpp diff --git a/src/knxold/network_layer_coupler.h b/src/knx/network_layer_coupler.h similarity index 100% rename from src/knxold/network_layer_coupler.h rename to src/knx/network_layer_coupler.h diff --git a/src/knxold/network_layer_device.cpp b/src/knx/network_layer_device.cpp similarity index 100% rename from src/knxold/network_layer_device.cpp rename to src/knx/network_layer_device.cpp diff --git a/src/knxold/network_layer_device.h b/src/knx/network_layer_device.h similarity index 100% rename from src/knxold/network_layer_device.h rename to src/knx/network_layer_device.h diff --git a/src/knxold/network_layer_entity.cpp b/src/knx/network_layer_entity.cpp similarity index 100% rename from src/knxold/network_layer_entity.cpp rename to src/knx/network_layer_entity.cpp diff --git a/src/knxold/network_layer_entity.h b/src/knx/network_layer_entity.h similarity index 100% rename from src/knxold/network_layer_entity.h rename to src/knx/network_layer_entity.h diff --git a/src/knxold/npdu.cpp b/src/knx/npdu.cpp similarity index 100% rename from src/knxold/npdu.cpp rename to src/knx/npdu.cpp diff --git a/src/knxold/npdu.h b/src/knx/npdu.h similarity index 100% rename from src/knxold/npdu.h rename to src/knx/npdu.h diff --git a/src/knxold/platform.cpp b/src/knx/platform.cpp similarity index 100% rename from src/knxold/platform.cpp rename to src/knx/platform.cpp diff --git a/src/knxold/platform.h b/src/knx/platform.h similarity index 100% rename from src/knxold/platform.h rename to src/knx/platform.h diff --git a/src/knxold/property.cpp b/src/knx/property.cpp similarity index 100% rename from src/knxold/property.cpp rename to src/knx/property.cpp diff --git a/src/knxold/property.h b/src/knx/property.h similarity index 100% rename from src/knxold/property.h rename to src/knx/property.h diff --git a/src/knxold/rf_data_link_layer.cpp b/src/knx/rf_data_link_layer.cpp similarity index 100% rename from src/knxold/rf_data_link_layer.cpp rename to src/knx/rf_data_link_layer.cpp diff --git a/src/knxold/rf_data_link_layer.h b/src/knx/rf_data_link_layer.h similarity index 100% rename from src/knxold/rf_data_link_layer.h rename to src/knx/rf_data_link_layer.h diff --git a/src/knxold/rf_medium_object.cpp b/src/knx/rf_medium_object.cpp similarity index 100% rename from src/knxold/rf_medium_object.cpp rename to src/knx/rf_medium_object.cpp diff --git a/src/knxold/rf_medium_object.h b/src/knx/rf_medium_object.h similarity index 100% rename from src/knxold/rf_medium_object.h rename to src/knx/rf_medium_object.h diff --git a/src/knxold/rf_physical_layer.h b/src/knx/rf_physical_layer.h similarity index 100% rename from src/knxold/rf_physical_layer.h rename to src/knx/rf_physical_layer.h diff --git a/src/knxold/rf_physical_layer_cc1101.cpp b/src/knx/rf_physical_layer_cc1101.cpp similarity index 100% rename from src/knxold/rf_physical_layer_cc1101.cpp rename to src/knx/rf_physical_layer_cc1101.cpp diff --git a/src/knxold/rf_physical_layer_cc1101.h b/src/knx/rf_physical_layer_cc1101.h similarity index 100% rename from src/knxold/rf_physical_layer_cc1101.h rename to src/knx/rf_physical_layer_cc1101.h diff --git a/src/knxold/rf_physical_layer_cc1310.cpp b/src/knx/rf_physical_layer_cc1310.cpp similarity index 100% rename from src/knxold/rf_physical_layer_cc1310.cpp rename to src/knx/rf_physical_layer_cc1310.cpp diff --git a/src/knxold/rf_physical_layer_cc1310.h b/src/knx/rf_physical_layer_cc1310.h similarity index 100% rename from src/knxold/rf_physical_layer_cc1310.h rename to src/knx/rf_physical_layer_cc1310.h diff --git a/src/knxold/router_object.cpp b/src/knx/router_object.cpp similarity index 100% rename from src/knxold/router_object.cpp rename to src/knx/router_object.cpp diff --git a/src/knxold/router_object.h b/src/knx/router_object.h similarity index 100% rename from src/knxold/router_object.h rename to src/knx/router_object.h diff --git a/src/knxold/save_restore.h b/src/knx/save_restore.h similarity index 100% rename from src/knxold/save_restore.h rename to src/knx/save_restore.h diff --git a/src/knxold/secure_application_layer.cpp b/src/knx/secure_application_layer.cpp similarity index 100% rename from src/knxold/secure_application_layer.cpp rename to src/knx/secure_application_layer.cpp diff --git a/src/knxold/secure_application_layer.h b/src/knx/secure_application_layer.h similarity index 100% rename from src/knxold/secure_application_layer.h rename to src/knx/secure_application_layer.h diff --git a/src/knxold/security_interface_object.cpp b/src/knx/security_interface_object.cpp similarity index 100% rename from src/knxold/security_interface_object.cpp rename to src/knx/security_interface_object.cpp diff --git a/src/knxold/security_interface_object.h b/src/knx/security_interface_object.h similarity index 100% rename from src/knxold/security_interface_object.h rename to src/knx/security_interface_object.h diff --git a/src/knxold/simple_map.h b/src/knx/simple_map.h similarity index 100% rename from src/knxold/simple_map.h rename to src/knx/simple_map.h diff --git a/src/knxold/table_object.cpp b/src/knx/table_object.cpp similarity index 100% rename from src/knxold/table_object.cpp rename to src/knx/table_object.cpp diff --git a/src/knxold/table_object.h b/src/knx/table_object.h similarity index 100% rename from src/knxold/table_object.h rename to src/knx/table_object.h diff --git a/src/knxold/tpdu.cpp b/src/knx/tpdu.cpp similarity index 100% rename from src/knxold/tpdu.cpp rename to src/knx/tpdu.cpp diff --git a/src/knxold/tpdu.h b/src/knx/tpdu.h similarity index 100% rename from src/knxold/tpdu.h rename to src/knx/tpdu.h diff --git a/src/knxold/tpuart_data_link_layer.cpp b/src/knx/tpuart_data_link_layer.cpp similarity index 100% rename from src/knxold/tpuart_data_link_layer.cpp rename to src/knx/tpuart_data_link_layer.cpp diff --git a/src/knxold/tpuart_data_link_layer.h b/src/knx/tpuart_data_link_layer.h similarity index 100% rename from src/knxold/tpuart_data_link_layer.h rename to src/knx/tpuart_data_link_layer.h diff --git a/src/knxold/transport_layer.cpp b/src/knx/transport_layer.cpp similarity index 100% rename from src/knxold/transport_layer.cpp rename to src/knx/transport_layer.cpp diff --git a/src/knxold/transport_layer.h b/src/knx/transport_layer.h similarity index 100% rename from src/knxold/transport_layer.h rename to src/knx/transport_layer.h diff --git a/src/knxold/usb_tunnel_interface.cpp b/src/knx/usb_tunnel_interface.cpp similarity index 100% rename from src/knxold/usb_tunnel_interface.cpp rename to src/knx/usb_tunnel_interface.cpp diff --git a/src/knxold/usb_tunnel_interface.h b/src/knx/usb_tunnel_interface.h similarity index 100% rename from src/knxold/usb_tunnel_interface.h rename to src/knx/usb_tunnel_interface.h