diff --git a/net/C027Interface/C027Interface.cpp b/drivers/C027Interface/C027Interface.cpp
similarity index 100%
rename from net/C027Interface/C027Interface.cpp
rename to drivers/C027Interface/C027Interface.cpp
diff --git a/net/C027Interface/C027Interface.h b/drivers/C027Interface/C027Interface.h
similarity index 100%
rename from net/C027Interface/C027Interface.h
rename to drivers/C027Interface/C027Interface.h
diff --git a/net/C027Interface/C027_Support.lib b/drivers/C027Interface/C027_Support.lib
similarity index 100%
rename from net/C027Interface/C027_Support.lib
rename to drivers/C027Interface/C027_Support.lib
diff --git a/net/ESP8266Interface/ESP8266/ATParser/ATParser.cpp b/drivers/ESP8266Interface/ESP8266/ATParser/ATParser.cpp
similarity index 100%
rename from net/ESP8266Interface/ESP8266/ATParser/ATParser.cpp
rename to drivers/ESP8266Interface/ESP8266/ATParser/ATParser.cpp
diff --git a/net/ESP8266Interface/ESP8266/ATParser/ATParser.h b/drivers/ESP8266Interface/ESP8266/ATParser/ATParser.h
similarity index 100%
rename from net/ESP8266Interface/ESP8266/ATParser/ATParser.h
rename to drivers/ESP8266Interface/ESP8266/ATParser/ATParser.h
diff --git a/net/ESP8266Interface/ESP8266/ATParser/BufferedSerial/Buffer/MyBuffer.cpp b/drivers/ESP8266Interface/ESP8266/ATParser/BufferedSerial/Buffer/MyBuffer.cpp
similarity index 100%
rename from net/ESP8266Interface/ESP8266/ATParser/BufferedSerial/Buffer/MyBuffer.cpp
rename to drivers/ESP8266Interface/ESP8266/ATParser/BufferedSerial/Buffer/MyBuffer.cpp
diff --git a/net/ESP8266Interface/ESP8266/ATParser/BufferedSerial/Buffer/MyBuffer.h b/drivers/ESP8266Interface/ESP8266/ATParser/BufferedSerial/Buffer/MyBuffer.h
similarity index 100%
rename from net/ESP8266Interface/ESP8266/ATParser/BufferedSerial/Buffer/MyBuffer.h
rename to drivers/ESP8266Interface/ESP8266/ATParser/BufferedSerial/Buffer/MyBuffer.h
diff --git a/net/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedPrint.c b/drivers/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedPrint.c
similarity index 100%
rename from net/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedPrint.c
rename to drivers/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedPrint.c
diff --git a/net/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedSerial.cpp b/drivers/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedSerial.cpp
similarity index 100%
rename from net/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedSerial.cpp
rename to drivers/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedSerial.cpp
diff --git a/net/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedSerial.h b/drivers/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedSerial.h
similarity index 100%
rename from net/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedSerial.h
rename to drivers/ESP8266Interface/ESP8266/ATParser/BufferedSerial/BufferedSerial.h
diff --git a/net/ESP8266Interface/ESP8266/ESP8266.cpp b/drivers/ESP8266Interface/ESP8266/ESP8266.cpp
similarity index 100%
rename from net/ESP8266Interface/ESP8266/ESP8266.cpp
rename to drivers/ESP8266Interface/ESP8266/ESP8266.cpp
diff --git a/net/ESP8266Interface/ESP8266/ESP8266.h b/drivers/ESP8266Interface/ESP8266/ESP8266.h
similarity index 100%
rename from net/ESP8266Interface/ESP8266/ESP8266.h
rename to drivers/ESP8266Interface/ESP8266/ESP8266.h
diff --git a/net/ESP8266Interface/ESP8266Interface.cpp b/drivers/ESP8266Interface/ESP8266Interface.cpp
similarity index 100%
rename from net/ESP8266Interface/ESP8266Interface.cpp
rename to drivers/ESP8266Interface/ESP8266Interface.cpp
diff --git a/net/ESP8266Interface/ESP8266Interface.h b/drivers/ESP8266Interface/ESP8266Interface.h
similarity index 100%
rename from net/ESP8266Interface/ESP8266Interface.h
rename to drivers/ESP8266Interface/ESP8266Interface.h
diff --git a/bluetooth/ble/.gitignore b/features/FEATURE_BLE/ble/.gitignore
similarity index 100%
rename from bluetooth/ble/.gitignore
rename to features/FEATURE_BLE/ble/.gitignore
diff --git a/bluetooth/ble/CHANGELOG.md b/features/FEATURE_BLE/ble/CHANGELOG.md
similarity index 100%
rename from bluetooth/ble/CHANGELOG.md
rename to features/FEATURE_BLE/ble/CHANGELOG.md
diff --git a/bluetooth/ble/CONTRIBUTING.md b/features/FEATURE_BLE/ble/CONTRIBUTING.md
similarity index 100%
rename from bluetooth/ble/CONTRIBUTING.md
rename to features/FEATURE_BLE/ble/CONTRIBUTING.md
diff --git a/bluetooth/ble/DOXYGEN_FRONTPAGE.md b/features/FEATURE_BLE/ble/DOXYGEN_FRONTPAGE.md
similarity index 100%
rename from bluetooth/ble/DOXYGEN_FRONTPAGE.md
rename to features/FEATURE_BLE/ble/DOXYGEN_FRONTPAGE.md
diff --git a/bluetooth/ble/LICENSE b/features/FEATURE_BLE/ble/LICENSE
similarity index 100%
rename from bluetooth/ble/LICENSE
rename to features/FEATURE_BLE/ble/LICENSE
diff --git a/bluetooth/ble/README.md b/features/FEATURE_BLE/ble/README.md
similarity index 100%
rename from bluetooth/ble/README.md
rename to features/FEATURE_BLE/ble/README.md
diff --git a/bluetooth/ble/apache-2.0.txt b/features/FEATURE_BLE/ble/apache-2.0.txt
similarity index 100%
rename from bluetooth/ble/apache-2.0.txt
rename to features/FEATURE_BLE/ble/apache-2.0.txt
diff --git a/bluetooth/ble/ble.doxyfile b/features/FEATURE_BLE/ble/ble.doxyfile
similarity index 100%
rename from bluetooth/ble/ble.doxyfile
rename to features/FEATURE_BLE/ble/ble.doxyfile
diff --git a/bluetooth/ble/ble/BLE.h b/features/FEATURE_BLE/ble/ble/BLE.h
similarity index 100%
rename from bluetooth/ble/ble/BLE.h
rename to features/FEATURE_BLE/ble/ble/BLE.h
diff --git a/bluetooth/ble/ble/BLEInstanceBase.h b/features/FEATURE_BLE/ble/ble/BLEInstanceBase.h
similarity index 100%
rename from bluetooth/ble/ble/BLEInstanceBase.h
rename to features/FEATURE_BLE/ble/ble/BLEInstanceBase.h
diff --git a/bluetooth/ble/ble/BLEProtocol.h b/features/FEATURE_BLE/ble/ble/BLEProtocol.h
similarity index 100%
rename from bluetooth/ble/ble/BLEProtocol.h
rename to features/FEATURE_BLE/ble/ble/BLEProtocol.h
diff --git a/bluetooth/ble/ble/CallChainOfFunctionPointersWithContext.h b/features/FEATURE_BLE/ble/ble/CallChainOfFunctionPointersWithContext.h
similarity index 100%
rename from bluetooth/ble/ble/CallChainOfFunctionPointersWithContext.h
rename to features/FEATURE_BLE/ble/ble/CallChainOfFunctionPointersWithContext.h
diff --git a/bluetooth/ble/ble/CharacteristicDescriptorDiscovery.h b/features/FEATURE_BLE/ble/ble/CharacteristicDescriptorDiscovery.h
similarity index 100%
rename from bluetooth/ble/ble/CharacteristicDescriptorDiscovery.h
rename to features/FEATURE_BLE/ble/ble/CharacteristicDescriptorDiscovery.h
diff --git a/bluetooth/ble/ble/DiscoveredCharacteristic.h b/features/FEATURE_BLE/ble/ble/DiscoveredCharacteristic.h
similarity index 100%
rename from bluetooth/ble/ble/DiscoveredCharacteristic.h
rename to features/FEATURE_BLE/ble/ble/DiscoveredCharacteristic.h
diff --git a/bluetooth/ble/ble/DiscoveredCharacteristicDescriptor.h b/features/FEATURE_BLE/ble/ble/DiscoveredCharacteristicDescriptor.h
similarity index 100%
rename from bluetooth/ble/ble/DiscoveredCharacteristicDescriptor.h
rename to features/FEATURE_BLE/ble/ble/DiscoveredCharacteristicDescriptor.h
diff --git a/bluetooth/ble/ble/DiscoveredService.h b/features/FEATURE_BLE/ble/ble/DiscoveredService.h
similarity index 100%
rename from bluetooth/ble/ble/DiscoveredService.h
rename to features/FEATURE_BLE/ble/ble/DiscoveredService.h
diff --git a/bluetooth/ble/ble/FunctionPointerWithContext.h b/features/FEATURE_BLE/ble/ble/FunctionPointerWithContext.h
similarity index 100%
rename from bluetooth/ble/ble/FunctionPointerWithContext.h
rename to features/FEATURE_BLE/ble/ble/FunctionPointerWithContext.h
diff --git a/bluetooth/ble/ble/Gap.h b/features/FEATURE_BLE/ble/ble/Gap.h
similarity index 100%
rename from bluetooth/ble/ble/Gap.h
rename to features/FEATURE_BLE/ble/ble/Gap.h
diff --git a/bluetooth/ble/ble/GapAdvertisingData.h b/features/FEATURE_BLE/ble/ble/GapAdvertisingData.h
similarity index 100%
rename from bluetooth/ble/ble/GapAdvertisingData.h
rename to features/FEATURE_BLE/ble/ble/GapAdvertisingData.h
diff --git a/bluetooth/ble/ble/GapAdvertisingParams.h b/features/FEATURE_BLE/ble/ble/GapAdvertisingParams.h
similarity index 100%
rename from bluetooth/ble/ble/GapAdvertisingParams.h
rename to features/FEATURE_BLE/ble/ble/GapAdvertisingParams.h
diff --git a/bluetooth/ble/ble/GapEvents.h b/features/FEATURE_BLE/ble/ble/GapEvents.h
similarity index 100%
rename from bluetooth/ble/ble/GapEvents.h
rename to features/FEATURE_BLE/ble/ble/GapEvents.h
diff --git a/bluetooth/ble/ble/GapScanningParams.h b/features/FEATURE_BLE/ble/ble/GapScanningParams.h
similarity index 100%
rename from bluetooth/ble/ble/GapScanningParams.h
rename to features/FEATURE_BLE/ble/ble/GapScanningParams.h
diff --git a/bluetooth/ble/ble/GattAttribute.h b/features/FEATURE_BLE/ble/ble/GattAttribute.h
similarity index 100%
rename from bluetooth/ble/ble/GattAttribute.h
rename to features/FEATURE_BLE/ble/ble/GattAttribute.h
diff --git a/bluetooth/ble/ble/GattCallbackParamTypes.h b/features/FEATURE_BLE/ble/ble/GattCallbackParamTypes.h
similarity index 100%
rename from bluetooth/ble/ble/GattCallbackParamTypes.h
rename to features/FEATURE_BLE/ble/ble/GattCallbackParamTypes.h
diff --git a/bluetooth/ble/ble/GattCharacteristic.h b/features/FEATURE_BLE/ble/ble/GattCharacteristic.h
similarity index 100%
rename from bluetooth/ble/ble/GattCharacteristic.h
rename to features/FEATURE_BLE/ble/ble/GattCharacteristic.h
diff --git a/bluetooth/ble/ble/GattClient.h b/features/FEATURE_BLE/ble/ble/GattClient.h
similarity index 100%
rename from bluetooth/ble/ble/GattClient.h
rename to features/FEATURE_BLE/ble/ble/GattClient.h
diff --git a/bluetooth/ble/ble/GattServer.h b/features/FEATURE_BLE/ble/ble/GattServer.h
similarity index 100%
rename from bluetooth/ble/ble/GattServer.h
rename to features/FEATURE_BLE/ble/ble/GattServer.h
diff --git a/bluetooth/ble/ble/GattServerEvents.h b/features/FEATURE_BLE/ble/ble/GattServerEvents.h
similarity index 100%
rename from bluetooth/ble/ble/GattServerEvents.h
rename to features/FEATURE_BLE/ble/ble/GattServerEvents.h
diff --git a/bluetooth/ble/ble/GattService.h b/features/FEATURE_BLE/ble/ble/GattService.h
similarity index 100%
rename from bluetooth/ble/ble/GattService.h
rename to features/FEATURE_BLE/ble/ble/GattService.h
diff --git a/bluetooth/ble/ble/SafeBool.h b/features/FEATURE_BLE/ble/ble/SafeBool.h
similarity index 100%
rename from bluetooth/ble/ble/SafeBool.h
rename to features/FEATURE_BLE/ble/ble/SafeBool.h
diff --git a/bluetooth/ble/ble/SecurityManager.h b/features/FEATURE_BLE/ble/ble/SecurityManager.h
similarity index 100%
rename from bluetooth/ble/ble/SecurityManager.h
rename to features/FEATURE_BLE/ble/ble/SecurityManager.h
diff --git a/bluetooth/ble/ble/ServiceDiscovery.h b/features/FEATURE_BLE/ble/ble/ServiceDiscovery.h
similarity index 100%
rename from bluetooth/ble/ble/ServiceDiscovery.h
rename to features/FEATURE_BLE/ble/ble/ServiceDiscovery.h
diff --git a/bluetooth/ble/ble/UUID.h b/features/FEATURE_BLE/ble/ble/UUID.h
similarity index 100%
rename from bluetooth/ble/ble/UUID.h
rename to features/FEATURE_BLE/ble/ble/UUID.h
diff --git a/bluetooth/ble/ble/blecommon.h b/features/FEATURE_BLE/ble/ble/blecommon.h
similarity index 100%
rename from bluetooth/ble/ble/blecommon.h
rename to features/FEATURE_BLE/ble/ble/blecommon.h
diff --git a/bluetooth/ble/ble/deprecate.h b/features/FEATURE_BLE/ble/ble/deprecate.h
similarity index 100%
rename from bluetooth/ble/ble/deprecate.h
rename to features/FEATURE_BLE/ble/ble/deprecate.h
diff --git a/bluetooth/ble/ble/services/BatteryService.h b/features/FEATURE_BLE/ble/ble/services/BatteryService.h
similarity index 100%
rename from bluetooth/ble/ble/services/BatteryService.h
rename to features/FEATURE_BLE/ble/ble/services/BatteryService.h
diff --git a/bluetooth/ble/ble/services/DFUService.h b/features/FEATURE_BLE/ble/ble/services/DFUService.h
similarity index 100%
rename from bluetooth/ble/ble/services/DFUService.h
rename to features/FEATURE_BLE/ble/ble/services/DFUService.h
diff --git a/bluetooth/ble/ble/services/DeviceInformationService.h b/features/FEATURE_BLE/ble/ble/services/DeviceInformationService.h
similarity index 100%
rename from bluetooth/ble/ble/services/DeviceInformationService.h
rename to features/FEATURE_BLE/ble/ble/services/DeviceInformationService.h
diff --git a/bluetooth/ble/ble/services/EddystoneConfigService.h b/features/FEATURE_BLE/ble/ble/services/EddystoneConfigService.h
similarity index 100%
rename from bluetooth/ble/ble/services/EddystoneConfigService.h
rename to features/FEATURE_BLE/ble/ble/services/EddystoneConfigService.h
diff --git a/bluetooth/ble/ble/services/EddystoneService.h b/features/FEATURE_BLE/ble/ble/services/EddystoneService.h
similarity index 100%
rename from bluetooth/ble/ble/services/EddystoneService.h
rename to features/FEATURE_BLE/ble/ble/services/EddystoneService.h
diff --git a/bluetooth/ble/ble/services/EnvironmentalService.h b/features/FEATURE_BLE/ble/ble/services/EnvironmentalService.h
similarity index 100%
rename from bluetooth/ble/ble/services/EnvironmentalService.h
rename to features/FEATURE_BLE/ble/ble/services/EnvironmentalService.h
diff --git a/bluetooth/ble/ble/services/HealthThermometerService.h b/features/FEATURE_BLE/ble/ble/services/HealthThermometerService.h
similarity index 100%
rename from bluetooth/ble/ble/services/HealthThermometerService.h
rename to features/FEATURE_BLE/ble/ble/services/HealthThermometerService.h
diff --git a/bluetooth/ble/ble/services/HeartRateService.h b/features/FEATURE_BLE/ble/ble/services/HeartRateService.h
similarity index 100%
rename from bluetooth/ble/ble/services/HeartRateService.h
rename to features/FEATURE_BLE/ble/ble/services/HeartRateService.h
diff --git a/bluetooth/ble/ble/services/LinkLossService.h b/features/FEATURE_BLE/ble/ble/services/LinkLossService.h
similarity index 100%
rename from bluetooth/ble/ble/services/LinkLossService.h
rename to features/FEATURE_BLE/ble/ble/services/LinkLossService.h
diff --git a/bluetooth/ble/ble/services/UARTService.h b/features/FEATURE_BLE/ble/ble/services/UARTService.h
similarity index 100%
rename from bluetooth/ble/ble/services/UARTService.h
rename to features/FEATURE_BLE/ble/ble/services/UARTService.h
diff --git a/bluetooth/ble/ble/services/URIBeaconConfigService.h b/features/FEATURE_BLE/ble/ble/services/URIBeaconConfigService.h
similarity index 100%
rename from bluetooth/ble/ble/services/URIBeaconConfigService.h
rename to features/FEATURE_BLE/ble/ble/services/URIBeaconConfigService.h
diff --git a/bluetooth/ble/ble/services/iBeacon.h b/features/FEATURE_BLE/ble/ble/services/iBeacon.h
similarity index 100%
rename from bluetooth/ble/ble/services/iBeacon.h
rename to features/FEATURE_BLE/ble/ble/services/iBeacon.h
diff --git a/bluetooth/ble/module.json b/features/FEATURE_BLE/ble/module.json
similarity index 100%
rename from bluetooth/ble/module.json
rename to features/FEATURE_BLE/ble/module.json
diff --git a/bluetooth/ble/source/BLE.cpp b/features/FEATURE_BLE/ble/source/BLE.cpp
similarity index 100%
rename from bluetooth/ble/source/BLE.cpp
rename to features/FEATURE_BLE/ble/source/BLE.cpp
diff --git a/bluetooth/ble/source/BLEInstanceBase.cpp b/features/FEATURE_BLE/ble/source/BLEInstanceBase.cpp
similarity index 100%
rename from bluetooth/ble/source/BLEInstanceBase.cpp
rename to features/FEATURE_BLE/ble/source/BLEInstanceBase.cpp
diff --git a/bluetooth/ble/source/DiscoveredCharacteristic.cpp b/features/FEATURE_BLE/ble/source/DiscoveredCharacteristic.cpp
similarity index 100%
rename from bluetooth/ble/source/DiscoveredCharacteristic.cpp
rename to features/FEATURE_BLE/ble/source/DiscoveredCharacteristic.cpp
diff --git a/bluetooth/ble/source/GapScanningParams.cpp b/features/FEATURE_BLE/ble/source/GapScanningParams.cpp
similarity index 100%
rename from bluetooth/ble/source/GapScanningParams.cpp
rename to features/FEATURE_BLE/ble/source/GapScanningParams.cpp
diff --git a/bluetooth/ble/source/services/DFUService.cpp b/features/FEATURE_BLE/ble/source/services/DFUService.cpp
similarity index 100%
rename from bluetooth/ble/source/services/DFUService.cpp
rename to features/FEATURE_BLE/ble/source/services/DFUService.cpp
diff --git a/bluetooth/ble/source/services/UARTService.cpp b/features/FEATURE_BLE/ble/source/services/UARTService.cpp
similarity index 100%
rename from bluetooth/ble/source/services/UARTService.cpp
rename to features/FEATURE_BLE/ble/source/services/UARTService.cpp
diff --git a/bluetooth/ble/source/services/URIBeaconConfigService.cpp b/features/FEATURE_BLE/ble/source/services/URIBeaconConfigService.cpp
similarity index 100%
rename from bluetooth/ble/source/services/URIBeaconConfigService.cpp
rename to features/FEATURE_BLE/ble/source/services/URIBeaconConfigService.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/CHANGELOG.md b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/CHANGELOG.md
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/CHANGELOG.md
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/CHANGELOG.md
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/LICENSE b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/LICENSE
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/LICENSE
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/LICENSE
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/apache-2.0.txt b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/apache-2.0.txt
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/apache-2.0.txt
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/apache-2.0.txt
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/s110_nrf51822_8.0.0_bootloader.hex b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/s110_nrf51822_8.0.0_bootloader.hex
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/s110_nrf51822_8.0.0_bootloader.hex
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/s110_nrf51822_8.0.0_bootloader.hex
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/s130_nrf51_1.0.0_bootloader.hex b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/s130_nrf51_1.0.0_bootloader.hex
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/s130_nrf51_1.0.0_bootloader.hex
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/s130_nrf51_1.0.0_bootloader.hex
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/softdevice_nrf51822_licence_agreement.txt b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/softdevice_nrf51822_licence_agreement.txt
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/softdevice_nrf51822_licence_agreement.txt
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/bootloader/softdevice_nrf51822_licence_agreement.txt
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/module.json b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/module.json
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/module.json
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/module.json
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/BSD-3clause-Nordic.txt b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/BSD-3clause-Nordic.txt
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/BSD-3clause-Nordic.txt
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/BSD-3clause-Nordic.txt
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/CHANGELOG.md b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/CHANGELOG.md
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/CHANGELOG.md
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/CHANGELOG.md
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/LICENSE b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/LICENSE
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/LICENSE
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/LICENSE
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/README.md b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/README.md
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/README.md
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/README.md
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/apache-2.0.txt b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/apache-2.0.txt
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/apache-2.0.txt
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/apache-2.0.txt
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/module.json b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/module.json
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/module.json
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/module.json
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/copyright_header.txt b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/copyright_header.txt
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/copyright_header.txt
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/copyright_header.txt
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/pick_nrf51_files.py b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/pick_nrf51_files.py
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/pick_nrf51_files.py
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/pick_nrf51_files.py
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/replace_headers.py b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/replace_headers.py
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/replace_headers.py
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/replace_headers.py
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/required_files.txt b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/required_files.txt
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/required_files.txt
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/script/required_files.txt
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_radio_notification/ble_radio_notification.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_radio_notification/ble_radio_notification.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_radio_notification/ble_radio_notification.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_radio_notification/ble_radio_notification.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_radio_notification/ble_radio_notification.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_radio_notification/ble_radio_notification.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_radio_notification/ble_radio_notification.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_radio_notification/ble_radio_notification.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_services/ble_dfu/ble_dfu.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_services/ble_dfu/ble_dfu.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_services/ble_dfu/ble_dfu.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_services/ble_dfu/ble_dfu.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_services/ble_dfu/ble_dfu.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_services/ble_dfu/ble_dfu.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_services/ble_dfu/ble_dfu.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/ble_services/ble_dfu/ble_dfu.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_advdata.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_advdata.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_advdata.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_advdata.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_advdata.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_advdata.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_advdata.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_advdata.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_params.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_params.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_params.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_params.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_params.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_params.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_params.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_params.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_state.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_state.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_state.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_state.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_state.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_state.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_state.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_conn_state.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_date_time.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_date_time.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_date_time.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_date_time.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_gatt_db.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_gatt_db.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_gatt_db.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_gatt_db.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_sensor_location.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_sensor_location.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_sensor_location.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_sensor_location.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_srv_common.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_srv_common.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_srv_common.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_srv_common.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_srv_common.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_srv_common.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_srv_common.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/common/ble_srv_common.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/config/device_manager_cnfg.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/config/device_manager_cnfg.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/config/device_manager_cnfg.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/config/device_manager_cnfg.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/device_manager.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/device_manager.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/device_manager.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/device_manager.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/device_manager_peripheral.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/device_manager_peripheral.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/device_manager_peripheral.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/device_manager/device_manager_peripheral.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/id_manager.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/id_manager.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/id_manager.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/id_manager.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/id_manager.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/id_manager.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/id_manager.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/id_manager.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data_storage.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data_storage.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data_storage.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data_storage.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data_storage.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data_storage.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data_storage.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_data_storage.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_database.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_database.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_database.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_database.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_database.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_database.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_database.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_database.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_id.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_id.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_id.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_id.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_id.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_id.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_id.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_id.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_manager_types.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_manager_types.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_manager_types.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/peer_manager_types.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_buffer.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_buffer.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_buffer.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_buffer.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_buffer.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_buffer.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_buffer.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_buffer.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_mutex.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_mutex.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_mutex.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_mutex.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_mutex.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_mutex.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_mutex.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/ble/peer_manager/pm_mutex.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/compiler_abstraction.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/compiler_abstraction.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/compiler_abstraction.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/compiler_abstraction.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51_bitfields.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51_bitfields.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51_bitfields.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51_bitfields.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51_deprecated.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51_deprecated.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51_deprecated.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/device/nrf51_deprecated.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/delay/nrf_delay.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/delay/nrf_delay.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/delay/nrf_delay.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/delay/nrf_delay.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/delay/nrf_delay.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/delay/nrf_delay.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/delay/nrf_delay.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/delay/nrf_delay.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_ecb.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_ecb.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_ecb.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_ecb.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_ecb.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_ecb.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_ecb.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_ecb.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpio.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpio.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpio.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpio.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpiote.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpiote.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpiote.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpiote.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_nvmc.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_nvmc.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_nvmc.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_nvmc.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_nvmc.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_nvmc.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_nvmc.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_nvmc.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_temp.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_temp.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_temp.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_temp.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_wdt.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_wdt.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_wdt.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/hal/nrf_wdt.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/config/pstorage_platform.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/config/pstorage_platform.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/config/pstorage_platform.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/config/pstorage_platform.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/pstorage.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/pstorage.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/pstorage.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/pstorage.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/pstorage.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/pstorage.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/pstorage.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/drivers_nrf/pstorage/pstorage.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_types.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_types.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_types.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_types.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_util.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_util.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_util.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_util.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_util.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_util.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_util.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/bootloader_util.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_app_handler.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_app_handler.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_app_handler.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_app_handler.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_app_handler.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_app_handler.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_app_handler.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_app_handler.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_bank_internal.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_bank_internal.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_bank_internal.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_bank_internal.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_ble_svc.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_ble_svc.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_ble_svc.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_ble_svc.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_ble_svc_internal.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_ble_svc_internal.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_ble_svc_internal.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_ble_svc_internal.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init_template.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init_template.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init_template.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init_template.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_transport.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_transport.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_transport.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_transport.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_types.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_types.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_types.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_types.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/crc16/crc16.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/crc16/crc16.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/crc16/crc16.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/crc16/crc16.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/crc16/crc16.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/crc16/crc16.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/crc16/crc16.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/crc16/crc16.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/experimental_section_vars/section_vars.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/experimental_section_vars/section_vars.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/experimental_section_vars/section_vars.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/experimental_section_vars/section_vars.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds_config.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds_config.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds_config.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds_config.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds_types_internal.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds_types_internal.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds_types_internal.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fds/fds_types_internal.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage_nosd.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage_nosd.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage_nosd.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/fstorage/fstorage_nosd.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/hci/hci_mem_pool.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/hci/hci_mem_pool.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/hci/hci_mem_pool.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/hci/hci_mem_pool.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/hci/hci_mem_pool.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/hci/hci_mem_pool.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/hci/hci_mem_pool.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/hci/hci_mem_pool.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/scheduler/app_scheduler.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/scheduler/app_scheduler.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/scheduler/app_scheduler.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/scheduler/app_scheduler.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/scheduler/app_scheduler.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/scheduler/app_scheduler.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/scheduler/app_scheduler.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/scheduler/app_scheduler.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/timer/app_timer.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/timer/app_timer.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/timer/app_timer.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/timer/app_timer.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_error.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_error.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_error.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_error.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_error.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_error.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_error.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_error.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util_platform.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util_platform.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util_platform.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util_platform.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util_platform.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util_platform.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util_platform.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/app_util_platform.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/common.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/common.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/common.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/common.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nordic_common.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nordic_common.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nordic_common.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nordic_common.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nrf_assert.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nrf_assert.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nrf_assert.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nrf_assert.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nrf_assert.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nrf_assert.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nrf_assert.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/nrf_assert.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_common.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_common.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_common.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_common.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_errors.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_errors.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_errors.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_errors.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_mapped_flags.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_mapped_flags.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_mapped_flags.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_mapped_flags.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_mapped_flags.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_mapped_flags.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_mapped_flags.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_mapped_flags.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_os.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_os.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_os.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/libraries/util/sdk_os.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/ant_stack_handler_types.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/ant_stack_handler_types.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/ant_stack_handler_types.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/ant_stack_handler_types.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/ble_stack_handler_types.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/ble_stack_handler_types.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/ble_stack_handler_types.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/ble_stack_handler_types.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler_appsh.c b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler_appsh.c
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler_appsh.c
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler_appsh.c
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler_appsh.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler_appsh.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler_appsh.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler_appsh.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_err.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_err.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_err.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_err.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gap.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gap.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gap.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gap.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gatt.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gatt.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gatt.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gatt.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gattc.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gattc.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gattc.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gattc.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gatts.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gatts.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gatts.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_gatts.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_hci.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_hci.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_hci.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_hci.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_l2cap.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_l2cap.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_l2cap.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_l2cap.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_ranges.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_ranges.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_ranges.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_ranges.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_types.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_types.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_types.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/ble_types.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_ble.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_ble.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_ble.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_ble.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error_sdm.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error_sdm.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error_sdm.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error_sdm.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error_soc.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error_soc.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error_soc.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_error_soc.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_mbr.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_mbr.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_mbr.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_mbr.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_sdm.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_sdm.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_sdm.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_sdm.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_soc.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_soc.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_soc.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_soc.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_svc.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_svc.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_svc.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/nrf_svc.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/softdevice_assert.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/softdevice_assert.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/softdevice_assert.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/softdevice/s130/headers/softdevice_assert.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/toolchain/system_nrf51.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/toolchain/system_nrf51.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/toolchain/system_nrf51.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/nordic_sdk/components/toolchain/system_nrf51.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/prevent_bootloader_frame_pointer.cmake b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/prevent_bootloader_frame_pointer.cmake
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/prevent_bootloader_frame_pointer.cmake
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/prevent_bootloader_frame_pointer.cmake
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/supress-warnings.cmake b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/supress-warnings.cmake
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/supress-warnings.cmake
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf51-sdk/source/supress-warnings.cmake
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/softdevice_nrf51822_licence_agreement.txt b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/softdevice_nrf51822_licence_agreement.txt
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/softdevice_nrf51822_licence_agreement.txt
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/softdevice_nrf51822_licence_agreement.txt
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_advertising.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_advertising.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_advertising.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_advertising.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_advertising.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_advertising.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_advertising.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_advertising.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_gap.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_gap.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_gap.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_gap.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_gap.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_gap.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_gap.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_gap.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_security.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_security.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_security.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_security.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_security.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_security.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_security.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_security.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/custom/custom_helper.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/custom/custom_helper.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/custom/custom_helper.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/custom/custom_helper.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/custom/custom_helper.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/custom/custom_helper.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/custom/custom_helper.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/custom/custom_helper.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/ansi_escape.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/ansi_escape.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/ansi_escape.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/ansi_escape.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/assertion.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/assertion.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/assertion.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/assertion.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/binary.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/binary.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/binary.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/binary.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/ble_error.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/ble_error.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/ble_error.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/ble_error.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/common.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/common.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/common.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/common.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/compiler.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/compiler.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/compiler.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/common/compiler.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xCharacteristicDescriptorDiscoverer.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xCharacteristicDescriptorDiscoverer.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xCharacteristicDescriptorDiscoverer.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xCharacteristicDescriptorDiscoverer.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xCharacteristicDescriptorDiscoverer.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xCharacteristicDescriptorDiscoverer.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xCharacteristicDescriptorDiscoverer.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xCharacteristicDescriptorDiscoverer.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xDiscoveredCharacteristic.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xDiscoveredCharacteristic.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xDiscoveredCharacteristic.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xDiscoveredCharacteristic.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xDiscoveredCharacteristic.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xDiscoveredCharacteristic.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xDiscoveredCharacteristic.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xDiscoveredCharacteristic.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGap.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGap.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGap.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGap.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGap.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGap.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGap.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGap.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattClient.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattClient.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattClient.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattClient.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattClient.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattClient.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattClient.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattClient.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattServer.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattServer.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattServer.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattServer.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattServer.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattServer.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattServer.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xGattServer.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xSecurityManager.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xSecurityManager.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xSecurityManager.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xSecurityManager.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xServiceDiscovery.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xServiceDiscovery.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xServiceDiscovery.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xServiceDiscovery.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xServiceDiscovery.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xServiceDiscovery.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xServiceDiscovery.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xServiceDiscovery.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xn.cpp b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xn.cpp
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xn.cpp
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xn.cpp
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xn.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xn.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xn.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/nRF5xn.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/projectconfig.h b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/projectconfig.h
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/projectconfig.h
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/projectconfig.h
diff --git a/bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/supress-warnings.cmake b/features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/supress-warnings.cmake
similarity index 100%
rename from bluetooth/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/supress-warnings.cmake
rename to features/FEATURE_BLE/ble/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/supress-warnings.cmake
diff --git a/net/coap-service.lib b/features/FEATURE_CLIENT/coap-service.lib
similarity index 100%
rename from net/coap-service.lib
rename to features/FEATURE_CLIENT/coap-service.lib
diff --git a/net/mbed-client-c.lib b/features/FEATURE_CLIENT/mbed-client-c.lib
similarity index 100%
rename from net/mbed-client-c.lib
rename to features/FEATURE_CLIENT/mbed-client-c.lib
diff --git a/net/mbed-client-classic.lib b/features/FEATURE_CLIENT/mbed-client-classic.lib
similarity index 100%
rename from net/mbed-client-classic.lib
rename to features/FEATURE_CLIENT/mbed-client-classic.lib
diff --git a/net/mbed-client-mbed-tls.lib b/features/FEATURE_CLIENT/mbed-client-mbed-tls.lib
similarity index 100%
rename from net/mbed-client-mbed-tls.lib
rename to features/FEATURE_CLIENT/mbed-client-mbed-tls.lib
diff --git a/net/mbed-client-randlib.lib b/features/FEATURE_CLIENT/mbed-client-randlib.lib
similarity index 100%
rename from net/mbed-client-randlib.lib
rename to features/FEATURE_CLIENT/mbed-client-randlib.lib
diff --git a/net/mbed-client.lib b/features/FEATURE_CLIENT/mbed-client.lib
similarity index 100%
rename from net/mbed-client.lib
rename to features/FEATURE_CLIENT/mbed-client.lib
diff --git a/net/mbed-mesh-api.lib b/features/FEATURE_CLIENT/mbed-mesh-api.lib
similarity index 100%
rename from net/mbed-mesh-api.lib
rename to features/FEATURE_CLIENT/mbed-mesh-api.lib
diff --git a/net/LWIPInterface/LWIPInterface.cpp b/features/FEATURE_IPV4/LWIPInterface/LWIPInterface.cpp
similarity index 100%
rename from net/LWIPInterface/LWIPInterface.cpp
rename to features/FEATURE_IPV4/LWIPInterface/LWIPInterface.cpp
diff --git a/net/LWIPInterface/LWIPInterface.h b/features/FEATURE_IPV4/LWIPInterface/LWIPInterface.h
similarity index 100%
rename from net/LWIPInterface/LWIPInterface.h
rename to features/FEATURE_IPV4/LWIPInterface/LWIPInterface.h
diff --git a/net/LWIPInterface/eth_arch.h b/features/FEATURE_IPV4/LWIPInterface/eth_arch.h
similarity index 100%
rename from net/LWIPInterface/eth_arch.h
rename to features/FEATURE_IPV4/LWIPInterface/eth_arch.h
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_Freescale/hardware_init_MK64F12.c b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_Freescale/hardware_init_MK64F12.c
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_Freescale/hardware_init_MK64F12.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_Freescale/hardware_init_MK64F12.c
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_Freescale/k64f_emac.c b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_Freescale/k64f_emac.c
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_Freescale/k64f_emac.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_Freescale/k64f_emac.c
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_Freescale/k64f_emac_config.h b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_Freescale/k64f_emac_config.h
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_Freescale/k64f_emac_config.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_Freescale/k64f_emac_config.h
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_Freescale/lwipopts_conf.h b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_Freescale/lwipopts_conf.h
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_Freescale/lwipopts_conf.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_Freescale/lwipopts_conf.h
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc17_emac.c b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc17_emac.c
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc17_emac.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc17_emac.c
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc17xx_emac.h b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc17xx_emac.h
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc17xx_emac.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc17xx_emac.h
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_emac_config.h b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_emac_config.h
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_emac_config.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_emac_config.h
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_phy.h b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_phy.h
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_phy.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_phy.h
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_phy_dp83848.c b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_phy_dp83848.c
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_phy_dp83848.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lpc_phy_dp83848.c
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lwipopts_conf.h b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lwipopts_conf.h
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_NXP/lwipopts_conf.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_NXP/lwipopts_conf.h
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_RZ_A1H/lwipopts_conf.h b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_RZ_A1H/lwipopts_conf.h
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_RZ_A1H/lwipopts_conf.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_RZ_A1H/lwipopts_conf.h
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_RZ_A1H/rza1_emac.c b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_RZ_A1H/rza1_emac.c
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_RZ_A1H/rza1_emac.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_RZ_A1H/rza1_emac.c
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_STM/lwipopts_conf.h b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_STM/lwipopts_conf.h
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_STM/lwipopts_conf.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_STM/lwipopts_conf.h
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_STM/stm32f4_emac.c b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_STM/stm32f4_emac.c
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_STM/stm32f4_emac.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_STM/stm32f4_emac.c
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_VK_RZ_A1H/lwipopts_conf.h b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_VK_RZ_A1H/lwipopts_conf.h
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_VK_RZ_A1H/lwipopts_conf.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_VK_RZ_A1H/lwipopts_conf.h
diff --git a/net/LWIPInterface/lwip-eth/arch/TARGET_VK_RZ_A1H/rza1_emac.c b/features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_VK_RZ_A1H/rza1_emac.c
similarity index 100%
rename from net/LWIPInterface/lwip-eth/arch/TARGET_VK_RZ_A1H/rza1_emac.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip-eth/arch/TARGET_VK_RZ_A1H/rza1_emac.c
diff --git a/net/LWIPInterface/lwip-sys/arch/cc.h b/features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/cc.h
similarity index 100%
rename from net/LWIPInterface/lwip-sys/arch/cc.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/cc.h
diff --git a/net/LWIPInterface/lwip-sys/arch/checksum.c b/features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/checksum.c
similarity index 100%
rename from net/LWIPInterface/lwip-sys/arch/checksum.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/checksum.c
diff --git a/net/LWIPInterface/lwip-sys/arch/memcpy.c b/features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/memcpy.c
similarity index 100%
rename from net/LWIPInterface/lwip-sys/arch/memcpy.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/memcpy.c
diff --git a/net/LWIPInterface/lwip-sys/arch/perf.h b/features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/perf.h
similarity index 100%
rename from net/LWIPInterface/lwip-sys/arch/perf.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/perf.h
diff --git a/net/LWIPInterface/lwip-sys/arch/sys_arch.c b/features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/sys_arch.c
similarity index 100%
rename from net/LWIPInterface/lwip-sys/arch/sys_arch.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/sys_arch.c
diff --git a/net/LWIPInterface/lwip-sys/arch/sys_arch.h b/features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/sys_arch.h
similarity index 100%
rename from net/LWIPInterface/lwip-sys/arch/sys_arch.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip-sys/arch/sys_arch.h
diff --git a/net/LWIPInterface/lwip/api/api_lib.c b/features/FEATURE_IPV4/LWIPInterface/lwip/api/api_lib.c
similarity index 100%
rename from net/LWIPInterface/lwip/api/api_lib.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/api/api_lib.c
diff --git a/net/LWIPInterface/lwip/api/api_msg.c b/features/FEATURE_IPV4/LWIPInterface/lwip/api/api_msg.c
similarity index 100%
rename from net/LWIPInterface/lwip/api/api_msg.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/api/api_msg.c
diff --git a/net/LWIPInterface/lwip/api/err.c b/features/FEATURE_IPV4/LWIPInterface/lwip/api/err.c
similarity index 100%
rename from net/LWIPInterface/lwip/api/err.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/api/err.c
diff --git a/net/LWIPInterface/lwip/api/netbuf.c b/features/FEATURE_IPV4/LWIPInterface/lwip/api/netbuf.c
similarity index 100%
rename from net/LWIPInterface/lwip/api/netbuf.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/api/netbuf.c
diff --git a/net/LWIPInterface/lwip/api/netdb.c b/features/FEATURE_IPV4/LWIPInterface/lwip/api/netdb.c
similarity index 100%
rename from net/LWIPInterface/lwip/api/netdb.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/api/netdb.c
diff --git a/net/LWIPInterface/lwip/api/netifapi.c b/features/FEATURE_IPV4/LWIPInterface/lwip/api/netifapi.c
similarity index 100%
rename from net/LWIPInterface/lwip/api/netifapi.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/api/netifapi.c
diff --git a/net/LWIPInterface/lwip/api/sockets.c b/features/FEATURE_IPV4/LWIPInterface/lwip/api/sockets.c
similarity index 100%
rename from net/LWIPInterface/lwip/api/sockets.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/api/sockets.c
diff --git a/net/LWIPInterface/lwip/api/tcpip.c b/features/FEATURE_IPV4/LWIPInterface/lwip/api/tcpip.c
similarity index 100%
rename from net/LWIPInterface/lwip/api/tcpip.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/api/tcpip.c
diff --git a/net/LWIPInterface/lwip/core/def.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/def.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/def.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/def.c
diff --git a/net/LWIPInterface/lwip/core/dhcp.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/dhcp.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/dhcp.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/dhcp.c
diff --git a/net/LWIPInterface/lwip/core/dns.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/dns.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/dns.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/dns.c
diff --git a/net/LWIPInterface/lwip/core/init.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/init.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/init.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/init.c
diff --git a/net/LWIPInterface/lwip/core/ipv4/autoip.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/autoip.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/ipv4/autoip.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/autoip.c
diff --git a/net/LWIPInterface/lwip/core/ipv4/icmp.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/icmp.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/ipv4/icmp.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/icmp.c
diff --git a/net/LWIPInterface/lwip/core/ipv4/igmp.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/igmp.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/ipv4/igmp.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/igmp.c
diff --git a/net/LWIPInterface/lwip/core/ipv4/inet.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/inet.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/ipv4/inet.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/inet.c
diff --git a/net/LWIPInterface/lwip/core/ipv4/inet_chksum.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/inet_chksum.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/ipv4/inet_chksum.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/inet_chksum.c
diff --git a/net/LWIPInterface/lwip/core/ipv4/ip.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/ip.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/ipv4/ip.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/ip.c
diff --git a/net/LWIPInterface/lwip/core/ipv4/ip_addr.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/ip_addr.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/ipv4/ip_addr.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/ip_addr.c
diff --git a/net/LWIPInterface/lwip/core/ipv4/ip_frag.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/ip_frag.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/ipv4/ip_frag.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/ipv4/ip_frag.c
diff --git a/net/LWIPInterface/lwip/core/mem.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/mem.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/mem.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/mem.c
diff --git a/net/LWIPInterface/lwip/core/memp.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/memp.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/memp.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/memp.c
diff --git a/net/LWIPInterface/lwip/core/netif.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/netif.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/netif.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/netif.c
diff --git a/net/LWIPInterface/lwip/core/pbuf.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/pbuf.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/pbuf.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/pbuf.c
diff --git a/net/LWIPInterface/lwip/core/raw.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/raw.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/raw.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/raw.c
diff --git a/net/LWIPInterface/lwip/core/snmp/asn1_dec.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/asn1_dec.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/snmp/asn1_dec.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/asn1_dec.c
diff --git a/net/LWIPInterface/lwip/core/snmp/asn1_enc.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/asn1_enc.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/snmp/asn1_enc.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/asn1_enc.c
diff --git a/net/LWIPInterface/lwip/core/snmp/mib2.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/mib2.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/snmp/mib2.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/mib2.c
diff --git a/net/LWIPInterface/lwip/core/snmp/mib_structs.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/mib_structs.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/snmp/mib_structs.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/mib_structs.c
diff --git a/net/LWIPInterface/lwip/core/snmp/msg_in.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/msg_in.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/snmp/msg_in.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/msg_in.c
diff --git a/net/LWIPInterface/lwip/core/snmp/msg_out.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/msg_out.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/snmp/msg_out.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/snmp/msg_out.c
diff --git a/net/LWIPInterface/lwip/core/stats.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/stats.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/stats.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/stats.c
diff --git a/net/LWIPInterface/lwip/core/tcp.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/tcp.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/tcp.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/tcp.c
diff --git a/net/LWIPInterface/lwip/core/tcp_in.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/tcp_in.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/tcp_in.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/tcp_in.c
diff --git a/net/LWIPInterface/lwip/core/tcp_out.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/tcp_out.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/tcp_out.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/tcp_out.c
diff --git a/net/LWIPInterface/lwip/core/timers.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/timers.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/timers.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/timers.c
diff --git a/net/LWIPInterface/lwip/core/udp.c b/features/FEATURE_IPV4/LWIPInterface/lwip/core/udp.c
similarity index 100%
rename from net/LWIPInterface/lwip/core/udp.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/core/udp.c
diff --git a/net/LWIPInterface/lwip/include/ipv4/lwip/autoip.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/autoip.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/ipv4/lwip/autoip.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/autoip.h
diff --git a/net/LWIPInterface/lwip/include/ipv4/lwip/icmp.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/icmp.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/ipv4/lwip/icmp.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/icmp.h
diff --git a/net/LWIPInterface/lwip/include/ipv4/lwip/igmp.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/igmp.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/ipv4/lwip/igmp.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/igmp.h
diff --git a/net/LWIPInterface/lwip/include/ipv4/lwip/inet.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/inet.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/ipv4/lwip/inet.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/inet.h
diff --git a/net/LWIPInterface/lwip/include/ipv4/lwip/inet_chksum.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/inet_chksum.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/ipv4/lwip/inet_chksum.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/inet_chksum.h
diff --git a/net/LWIPInterface/lwip/include/ipv4/lwip/ip.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/ip.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/ipv4/lwip/ip.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/ip.h
diff --git a/net/LWIPInterface/lwip/include/ipv4/lwip/ip_addr.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/ip_addr.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/ipv4/lwip/ip_addr.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/ip_addr.h
diff --git a/net/LWIPInterface/lwip/include/ipv4/lwip/ip_frag.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/ip_frag.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/ipv4/lwip/ip_frag.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/ipv4/lwip/ip_frag.h
diff --git a/net/LWIPInterface/lwip/include/lwip/api.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/api.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/api.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/api.h
diff --git a/net/LWIPInterface/lwip/include/lwip/api_msg.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/api_msg.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/api_msg.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/api_msg.h
diff --git a/net/LWIPInterface/lwip/include/lwip/arch.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/arch.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/arch.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/arch.h
diff --git a/net/LWIPInterface/lwip/include/lwip/debug.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/debug.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/debug.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/debug.h
diff --git a/net/LWIPInterface/lwip/include/lwip/def.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/def.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/def.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/def.h
diff --git a/net/LWIPInterface/lwip/include/lwip/dhcp.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/dhcp.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/dhcp.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/dhcp.h
diff --git a/net/LWIPInterface/lwip/include/lwip/dns.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/dns.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/dns.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/dns.h
diff --git a/net/LWIPInterface/lwip/include/lwip/err.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/err.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/err.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/err.h
diff --git a/net/LWIPInterface/lwip/include/lwip/init.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/init.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/init.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/init.h
diff --git a/net/LWIPInterface/lwip/include/lwip/mem.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/mem.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/mem.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/mem.h
diff --git a/net/LWIPInterface/lwip/include/lwip/memp.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/memp.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/memp.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/memp.h
diff --git a/net/LWIPInterface/lwip/include/lwip/memp_std.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/memp_std.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/memp_std.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/memp_std.h
diff --git a/net/LWIPInterface/lwip/include/lwip/netbuf.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/netbuf.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/netbuf.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/netbuf.h
diff --git a/net/LWIPInterface/lwip/include/lwip/netdb.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/netdb.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/netdb.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/netdb.h
diff --git a/net/LWIPInterface/lwip/include/lwip/netif.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/netif.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/netif.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/netif.h
diff --git a/net/LWIPInterface/lwip/include/lwip/netifapi.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/netifapi.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/netifapi.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/netifapi.h
diff --git a/net/LWIPInterface/lwip/include/lwip/opt.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/opt.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/opt.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/opt.h
diff --git a/net/LWIPInterface/lwip/include/lwip/pbuf.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/pbuf.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/pbuf.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/pbuf.h
diff --git a/net/LWIPInterface/lwip/include/lwip/raw.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/raw.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/raw.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/raw.h
diff --git a/net/LWIPInterface/lwip/include/lwip/sio.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/sio.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/sio.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/sio.h
diff --git a/net/LWIPInterface/lwip/include/lwip/snmp.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/snmp.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/snmp.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/snmp.h
diff --git a/net/LWIPInterface/lwip/include/lwip/snmp_asn1.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/snmp_asn1.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/snmp_asn1.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/snmp_asn1.h
diff --git a/net/LWIPInterface/lwip/include/lwip/snmp_msg.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/snmp_msg.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/snmp_msg.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/snmp_msg.h
diff --git a/net/LWIPInterface/lwip/include/lwip/snmp_structs.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/snmp_structs.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/snmp_structs.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/snmp_structs.h
diff --git a/net/LWIPInterface/lwip/include/lwip/sockets.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/sockets.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/sockets.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/sockets.h
diff --git a/net/LWIPInterface/lwip/include/lwip/stats.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/stats.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/stats.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/stats.h
diff --git a/net/LWIPInterface/lwip/include/lwip/sys.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/sys.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/sys.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/sys.h
diff --git a/net/LWIPInterface/lwip/include/lwip/tcp.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/tcp.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/tcp.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/tcp.h
diff --git a/net/LWIPInterface/lwip/include/lwip/tcp_impl.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/tcp_impl.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/tcp_impl.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/tcp_impl.h
diff --git a/net/LWIPInterface/lwip/include/lwip/tcpip.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/tcpip.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/tcpip.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/tcpip.h
diff --git a/net/LWIPInterface/lwip/include/lwip/timers.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/timers.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/timers.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/timers.h
diff --git a/net/LWIPInterface/lwip/include/lwip/udp.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/udp.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/lwip/udp.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/lwip/udp.h
diff --git a/net/LWIPInterface/lwip/include/netif/etharp.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/netif/etharp.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/netif/etharp.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/netif/etharp.h
diff --git a/net/LWIPInterface/lwip/include/netif/ppp_oe.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/netif/ppp_oe.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/netif/ppp_oe.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/netif/ppp_oe.h
diff --git a/net/LWIPInterface/lwip/include/netif/slipif.h b/features/FEATURE_IPV4/LWIPInterface/lwip/include/netif/slipif.h
similarity index 100%
rename from net/LWIPInterface/lwip/include/netif/slipif.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/include/netif/slipif.h
diff --git a/net/LWIPInterface/lwip/lwipopts.h b/features/FEATURE_IPV4/LWIPInterface/lwip/lwipopts.h
similarity index 100%
rename from net/LWIPInterface/lwip/lwipopts.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/lwipopts.h
diff --git a/net/LWIPInterface/lwip/netif/etharp.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/etharp.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/etharp.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/etharp.c
diff --git a/net/LWIPInterface/lwip/netif/ethernetif.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ethernetif.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ethernetif.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ethernetif.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/auth.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/auth.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/auth.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/auth.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/auth.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/auth.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/auth.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/auth.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/chap.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/chap.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/chap.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/chap.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/chap.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/chap.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/chap.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/chap.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/chpms.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/chpms.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/chpms.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/chpms.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/chpms.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/chpms.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/chpms.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/chpms.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/fsm.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/fsm.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/fsm.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/fsm.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/fsm.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/fsm.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/fsm.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/fsm.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/ipcp.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/ipcp.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/ipcp.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/ipcp.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/ipcp.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/ipcp.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/ipcp.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/ipcp.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/lcp.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/lcp.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/lcp.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/lcp.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/lcp.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/lcp.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/lcp.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/lcp.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/magic.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/magic.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/magic.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/magic.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/magic.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/magic.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/magic.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/magic.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/md5.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/md5.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/md5.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/md5.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/md5.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/md5.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/md5.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/md5.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/pap.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/pap.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/pap.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/pap.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/pap.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/pap.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/pap.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/pap.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/ppp.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/ppp.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/ppp.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/ppp.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/ppp.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/ppp.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/ppp.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/ppp.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/ppp_oe.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/ppp_oe.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/ppp_oe.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/ppp_oe.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/pppdebug.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/pppdebug.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/pppdebug.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/pppdebug.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/randm.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/randm.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/randm.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/randm.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/randm.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/randm.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/randm.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/randm.h
diff --git a/net/LWIPInterface/lwip/netif/ppp/vj.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/vj.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/vj.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/vj.c
diff --git a/net/LWIPInterface/lwip/netif/ppp/vj.h b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/vj.h
similarity index 100%
rename from net/LWIPInterface/lwip/netif/ppp/vj.h
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/ppp/vj.h
diff --git a/net/LWIPInterface/lwip/netif/slipif.c b/features/FEATURE_IPV4/LWIPInterface/lwip/netif/slipif.c
similarity index 100%
rename from net/LWIPInterface/lwip/netif/slipif.c
rename to features/FEATURE_IPV4/LWIPInterface/lwip/netif/slipif.c
diff --git a/net/LWIPInterface/lwipopts.h b/features/FEATURE_IPV4/LWIPInterface/lwipopts.h
similarity index 100%
rename from net/LWIPInterface/lwipopts.h
rename to features/FEATURE_IPV4/LWIPInterface/lwipopts.h
diff --git a/net/atmel-rf-driver.lib b/features/FEATURE_IPV6/atmel-rf-driver.lib
similarity index 100%
rename from net/atmel-rf-driver.lib
rename to features/FEATURE_IPV6/atmel-rf-driver.lib
diff --git a/net/mbed-trace.lib b/features/FEATURE_IPV6/mbed-trace.lib
similarity index 100%
rename from net/mbed-trace.lib
rename to features/FEATURE_IPV6/mbed-trace.lib
diff --git a/net/nanostack-hal-mbed-cmsis-rtos.lib b/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos.lib
similarity index 100%
rename from net/nanostack-hal-mbed-cmsis-rtos.lib
rename to features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos.lib
diff --git a/net/nanostack-interface/NanostackInterface.cpp b/features/FEATURE_IPV6/nanostack-interface/NanostackInterface.cpp
similarity index 100%
rename from net/nanostack-interface/NanostackInterface.cpp
rename to features/FEATURE_IPV6/nanostack-interface/NanostackInterface.cpp
diff --git a/net/nanostack-interface/NanostackInterface.h b/features/FEATURE_IPV6/nanostack-interface/NanostackInterface.h
similarity index 100%
rename from net/nanostack-interface/NanostackInterface.h
rename to features/FEATURE_IPV6/nanostack-interface/NanostackInterface.h
diff --git a/net/nanostack-libservice.lib b/features/FEATURE_IPV6/nanostack-libservice.lib
similarity index 100%
rename from net/nanostack-libservice.lib
rename to features/FEATURE_IPV6/nanostack-libservice.lib
diff --git a/net/sal-stack-nanostack-eventloop.lib b/features/FEATURE_IPV6/sal-stack-nanostack-eventloop.lib
similarity index 100%
rename from net/sal-stack-nanostack-eventloop.lib
rename to features/FEATURE_IPV6/sal-stack-nanostack-eventloop.lib
diff --git a/net/sal-stack-nanostack-private.lib b/features/FEATURE_IPV6/sal-stack-nanostack-private.lib
similarity index 100%
rename from net/sal-stack-nanostack-private.lib
rename to features/FEATURE_IPV6/sal-stack-nanostack-private.lib
diff --git a/net/NetworkSocketAPI/CellularInterface.h b/features/NetworkSocketAPI/CellularInterface.h
similarity index 100%
rename from net/NetworkSocketAPI/CellularInterface.h
rename to features/NetworkSocketAPI/CellularInterface.h
diff --git a/net/NetworkSocketAPI/DnsQuery/DnsQuery.cpp b/features/NetworkSocketAPI/DnsQuery/DnsQuery.cpp
similarity index 100%
rename from net/NetworkSocketAPI/DnsQuery/DnsQuery.cpp
rename to features/NetworkSocketAPI/DnsQuery/DnsQuery.cpp
diff --git a/net/NetworkSocketAPI/DnsQuery/DnsQuery.h b/features/NetworkSocketAPI/DnsQuery/DnsQuery.h
similarity index 100%
rename from net/NetworkSocketAPI/DnsQuery/DnsQuery.h
rename to features/NetworkSocketAPI/DnsQuery/DnsQuery.h
diff --git a/net/NetworkSocketAPI/EthernetInterface.h b/features/NetworkSocketAPI/EthernetInterface.h
similarity index 100%
rename from net/NetworkSocketAPI/EthernetInterface.h
rename to features/NetworkSocketAPI/EthernetInterface.h
diff --git a/net/NetworkSocketAPI/MeshInterface.h b/features/NetworkSocketAPI/MeshInterface.h
similarity index 100%
rename from net/NetworkSocketAPI/MeshInterface.h
rename to features/NetworkSocketAPI/MeshInterface.h
diff --git a/net/NetworkSocketAPI/NetworkStack.cpp b/features/NetworkSocketAPI/NetworkStack.cpp
similarity index 100%
rename from net/NetworkSocketAPI/NetworkStack.cpp
rename to features/NetworkSocketAPI/NetworkStack.cpp
diff --git a/net/NetworkSocketAPI/NetworkStack.h b/features/NetworkSocketAPI/NetworkStack.h
similarity index 100%
rename from net/NetworkSocketAPI/NetworkStack.h
rename to features/NetworkSocketAPI/NetworkStack.h
diff --git a/net/NetworkSocketAPI/Socket.cpp b/features/NetworkSocketAPI/Socket.cpp
similarity index 100%
rename from net/NetworkSocketAPI/Socket.cpp
rename to features/NetworkSocketAPI/Socket.cpp
diff --git a/net/NetworkSocketAPI/Socket.h b/features/NetworkSocketAPI/Socket.h
similarity index 100%
rename from net/NetworkSocketAPI/Socket.h
rename to features/NetworkSocketAPI/Socket.h
diff --git a/net/NetworkSocketAPI/SocketAddress.cpp b/features/NetworkSocketAPI/SocketAddress.cpp
similarity index 100%
rename from net/NetworkSocketAPI/SocketAddress.cpp
rename to features/NetworkSocketAPI/SocketAddress.cpp
diff --git a/net/NetworkSocketAPI/SocketAddress.h b/features/NetworkSocketAPI/SocketAddress.h
similarity index 100%
rename from net/NetworkSocketAPI/SocketAddress.h
rename to features/NetworkSocketAPI/SocketAddress.h
diff --git a/net/NetworkSocketAPI/TCPServer.cpp b/features/NetworkSocketAPI/TCPServer.cpp
similarity index 100%
rename from net/NetworkSocketAPI/TCPServer.cpp
rename to features/NetworkSocketAPI/TCPServer.cpp
diff --git a/net/NetworkSocketAPI/TCPServer.h b/features/NetworkSocketAPI/TCPServer.h
similarity index 100%
rename from net/NetworkSocketAPI/TCPServer.h
rename to features/NetworkSocketAPI/TCPServer.h
diff --git a/net/NetworkSocketAPI/TCPSocket.cpp b/features/NetworkSocketAPI/TCPSocket.cpp
similarity index 100%
rename from net/NetworkSocketAPI/TCPSocket.cpp
rename to features/NetworkSocketAPI/TCPSocket.cpp
diff --git a/net/NetworkSocketAPI/TCPSocket.h b/features/NetworkSocketAPI/TCPSocket.h
similarity index 100%
rename from net/NetworkSocketAPI/TCPSocket.h
rename to features/NetworkSocketAPI/TCPSocket.h
diff --git a/net/NetworkSocketAPI/UDPSocket.cpp b/features/NetworkSocketAPI/UDPSocket.cpp
similarity index 100%
rename from net/NetworkSocketAPI/UDPSocket.cpp
rename to features/NetworkSocketAPI/UDPSocket.cpp
diff --git a/net/NetworkSocketAPI/UDPSocket.h b/features/NetworkSocketAPI/UDPSocket.h
similarity index 100%
rename from net/NetworkSocketAPI/UDPSocket.h
rename to features/NetworkSocketAPI/UDPSocket.h
diff --git a/net/NetworkSocketAPI/WiFiInterface.h b/features/NetworkSocketAPI/WiFiInterface.h
similarity index 100%
rename from net/NetworkSocketAPI/WiFiInterface.h
rename to features/NetworkSocketAPI/WiFiInterface.h
diff --git a/hal_temp/mbed-drivers/mbed.h b/features/hal_temp/mbed-drivers/mbed.h
similarity index 100%
rename from hal_temp/mbed-drivers/mbed.h
rename to features/hal_temp/mbed-drivers/mbed.h
diff --git a/core/mbedtls/LICENSE b/features/mbedtls/LICENSE
similarity index 100%
rename from core/mbedtls/LICENSE
rename to features/mbedtls/LICENSE
diff --git a/core/mbedtls/README.md b/features/mbedtls/README.md
similarity index 100%
rename from core/mbedtls/README.md
rename to features/mbedtls/README.md
diff --git a/core/mbedtls/VERSION.txt b/features/mbedtls/VERSION.txt
similarity index 100%
rename from core/mbedtls/VERSION.txt
rename to features/mbedtls/VERSION.txt
diff --git a/core/mbedtls/apache-2.0.txt b/features/mbedtls/apache-2.0.txt
similarity index 100%
rename from core/mbedtls/apache-2.0.txt
rename to features/mbedtls/apache-2.0.txt
diff --git a/core/mbedtls/importer/Makefile b/features/mbedtls/importer/Makefile
similarity index 100%
rename from core/mbedtls/importer/Makefile
rename to features/mbedtls/importer/Makefile
diff --git a/core/mbedtls/importer/TARGET_IGNORE/.gitignore b/features/mbedtls/importer/TARGET_IGNORE/.gitignore
similarity index 100%
rename from core/mbedtls/importer/TARGET_IGNORE/.gitignore
rename to features/mbedtls/importer/TARGET_IGNORE/.gitignore
diff --git a/core/mbedtls/importer/adjust-config.sh b/features/mbedtls/importer/adjust-config.sh
similarity index 100%
rename from core/mbedtls/importer/adjust-config.sh
rename to features/mbedtls/importer/adjust-config.sh
diff --git a/core/mbedtls/inc/mbedtls/aes.h b/features/mbedtls/inc/mbedtls/aes.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/aes.h
rename to features/mbedtls/inc/mbedtls/aes.h
diff --git a/core/mbedtls/inc/mbedtls/aesni.h b/features/mbedtls/inc/mbedtls/aesni.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/aesni.h
rename to features/mbedtls/inc/mbedtls/aesni.h
diff --git a/core/mbedtls/inc/mbedtls/arc4.h b/features/mbedtls/inc/mbedtls/arc4.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/arc4.h
rename to features/mbedtls/inc/mbedtls/arc4.h
diff --git a/core/mbedtls/inc/mbedtls/asn1.h b/features/mbedtls/inc/mbedtls/asn1.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/asn1.h
rename to features/mbedtls/inc/mbedtls/asn1.h
diff --git a/core/mbedtls/inc/mbedtls/asn1write.h b/features/mbedtls/inc/mbedtls/asn1write.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/asn1write.h
rename to features/mbedtls/inc/mbedtls/asn1write.h
diff --git a/core/mbedtls/inc/mbedtls/base64.h b/features/mbedtls/inc/mbedtls/base64.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/base64.h
rename to features/mbedtls/inc/mbedtls/base64.h
diff --git a/core/mbedtls/inc/mbedtls/bignum.h b/features/mbedtls/inc/mbedtls/bignum.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/bignum.h
rename to features/mbedtls/inc/mbedtls/bignum.h
diff --git a/core/mbedtls/inc/mbedtls/blowfish.h b/features/mbedtls/inc/mbedtls/blowfish.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/blowfish.h
rename to features/mbedtls/inc/mbedtls/blowfish.h
diff --git a/core/mbedtls/inc/mbedtls/bn_mul.h b/features/mbedtls/inc/mbedtls/bn_mul.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/bn_mul.h
rename to features/mbedtls/inc/mbedtls/bn_mul.h
diff --git a/core/mbedtls/inc/mbedtls/camellia.h b/features/mbedtls/inc/mbedtls/camellia.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/camellia.h
rename to features/mbedtls/inc/mbedtls/camellia.h
diff --git a/core/mbedtls/inc/mbedtls/ccm.h b/features/mbedtls/inc/mbedtls/ccm.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ccm.h
rename to features/mbedtls/inc/mbedtls/ccm.h
diff --git a/core/mbedtls/inc/mbedtls/certs.h b/features/mbedtls/inc/mbedtls/certs.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/certs.h
rename to features/mbedtls/inc/mbedtls/certs.h
diff --git a/core/mbedtls/inc/mbedtls/check_config.h b/features/mbedtls/inc/mbedtls/check_config.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/check_config.h
rename to features/mbedtls/inc/mbedtls/check_config.h
diff --git a/core/mbedtls/inc/mbedtls/cipher.h b/features/mbedtls/inc/mbedtls/cipher.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/cipher.h
rename to features/mbedtls/inc/mbedtls/cipher.h
diff --git a/core/mbedtls/inc/mbedtls/cipher_internal.h b/features/mbedtls/inc/mbedtls/cipher_internal.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/cipher_internal.h
rename to features/mbedtls/inc/mbedtls/cipher_internal.h
diff --git a/core/mbedtls/inc/mbedtls/compat-1.3.h b/features/mbedtls/inc/mbedtls/compat-1.3.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/compat-1.3.h
rename to features/mbedtls/inc/mbedtls/compat-1.3.h
diff --git a/core/mbedtls/inc/mbedtls/config.h b/features/mbedtls/inc/mbedtls/config.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/config.h
rename to features/mbedtls/inc/mbedtls/config.h
diff --git a/core/mbedtls/inc/mbedtls/ctr_drbg.h b/features/mbedtls/inc/mbedtls/ctr_drbg.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ctr_drbg.h
rename to features/mbedtls/inc/mbedtls/ctr_drbg.h
diff --git a/core/mbedtls/inc/mbedtls/debug.h b/features/mbedtls/inc/mbedtls/debug.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/debug.h
rename to features/mbedtls/inc/mbedtls/debug.h
diff --git a/core/mbedtls/inc/mbedtls/des.h b/features/mbedtls/inc/mbedtls/des.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/des.h
rename to features/mbedtls/inc/mbedtls/des.h
diff --git a/core/mbedtls/inc/mbedtls/dhm.h b/features/mbedtls/inc/mbedtls/dhm.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/dhm.h
rename to features/mbedtls/inc/mbedtls/dhm.h
diff --git a/core/mbedtls/inc/mbedtls/ecdh.h b/features/mbedtls/inc/mbedtls/ecdh.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ecdh.h
rename to features/mbedtls/inc/mbedtls/ecdh.h
diff --git a/core/mbedtls/inc/mbedtls/ecdsa.h b/features/mbedtls/inc/mbedtls/ecdsa.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ecdsa.h
rename to features/mbedtls/inc/mbedtls/ecdsa.h
diff --git a/core/mbedtls/inc/mbedtls/ecjpake.h b/features/mbedtls/inc/mbedtls/ecjpake.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ecjpake.h
rename to features/mbedtls/inc/mbedtls/ecjpake.h
diff --git a/core/mbedtls/inc/mbedtls/ecp.h b/features/mbedtls/inc/mbedtls/ecp.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ecp.h
rename to features/mbedtls/inc/mbedtls/ecp.h
diff --git a/core/mbedtls/inc/mbedtls/entropy.h b/features/mbedtls/inc/mbedtls/entropy.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/entropy.h
rename to features/mbedtls/inc/mbedtls/entropy.h
diff --git a/core/mbedtls/inc/mbedtls/entropy_poll.h b/features/mbedtls/inc/mbedtls/entropy_poll.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/entropy_poll.h
rename to features/mbedtls/inc/mbedtls/entropy_poll.h
diff --git a/core/mbedtls/inc/mbedtls/error.h b/features/mbedtls/inc/mbedtls/error.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/error.h
rename to features/mbedtls/inc/mbedtls/error.h
diff --git a/core/mbedtls/inc/mbedtls/gcm.h b/features/mbedtls/inc/mbedtls/gcm.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/gcm.h
rename to features/mbedtls/inc/mbedtls/gcm.h
diff --git a/core/mbedtls/inc/mbedtls/havege.h b/features/mbedtls/inc/mbedtls/havege.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/havege.h
rename to features/mbedtls/inc/mbedtls/havege.h
diff --git a/core/mbedtls/inc/mbedtls/hmac_drbg.h b/features/mbedtls/inc/mbedtls/hmac_drbg.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/hmac_drbg.h
rename to features/mbedtls/inc/mbedtls/hmac_drbg.h
diff --git a/core/mbedtls/inc/mbedtls/md.h b/features/mbedtls/inc/mbedtls/md.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/md.h
rename to features/mbedtls/inc/mbedtls/md.h
diff --git a/core/mbedtls/inc/mbedtls/md2.h b/features/mbedtls/inc/mbedtls/md2.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/md2.h
rename to features/mbedtls/inc/mbedtls/md2.h
diff --git a/core/mbedtls/inc/mbedtls/md4.h b/features/mbedtls/inc/mbedtls/md4.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/md4.h
rename to features/mbedtls/inc/mbedtls/md4.h
diff --git a/core/mbedtls/inc/mbedtls/md5.h b/features/mbedtls/inc/mbedtls/md5.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/md5.h
rename to features/mbedtls/inc/mbedtls/md5.h
diff --git a/core/mbedtls/inc/mbedtls/md_internal.h b/features/mbedtls/inc/mbedtls/md_internal.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/md_internal.h
rename to features/mbedtls/inc/mbedtls/md_internal.h
diff --git a/core/mbedtls/inc/mbedtls/memory_buffer_alloc.h b/features/mbedtls/inc/mbedtls/memory_buffer_alloc.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/memory_buffer_alloc.h
rename to features/mbedtls/inc/mbedtls/memory_buffer_alloc.h
diff --git a/core/mbedtls/inc/mbedtls/net.h b/features/mbedtls/inc/mbedtls/net.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/net.h
rename to features/mbedtls/inc/mbedtls/net.h
diff --git a/core/mbedtls/inc/mbedtls/oid.h b/features/mbedtls/inc/mbedtls/oid.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/oid.h
rename to features/mbedtls/inc/mbedtls/oid.h
diff --git a/core/mbedtls/inc/mbedtls/padlock.h b/features/mbedtls/inc/mbedtls/padlock.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/padlock.h
rename to features/mbedtls/inc/mbedtls/padlock.h
diff --git a/core/mbedtls/inc/mbedtls/pem.h b/features/mbedtls/inc/mbedtls/pem.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/pem.h
rename to features/mbedtls/inc/mbedtls/pem.h
diff --git a/core/mbedtls/inc/mbedtls/pk.h b/features/mbedtls/inc/mbedtls/pk.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/pk.h
rename to features/mbedtls/inc/mbedtls/pk.h
diff --git a/core/mbedtls/inc/mbedtls/pk_internal.h b/features/mbedtls/inc/mbedtls/pk_internal.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/pk_internal.h
rename to features/mbedtls/inc/mbedtls/pk_internal.h
diff --git a/core/mbedtls/inc/mbedtls/pkcs11.h b/features/mbedtls/inc/mbedtls/pkcs11.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/pkcs11.h
rename to features/mbedtls/inc/mbedtls/pkcs11.h
diff --git a/core/mbedtls/inc/mbedtls/pkcs12.h b/features/mbedtls/inc/mbedtls/pkcs12.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/pkcs12.h
rename to features/mbedtls/inc/mbedtls/pkcs12.h
diff --git a/core/mbedtls/inc/mbedtls/pkcs5.h b/features/mbedtls/inc/mbedtls/pkcs5.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/pkcs5.h
rename to features/mbedtls/inc/mbedtls/pkcs5.h
diff --git a/core/mbedtls/inc/mbedtls/platform.h b/features/mbedtls/inc/mbedtls/platform.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/platform.h
rename to features/mbedtls/inc/mbedtls/platform.h
diff --git a/core/mbedtls/inc/mbedtls/ripemd160.h b/features/mbedtls/inc/mbedtls/ripemd160.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ripemd160.h
rename to features/mbedtls/inc/mbedtls/ripemd160.h
diff --git a/core/mbedtls/inc/mbedtls/rsa.h b/features/mbedtls/inc/mbedtls/rsa.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/rsa.h
rename to features/mbedtls/inc/mbedtls/rsa.h
diff --git a/core/mbedtls/inc/mbedtls/sha1.h b/features/mbedtls/inc/mbedtls/sha1.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/sha1.h
rename to features/mbedtls/inc/mbedtls/sha1.h
diff --git a/core/mbedtls/inc/mbedtls/sha256.h b/features/mbedtls/inc/mbedtls/sha256.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/sha256.h
rename to features/mbedtls/inc/mbedtls/sha256.h
diff --git a/core/mbedtls/inc/mbedtls/sha512.h b/features/mbedtls/inc/mbedtls/sha512.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/sha512.h
rename to features/mbedtls/inc/mbedtls/sha512.h
diff --git a/core/mbedtls/inc/mbedtls/ssl.h b/features/mbedtls/inc/mbedtls/ssl.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ssl.h
rename to features/mbedtls/inc/mbedtls/ssl.h
diff --git a/core/mbedtls/inc/mbedtls/ssl_cache.h b/features/mbedtls/inc/mbedtls/ssl_cache.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ssl_cache.h
rename to features/mbedtls/inc/mbedtls/ssl_cache.h
diff --git a/core/mbedtls/inc/mbedtls/ssl_ciphersuites.h b/features/mbedtls/inc/mbedtls/ssl_ciphersuites.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ssl_ciphersuites.h
rename to features/mbedtls/inc/mbedtls/ssl_ciphersuites.h
diff --git a/core/mbedtls/inc/mbedtls/ssl_cookie.h b/features/mbedtls/inc/mbedtls/ssl_cookie.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ssl_cookie.h
rename to features/mbedtls/inc/mbedtls/ssl_cookie.h
diff --git a/core/mbedtls/inc/mbedtls/ssl_internal.h b/features/mbedtls/inc/mbedtls/ssl_internal.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ssl_internal.h
rename to features/mbedtls/inc/mbedtls/ssl_internal.h
diff --git a/core/mbedtls/inc/mbedtls/ssl_ticket.h b/features/mbedtls/inc/mbedtls/ssl_ticket.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/ssl_ticket.h
rename to features/mbedtls/inc/mbedtls/ssl_ticket.h
diff --git a/core/mbedtls/inc/mbedtls/threading.h b/features/mbedtls/inc/mbedtls/threading.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/threading.h
rename to features/mbedtls/inc/mbedtls/threading.h
diff --git a/core/mbedtls/inc/mbedtls/timing.h b/features/mbedtls/inc/mbedtls/timing.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/timing.h
rename to features/mbedtls/inc/mbedtls/timing.h
diff --git a/core/mbedtls/inc/mbedtls/version.h b/features/mbedtls/inc/mbedtls/version.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/version.h
rename to features/mbedtls/inc/mbedtls/version.h
diff --git a/core/mbedtls/inc/mbedtls/x509.h b/features/mbedtls/inc/mbedtls/x509.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/x509.h
rename to features/mbedtls/inc/mbedtls/x509.h
diff --git a/core/mbedtls/inc/mbedtls/x509_crl.h b/features/mbedtls/inc/mbedtls/x509_crl.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/x509_crl.h
rename to features/mbedtls/inc/mbedtls/x509_crl.h
diff --git a/core/mbedtls/inc/mbedtls/x509_crt.h b/features/mbedtls/inc/mbedtls/x509_crt.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/x509_crt.h
rename to features/mbedtls/inc/mbedtls/x509_crt.h
diff --git a/core/mbedtls/inc/mbedtls/x509_csr.h b/features/mbedtls/inc/mbedtls/x509_csr.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/x509_csr.h
rename to features/mbedtls/inc/mbedtls/x509_csr.h
diff --git a/core/mbedtls/inc/mbedtls/xtea.h b/features/mbedtls/inc/mbedtls/xtea.h
similarity index 100%
rename from core/mbedtls/inc/mbedtls/xtea.h
rename to features/mbedtls/inc/mbedtls/xtea.h
diff --git a/core/mbedtls/src/.gitignore b/features/mbedtls/src/.gitignore
similarity index 100%
rename from core/mbedtls/src/.gitignore
rename to features/mbedtls/src/.gitignore
diff --git a/core/mbedtls/src/Makefile b/features/mbedtls/src/Makefile
similarity index 100%
rename from core/mbedtls/src/Makefile
rename to features/mbedtls/src/Makefile
diff --git a/core/mbedtls/src/aes.c b/features/mbedtls/src/aes.c
similarity index 100%
rename from core/mbedtls/src/aes.c
rename to features/mbedtls/src/aes.c
diff --git a/core/mbedtls/src/aesni.c b/features/mbedtls/src/aesni.c
similarity index 100%
rename from core/mbedtls/src/aesni.c
rename to features/mbedtls/src/aesni.c
diff --git a/core/mbedtls/src/arc4.c b/features/mbedtls/src/arc4.c
similarity index 100%
rename from core/mbedtls/src/arc4.c
rename to features/mbedtls/src/arc4.c
diff --git a/core/mbedtls/src/asn1parse.c b/features/mbedtls/src/asn1parse.c
similarity index 100%
rename from core/mbedtls/src/asn1parse.c
rename to features/mbedtls/src/asn1parse.c
diff --git a/core/mbedtls/src/asn1write.c b/features/mbedtls/src/asn1write.c
similarity index 100%
rename from core/mbedtls/src/asn1write.c
rename to features/mbedtls/src/asn1write.c
diff --git a/core/mbedtls/src/base64.c b/features/mbedtls/src/base64.c
similarity index 100%
rename from core/mbedtls/src/base64.c
rename to features/mbedtls/src/base64.c
diff --git a/core/mbedtls/src/bignum.c b/features/mbedtls/src/bignum.c
similarity index 100%
rename from core/mbedtls/src/bignum.c
rename to features/mbedtls/src/bignum.c
diff --git a/core/mbedtls/src/blowfish.c b/features/mbedtls/src/blowfish.c
similarity index 100%
rename from core/mbedtls/src/blowfish.c
rename to features/mbedtls/src/blowfish.c
diff --git a/core/mbedtls/src/camellia.c b/features/mbedtls/src/camellia.c
similarity index 100%
rename from core/mbedtls/src/camellia.c
rename to features/mbedtls/src/camellia.c
diff --git a/core/mbedtls/src/ccm.c b/features/mbedtls/src/ccm.c
similarity index 100%
rename from core/mbedtls/src/ccm.c
rename to features/mbedtls/src/ccm.c
diff --git a/core/mbedtls/src/certs.c b/features/mbedtls/src/certs.c
similarity index 100%
rename from core/mbedtls/src/certs.c
rename to features/mbedtls/src/certs.c
diff --git a/core/mbedtls/src/cipher.c b/features/mbedtls/src/cipher.c
similarity index 100%
rename from core/mbedtls/src/cipher.c
rename to features/mbedtls/src/cipher.c
diff --git a/core/mbedtls/src/cipher_wrap.c b/features/mbedtls/src/cipher_wrap.c
similarity index 100%
rename from core/mbedtls/src/cipher_wrap.c
rename to features/mbedtls/src/cipher_wrap.c
diff --git a/core/mbedtls/src/ctr_drbg.c b/features/mbedtls/src/ctr_drbg.c
similarity index 100%
rename from core/mbedtls/src/ctr_drbg.c
rename to features/mbedtls/src/ctr_drbg.c
diff --git a/core/mbedtls/src/debug.c b/features/mbedtls/src/debug.c
similarity index 100%
rename from core/mbedtls/src/debug.c
rename to features/mbedtls/src/debug.c
diff --git a/core/mbedtls/src/des.c b/features/mbedtls/src/des.c
similarity index 100%
rename from core/mbedtls/src/des.c
rename to features/mbedtls/src/des.c
diff --git a/core/mbedtls/src/dhm.c b/features/mbedtls/src/dhm.c
similarity index 100%
rename from core/mbedtls/src/dhm.c
rename to features/mbedtls/src/dhm.c
diff --git a/core/mbedtls/src/ecdh.c b/features/mbedtls/src/ecdh.c
similarity index 100%
rename from core/mbedtls/src/ecdh.c
rename to features/mbedtls/src/ecdh.c
diff --git a/core/mbedtls/src/ecdsa.c b/features/mbedtls/src/ecdsa.c
similarity index 100%
rename from core/mbedtls/src/ecdsa.c
rename to features/mbedtls/src/ecdsa.c
diff --git a/core/mbedtls/src/ecjpake.c b/features/mbedtls/src/ecjpake.c
similarity index 100%
rename from core/mbedtls/src/ecjpake.c
rename to features/mbedtls/src/ecjpake.c
diff --git a/core/mbedtls/src/ecp.c b/features/mbedtls/src/ecp.c
similarity index 100%
rename from core/mbedtls/src/ecp.c
rename to features/mbedtls/src/ecp.c
diff --git a/core/mbedtls/src/ecp_curves.c b/features/mbedtls/src/ecp_curves.c
similarity index 100%
rename from core/mbedtls/src/ecp_curves.c
rename to features/mbedtls/src/ecp_curves.c
diff --git a/core/mbedtls/src/entropy.c b/features/mbedtls/src/entropy.c
similarity index 100%
rename from core/mbedtls/src/entropy.c
rename to features/mbedtls/src/entropy.c
diff --git a/core/mbedtls/src/entropy_poll.c b/features/mbedtls/src/entropy_poll.c
similarity index 100%
rename from core/mbedtls/src/entropy_poll.c
rename to features/mbedtls/src/entropy_poll.c
diff --git a/core/mbedtls/src/error.c b/features/mbedtls/src/error.c
similarity index 100%
rename from core/mbedtls/src/error.c
rename to features/mbedtls/src/error.c
diff --git a/core/mbedtls/src/gcm.c b/features/mbedtls/src/gcm.c
similarity index 100%
rename from core/mbedtls/src/gcm.c
rename to features/mbedtls/src/gcm.c
diff --git a/core/mbedtls/src/havege.c b/features/mbedtls/src/havege.c
similarity index 100%
rename from core/mbedtls/src/havege.c
rename to features/mbedtls/src/havege.c
diff --git a/core/mbedtls/src/hmac_drbg.c b/features/mbedtls/src/hmac_drbg.c
similarity index 100%
rename from core/mbedtls/src/hmac_drbg.c
rename to features/mbedtls/src/hmac_drbg.c
diff --git a/core/mbedtls/src/md.c b/features/mbedtls/src/md.c
similarity index 100%
rename from core/mbedtls/src/md.c
rename to features/mbedtls/src/md.c
diff --git a/core/mbedtls/src/md2.c b/features/mbedtls/src/md2.c
similarity index 100%
rename from core/mbedtls/src/md2.c
rename to features/mbedtls/src/md2.c
diff --git a/core/mbedtls/src/md4.c b/features/mbedtls/src/md4.c
similarity index 100%
rename from core/mbedtls/src/md4.c
rename to features/mbedtls/src/md4.c
diff --git a/core/mbedtls/src/md5.c b/features/mbedtls/src/md5.c
similarity index 100%
rename from core/mbedtls/src/md5.c
rename to features/mbedtls/src/md5.c
diff --git a/core/mbedtls/src/md_wrap.c b/features/mbedtls/src/md_wrap.c
similarity index 100%
rename from core/mbedtls/src/md_wrap.c
rename to features/mbedtls/src/md_wrap.c
diff --git a/core/mbedtls/src/memory_buffer_alloc.c b/features/mbedtls/src/memory_buffer_alloc.c
similarity index 100%
rename from core/mbedtls/src/memory_buffer_alloc.c
rename to features/mbedtls/src/memory_buffer_alloc.c
diff --git a/core/mbedtls/src/net.c b/features/mbedtls/src/net.c
similarity index 100%
rename from core/mbedtls/src/net.c
rename to features/mbedtls/src/net.c
diff --git a/core/mbedtls/src/oid.c b/features/mbedtls/src/oid.c
similarity index 100%
rename from core/mbedtls/src/oid.c
rename to features/mbedtls/src/oid.c
diff --git a/core/mbedtls/src/padlock.c b/features/mbedtls/src/padlock.c
similarity index 100%
rename from core/mbedtls/src/padlock.c
rename to features/mbedtls/src/padlock.c
diff --git a/core/mbedtls/src/pem.c b/features/mbedtls/src/pem.c
similarity index 100%
rename from core/mbedtls/src/pem.c
rename to features/mbedtls/src/pem.c
diff --git a/core/mbedtls/src/pk.c b/features/mbedtls/src/pk.c
similarity index 100%
rename from core/mbedtls/src/pk.c
rename to features/mbedtls/src/pk.c
diff --git a/core/mbedtls/src/pk_wrap.c b/features/mbedtls/src/pk_wrap.c
similarity index 100%
rename from core/mbedtls/src/pk_wrap.c
rename to features/mbedtls/src/pk_wrap.c
diff --git a/core/mbedtls/src/pkcs11.c b/features/mbedtls/src/pkcs11.c
similarity index 100%
rename from core/mbedtls/src/pkcs11.c
rename to features/mbedtls/src/pkcs11.c
diff --git a/core/mbedtls/src/pkcs12.c b/features/mbedtls/src/pkcs12.c
similarity index 100%
rename from core/mbedtls/src/pkcs12.c
rename to features/mbedtls/src/pkcs12.c
diff --git a/core/mbedtls/src/pkcs5.c b/features/mbedtls/src/pkcs5.c
similarity index 100%
rename from core/mbedtls/src/pkcs5.c
rename to features/mbedtls/src/pkcs5.c
diff --git a/core/mbedtls/src/pkparse.c b/features/mbedtls/src/pkparse.c
similarity index 100%
rename from core/mbedtls/src/pkparse.c
rename to features/mbedtls/src/pkparse.c
diff --git a/core/mbedtls/src/pkwrite.c b/features/mbedtls/src/pkwrite.c
similarity index 100%
rename from core/mbedtls/src/pkwrite.c
rename to features/mbedtls/src/pkwrite.c
diff --git a/core/mbedtls/src/platform.c b/features/mbedtls/src/platform.c
similarity index 100%
rename from core/mbedtls/src/platform.c
rename to features/mbedtls/src/platform.c
diff --git a/core/mbedtls/src/ripemd160.c b/features/mbedtls/src/ripemd160.c
similarity index 100%
rename from core/mbedtls/src/ripemd160.c
rename to features/mbedtls/src/ripemd160.c
diff --git a/core/mbedtls/src/rsa.c b/features/mbedtls/src/rsa.c
similarity index 100%
rename from core/mbedtls/src/rsa.c
rename to features/mbedtls/src/rsa.c
diff --git a/core/mbedtls/src/sha1.c b/features/mbedtls/src/sha1.c
similarity index 100%
rename from core/mbedtls/src/sha1.c
rename to features/mbedtls/src/sha1.c
diff --git a/core/mbedtls/src/sha256.c b/features/mbedtls/src/sha256.c
similarity index 100%
rename from core/mbedtls/src/sha256.c
rename to features/mbedtls/src/sha256.c
diff --git a/core/mbedtls/src/sha512.c b/features/mbedtls/src/sha512.c
similarity index 100%
rename from core/mbedtls/src/sha512.c
rename to features/mbedtls/src/sha512.c
diff --git a/core/mbedtls/src/ssl_cache.c b/features/mbedtls/src/ssl_cache.c
similarity index 100%
rename from core/mbedtls/src/ssl_cache.c
rename to features/mbedtls/src/ssl_cache.c
diff --git a/core/mbedtls/src/ssl_ciphersuites.c b/features/mbedtls/src/ssl_ciphersuites.c
similarity index 100%
rename from core/mbedtls/src/ssl_ciphersuites.c
rename to features/mbedtls/src/ssl_ciphersuites.c
diff --git a/core/mbedtls/src/ssl_cli.c b/features/mbedtls/src/ssl_cli.c
similarity index 100%
rename from core/mbedtls/src/ssl_cli.c
rename to features/mbedtls/src/ssl_cli.c
diff --git a/core/mbedtls/src/ssl_cookie.c b/features/mbedtls/src/ssl_cookie.c
similarity index 100%
rename from core/mbedtls/src/ssl_cookie.c
rename to features/mbedtls/src/ssl_cookie.c
diff --git a/core/mbedtls/src/ssl_srv.c b/features/mbedtls/src/ssl_srv.c
similarity index 100%
rename from core/mbedtls/src/ssl_srv.c
rename to features/mbedtls/src/ssl_srv.c
diff --git a/core/mbedtls/src/ssl_ticket.c b/features/mbedtls/src/ssl_ticket.c
similarity index 100%
rename from core/mbedtls/src/ssl_ticket.c
rename to features/mbedtls/src/ssl_ticket.c
diff --git a/core/mbedtls/src/ssl_tls.c b/features/mbedtls/src/ssl_tls.c
similarity index 100%
rename from core/mbedtls/src/ssl_tls.c
rename to features/mbedtls/src/ssl_tls.c
diff --git a/core/mbedtls/src/threading.c b/features/mbedtls/src/threading.c
similarity index 100%
rename from core/mbedtls/src/threading.c
rename to features/mbedtls/src/threading.c
diff --git a/core/mbedtls/src/timing.c b/features/mbedtls/src/timing.c
similarity index 100%
rename from core/mbedtls/src/timing.c
rename to features/mbedtls/src/timing.c
diff --git a/core/mbedtls/src/version.c b/features/mbedtls/src/version.c
similarity index 100%
rename from core/mbedtls/src/version.c
rename to features/mbedtls/src/version.c
diff --git a/core/mbedtls/src/version_features.c b/features/mbedtls/src/version_features.c
similarity index 100%
rename from core/mbedtls/src/version_features.c
rename to features/mbedtls/src/version_features.c
diff --git a/core/mbedtls/src/x509.c b/features/mbedtls/src/x509.c
similarity index 100%
rename from core/mbedtls/src/x509.c
rename to features/mbedtls/src/x509.c
diff --git a/core/mbedtls/src/x509_create.c b/features/mbedtls/src/x509_create.c
similarity index 100%
rename from core/mbedtls/src/x509_create.c
rename to features/mbedtls/src/x509_create.c
diff --git a/core/mbedtls/src/x509_crl.c b/features/mbedtls/src/x509_crl.c
similarity index 100%
rename from core/mbedtls/src/x509_crl.c
rename to features/mbedtls/src/x509_crl.c
diff --git a/core/mbedtls/src/x509_crt.c b/features/mbedtls/src/x509_crt.c
similarity index 100%
rename from core/mbedtls/src/x509_crt.c
rename to features/mbedtls/src/x509_crt.c
diff --git a/core/mbedtls/src/x509_csr.c b/features/mbedtls/src/x509_csr.c
similarity index 100%
rename from core/mbedtls/src/x509_csr.c
rename to features/mbedtls/src/x509_csr.c
diff --git a/core/mbedtls/src/x509write_crt.c b/features/mbedtls/src/x509write_crt.c
similarity index 100%
rename from core/mbedtls/src/x509write_crt.c
rename to features/mbedtls/src/x509write_crt.c
diff --git a/core/mbedtls/src/x509write_csr.c b/features/mbedtls/src/x509write_csr.c
similarity index 100%
rename from core/mbedtls/src/x509write_csr.c
rename to features/mbedtls/src/x509write_csr.c
diff --git a/core/mbedtls/src/xtea.c b/features/mbedtls/src/xtea.c
similarity index 100%
rename from core/mbedtls/src/xtea.c
rename to features/mbedtls/src/xtea.c
diff --git a/storage/cfstore/LICENSE b/features/storage/cfstore/LICENSE
similarity index 100%
rename from storage/cfstore/LICENSE
rename to features/storage/cfstore/LICENSE
diff --git a/storage/cfstore/Makefile.scripts b/features/storage/cfstore/Makefile.scripts
similarity index 100%
rename from storage/cfstore/Makefile.scripts
rename to features/storage/cfstore/Makefile.scripts
diff --git a/storage/cfstore/README.md b/features/storage/cfstore/README.md
similarity index 100%
rename from storage/cfstore/README.md
rename to features/storage/cfstore/README.md
diff --git a/storage/cfstore/VERSION b/features/storage/cfstore/VERSION
similarity index 100%
rename from storage/cfstore/VERSION
rename to features/storage/cfstore/VERSION
diff --git a/storage/cfstore/apache-2.0.txt b/features/storage/cfstore/apache-2.0.txt
similarity index 100%
rename from storage/cfstore/apache-2.0.txt
rename to features/storage/cfstore/apache-2.0.txt
diff --git a/storage/cfstore/berkeley.txt b/features/storage/cfstore/berkeley.txt
similarity index 100%
rename from storage/cfstore/berkeley.txt
rename to features/storage/cfstore/berkeley.txt
diff --git a/storage/cfstore/chernov.txt b/features/storage/cfstore/chernov.txt
similarity index 100%
rename from storage/cfstore/chernov.txt
rename to features/storage/cfstore/chernov.txt
diff --git a/storage/cfstore/configuration-store/configuration_store.h b/features/storage/cfstore/configuration-store/configuration_store.h
similarity index 100%
rename from storage/cfstore/configuration-store/configuration_store.h
rename to features/storage/cfstore/configuration-store/configuration_store.h
diff --git a/storage/cfstore/doc/design/configuration_store_getting_started.md b/features/storage/cfstore/doc/design/configuration_store_getting_started.md
similarity index 100%
rename from storage/cfstore/doc/design/configuration_store_getting_started.md
rename to features/storage/cfstore/doc/design/configuration_store_getting_started.md
diff --git a/storage/cfstore/doc/design/configuration_store_hld.md b/features/storage/cfstore/doc/design/configuration_store_hld.md
similarity index 100%
rename from storage/cfstore/doc/design/configuration_store_hld.md
rename to features/storage/cfstore/doc/design/configuration_store_hld.md
diff --git a/storage/cfstore/doc/design/configuration_store_lld.md b/features/storage/cfstore/doc/design/configuration_store_lld.md
similarity index 100%
rename from storage/cfstore/doc/design/configuration_store_lld.md
rename to features/storage/cfstore/doc/design/configuration_store_lld.md
diff --git a/storage/cfstore/doc/design/configuration_store_product_requirements.md b/features/storage/cfstore/doc/design/configuration_store_product_requirements.md
similarity index 100%
rename from storage/cfstore/doc/design/configuration_store_product_requirements.md
rename to features/storage/cfstore/doc/design/configuration_store_product_requirements.md
diff --git a/storage/cfstore/doc/design/configuration_store_project.md b/features/storage/cfstore/doc/design/configuration_store_project.md
similarity index 100%
rename from storage/cfstore/doc/design/configuration_store_project.md
rename to features/storage/cfstore/doc/design/configuration_store_project.md
diff --git a/storage/cfstore/doc/design/configuration_store_requirements.md b/features/storage/cfstore/doc/design/configuration_store_requirements.md
similarity index 100%
rename from storage/cfstore/doc/design/configuration_store_requirements.md
rename to features/storage/cfstore/doc/design/configuration_store_requirements.md
diff --git a/storage/cfstore/doc/design/configuration_store_terminology.md b/features/storage/cfstore/doc/design/configuration_store_terminology.md
similarity index 100%
rename from storage/cfstore/doc/design/configuration_store_terminology.md
rename to features/storage/cfstore/doc/design/configuration_store_terminology.md
diff --git a/storage/cfstore/doc/design/configuration_store_test_plan.md b/features/storage/cfstore/doc/design/configuration_store_test_plan.md
similarity index 100%
rename from storage/cfstore/doc/design/configuration_store_test_plan.md
rename to features/storage/cfstore/doc/design/configuration_store_test_plan.md
diff --git a/storage/cfstore/doc/design/pics/cfstore_hld_seqdiag_find_full_part_async.png b/features/storage/cfstore/doc/design/pics/cfstore_hld_seqdiag_find_full_part_async.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstore_hld_seqdiag_find_full_part_async.png
rename to features/storage/cfstore/doc/design/pics/cfstore_hld_seqdiag_find_full_part_async.png
diff --git a/storage/cfstore/doc/design/pics/cfstore_hld_seqdiag_find_full_part_sync.png b/features/storage/cfstore/doc/design/pics/cfstore_hld_seqdiag_find_full_part_sync.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstore_hld_seqdiag_find_full_part_sync.png
rename to features/storage/cfstore/doc/design/pics/cfstore_hld_seqdiag_find_full_part_sync.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_create_async.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_create_async.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_create_async.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_create_async.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_create_sync.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_create_sync.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_create_sync.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_create_sync.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_full_async.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_full_async.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_full_async.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_full_async.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_full_sync.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_full_sync.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_full_sync.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_full_sync.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_part_async.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_part_async.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_part_async.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_part_async.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_part_sync.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_part_sync.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_part_sync.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_find_part_sync.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_getversion_getcapabilities_sync.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_getversion_getcapabilities_sync.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_getversion_getcapabilities_sync.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_getversion_getcapabilities_sync.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_init_uninit_async.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_init_uninit_async.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_init_uninit_async.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_init_uninit_async.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_init_uninit_sync.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_init_uninit_sync.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_init_uninit_sync.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_init_uninit_sync.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_read_async.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_read_async.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_read_async.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_read_async.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_read_sync.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_read_sync.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_read_sync.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_read_sync.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_write_async.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_write_async.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_write_async.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_write_async.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_write_sync.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_write_sync.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_write_sync.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_open_write_sync.png
diff --git a/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_power_control_sync.png b/features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_power_control_sync.png
similarity index 100%
rename from storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_power_control_sync.png
rename to features/storage/cfstore/doc/design/pics/cfstrore_hld_seqdiag_power_control_sync.png
diff --git a/storage/cfstore/doc/design/pics/configuration_store_hld_api_summary.jpg b/features/storage/cfstore/doc/design/pics/configuration_store_hld_api_summary.jpg
similarity index 100%
rename from storage/cfstore/doc/design/pics/configuration_store_hld_api_summary.jpg
rename to features/storage/cfstore/doc/design/pics/configuration_store_hld_api_summary.jpg
diff --git a/storage/cfstore/doc/design/umlet/configuartion_store_hld.uxf b/features/storage/cfstore/doc/design/umlet/configuartion_store_hld.uxf
similarity index 100%
rename from storage/cfstore/doc/design/umlet/configuartion_store_hld.uxf
rename to features/storage/cfstore/doc/design/umlet/configuartion_store_hld.uxf
diff --git a/storage/cfstore/doc/project/configuration_store_releases.md b/features/storage/cfstore/doc/project/configuration_store_releases.md
similarity index 100%
rename from storage/cfstore/doc/project/configuration_store_releases.md
rename to features/storage/cfstore/doc/project/configuration_store_releases.md
diff --git a/storage/cfstore/source/cfstore_config.h b/features/storage/cfstore/source/cfstore_config.h
similarity index 100%
rename from storage/cfstore/source/cfstore_config.h
rename to features/storage/cfstore/source/cfstore_config.h
diff --git a/storage/cfstore/source/cfstore_debug.h b/features/storage/cfstore/source/cfstore_debug.h
similarity index 100%
rename from storage/cfstore/source/cfstore_debug.h
rename to features/storage/cfstore/source/cfstore_debug.h
diff --git a/storage/cfstore/source/cfstore_fnmatch.c b/features/storage/cfstore/source/cfstore_fnmatch.c
similarity index 100%
rename from storage/cfstore/source/cfstore_fnmatch.c
rename to features/storage/cfstore/source/cfstore_fnmatch.c
diff --git a/storage/cfstore/source/cfstore_fnmatch.h b/features/storage/cfstore/source/cfstore_fnmatch.h
similarity index 100%
rename from storage/cfstore/source/cfstore_fnmatch.h
rename to features/storage/cfstore/source/cfstore_fnmatch.h
diff --git a/storage/cfstore/source/cfstore_list.h b/features/storage/cfstore/source/cfstore_list.h
similarity index 100%
rename from storage/cfstore/source/cfstore_list.h
rename to features/storage/cfstore/source/cfstore_list.h
diff --git a/storage/cfstore/source/cfstore_test.c b/features/storage/cfstore/source/cfstore_test.c
similarity index 100%
rename from storage/cfstore/source/cfstore_test.c
rename to features/storage/cfstore/source/cfstore_test.c
diff --git a/storage/cfstore/source/cfstore_test.h b/features/storage/cfstore/source/cfstore_test.h
similarity index 100%
rename from storage/cfstore/source/cfstore_test.h
rename to features/storage/cfstore/source/cfstore_test.h
diff --git a/storage/cfstore/source/cfstore_utest.h b/features/storage/cfstore/source/cfstore_utest.h
similarity index 100%
rename from storage/cfstore/source/cfstore_utest.h
rename to features/storage/cfstore/source/cfstore_utest.h
diff --git a/storage/cfstore/source/cfstore_uvisor.h b/features/storage/cfstore/source/cfstore_uvisor.h
similarity index 100%
rename from storage/cfstore/source/cfstore_uvisor.h
rename to features/storage/cfstore/source/cfstore_uvisor.h
diff --git a/storage/cfstore/source/configuration_store.c b/features/storage/cfstore/source/configuration_store.c
similarity index 100%
rename from storage/cfstore/source/configuration_store.c
rename to features/storage/cfstore/source/configuration_store.c
diff --git a/storage/cfstore/tatmanjants.txt b/features/storage/cfstore/tatmanjants.txt
similarity index 100%
rename from storage/cfstore/tatmanjants.txt
rename to features/storage/cfstore/tatmanjants.txt
diff --git a/storage/flash-journal/flash-journal-strategy-sequential/config.h b/features/storage/flash-journal/flash-journal-strategy-sequential/config.h
similarity index 100%
rename from storage/flash-journal/flash-journal-strategy-sequential/config.h
rename to features/storage/flash-journal/flash-journal-strategy-sequential/config.h
diff --git a/storage/flash-journal/flash-journal-strategy-sequential/flash_journal_private.h b/features/storage/flash-journal/flash-journal-strategy-sequential/flash_journal_private.h
similarity index 100%
rename from storage/flash-journal/flash-journal-strategy-sequential/flash_journal_private.h
rename to features/storage/flash-journal/flash-journal-strategy-sequential/flash_journal_private.h
diff --git a/storage/flash-journal/flash-journal-strategy-sequential/flash_journal_strategy_sequential.h b/features/storage/flash-journal/flash-journal-strategy-sequential/flash_journal_strategy_sequential.h
similarity index 100%
rename from storage/flash-journal/flash-journal-strategy-sequential/flash_journal_strategy_sequential.h
rename to features/storage/flash-journal/flash-journal-strategy-sequential/flash_journal_strategy_sequential.h
diff --git a/storage/flash-journal/flash-journal-strategy-sequential/strategy.c b/features/storage/flash-journal/flash-journal-strategy-sequential/strategy.c
similarity index 100%
rename from storage/flash-journal/flash-journal-strategy-sequential/strategy.c
rename to features/storage/flash-journal/flash-journal-strategy-sequential/strategy.c
diff --git a/storage/flash-journal/flash-journal-strategy-sequential/support_funcs.c b/features/storage/flash-journal/flash-journal-strategy-sequential/support_funcs.c
similarity index 100%
rename from storage/flash-journal/flash-journal-strategy-sequential/support_funcs.c
rename to features/storage/flash-journal/flash-journal-strategy-sequential/support_funcs.c
diff --git a/storage/flash-journal/flash-journal-strategy-sequential/support_funcs.h b/features/storage/flash-journal/flash-journal-strategy-sequential/support_funcs.h
similarity index 100%
rename from storage/flash-journal/flash-journal-strategy-sequential/support_funcs.h
rename to features/storage/flash-journal/flash-journal-strategy-sequential/support_funcs.h
diff --git a/storage/flash-journal/flash_journal.h b/features/storage/flash-journal/flash_journal.h
similarity index 100%
rename from storage/flash-journal/flash_journal.h
rename to features/storage/flash-journal/flash_journal.h