diff --git a/connectivity/cellular/include/cellular/framework/API/ATHandler.h b/connectivity/cellular/include/cellular/framework/API/ATHandler.h
index f0d9828..5010b9a 100644
--- a/connectivity/cellular/include/cellular/framework/API/ATHandler.h
+++ b/connectivity/cellular/include/cellular/framework/API/ATHandler.h
@@ -22,7 +22,7 @@
 #include "platform/mbed_chrono.h"
 
 #include "events/EventQueue.h"
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 
 #include "Callback.h"
 #include "rtos/Kernel.h"
diff --git a/connectivity/cellular/include/cellular/framework/API/CellularContext.h b/connectivity/cellular/include/cellular/framework/API/CellularContext.h
index 1b97820..8281b1c 100644
--- a/connectivity/cellular/include/cellular/framework/API/CellularContext.h
+++ b/connectivity/cellular/include/cellular/framework/API/CellularContext.h
@@ -17,11 +17,11 @@
 #ifndef _CELLULARCONTEXT_H_
 #define _CELLULARCONTEXT_H_
 
-#include "NetworkStack.h"
-#include "CellularInterface.h"
+#include "netsocket/NetworkStack.h"
+#include "netsocket/CellularInterface.h"
 #include "CellularDevice.h"
 #include "CellularUtil.h"
-#include "ControlPlane_netif.h"
+#include "netsocket/ControlPlane_netif.h"
 #include "PinNames.h"
 
 /** @file CellularContext.h
diff --git a/connectivity/cellular/include/cellular/framework/API/CellularInformation.h b/connectivity/cellular/include/cellular/framework/API/CellularInformation.h
index 689e78f..e68d96c 100644
--- a/connectivity/cellular/include/cellular/framework/API/CellularInformation.h
+++ b/connectivity/cellular/include/cellular/framework/API/CellularInformation.h
@@ -19,7 +19,7 @@
 #define CELLULAR_INFORMATION_H_
 
 #include <stddef.h>
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 
 const int MAX_IMSI_LENGTH = 15;
 const int MAX_ICCID_LENGTH = 20 + 1; // +1 for zero termination
diff --git a/connectivity/cellular/include/cellular/framework/API/CellularNetwork.h b/connectivity/cellular/include/cellular/framework/API/CellularNetwork.h
index c37e9ce..a8894c7 100644
--- a/connectivity/cellular/include/cellular/framework/API/CellularNetwork.h
+++ b/connectivity/cellular/include/cellular/framework/API/CellularNetwork.h
@@ -19,7 +19,7 @@
 
 #include "CellularList.h"
 #include "Callback.h"
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 
 namespace mbed {
 
diff --git a/connectivity/cellular/include/cellular/framework/API/CellularSMS.h b/connectivity/cellular/include/cellular/framework/API/CellularSMS.h
index 7a3004a..0e0be51 100644
--- a/connectivity/cellular/include/cellular/framework/API/CellularSMS.h
+++ b/connectivity/cellular/include/cellular/framework/API/CellularSMS.h
@@ -21,7 +21,7 @@
 #if MBED_CONF_CELLULAR_USE_SMS
 
 #include "Callback.h"
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 
 namespace mbed {
 
diff --git a/connectivity/cellular/include/cellular/framework/AT/AT_CellularStack.h b/connectivity/cellular/include/cellular/framework/AT/AT_CellularStack.h
index f0befb7..11308f8 100644
--- a/connectivity/cellular/include/cellular/framework/AT/AT_CellularStack.h
+++ b/connectivity/cellular/include/cellular/framework/AT/AT_CellularStack.h
@@ -19,7 +19,7 @@
 #define AT_CELLULAR_STACK_H_
 
 #include "ATHandler.h"
-#include "NetworkStack.h"
+#include "netsocket/NetworkStack.h"
 #include "PlatformMutex.h"
 #include "AT_CellularDevice.h"
 
diff --git a/connectivity/cellular/include/cellular/framework/AT/AT_ControlPlane_netif.h b/connectivity/cellular/include/cellular/framework/AT/AT_ControlPlane_netif.h
index 6c222c9..b9c1eff 100644
--- a/connectivity/cellular/include/cellular/framework/AT/AT_ControlPlane_netif.h
+++ b/connectivity/cellular/include/cellular/framework/AT/AT_ControlPlane_netif.h
@@ -16,7 +16,7 @@
  */
 
 #include "CellularList.h"
-#include "ControlPlane_netif.h"
+#include "netsocket/ControlPlane_netif.h"
 #include "ATHandler.h"
 #include "AT_CellularDevice.h"
 
diff --git a/connectivity/cellular/include/cellular/framework/common/CellularCommon.h b/connectivity/cellular/include/cellular/framework/common/CellularCommon.h
index 10f2047..f0466e8 100644
--- a/connectivity/cellular/include/cellular/framework/common/CellularCommon.h
+++ b/connectivity/cellular/include/cellular/framework/common/CellularCommon.h
@@ -19,7 +19,7 @@
 #define CELLULAR_COMMON_
 
 #include <stdint.h>
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 
 const int CELLULAR_RETRY_ARRAY_SIZE = 10;
 
