diff --git a/connectivity/FEATURE_BLE/CMakeLists.txt b/connectivity/FEATURE_BLE/CMakeLists.txt
index 0a3f3857c5..d3185164ac 100644
--- a/connectivity/FEATURE_BLE/CMakeLists.txt
+++ b/connectivity/FEATURE_BLE/CMakeLists.txt
@@ -2,27 +2,21 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(libraries)
+add_subdirectory(source)
 
 target_include_directories(mbed-os
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ble
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/common
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/common/ble
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/common/ble/gap
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/internal
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/services
-)
-
-target_sources(mbed-os
-    PRIVATE
-        source/BLE.cpp
-        source/DiscoveredCharacteristic.cpp
-        source/FileSecurityDb.cpp
-        source/KVStoreSecurityDb.cpp
-
-        source/gap/AdvertisingDataBuilder.cpp
-        source/gap/AdvertisingParameters.cpp
-        source/gap/ConnectionParameters.cpp
+        .
+        include
+        include/ble
+        include/ble/common
+        include/ble/common/ble
+        include/ble/common/ble/gap
+        include/ble/compatibility
+        include/ble/compatibility/ble
+        include/ble/driver
+        include/ble/gap
+        include/ble/gatt
+        include/ble/services
+        source
 )
diff --git a/connectivity/FEATURE_BLE/libraries/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/CMakeLists.txt
index 325e167411..3f88cff897 100644
--- a/connectivity/FEATURE_BLE/libraries/CMakeLists.txt
+++ b/connectivity/FEATURE_BLE/libraries/CMakeLists.txt
@@ -3,4 +3,9 @@
 
 mbed_add_cmake_directory_if_labels("TARGET")
 
-add_subdirectory(ble-api-implementation)
+add_subdirectory(cordio_stack)
+
+target_include_directories(mbed-os
+    PUBLIC
+        .
+)
diff --git a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/CMakeLists.txt
deleted file mode 100644
index 59effd3876..0000000000
--- a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ble
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/internal
-)
-
-target_sources(mbed-os
-    PRIVATE
-        source/GapImpl.cpp
-        source/GattClientImpl.cpp
-        source/GattServerImpl.cpp
-        source/SecurityManagerImpl.cpp
-)
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/cordio_stack/CMakeLists.txt
similarity index 58%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/CMakeLists.txt
rename to connectivity/FEATURE_BLE/libraries/cordio_stack/CMakeLists.txt
index 06c9906cee..723954460d 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/CMakeLists.txt
+++ b/connectivity/FEATURE_BLE/libraries/cordio_stack/CMakeLists.txt
@@ -2,10 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(ble-host)
+add_subdirectory(platform)
 add_subdirectory(wsf)
