diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index b6b1d6b6af..9a182649aa 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -124,8 +124,8 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../cmsis"
   "${PROJECT_SOURCE_DIR}/../features/frameworks"
   "${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace"
-  "${PROJECT_SOURCE_DIR}/../features/frameworks/nanostack-libservice"
-  "${PROJECT_SOURCE_DIR}/../features/frameworks/nanostack-libservice/mbed-client-libservice"
+  "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice"
+  "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice/mbed-client-libservice"
   "${PROJECT_SOURCE_DIR}/../features/filesystem/fat"
   "${PROJECT_SOURCE_DIR}/../features/filesystem/fat/ChaN"
   "${PROJECT_SOURCE_DIR}/../features/filesystem/bd"
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake
index b08b27ebbf..aa1c310f81 100644
--- a/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake
+++ b/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake
@@ -15,11 +15,11 @@ set(unittest-includes ${unittest-includes}
 # Source files
 set(unittest-sources
   ../features/cellular/framework/AT/AT_CellularStack.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
   ../features/netsocket/SocketAddress.cpp
 )
 
diff --git a/UNITTESTS/features/cellular/framework/device/cellularcontext/unittest.cmake b/UNITTESTS/features/cellular/framework/device/cellularcontext/unittest.cmake
index 9cccec2399..2d0c66d41b 100644
--- a/UNITTESTS/features/cellular/framework/device/cellularcontext/unittest.cmake
+++ b/UNITTESTS/features/cellular/framework/device/cellularcontext/unittest.cmake
@@ -14,11 +14,11 @@ set(unittest-includes ${unittest-includes}
 # Source files
 set(unittest-sources
   ../features/cellular/framework/device/CellularContext.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
   ../features/netsocket/SocketAddress.cpp
 )
 
diff --git a/UNITTESTS/features/netsocket/DTLSSocket/unittest.cmake b/UNITTESTS/features/netsocket/DTLSSocket/unittest.cmake
index 29f7916c8a..e3d1872d09 100644
--- a/UNITTESTS/features/netsocket/DTLSSocket/unittest.cmake
+++ b/UNITTESTS/features/netsocket/DTLSSocket/unittest.cmake
@@ -12,11 +12,11 @@ set(unittest-sources
   ../features/netsocket/DTLSSocket.cpp
   ../features/netsocket/DTLSSocketWrapper.cpp
   ../features/netsocket/TLSSocketWrapper.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/features/netsocket/DTLSSocketWrapper/unittest.cmake b/UNITTESTS/features/netsocket/DTLSSocketWrapper/unittest.cmake
index ddf449e3fb..80f91b2822 100644
--- a/UNITTESTS/features/netsocket/DTLSSocketWrapper/unittest.cmake
+++ b/UNITTESTS/features/netsocket/DTLSSocketWrapper/unittest.cmake
@@ -11,11 +11,11 @@ set(unittest-sources
   ../features/netsocket/UDPSocket.cpp
   ../features/netsocket/DTLSSocketWrapper.cpp
   ../features/netsocket/TLSSocketWrapper.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/features/netsocket/EthernetInterface/unittest.cmake b/UNITTESTS/features/netsocket/EthernetInterface/unittest.cmake
index 7b9dba8511..325d7ea475 100644
--- a/UNITTESTS/features/netsocket/EthernetInterface/unittest.cmake
+++ b/UNITTESTS/features/netsocket/EthernetInterface/unittest.cmake
@@ -13,12 +13,12 @@ set(unittest-sources
   ../features/netsocket/EMACInterface.cpp
   ../features/netsocket/NetworkInterface.cpp
   ../features/netsocket/NetworkStack.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
-  ../features/frameworks/nanostack-libservice/source/libList/ns_list.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
+  ../connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
 )
 
 # Test files
diff --git a/UNITTESTS/features/netsocket/InternetSocket/unittest.cmake b/UNITTESTS/features/netsocket/InternetSocket/unittest.cmake
index db9709ebac..bd539ecf60 100644
--- a/UNITTESTS/features/netsocket/InternetSocket/unittest.cmake
+++ b/UNITTESTS/features/netsocket/InternetSocket/unittest.cmake
@@ -9,11 +9,11 @@ set(unittest-sources
   ../features/netsocket/SocketAddress.cpp
   ../features/netsocket/NetworkStack.cpp
   ../features/netsocket/InternetSocket.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/features/netsocket/NetworkInterface/unittest.cmake b/UNITTESTS/features/netsocket/NetworkInterface/unittest.cmake
index 46a1ec8ef8..f1edb8fab8 100644
--- a/UNITTESTS/features/netsocket/NetworkInterface/unittest.cmake
+++ b/UNITTESTS/features/netsocket/NetworkInterface/unittest.cmake
@@ -10,12 +10,12 @@ set(unittest-sources
   ../features/netsocket/SocketAddress.cpp
   ../features/netsocket/NetworkStack.cpp
   ../features/netsocket/NetworkInterface.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
-  ../features/frameworks/nanostack-libservice/source/libList/ns_list.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
+  ../connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
 )
 
 # Test files
diff --git a/UNITTESTS/features/netsocket/NetworkStack/unittest.cmake b/UNITTESTS/features/netsocket/NetworkStack/unittest.cmake
index ec4f1d91be..aaf957c533 100644
--- a/UNITTESTS/features/netsocket/NetworkStack/unittest.cmake
+++ b/UNITTESTS/features/netsocket/NetworkStack/unittest.cmake
@@ -11,11 +11,11 @@ set(unittest-sources
   ../features/netsocket/SocketAddress.cpp
   ../features/netsocket/NetworkStack.cpp
   ../features/netsocket/NetworkInterface.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
 )
 
 # Test files
diff --git a/UNITTESTS/features/netsocket/PPPInterface/unittest.cmake b/UNITTESTS/features/netsocket/PPPInterface/unittest.cmake
index 956803dfe3..e94ae14900 100644
--- a/UNITTESTS/features/netsocket/PPPInterface/unittest.cmake
+++ b/UNITTESTS/features/netsocket/PPPInterface/unittest.cmake
@@ -13,12 +13,12 @@ set(unittest-sources
   ../features/netsocket/EMACInterface.cpp
   ../features/netsocket/NetworkInterface.cpp
   ../features/netsocket/NetworkStack.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
-  ../features/frameworks/nanostack-libservice/source/libList/ns_list.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
+  ../connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
 )
 
 # Test files
diff --git a/UNITTESTS/features/netsocket/SocketAddress/unittest.cmake b/UNITTESTS/features/netsocket/SocketAddress/unittest.cmake
index 6c4171c23f..cc50204645 100644
--- a/UNITTESTS/features/netsocket/SocketAddress/unittest.cmake
+++ b/UNITTESTS/features/netsocket/SocketAddress/unittest.cmake
@@ -9,11 +9,11 @@ set(TEST_SUITE_NAME "features_netsocket_SocketAddress")
 # Source files
 set(unittest-sources
   ../features/netsocket/SocketAddress.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
 )
 
 # Test files
diff --git a/UNITTESTS/features/netsocket/TCPSocket/unittest.cmake b/UNITTESTS/features/netsocket/TCPSocket/unittest.cmake
index 92b506ba72..fae8d912c0 100644
--- a/UNITTESTS/features/netsocket/TCPSocket/unittest.cmake
+++ b/UNITTESTS/features/netsocket/TCPSocket/unittest.cmake
@@ -8,11 +8,11 @@ set(unittest-sources
   ../features/netsocket/NetworkStack.cpp
   ../features/netsocket/InternetSocket.cpp
   ../features/netsocket/TCPSocket.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/features/netsocket/TLSSocket/unittest.cmake b/UNITTESTS/features/netsocket/TLSSocket/unittest.cmake
index e4746d3df4..bc2a2fff94 100644
--- a/UNITTESTS/features/netsocket/TLSSocket/unittest.cmake
+++ b/UNITTESTS/features/netsocket/TLSSocket/unittest.cmake
@@ -10,11 +10,11 @@ set(unittest-sources
   ../features/netsocket/TCPSocket.cpp
   ../features/netsocket/TLSSocket.cpp
   ../features/netsocket/TLSSocketWrapper.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/features/netsocket/TLSSocketWrapper/unittest.cmake b/UNITTESTS/features/netsocket/TLSSocketWrapper/unittest.cmake
index 2096f1da75..9510c9141e 100644
--- a/UNITTESTS/features/netsocket/TLSSocketWrapper/unittest.cmake
+++ b/UNITTESTS/features/netsocket/TLSSocketWrapper/unittest.cmake
@@ -9,11 +9,11 @@ set(unittest-sources
   ../features/netsocket/InternetSocket.cpp
   ../features/netsocket/TCPSocket.cpp
   ../features/netsocket/TLSSocketWrapper.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/features/netsocket/UDPSocket/unittest.cmake b/UNITTESTS/features/netsocket/UDPSocket/unittest.cmake
index 3eabef520d..abd933e2df 100644
--- a/UNITTESTS/features/netsocket/UDPSocket/unittest.cmake
+++ b/UNITTESTS/features/netsocket/UDPSocket/unittest.cmake
@@ -9,11 +9,11 @@ set(unittest-sources
   ../features/netsocket/InternetSocket.cpp
   ../features/netsocket/InternetDatagramSocket.cpp
   ../features/netsocket/UDPSocket.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/moduletests/features/netsocket/IfaceDnsSocket/unittest.cmake b/UNITTESTS/moduletests/features/netsocket/IfaceDnsSocket/unittest.cmake
index cc839e474b..e7b77d9304 100644
--- a/UNITTESTS/moduletests/features/netsocket/IfaceDnsSocket/unittest.cmake
+++ b/UNITTESTS/moduletests/features/netsocket/IfaceDnsSocket/unittest.cmake
@@ -16,13 +16,13 @@ set(unittest-sources
   ../features/netsocket/EthernetInterface.cpp
   ../features/netsocket/EMACInterface.cpp
   ../features/netsocket/nsapi_dns.cpp
-  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
-  ../features/frameworks/nanostack-libservice/source/libList/ns_list.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
+  ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
+  ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
+  ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
+  ../connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
 )
 
 set(unittest-test-sources