diff --git a/libraries/ble/nordic_native/GapAdvertisingData.cpp b/libraries/ble/ble-api/GapAdvertisingData.cpp
similarity index 100%
rename from libraries/ble/nordic_native/GapAdvertisingData.cpp
rename to libraries/ble/ble-api/GapAdvertisingData.cpp
diff --git a/libraries/ble/nordic_native/GapAdvertisingData.h b/libraries/ble/ble-api/GapAdvertisingData.h
similarity index 100%
rename from libraries/ble/nordic_native/GapAdvertisingData.h
rename to libraries/ble/ble-api/GapAdvertisingData.h
diff --git a/libraries/ble/nordic_native/GapAdvertisingParams.cpp b/libraries/ble/ble-api/GapAdvertisingParams.cpp
similarity index 100%
rename from libraries/ble/nordic_native/GapAdvertisingParams.cpp
rename to libraries/ble/ble-api/GapAdvertisingParams.cpp
diff --git a/libraries/ble/nordic_native/GapAdvertisingParams.h b/libraries/ble/ble-api/GapAdvertisingParams.h
similarity index 100%
rename from libraries/ble/nordic_native/GapAdvertisingParams.h
rename to libraries/ble/ble-api/GapAdvertisingParams.h
diff --git a/libraries/ble/nordic_native/GattCharacteristic.cpp b/libraries/ble/ble-api/GattCharacteristic.cpp
similarity index 100%
rename from libraries/ble/nordic_native/GattCharacteristic.cpp
rename to libraries/ble/ble-api/GattCharacteristic.cpp
diff --git a/libraries/ble/nordic_native/GattCharacteristic.h b/libraries/ble/ble-api/GattCharacteristic.h
similarity index 100%
rename from libraries/ble/nordic_native/GattCharacteristic.h
rename to libraries/ble/ble-api/GattCharacteristic.h
diff --git a/libraries/ble/nordic_native/GattService.cpp b/libraries/ble/ble-api/GattService.cpp
similarity index 100%
rename from libraries/ble/nordic_native/GattService.cpp
rename to libraries/ble/ble-api/GattService.cpp
diff --git a/libraries/ble/nordic_native/GattService.h b/libraries/ble/ble-api/GattService.h
similarity index 100%
rename from libraries/ble/nordic_native/GattService.h
rename to libraries/ble/ble-api/GattService.h
diff --git a/libraries/ble/nordic_native/UUID.cpp b/libraries/ble/ble-api/UUID.cpp
similarity index 100%
rename from libraries/ble/nordic_native/UUID.cpp
rename to libraries/ble/ble-api/UUID.cpp
diff --git a/libraries/ble/nordic_native/UUID.h b/libraries/ble/ble-api/UUID.h
similarity index 100%
rename from libraries/ble/nordic_native/UUID.h
rename to libraries/ble/ble-api/UUID.h
diff --git a/libraries/ble/nordic_native/blecommon.h b/libraries/ble/ble-api/blecommon.h
similarity index 100%
rename from libraries/ble/nordic_native/blecommon.h
rename to libraries/ble/ble-api/blecommon.h
diff --git a/libraries/ble/nordic_native/hw/BLEDevice.h b/libraries/ble/ble-api/hw/BLEDevice.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/BLEDevice.h
rename to libraries/ble/ble-api/hw/BLEDevice.h
diff --git a/libraries/ble/nordic_native/hw/Gap.h b/libraries/ble/ble-api/hw/Gap.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/Gap.h
rename to libraries/ble/ble-api/hw/Gap.h
diff --git a/libraries/ble/nordic_native/hw/GapEvents.h b/libraries/ble/ble-api/hw/GapEvents.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/GapEvents.h
rename to libraries/ble/ble-api/hw/GapEvents.h
diff --git a/libraries/ble/nordic_native/hw/GattServer.h b/libraries/ble/ble-api/hw/GattServer.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/GattServer.h
rename to libraries/ble/ble-api/hw/GattServer.h
diff --git a/libraries/ble/nordic_native/hw/GattServerEvents.h b/libraries/ble/ble-api/hw/GattServerEvents.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/GattServerEvents.h
rename to libraries/ble/ble-api/hw/GattServerEvents.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/btle/btle.cpp b/libraries/ble/nRF51822/btle/btle.cpp
similarity index 98%
rename from libraries/ble/nordic_native/hw/nRF51822n/btle/btle.cpp
rename to libraries/ble/nRF51822/btle/btle.cpp
index f0ecadb670..f75f9ed818 100644
--- a/libraries/ble/nordic_native/hw/nRF51822n/btle/btle.cpp
+++ b/libraries/ble/nRF51822/btle/btle.cpp
@@ -33,8 +33,8 @@
 #include "pstorage.h"
 
 #include "hw/GapEvents.h"
