diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
index 8753fa2ab8..3d25415ed5 100644
--- a/connectivity/CMakeLists.txt
+++ b/connectivity/CMakeLists.txt
@@ -5,4 +5,5 @@ add_subdirectory(cellular)
 add_subdirectory(drivers)
 add_subdirectory(libraries)
 add_subdirectory(lwipstack)
+add_subdirectory(nanostack)
 add_subdirectory(netsocket)
diff --git a/connectivity/nanostack/CMakeLists.txt b/connectivity/nanostack/CMakeLists.txt
new file mode 100644
index 0000000000..f2ea55762c
--- /dev/null
+++ b/connectivity/nanostack/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(coap-service)
+add_subdirectory(mbed-mesh-api)
+add_subdirectory(nanostack-hal-mbed-cmsis-rtos)
+add_subdirectory(sal-stack-nanostack)
+add_subdirectory(sal-stack-nanostack-eventloop)
+
+target_include_directories(mbed-os
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/nanostack-interface
+)
+
+target_sources(mbed-os
+    PRIVATE
+        source/Nanostack.cpp
+)
diff --git a/features/nanostack/coap-service/CMakeLists.txt b/connectivity/nanostack/coap-service/CMakeLists.txt
similarity index 100%
rename from features/nanostack/coap-service/CMakeLists.txt
rename to connectivity/nanostack/coap-service/CMakeLists.txt
diff --git a/features/nanostack/mbed-mesh-api/CMakeLists.txt b/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt
similarity index 100%
rename from features/nanostack/mbed-mesh-api/CMakeLists.txt
rename to connectivity/nanostack/mbed-mesh-api/CMakeLists.txt
index 55a530c1e9..ad495f0828 100644
--- a/features/nanostack/mbed-mesh-api/CMakeLists.txt
+++ b/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt
@@ -1,6 +1,13 @@
 # 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}/mbed-mesh-api
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/include
+)
+
 target_sources(mbed-os
     PRIVATE
         source/CallbackHandler.cpp
@@ -19,10 +26,3 @@ target_sources(mbed-os
         source/thread_tasklet.c
         source/wisun_tasklet.c
 )
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/mbed-mesh-api
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/include
-)
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt
similarity index 88%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt
index ccd8028f40..78f8aac857 100644
--- a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt
+++ b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt
@@ -1,12 +1,18 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+
+target_include_directories(mbed-os
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 target_sources(mbed-os
     PRIVATE
         arm_hal_fhss_timer.cpp
         arm_hal_interrupt.c
         arm_hal_random.c
         arm_hal_timer.cpp
-        mbed_lib.json
         ns_event_loop.c
         ns_event_loop_mbed.cpp
         ns_event_loop_mutex.c
@@ -15,8 +21,3 @@ target_sources(mbed-os
 
         nvm/nvm_ram.c
 )
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-)
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack-eventloop/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/CMakeLists.txt
similarity index 93%
rename from features/nanostack/sal-stack-nanostack/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/CMakeLists.txt
index 7ed33b953d..16837da704 100644
--- a/features/nanostack/sal-stack-nanostack/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/CMakeLists.txt
@@ -1,13 +1,6 @@
+# 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}/nanostack
-        ${CMAKE_CURRENT_SOURCE_DIR}/nanostack/platform
-        ${CMAKE_CURRENT_SOURCE_DIR}/source
-)
-
 add_subdirectory(source/6LoWPAN)
 add_subdirectory(source/BorderRouter)
 add_subdirectory(source/Common_Protocols)
@@ -25,3 +18,11 @@ add_subdirectory(source/configs)
 add_subdirectory(source/ipv6_stack)
 add_subdirectory(source/libDHCPv6)
 add_subdirectory(source/libNET)
+
+target_include_directories(mbed-os
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/nanostack
+        ${CMAKE_CURRENT_SOURCE_DIR}/nanostack/platform
+        ${CMAKE_CURRENT_SOURCE_DIR}/source
+)
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/configs/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/ipv6_stack/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/ipv6_stack/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt
diff --git a/features/CMakeLists.txt b/features/CMakeLists.txt
index 016d5cfbd4..735121c58d 100644
--- a/features/CMakeLists.txt
+++ b/features/CMakeLists.txt
@@ -10,7 +10,6 @@ add_subdirectory(frameworks/mbed-trace)
 add_subdirectory(frameworks/mbed-client-cli)
 add_subdirectory(lorawan)
 add_subdirectory(mbedtls)
-add_subdirectory(nanostack)
 add_subdirectory(nfc)
 
 target_include_directories(mbed-os
diff --git a/features/nanostack/CMakeLists.txt b/features/nanostack/CMakeLists.txt
deleted file mode 100644
index fac0a45e5e..0000000000
--- a/features/nanostack/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(coap-service)
-add_subdirectory(mbed-mesh-api)
-add_subdirectory(nanostack-hal-mbed-cmsis-rtos)
-add_subdirectory(nanostack-interface)
-add_subdirectory(sal-stack-nanostack)
-add_subdirectory(sal-stack-nanostack-eventloop)
diff --git a/features/nanostack/nanostack-interface/CMakeLists.txt b/features/nanostack/nanostack-interface/CMakeLists.txt
deleted file mode 100644
index f40ebc05f7..0000000000
--- a/features/nanostack/nanostack-interface/CMakeLists.txt
+++ /dev/null
@@ -1,12 +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}
-)
-
-target_sources(mbed-os
-    PRIVATE
-        Nanostack.cpp
-)