diff --git a/connectivity/drivers/802.15.4_RF/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/CMakeLists.txt
index 6eaa48a9cd..61b0ce775f 100644
--- a/connectivity/drivers/802.15.4_RF/CMakeLists.txt
+++ b/connectivity/drivers/802.15.4_RF/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+mbed_add_cmake_directory_if_labels("TARGET")
+
 add_subdirectory(atmel-rf-driver)
 add_subdirectory(mcr20a-rf-driver)
 add_subdirectory(stm-s2lp-rf-driver)
diff --git a/features/nanostack/nanostack-interface/targets/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/TARGET_Freescale/CMakeLists.txt
similarity index 100%
rename from features/nanostack/nanostack-interface/targets/CMakeLists.txt
rename to connectivity/drivers/802.15.4_RF/TARGET_Freescale/CMakeLists.txt
diff --git a/features/nanostack/nanostack-interface/targets/TARGET_Freescale/TARGET_KW41Z/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/CMakeLists.txt
similarity index 100%
rename from features/nanostack/nanostack-interface/targets/TARGET_Freescale/TARGET_KW41Z/CMakeLists.txt
rename to connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/CMakeLists.txt
diff --git a/features/nanostack/nanostack-interface/targets/TARGET_Freescale/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/CMakeLists.txt
similarity index 100%
rename from features/nanostack/nanostack-interface/targets/TARGET_Freescale/CMakeLists.txt
rename to connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/CMakeLists.txt
diff --git a/features/nanostack/nanostack-interface/targets/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt
similarity index 100%
rename from features/nanostack/nanostack-interface/targets/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt
rename to connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt
diff --git a/features/nanostack/nanostack-interface/CMakeLists.txt b/features/nanostack/nanostack-interface/CMakeLists.txt
index 813eab44ad..f40ebc05f7 100644
--- a/features/nanostack/nanostack-interface/CMakeLists.txt
+++ b/features/nanostack/nanostack-interface/CMakeLists.txt
@@ -1,14 +1,12 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(targets)
-
-target_sources(mbed-os
-    PRIVATE
-        Nanostack.cpp
-)
-
 target_include_directories(mbed-os
     PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
 )
+
+target_sources(mbed-os
+    PRIVATE
+        Nanostack.cpp
+)
diff --git a/features/nanostack/nanostack-interface/targets/TARGET_Silicon_Labs/CMakeLists.txt b/features/nanostack/nanostack-interface/targets/TARGET_Silicon_Labs/CMakeLists.txt
deleted file mode 100644
index f403f3ac48..0000000000
--- a/features/nanostack/nanostack-interface/targets/TARGET_Silicon_Labs/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-mbed_add_cmake_directory_if_labels("TARGET")