-#include "hw/nRF51822n/nRF51Gap.h"
-#include "hw/nRF51822n/nRF51GattServer.h"
+#include "nRF51Gap.h"
+#include "nRF51GattServer.h"
 
 static void service_error_callback(uint32_t nrf_error);
 void        assert_nrf_callback(uint16_t line_num, const uint8_t * p_file_name);
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/btle/btle.h b/libraries/ble/nRF51822/btle/btle.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/btle/btle.h
rename to libraries/ble/nRF51822/btle/btle.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/btle/btle_advertising.cpp b/libraries/ble/nRF51822/btle/btle_advertising.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/btle/btle_advertising.cpp
rename to libraries/ble/nRF51822/btle/btle_advertising.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/btle/btle_advertising.h b/libraries/ble/nRF51822/btle/btle_advertising.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/btle/btle_advertising.h
rename to libraries/ble/nRF51822/btle/btle_advertising.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/btle/btle_gap.cpp b/libraries/ble/nRF51822/btle/btle_gap.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/btle/btle_gap.cpp
rename to libraries/ble/nRF51822/btle/btle_gap.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/btle/btle_gap.h b/libraries/ble/nRF51822/btle/btle_gap.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/btle/btle_gap.h
rename to libraries/ble/nRF51822/btle/btle_gap.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/btle/custom/custom_helper.cpp b/libraries/ble/nRF51822/btle/custom/custom_helper.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/btle/custom/custom_helper.cpp
rename to libraries/ble/nRF51822/btle/custom/custom_helper.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/btle/custom/custom_helper.h b/libraries/ble/nRF51822/btle/custom/custom_helper.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/btle/custom/custom_helper.h
rename to libraries/ble/nRF51822/btle/custom/custom_helper.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/common/ansi_escape.h b/libraries/ble/nRF51822/common/ansi_escape.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/common/ansi_escape.h
rename to libraries/ble/nRF51822/common/ansi_escape.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/common/assertion.h b/libraries/ble/nRF51822/common/assertion.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/common/assertion.h
rename to libraries/ble/nRF51822/common/assertion.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/common/binary.h b/libraries/ble/nRF51822/common/binary.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/common/binary.h
rename to libraries/ble/nRF51822/common/binary.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/common/ble_error.h b/libraries/ble/nRF51822/common/ble_error.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/common/ble_error.h
rename to libraries/ble/nRF51822/common/ble_error.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/common/common.h b/libraries/ble/nRF51822/common/common.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/common/common.h
rename to libraries/ble/nRF51822/common/common.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/common/compiler.h b/libraries/ble/nRF51822/common/compiler.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/common/compiler.h
rename to libraries/ble/nRF51822/common/compiler.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nRF51822n.cpp b/libraries/ble/nRF51822/nRF51822n.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nRF51822n.cpp
rename to libraries/ble/nRF51822/nRF51822n.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nRF51822n.h b/libraries/ble/nRF51822/nRF51822n.h
similarity index 94%
rename from libraries/ble/nordic_native/hw/nRF51822n/nRF51822n.h
rename to libraries/ble/nRF51822/nRF51822n.h
index 7b000c79e4..f12f059559 100644
--- a/libraries/ble/nordic_native/hw/nRF51822n/nRF51822n.h
+++ b/libraries/ble/nRF51822/nRF51822n.h
@@ -25,8 +25,8 @@
 #include "mbed.h"
 #include "blecommon.h"
 #include "hw/BLEDevice.h"