diff --git a/connectivity/cellular/include/cellular/framework/common/CellularUtil.h b/connectivity/cellular/include/cellular/framework/common/CellularUtil.h
index ede626b..3ae0aab 100644
--- a/connectivity/cellular/include/cellular/framework/common/CellularUtil.h
+++ b/connectivity/cellular/include/cellular/framework/common/CellularUtil.h
@@ -20,7 +20,7 @@
 
 #include <stddef.h>
 #include <inttypes.h>
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 
 namespace mbed_cellular_util {
 
diff --git a/connectivity/drivers/wifi/esp8266-driver/ESP8266/ESP8266.cpp b/connectivity/drivers/wifi/esp8266-driver/ESP8266/ESP8266.cpp
index 2de83a6..56dd02a 100644
--- a/connectivity/drivers/wifi/esp8266-driver/ESP8266/ESP8266.cpp
+++ b/connectivity/drivers/wifi/esp8266-driver/ESP8266/ESP8266.cpp
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 #include "ESP8266.h"
-#include "features/netsocket/nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 #include "mbed_trace.h"
 #include "PinNames.h"
 #include "platform/Callback.h"
diff --git a/connectivity/drivers/wifi/esp8266-driver/ESP8266/ESP8266.h b/connectivity/drivers/wifi/esp8266-driver/ESP8266/ESP8266.h
index 164c877..4b5b189 100644
--- a/connectivity/drivers/wifi/esp8266-driver/ESP8266/ESP8266.h
+++ b/connectivity/drivers/wifi/esp8266-driver/ESP8266/ESP8266.h
@@ -23,8 +23,8 @@
 #include <ctime>
 
 #include "drivers/BufferedSerial.h"
-#include "features/netsocket/nsapi_types.h"
-#include "features/netsocket/WiFiAccessPoint.h"
+#include "netsocket/nsapi_types.h"
+#include "netsocket/WiFiAccessPoint.h"
 #include "PinNames.h"
 #include "platform/ATCmdParser.h"
 #include "platform/Callback.h"
@@ -32,7 +32,7 @@
 #include "platform/mbed_error.h"
 #include "rtos/Mutex.h"
 #include "rtos/ThisThread.h"
-#include "features/netsocket/SocketAddress.h"
+#include "netsocket/SocketAddress.h"
 
 // Various timeouts for different ESP8266 operations
 // (some of these can't use literal form as they're needed for defaults in this header, where
diff --git a/connectivity/drivers/wifi/esp8266-driver/ESP8266Interface.cpp b/connectivity/drivers/wifi/esp8266-driver/ESP8266Interface.cpp
index 9046697..592817a 100644
--- a/connectivity/drivers/wifi/esp8266-driver/ESP8266Interface.cpp
+++ b/connectivity/drivers/wifi/esp8266-driver/ESP8266Interface.cpp
@@ -24,7 +24,7 @@
 #include "ESP8266Interface.h"
 #include "events/EventQueue.h"
 #include "events/mbed_shared_queues.h"
-#include "features/netsocket/nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 #include "mbed_trace.h"
 #include "platform/Callback.h"
 #include "platform/mbed_atomic.h"
diff --git a/connectivity/drivers/wifi/esp8266-driver/ESP8266Interface.h b/connectivity/drivers/wifi/esp8266-driver/ESP8266Interface.h
index b3c970b..e617ace 100644
--- a/connectivity/drivers/wifi/esp8266-driver/ESP8266Interface.h
+++ b/connectivity/drivers/wifi/esp8266-driver/ESP8266Interface.h
@@ -24,12 +24,12 @@
 #include "ESP8266/ESP8266.h"
 #include "events/EventQueue.h"
 #include "events/mbed_shared_queues.h"
-#include "features/netsocket/NetworkInterface.h"
-#include "features/netsocket/NetworkStack.h"
-#include "features/netsocket/nsapi_types.h"
-#include "features/netsocket/SocketAddress.h"
-#include "features/netsocket/WiFiAccessPoint.h"
-#include "features/netsocket/WiFiInterface.h"
+#include "netsocket/NetworkInterface.h"
+#include "netsocket/NetworkStack.h"
+#include "netsocket/nsapi_types.h"
+#include "netsocket/SocketAddress.h"
+#include "netsocket/WiFiAccessPoint.h"
+#include "netsocket/WiFiInterface.h"
 #include "platform/Callback.h"
 #include "platform/mbed_chrono.h"
 #if MBED_CONF_RTOS_PRESENT
diff --git a/docs/design-documents/features/connectivity/TLSSocket - Design document.md b/docs/design-documents/features/connectivity/TLSSocket - Design document.md
index f12a802..666569c 100644
--- a/docs/design-documents/features/connectivity/TLSSocket - Design document.md
+++ b/docs/design-documents/features/connectivity/TLSSocket - Design document.md
@@ -133,7 +133,7 @@
 
 ##  Detailed design for abstract socket API
 
-The Mbed OS [Socket interface](https://github.com/ARMmbed/mbed-os/blob/master/features/netsocket/Socket.h) is an abstract C++ inteface that follows the POSIX socket API.
+The Mbed OS [Socket interface](https://github.com/ARMmbed/mbed-os/blob/master/connectivity/netsocket/Socket.h) is an abstract C++ inteface that follows the POSIX socket API.
 
 ### Receiving and sending data from Mbed TLS