-
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/platform/include
-)
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/ble-host/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/cordio_stack/ble-host/CMakeLists.txt
similarity index 88%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/ble-host/CMakeLists.txt
rename to connectivity/FEATURE_BLE/libraries/cordio_stack/ble-host/CMakeLists.txt
index 26ebab30db..c0f5e7fe01 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/ble-host/CMakeLists.txt
+++ b/connectivity/FEATURE_BLE/libraries/cordio_stack/ble-host/CMakeLists.txt
@@ -3,15 +3,15 @@
 
 target_include_directories(mbed-os
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/sources/hci/dual_chip
-        ${CMAKE_CURRENT_SOURCE_DIR}/sources/sec/common
-        ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/att
-        ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/cfg
-        ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/dm
-        ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/hci
-        ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/l2c
-        ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/smp
+        include
+        sources/hci/dual_chip
+        sources/sec/common
+        sources/stack/att
+        sources/stack/cfg
+        sources/stack/dm
+        sources/stack/hci
+        sources/stack/l2c
+        sources/stack/smp
 )
 
 target_sources(mbed-os
diff --git a/connectivity/FEATURE_BLE/libraries/cordio_stack/platform/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/cordio_stack/platform/CMakeLists.txt
new file mode 100644
index 0000000000..0e955b22d6
--- /dev/null
+++ b/connectivity/FEATURE_BLE/libraries/cordio_stack/platform/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-os
+    PUBLIC
+        include
+)
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/wsf/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/cordio_stack/wsf/CMakeLists.txt
similarity index 90%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/wsf/CMakeLists.txt
rename to connectivity/FEATURE_BLE/libraries/cordio_stack/wsf/CMakeLists.txt
index dc6322776d..4616490c37 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/wsf/CMakeLists.txt
+++ b/connectivity/FEATURE_BLE/libraries/cordio_stack/wsf/CMakeLists.txt
@@ -3,8 +3,8 @@
 
 target_include_directories(mbed-os
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/util
+        include
+        include/util
 )
 
 target_sources(mbed-os
diff --git a/connectivity/FEATURE_BLE/source/CMakeLists.txt b/connectivity/FEATURE_BLE/source/CMakeLists.txt
new file mode 100644
index 0000000000..f4ee93b007
--- /dev/null
+++ b/connectivity/FEATURE_BLE/source/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(cordio)
+add_subdirectory(gap)
+add_subdirectory(gatt)
+add_subdirectory(generic)
+add_subdirectory(pal)
+
+target_sources(mbed-os
+    PRIVATE
+        BLE.cpp
+        Gap.cpp
+        GattClient.cpp
+        GattServer.cpp
+        SecurityManager.cpp
+)
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/CMakeLists.txt b/connectivity/FEATURE_BLE/source/cordio/CMakeLists.txt
similarity index 66%
rename from connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/CMakeLists.txt
rename to connectivity/FEATURE_BLE/source/cordio/CMakeLists.txt
index 735639d27a..a91a8229f6 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/CMakeLists.txt
+++ b/connectivity/FEATURE_BLE/source/cordio/CMakeLists.txt
@@ -1,16 +1,11 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(stack)
-
 target_include_directories(mbed-os
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/driver
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ble
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/internal
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack_adaptation
+        .
+        source
+        stack_adaptation
 )
 
 target_sources(mbed-os
@@ -20,13 +15,12 @@ target_sources(mbed-os
         driver/H4TransportDriver.cpp
 
         source/BLEInstanceBaseImpl.cpp
+        source/GattServerImpl.cpp
         source/PalAttClientImpl.cpp
         source/PalEventQueueImpl.cpp
         source/PalGapImpl.cpp
-        source/PalGattClientImpl.cpp
         source/PalGenericAccessServiceImpl.cpp
         source/PalSecurityManagerImpl.cpp
-        source/PalSigningMonitorImpl.cpp
 
         stack_adaptation/hci_tr.c
         stack_adaptation/hci_vs.c
diff --git a/connectivity/FEATURE_BLE/source/gap/CMakeLists.txt b/connectivity/FEATURE_BLE/source/gap/CMakeLists.txt
new file mode 100644
index 0000000000..1f77abda18
--- /dev/null
+++ b/connectivity/FEATURE_BLE/source/gap/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_sources(mbed-os
+    PRIVATE
+        AdvertisingDataBuilder.cpp
+        AdvertisingParameters.cpp
+        ConnectionParameters.cpp
+)
diff --git a/connectivity/FEATURE_BLE/source/gatt/CMakeLists.txt b/connectivity/FEATURE_BLE/source/gatt/CMakeLists.txt
new file mode 100644
index 0000000000..1b00ca6e07
--- /dev/null
+++ b/connectivity/FEATURE_BLE/source/gatt/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_sources(mbed-os
+    PRIVATE
+        DiscoveredCharacteristic.cpp
+)
diff --git a/connectivity/FEATURE_BLE/source/generic/CMakeLists.txt b/connectivity/FEATURE_BLE/source/generic/CMakeLists.txt
new file mode 100644
index 0000000000..6b774633db
--- /dev/null
+++ b/connectivity/FEATURE_BLE/source/generic/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-os
+    PUBLIC
+        .
+)
+
+target_sources(mbed-os
+    PRIVATE
+        FileSecurityDb.cpp
+        GapImpl.cpp
+        GattClientImpl.cpp
+        KVStoreSecurityDb.cpp
+        SecurityManagerImpl.cpp
+)
diff --git a/connectivity/FEATURE_BLE/source/pal/CMakeLists.txt b/connectivity/FEATURE_BLE/source/pal/CMakeLists.txt
new file mode 100644
index 0000000000..26f0ee37ab
--- /dev/null
+++ b/connectivity/FEATURE_BLE/source/pal/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-os
+    PUBLIC
+        .
+)
+
+target_sources(mbed-os
+    PRIVATE
+        PalAttClientToGattClient.cpp
+)