-#include "hw/nRF51822n/nRF51Gap.h"
-#include "hw/nRF51822n/nRF51GattServer.h"
+#include "nRF51Gap.h"
+#include "nRF51GattServer.h"
 
 /**************************************************************************/
 /*!
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nRF51Gap.cpp b/libraries/ble/nRF51822/nRF51Gap.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nRF51Gap.cpp
rename to libraries/ble/nRF51822/nRF51Gap.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nRF51Gap.h b/libraries/ble/nRF51822/nRF51Gap.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nRF51Gap.h
rename to libraries/ble/nRF51822/nRF51Gap.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nRF51GattServer.cpp b/libraries/ble/nRF51822/nRF51GattServer.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nRF51GattServer.cpp
rename to libraries/ble/nRF51822/nRF51GattServer.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nRF51GattServer.h b/libraries/ble/nRF51822/nRF51GattServer.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nRF51GattServer.h
rename to libraries/ble/nRF51822/nRF51GattServer.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/app_common/app_timer.cpp b/libraries/ble/nRF51822/nordic/app_common/app_timer.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/app_common/app_timer.cpp
rename to libraries/ble/nRF51822/nordic/app_common/app_timer.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/app_common/crc16.cpp b/libraries/ble/nRF51822/nordic/app_common/crc16.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/app_common/crc16.cpp
rename to libraries/ble/nRF51822/nordic/app_common/crc16.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/app_common/pstorage.cpp b/libraries/ble/nRF51822/nordic/app_common/pstorage.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/app_common/pstorage.cpp
rename to libraries/ble/nRF51822/nordic/app_common/pstorage.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_advdata.cpp b/libraries/ble/nRF51822/nordic/ble/ble_advdata.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_advdata.cpp
rename to libraries/ble/nRF51822/nordic/ble/ble_advdata.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_advdata_parser.cpp b/libraries/ble/nRF51822/nordic/ble/ble_advdata_parser.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_advdata_parser.cpp
rename to libraries/ble/nRF51822/nordic/ble/ble_advdata_parser.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_bondmngr.cpp b/libraries/ble/nRF51822/nordic/ble/ble_bondmngr.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_bondmngr.cpp
rename to libraries/ble/nRF51822/nordic/ble/ble_bondmngr.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_conn_params.cpp b/libraries/ble/nRF51822/nordic/ble/ble_conn_params.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_conn_params.cpp
rename to libraries/ble/nRF51822/nordic/ble/ble_conn_params.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_debug_assert_handler.cpp b/libraries/ble/nRF51822/nordic/ble/ble_debug_assert_handler.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_debug_assert_handler.cpp
rename to libraries/ble/nRF51822/nordic/ble/ble_debug_assert_handler.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_error_log.cpp b/libraries/ble/nRF51822/nordic/ble/ble_error_log.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_error_log.cpp
rename to libraries/ble/nRF51822/nordic/ble/ble_error_log.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_services/ble_srv_common.cpp b/libraries/ble/nRF51822/nordic/ble/ble_services/ble_srv_common.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/ble/ble_services/ble_srv_common.cpp
rename to libraries/ble/nRF51822/nordic/ble/ble_services/ble_srv_common.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/ble_bondmngr_cfg.h b/libraries/ble/nRF51822/nordic/ble_bondmngr_cfg.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/ble_bondmngr_cfg.h
rename to libraries/ble/nRF51822/nordic/ble_bondmngr_cfg.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nordic_global.h b/libraries/ble/nRF51822/nordic/nordic_global.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nordic_global.h
rename to libraries/ble/nRF51822/nordic/nordic_global.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_button.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_button.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_button.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_button.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_error.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_error.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_error.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_error.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_fifo.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_fifo.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_fifo.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_fifo.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_gpiote.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_gpiote.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_gpiote.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_gpiote.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_scheduler.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_scheduler.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_scheduler.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_scheduler.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_timer.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_timer.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_timer.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_timer.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_uart.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_uart.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_uart.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_uart.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_util.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_util.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/app_util.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/app_util.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/crc16.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/crc16.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/crc16.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/crc16.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_mem_pool.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/hci_mem_pool.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_mem_pool.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/hci_mem_pool.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_mem_pool_internal.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/hci_mem_pool_internal.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_mem_pool_internal.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/hci_mem_pool_internal.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_slip.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/hci_slip.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_slip.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/hci_slip.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_transport.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/hci_transport.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_transport.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/hci_transport.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/pstorage.h b/libraries/ble/nRF51822/nordic/nrf-sdk/app_common/pstorage.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/app_common/pstorage.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/app_common/pstorage.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_advdata.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_advdata.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_advdata.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_advdata.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_advdata_parser.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_advdata_parser.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_advdata_parser.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_advdata_parser.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_bondmngr.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_bondmngr.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_bondmngr.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_bondmngr.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_central_bondmngr.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_central_bondmngr.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_central_bondmngr.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_central_bondmngr.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_conn_params.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_conn_params.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_conn_params.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_conn_params.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_date_time.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_date_time.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_date_time.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_date_time.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_debug_assert_handler.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_debug_assert_handler.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_debug_assert_handler.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_debug_assert_handler.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_dtm.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_dtm.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_dtm.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_dtm.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_error_log.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_error_log.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_error_log.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_error_log.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_flash.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_flash.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_flash.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_flash.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_racp.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_racp.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_racp.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_racp.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_radio_notification.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_radio_notification.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_radio_notification.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_radio_notification.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_sensorsim.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_sensorsim.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_sensorsim.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_sensorsim.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_services/ble_srv_common.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_services/ble_srv_common.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/ble_services/ble_srv_common.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/ble_services/ble_srv_common.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder_gap.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder_gap.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder_gap.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder_gap.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder_gatts.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder_gatts.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder_gatts.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_decoder_gatts.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_encoder.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_encoder.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_encoder.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_cmd_encoder.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_defines.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_defines.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_defines.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_defines.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder_gap.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder_gap.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder_gap.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder_gap.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder_gatts.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder_gatts.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder_gatts.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_decoder_gatts.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder_gap.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder_gap.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder_gap.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder_gap.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder_gatts.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder_gatts.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder_gatts.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_event_encoder_gatts.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_pkt_receiver.h b/libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_pkt_receiver.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/ble/rpc/ble_rpc_pkt_receiver.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/ble/rpc/ble_rpc_pkt_receiver.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nordic_common.h b/libraries/ble/nRF51822/nordic/nrf-sdk/nordic_common.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nordic_common.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/nordic_common.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nrf_assert.h b/libraries/ble/nRF51822/nordic/nrf-sdk/nrf_assert.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nrf_assert.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/nrf_assert.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nrf_ecb.h b/libraries/ble/nRF51822/nordic/nrf-sdk/nrf_ecb.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nrf_ecb.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/nrf_ecb.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nrf_gpio.h b/libraries/ble/nRF51822/nordic/nrf-sdk/nrf_gpio.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nrf_gpio.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/nrf_gpio.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nrf_nvmc.h b/libraries/ble/nRF51822/nordic/nrf-sdk/nrf_nvmc.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nrf_nvmc.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/nrf_nvmc.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nrf_temp.h b/libraries/ble/nRF51822/nordic/nrf-sdk/nrf_temp.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/nrf_temp.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/nrf_temp.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_err.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_err.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_err.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_err.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gap.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_gap.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gap.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_gap.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gatt.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_gatt.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gatt.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_gatt.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gattc.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_gattc.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gattc.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_gattc.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gatts.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_gatts.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gatts.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_gatts.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_hci.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_hci.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_hci.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_hci.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_l2cap.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_l2cap.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_l2cap.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_l2cap.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_ranges.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_ranges.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_ranges.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_ranges.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_types.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_types.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/ble_types.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/ble_types.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_error.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_error.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_error.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_error.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_error_sdm.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_error_sdm.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_error_sdm.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_error_sdm.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_error_soc.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_error_soc.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_error_soc.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_error_soc.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_sdm.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_sdm.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_sdm.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_sdm.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_soc.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_soc.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_soc.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_soc.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_svc.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_svc.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_svc.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/nrf_svc.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/softdevice_assert.h b/libraries/ble/nRF51822/nordic/nrf-sdk/s110/softdevice_assert.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/s110/softdevice_assert.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/s110/softdevice_assert.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/sd_common/ant_stack_handler_types.h b/libraries/ble/nRF51822/nordic/nrf-sdk/sd_common/ant_stack_handler_types.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/sd_common/ant_stack_handler_types.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/sd_common/ant_stack_handler_types.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/sd_common/ble_stack_handler_types.h b/libraries/ble/nRF51822/nordic/nrf-sdk/sd_common/ble_stack_handler_types.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/sd_common/ble_stack_handler_types.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/sd_common/ble_stack_handler_types.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/sd_common/softdevice_handler.h b/libraries/ble/nRF51822/nordic/nrf-sdk/sd_common/softdevice_handler.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/sd_common/softdevice_handler.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/sd_common/softdevice_handler.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/system_nrf51.h b/libraries/ble/nRF51822/nordic/nrf-sdk/system_nrf51.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/nrf-sdk/system_nrf51.h
rename to libraries/ble/nRF51822/nordic/nrf-sdk/system_nrf51.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/pstorage_platform.h b/libraries/ble/nRF51822/nordic/pstorage_platform.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/pstorage_platform.h
rename to libraries/ble/nRF51822/nordic/pstorage_platform.h
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/nordic/softdevice_handler.cpp b/libraries/ble/nRF51822/nordic/softdevice_handler.cpp
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/nordic/softdevice_handler.cpp
rename to libraries/ble/nRF51822/nordic/softdevice_handler.cpp
diff --git a/libraries/ble/nordic_native/hw/nRF51822n/projectconfig.h b/libraries/ble/nRF51822/projectconfig.h
similarity index 100%
rename from libraries/ble/nordic_native/hw/nRF51822n/projectconfig.h
rename to libraries/ble/nRF51822/projectconfig.h
diff --git a/libraries/tests/mbed/rpc/main.cpp b/libraries/tests/mbed/rpc/main.cpp
index dcf8f8e66f..a8336c3ed0 100644
--- a/libraries/tests/mbed/rpc/main.cpp
+++ b/libraries/tests/mbed/rpc/main.cpp
@@ -1,59 +1,63 @@
 #include "mbed.h"
+#include "test_env.h"
 #include "mbed_rpc.h"
 
-float f = 0;
-
 void foo(Arguments *args, Reply *reply) {
     reply->putData<float>(args->getArg<float>() * 3.3);
 }
 
-char outbuf[RPC_MAX_STRING];
-void test(const char *input, const char *expected) {
-    printf("> %s\n", input);
+bool rpc_test(const char *input, const char *expected) {
+    char outbuf[RPC_MAX_STRING] = {0};
     bool result = RPC::call(input, outbuf);
-    
-    if (!result) {
-        printf("[ERROR] The remote procedure call failed\n");
-    } else if (strcmp(outbuf, expected) != 0) {
-        printf("[ERROR] \"%s\" != \"%s\"\n", outbuf, expected);
+    printf("RPC: %s -> ", input);
+
+    if (result == false) {
+        printf("Procedure call ... [FAIL]\r\n");
+    } else if (strncmp(outbuf, expected, RPC_MAX_STRING) != 0) {
+        printf("'%s' != '%s' ... [FAIL]\r\n", outbuf, expected);
+        result = false;
     } else {
-        printf("{%s}\n", outbuf);
+        printf("'%s' ... [OK]\r\n", outbuf);
     }
+    return result;
 }
 
+#define RPC_TEST(INPUT,EXPECTED) result = result && rpc_test(INPUT,EXPECTED); if (result == false) { notify_completion(result); exit(1); }
+
 int main() {
+    float f = 0;
+    bool result = true;
     // Variable
     RPCVariable<float> rpc_f(&f, "f");
-    test("/f/write 1", "");
-    test("/f/read", "1");
-    
+    RPC_TEST("/f/write 1", "");
+    RPC_TEST("/f/read", "1");
+
     // Function
     RPCFunction rpc_foo(&foo, "foo");
-    test("/foo/run 1", "3.2999999523162842");
-    
+    RPC_TEST("/foo/run 1", "3.2999999523162842");
+
     // Class
     RPC::add_rpc_class<RpcDigitalOut>();
-    test("/DigitalOut/new LED2 led2", "led2");
-    test("/led2/write 1", "");
-    test("/led2/read", "1");
-    
+    RPC_TEST("/DigitalOut/new LED2 led2", "led2");
+    RPC_TEST("/led2/write 1", "");
+    RPC_TEST("/led2/read", "1");
+
     // Instance
     RpcDigitalOut rpc_led(LED1, "led1");
-    test("/led1/write 1", "");
-    test("/led1/read", "1");
-    
+    RPC_TEST("/led1/write 1", "");
+    RPC_TEST("/led1/read", "1");
+
     // Introspection
-    test("/", "led1 led2 foo f DigitalOut RPC");
-    test("/f", "read write delete");
-    test("/foo", "run delete");
-    test("/DigitalOut", "new");
-    test("/led1", "write read delete");
-    
+    RPC_TEST("/", "led1 led2 foo f DigitalOut RPC");
+    RPC_TEST("/f", "read write delete");
+    RPC_TEST("/foo", "run delete");
+    RPC_TEST("/DigitalOut", "new");
+    RPC_TEST("/led1", "write read delete");
+
     // Delete instance
-    test("/led2/delete", "");
-    test("/", "led1 foo f DigitalOut RPC");
-    
-    while (true) {
-        wait(1);
-    }
+    RPC_TEST("/led2/delete", "");
+    RPC_TEST("/", "led1 foo f DigitalOut RPC");
+
+    notify_completion(result);
+    return 0;
 }
diff --git a/libraries/tests/mbed/vtor_reloc/main.cpp b/libraries/tests/mbed/vtor_reloc/main.cpp
index 0ab7fb8572..f5640fe50f 100644
--- a/libraries/tests/mbed/vtor_reloc/main.cpp
+++ b/libraries/tests/mbed/vtor_reloc/main.cpp
@@ -13,11 +13,13 @@
 DigitalOut out(PIN_OUT);
 DigitalOut myled(LED1);
 
-static volatile int checks;
-static uint32_t int_table[NUM_VECTORS];
+volatile int checks = 0;
+uint32_t int_table[NUM_VECTORS];
+
+#define FALLING_EDGE_COUNT 5
 
 void flipper() {
-    for (int i = 0; i < 5; i++) {
+    for (int i = 0; i < FALLING_EDGE_COUNT; i++) {
         out = 1;
         wait(0.2);
         out = 0;
@@ -38,24 +40,36 @@ static bool test_once() {
     in.fall(in_handler);
     flipper();
     in.fall(NULL);
-    bool result = (checks == 5);
-    printf(result ? "Test passed.\r\n" : "Test failed.\r\n");
+    bool result = (checks == FALLING_EDGE_COUNT);
+    printf("Falling edge checks counted: %d ... [%s]\r\n", checks, result ? "OK" : "FAIL");
     return result;
 }
 
 int main() {
-    printf("Starting first test (interrupts not relocated).\r\n");
-    if (!test_once()) {
-        notify_completion(false);
-        return 1;
+
+    // First test, no table reallocation
+    {
+        printf("Starting first test (interrupts not relocated).\r\n");
+        bool ret = test_once();
+        if (ret == false) {
+            notify_completion(false);
+            return 1;
+        }
     }
 
     // Relocate interrupt table and test again
-    memcpy(int_table, (void*)SCB->VTOR, sizeof(int_table));
-    SCB->VTOR = (uint32_t)int_table;
-    printf("Starting second test (interrupts relocated).\r\n");
+    {
+        printf("Starting second test (interrupts relocated).\r\n");
+        memcpy(int_table, (void*)SCB->VTOR, sizeof(int_table));
+        SCB->VTOR = (uint32_t)int_table;
 
-    notify_completion(test_once());
+        bool ret = test_once();
+        if (ret == false) {
+            notify_completion(false);
+            return 1;
+        }
+    }
+
+    notify_completion(true);
     return 0;
 }
-
diff --git a/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp b/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp
index b2d4c8dee0..cfdd17f18d 100644
--- a/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp
+++ b/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp
@@ -1,49 +1,65 @@
 #include "mbed.h"
+#include "test_env.h"
 #include "EthernetInterface.h"
 #include "HTTPClient.h"
 
-EthernetInterface eth;
-HTTPClient http;
-char str[512];
+#define BUFFER_SIZE 512
 
-int main() 
+int main()
 {
+    char http_request_buffer[BUFFER_SIZE+1] = {0};
+    HTTPClient http;
+    EthernetInterface eth;
     eth.init(); //Use DHCP
-
     eth.connect();
-    
-    //GET data
-    printf("Trying to fetch page...\n");
-    int ret = http.get("http://mbed.org/media/uploads/donatien/hello.txt", str, 128);
-    if (!ret)
-    {
-      printf("Page fetched successfully - read %d characters\n", strlen(str));
-      printf("Result: %s\n", str);
-    }
-    else
-    {
-      printf("Error - ret = %d - HTTP return code = %d\n", ret, http.getHTTPResponseCode());
-    }
-    
-    //POST data
-    HTTPMap map;
-    HTTPText text(str, 512);
-    map.put("Hello", "World");
-    map.put("test", "1234");
-    printf("Trying to post data...\n");
-    ret = http.post("http://httpbin.org/post", map, &text);
-    if (!ret)
-    {
-      printf("Executed POST successfully - read %d characters\n", strlen(str));
-      printf("Result: %s\n", str);
-    }
-    else
-    {
-      printf("Error - ret = %d - HTTP return code = %d\n", ret, http.getHTTPResponseCode());
-    }
-    
-    eth.disconnect();  
 
-    while(1) {
+    //GET data
+    {
+        bool result = true;
+        const char *url_hello_txt = "http://mbed.org/media/uploads/donatien/hello.txt";
+        printf("HTTP_GET: Trying to fetch page '%s'...\r\n", url_hello_txt);
+        const int ret = http.get(url_hello_txt, http_request_buffer, BUFFER_SIZE);
+        if (ret == 0)
+        {
+          printf("HTTP_GET: Read %d chars: '%s' ... [OK]\r\n", strlen(http_request_buffer), http_request_buffer);
+        }
+        else
+        {
+          printf("HTTP_GET: Error(%d). HTTP error(%d) ... [FAIL]\r\n", ret, http.getHTTPResponseCode());
+          result = false;
+        }
+
+        if (result == false) {
+            notify_completion(false);
+            exit(ret);
+        }
     }
+
+    //POST data
+    {
+        bool result = true;
+        const char *url_httpbin_post = "http://httpbin.org/post";
+        HTTPMap map;
+        HTTPText text(http_request_buffer, BUFFER_SIZE);
+        map.put("Hello", "World");
+        map.put("test", "1234");
+        printf("HTTP_POST: Trying to post data to '%s' ...\r\n", url_httpbin_post);
+        const int ret = http.post(url_httpbin_post, map, &text);
+        if (ret == 0) {
+          printf("HTTP_POST: Read %d chars ... [OK]\n", strlen(http_request_buffer));
+          printf("HTTP_POST: %s\r\n", http_request_buffer);
+        }
+        else {
+          printf("HTTP_GET: Error(%d). HTTP error(%d) ... [FAIL]\r\n", ret, http.getHTTPResponseCode());
+          result = false;
+        }
+
+        if (result == false) {
+            notify_completion(false);
+            exit(ret);
+        }
+    }
+    eth.disconnect();
+    notify_completion(true);
+    return 0;
 }
diff --git a/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp b/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp
index 423fce869e..ee24d34d66 100644
--- a/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp
+++ b/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp
@@ -1,31 +1,37 @@
 #include "mbed.h"
+#include "test_env.h"
 #include "EthernetInterface.h"
 #include "NTPClient.h"
 
-EthernetInterface eth;
-NTPClient ntp;
-
-int main() 
+int main()
 {
+    EthernetInterface eth;
+    NTPClient ntp;
     eth.init(); //Use DHCP
-
     eth.connect();
-   
-    printf("Trying to update time...\r\n");
-    if (ntp.setTime("0.pool.ntp.org") == 0)
-    {
-      printf("Set time successfully\r\n");
-      time_t ctTime;
-      ctTime = time(NULL);
-      printf("Time is set to (UTC): %s\r\n", ctime(&ctTime));
-    }
-    else
-    {
-      printf("Error\r\n");
-    } 
-   
-    eth.disconnect();  
 
-    while(1) {
+    // NTP set time
+    {
+        bool result = true;
+        const char *url_ntp_server = "0.pool.ntp.org";
+        printf("NTP_SETTIME: Trying to update time... \r\n");
+        const int ret = ntp.setTime(url_ntp_server);
+        if (ret == 0) {
+          time_t ctTime = time(NULL);
+          printf("NTP_SETTIME: UTC Time read successfully ... [OK]\r\n");
+          printf("NTP_SETTIME: %s\r\n", ctime(&ctTime));
+        }
+        else {
+          printf("NTP_SETTIME: Error(%d) ... [FAIL]\r\n", ret);
+          result = false;
+        }
+
+        if (result == false) {
+            notify_completion(false);
+            exit(ret);
+        }
     }
+    eth.disconnect();
+    notify_completion(true);
+    return 0;
 }
diff --git a/workspace_tools/synch.py b/workspace_tools/synch.py
index 16123f23d5..a588ed9522 100644
--- a/workspace_tools/synch.py
+++ b/workspace_tools/synch.py
@@ -36,13 +36,16 @@ from workspace_tools.paths import LIB_DIR
 from workspace_tools.utils import run_cmd
 
 MBED_URL = "mbed.org"
+MBED_USER = "mbed_official"
 
 changed = []
 push_remote = True
 quiet = False
 commit_msg = ''
 
-# mbed_official code that does have a mirror in the mbed SDK
+# Code that does have a mirror in the mbed SDK
+# Tuple data: (repo_name, list_of_code_dirs, [team])
+# team is optional - if not specified, the code is published under mbed_official
 OFFICIAL_CODE = ( 
     ("mbed-src" , "mbed"),
     ("mbed-rtos", "rtos"),
@@ -64,10 +67,13 @@ OFFICIAL_CODE = (
     ("UbloxUSBModem", "net/cellular/UbloxUSBModem"),
     ("UbloxModemHTTPClientTest", ["tests/net/cellular/http/common", "tests/net/cellular/http/ubloxusb"]),
     ("UbloxModemSMSTest", ["tests/net/cellular/sms/common", "tests/net/cellular/sms/ubloxusb"]),
+
+    ("ble-api", "ble/ble-api"),
+    ("nRF51822", "ble/nRF51822", "Nordic-Semiconductor"),
 )
 
 
-# mbed_official code that does have dependencies to libraries should point to
+# Code that does have dependencies to libraries should point to
 # the latest revision. By default, they point to a specific revision.
 CODE_WITH_DEPENDENCIES = (
     # Libraries
@@ -115,24 +121,25 @@ def ignore_path(name, reg_exps):
             return True
     return False
 
-class MbedOfficialRepository:
-    URL = "http://" + MBED_URL + "/users/mbed_official/code/%s/"
-
+class MbedRepository:
     @staticmethod
     def run_and_print(command, cwd):
         stdout, _, _ = run_cmd(command, wd=cwd, redirect=True)
         print(stdout)
     
-    def __init__(self, name):
+    def __init__(self, name, team = None):
         self.name = name
         self.path = join(MBED_ORG_PATH, name)
-        
+        if team is None:
+            self.url = "http://" + MBED_URL + "/users/" + MBED_USER + "/code/%s/"
+        else:
+            self.url = "http://" + MBED_URL + "/teams/" + team + "/code/%s/"
         if not exists(self.path):
             # Checkout code
             if not exists(MBED_ORG_PATH):
                 makedirs(MBED_ORG_PATH)
             
-            self.run_and_print(['hg', 'clone', MbedOfficialRepository.URL % name], cwd=MBED_ORG_PATH)
+            self.run_and_print(['hg', 'clone', self.url % name], cwd=MBED_ORG_PATH)
         
         else:
             # Update
@@ -241,8 +248,8 @@ def visit_files(path, visit):
             visit(join(root, file))
 
 
-def update_repo(repo_name, sdk_paths):
-    repo = MbedOfficialRepository(repo_name)
+def update_repo(repo_name, sdk_paths, team_name):
+    repo = MbedRepository(repo_name, team_name)
     # copy files from mbed SDK to mbed_official repository
     def visit_mbed_sdk(sdk_file):
         repo_file = join(repo.path, relpath(sdk_file, sdk_path))
@@ -271,17 +278,25 @@ def update_repo(repo_name, sdk_paths):
 
 
 def update_code(repositories):
-    for repo_name, sdk_dir in repositories:
+    for r in repositories:
+        repo_name, sdk_dir = r[0], r[1]
+        team_name = r[2] if len(r) == 3 else None
         print '\n=== Updating "%s" ===' % repo_name
         sdk_dirs = [sdk_dir] if type(sdk_dir) != type([]) else sdk_dir
         sdk_path = [join(LIB_DIR, d) for d in sdk_dirs]
-        update_repo(repo_name, sdk_path)
+        update_repo(repo_name, sdk_path, team_name)
 
+def update_single_repo(repo):
+    repos = [r for r in OFFICIAL_CODE if r[0] == repo]
+    if not repos:
+        print "Repository '%s' not found" % repo
+    else:
+        update_code(repos)
 
 def update_dependencies(repositories):
     for repo_name in repositories:
         print '\n=== Updating "%s" ===' % repo_name
-        repo = MbedOfficialRepository(repo_name)
+        repo = MbedRepository(repo_name)
         
         # point to the latest libraries
         def visit_repo(repo_file):
@@ -315,6 +330,9 @@ def do_sync(options):
     if options.mbed:
         update_mbed()
 
+    if options.repo:
+        update_single_repo(options.repo)
+
     if changed:
         print "Repositories with changes:", changed
 
@@ -342,6 +360,11 @@ if __name__ == '__main__':
     parser.add_option("", "--commit_message",
                   action="store", type="string", default='', dest='msg',
                   help="Commit message to use for all the commits")
+
+    parser.add_option("-r", "--repository",
+                  action="store", type="string", default='', dest='repo',
+                  help="Synchronize only the given repository")
+                 
     parser.add_option("-q", "--quiet",
                   action="store_true", default=False,
                   help="Don't ask for confirmation before commiting or pushing")
diff --git a/workspace_tools/tests.py b/workspace_tools/tests.py
index f7de5de84e..ecfb24c8ed 100644
--- a/workspace_tools/tests.py
+++ b/workspace_tools/tests.py
@@ -25,7 +25,8 @@ BENCHMARKS_DIR = join(TEST_DIR, "benchmarks")
 
 SD = join(TEST_DIR, "sd")
 TMP102 = join(PERIPHERALS, 'TMP102')
-BLE_NORDIC_NATIVE = join(LIB_DIR, "ble", "nordic_native")
+BLE_API = join(LIB_DIR, "ble", "ble-api")
+BLE_NRF51822 = join(LIB_DIR, "ble", "nRF51822")
 
 """
 Wiring:
@@ -346,8 +347,8 @@ TESTS = [
     {
         "id": "MBED_15", "description": "RPC",
         "source_dir": join(TEST_DIR, "mbed", "rpc"),
-        "dependencies": [MBED_LIBRARIES, join(LIB_DIR, "rpc")],
-        "host_test": "rpc",
+        "dependencies": [MBED_LIBRARIES, join(LIB_DIR, "rpc"), TEST_MBED_LIB],
+        "automated": True,
     },
     {
         "id": "MBED_16", "description": "RTC",
@@ -600,17 +601,21 @@ TESTS = [
         "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
         "automated": True,
         "host_test" : "udpecho_client_auto",
-        "peripherals": ["ethernet"]
+        "peripherals": ["ethernet"],
     },
     {
         "id": "NET_7", "description": "HTTP client",
         "source_dir": join(TEST_DIR, "net", "protocols", "HTTPClient_HelloWorld"),
-        "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
+        "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY, TEST_MBED_LIB],
+        "automated": True,
+        "peripherals": ["ethernet"],
     },
     {
         "id": "NET_8", "description": "NTP client",
         "source_dir": join(TEST_DIR, "net", "protocols", "NTPClient_HelloWorld"),
-        "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
+        "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY, TEST_MBED_LIB],
+        "automated": True,
+        "peripherals": ["ethernet"],
     },
     {
         "id": "NET_9", "description": "Multicast Send",
@@ -752,17 +757,17 @@ TESTS = [
     {
         "id": "NORDIC_1", "description": "BLE Health Thermometer",
         "source_dir": join(TEST_DIR, "ble", "Health_Thermometer"),
-        "dependencies": [MBED_LIBRARIES, TMP102, BLE_NORDIC_NATIVE],
+        "dependencies": [MBED_LIBRARIES, TMP102, BLE_API, BLE_NRF51822],
     },
     {
         "id": "NORDIC_2", "description": "BLE Heart Rate Monitor",
         "source_dir": join(TEST_DIR, "ble", "HeartRate"),
-        "dependencies": [MBED_LIBRARIES, BLE_NORDIC_NATIVE],
+        "dependencies": [MBED_LIBRARIES, BLE_API, BLE_NRF51822],
     },
     {
         "id": "NORDIC_3", "description": "BLE iBeacon",
         "source_dir": join(TEST_DIR, "ble", "iBeacon"),
-        "dependencies": [MBED_LIBRARIES, BLE_NORDIC_NATIVE],
+        "dependencies": [MBED_LIBRARIES, BLE_API, BLE_NRF51822],
     },
 ]