diff --git a/LICENSE.md b/LICENSE.md
index 7863be4..6a5d58c 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -14,7 +14,7 @@
 - [features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor) - BSD-3-Clause
 - [features/lorawan](./features/lorawan) - Revised BSD
 - [connectivity/lwipstack](./connectivity/lwipstack) - BSD-style, MIT-style
-- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause
+- [connectivity/nanostack/sal-stack-nanostack](./connectivity/nanostack/sal-stack-nanostack) - BSD-3-Clause
 - [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
 - [features/unsupported](./features/unsupported) - MIT-style, BSD-style
 - [storage/blockdevice](./storage/blockdevice) - Apache 2.0, MIT
diff --git a/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake b/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake
index 7e9eeb8..61aaae9 100644
--- a/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake
+++ b/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake
@@ -36,7 +36,7 @@
   stubs/aes_stub.c
   stubs/cmac_stub.c
   stubs/mbed_assert_stub.cpp
-  ../features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
+  ../connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
 
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/unittest.cmake b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/unittest.cmake
index 12cc718..4a3938b 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/unittest.cmake
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/unittest.cmake
@@ -26,7 +26,7 @@
   stubs/mbed_atomic_stub.c
   stubs/mbed_critical_stub.c
   stubs/equeue_stub.c
-  ../features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
+  ../connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
   stubs/EventQueue_stub.cpp
   stubs/mbed_shared_queues_stub.cpp
   stubs/nsapi_dns_stub.cpp
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp
index f95fbc9..fcc72c6 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp
@@ -19,7 +19,7 @@
 #include "netsocket/UDPSocket.h"
 #include "netsocket/DTLSSocketWrapper.h"
 #include "NetworkStack_stub.h"
-#include "features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h"
+#include "connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h"
 #include <cstring> //memset
 
 #include "mbed_error.h"
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/unittest.cmake b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/unittest.cmake
index 2155eb0..817bd84 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/unittest.cmake
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/unittest.cmake
@@ -25,7 +25,7 @@
   stubs/mbed_atomic_stub.c
   stubs/mbed_critical_stub.c
   stubs/equeue_stub.c
-  ../features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
+  ../connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
   stubs/EventQueue_stub.cpp
   stubs/mbed_shared_queues_stub.cpp
   stubs/nsapi_dns_stub.cpp
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/unittest.cmake b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/unittest.cmake
index be7871e..112826e 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/unittest.cmake
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/unittest.cmake
@@ -24,7 +24,7 @@
   stubs/mbed_atomic_stub.c
   stubs/mbed_critical_stub.c
   stubs/equeue_stub.c
-  ../features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
+  ../connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
   stubs/EventQueue_stub.cpp
   stubs/mbed_shared_queues_stub.cpp
   stubs/nsapi_dns_stub.cpp
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp
index 57f1838..056317d 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp
@@ -19,7 +19,7 @@
 #include "netsocket/TCPSocket.h"
 #include "netsocket/TLSSocketWrapper.h"
 #include "NetworkStack_stub.h"
-#include "features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h"
+#include "connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h"
 #include <cstring> //memset
 
 #include "mbed_error.h"
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/unittest.cmake b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/unittest.cmake
index 0700b22..c7a111a 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/unittest.cmake
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/unittest.cmake
@@ -23,7 +23,7 @@
   stubs/mbed_atomic_stub.c
   stubs/mbed_critical_stub.c
   stubs/equeue_stub.c
-  ../features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
+  ../connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
   stubs/EventQueue_stub.cpp
   stubs/mbed_shared_queues_stub.cpp
   stubs/nsapi_dns_stub.cpp
diff --git a/doxyfile_options b/doxyfile_options
index bdab045..80155aa 100644
--- a/doxyfile_options
+++ b/doxyfile_options
@@ -846,8 +846,8 @@
                          */features/mbedtls/* \
                          */features/unsupported/* \
                          */connectivity/lwipstack/* \
-                         */features/nanostack/sal-stack-nanostack/* \
-                         */features/nanostack/coap-service/* \
+                         */connectivity/nanostack/sal-stack-nanostack/* \
+                         */connectivity/nanostack/coap-service/* \
                          */mbed-trace/* \
                          */mbed-coap/* \
                          */nanostack-libservice/* \