diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/README.md b/connectivity/FEATURE_BLE/source/impl/README.md
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/README.md
rename to connectivity/FEATURE_BLE/source/impl/README.md
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/TESTS/cordio_hci/driver/main.cpp b/connectivity/FEATURE_BLE/source/impl/TESTS/cordio_hci/driver/main.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/TESTS/cordio_hci/driver/main.cpp
rename to connectivity/FEATURE_BLE/source/impl/TESTS/cordio_hci/driver/main.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/TESTS/cordio_hci/transport/main.cpp b/connectivity/FEATURE_BLE/source/impl/TESTS/cordio_hci/transport/main.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/TESTS/cordio_hci/transport/main.cpp
rename to connectivity/FEATURE_BLE/source/impl/TESTS/cordio_hci/transport/main.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/doc/HCIAbstraction.md b/connectivity/FEATURE_BLE/source/impl/doc/HCIAbstraction.md
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/doc/HCIAbstraction.md
rename to connectivity/FEATURE_BLE/source/impl/doc/HCIAbstraction.md
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/doc/PortingGuide.md b/connectivity/FEATURE_BLE/source/impl/doc/PortingGuide.md
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/doc/PortingGuide.md
rename to connectivity/FEATURE_BLE/source/impl/doc/PortingGuide.md
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/doc/resources/architecture.png b/connectivity/FEATURE_BLE/source/impl/doc/resources/architecture.png
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/doc/resources/architecture.png
rename to connectivity/FEATURE_BLE/source/impl/doc/resources/architecture.png
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/doc/resources/architecture_layer.png b/connectivity/FEATURE_BLE/source/impl/doc/resources/architecture_layer.png
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/doc/resources/architecture_layer.png
rename to connectivity/FEATURE_BLE/source/impl/doc/resources/architecture_layer.png
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.cpp b/connectivity/FEATURE_BLE/source/impl/driver/CordioHCIDriver.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.cpp
rename to connectivity/FEATURE_BLE/source/impl/driver/CordioHCIDriver.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.h b/connectivity/FEATURE_BLE/source/impl/driver/CordioHCIDriver.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.h
rename to connectivity/FEATURE_BLE/source/impl/driver/CordioHCIDriver.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCITransportDriver.cpp b/connectivity/FEATURE_BLE/source/impl/driver/CordioHCITransportDriver.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCITransportDriver.cpp
rename to connectivity/FEATURE_BLE/source/impl/driver/CordioHCITransportDriver.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCITransportDriver.h b/connectivity/FEATURE_BLE/source/impl/driver/CordioHCITransportDriver.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCITransportDriver.h
rename to connectivity/FEATURE_BLE/source/impl/driver/CordioHCITransportDriver.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/H4TransportDriver.cpp b/connectivity/FEATURE_BLE/source/impl/driver/H4TransportDriver.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/H4TransportDriver.cpp
rename to connectivity/FEATURE_BLE/source/impl/driver/H4TransportDriver.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/H4TransportDriver.h b/connectivity/FEATURE_BLE/source/impl/driver/H4TransportDriver.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/H4TransportDriver.h
rename to connectivity/FEATURE_BLE/source/impl/driver/H4TransportDriver.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h b/connectivity/FEATURE_BLE/source/impl/include/ble/internal/BLEInstanceBaseImpl.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h
rename to connectivity/FEATURE_BLE/source/impl/include/ble/internal/BLEInstanceBaseImpl.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalAttClientImpl.h b/connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalAttClientImpl.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalAttClientImpl.h
rename to connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalAttClientImpl.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalEventQueueImpl.h b/connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalEventQueueImpl.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalEventQueueImpl.h
rename to connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalEventQueueImpl.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGapImpl.h b/connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalGapImpl.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGapImpl.h
rename to connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalGapImpl.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGattClientImpl.h b/connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalGattClientImpl.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGattClientImpl.h
rename to connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalGattClientImpl.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGenericAccessServiceImpl.h b/connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalGenericAccessServiceImpl.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGenericAccessServiceImpl.h
rename to connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalGenericAccessServiceImpl.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h b/connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalSecurityManagerImpl.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h
rename to connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalSecurityManagerImpl.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSigningMonitorImpl.h b/connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalSigningMonitorImpl.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSigningMonitorImpl.h
rename to connectivity/FEATURE_BLE/source/impl/include/ble/internal/PalSigningMonitorImpl.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/mbed_lib.json b/connectivity/FEATURE_BLE/source/impl/mbed_lib.json
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/mbed_lib.json
rename to connectivity/FEATURE_BLE/source/impl/mbed_lib.json
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/BLEInstanceBaseImpl.cpp b/connectivity/FEATURE_BLE/source/impl/source/BLEInstanceBaseImpl.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/BLEInstanceBaseImpl.cpp
rename to connectivity/FEATURE_BLE/source/impl/source/BLEInstanceBaseImpl.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalAttClientImpl.cpp b/connectivity/FEATURE_BLE/source/impl/source/PalAttClientImpl.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalAttClientImpl.cpp
rename to connectivity/FEATURE_BLE/source/impl/source/PalAttClientImpl.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalEventQueueImpl.cpp b/connectivity/FEATURE_BLE/source/impl/source/PalEventQueueImpl.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalEventQueueImpl.cpp
rename to connectivity/FEATURE_BLE/source/impl/source/PalEventQueueImpl.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGapImpl.cpp b/connectivity/FEATURE_BLE/source/impl/source/PalGapImpl.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGapImpl.cpp
rename to connectivity/FEATURE_BLE/source/impl/source/PalGapImpl.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGattClientImpl.cpp b/connectivity/FEATURE_BLE/source/impl/source/PalGattClientImpl.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGattClientImpl.cpp
rename to connectivity/FEATURE_BLE/source/impl/source/PalGattClientImpl.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGenericAccessServiceImpl.cpp b/connectivity/FEATURE_BLE/source/impl/source/PalGenericAccessServiceImpl.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGenericAccessServiceImpl.cpp
rename to connectivity/FEATURE_BLE/source/impl/source/PalGenericAccessServiceImpl.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp b/connectivity/FEATURE_BLE/source/impl/source/PalSecurityManagerImpl.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp
rename to connectivity/FEATURE_BLE/source/impl/source/PalSecurityManagerImpl.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSigningMonitorImpl.cpp b/connectivity/FEATURE_BLE/source/impl/source/PalSigningMonitorImpl.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSigningMonitorImpl.cpp
rename to connectivity/FEATURE_BLE/source/impl/source/PalSigningMonitorImpl.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/hci_mbed_os_adaptation.h b/connectivity/FEATURE_BLE/source/impl/stack_adaptation/hci_mbed_os_adaptation.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/hci_mbed_os_adaptation.h
rename to connectivity/FEATURE_BLE/source/impl/stack_adaptation/hci_mbed_os_adaptation.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/hci_tr.c b/connectivity/FEATURE_BLE/source/impl/stack_adaptation/hci_tr.c
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/hci_tr.c
rename to connectivity/FEATURE_BLE/source/impl/stack_adaptation/hci_tr.c
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/hci_vs.c b/connectivity/FEATURE_BLE/source/impl/stack_adaptation/hci_vs.c
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/hci_vs.c
rename to connectivity/FEATURE_BLE/source/impl/stack_adaptation/hci_vs.c
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/pal_mbed_os_adaptation.cpp b/connectivity/FEATURE_BLE/source/impl/stack_adaptation/pal_mbed_os_adaptation.cpp
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/pal_mbed_os_adaptation.cpp
rename to connectivity/FEATURE_BLE/source/impl/stack_adaptation/pal_mbed_os_adaptation.cpp
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/wsf_cs.c b/connectivity/FEATURE_BLE/source/impl/stack_adaptation/wsf_cs.c
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/wsf_cs.c
rename to connectivity/FEATURE_BLE/source/impl/stack_adaptation/wsf_cs.c
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/wsf_mbed_os_adaptation.c b/connectivity/FEATURE_BLE/source/impl/stack_adaptation/wsf_mbed_os_adaptation.c
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/wsf_mbed_os_adaptation.c
rename to connectivity/FEATURE_BLE/source/impl/stack_adaptation/wsf_mbed_os_adaptation.c
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/wsf_mbed_os_adaptation.h b/connectivity/FEATURE_BLE/source/impl/stack_adaptation/wsf_mbed_os_adaptation.h
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/wsf_mbed_os_adaptation.h
rename to connectivity/FEATURE_BLE/source/impl/stack_adaptation/wsf_mbed_os_adaptation.h
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/wsf_os.c b/connectivity/FEATURE_BLE/source/impl/stack_adaptation/wsf_os.c
similarity index 100%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack_adaptation/wsf_os.c
rename to connectivity/FEATURE_BLE/source/impl/stack_adaptation/wsf_os.c