diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
index 3235a23..8f29272 100644
--- a/connectivity/CMakeLists.txt
+++ b/connectivity/CMakeLists.txt
@@ -4,3 +4,4 @@
 add_subdirectory(cellular)
 add_subdirectory(drivers)
 add_subdirectory(libraries)
+add_subdirectory(netsocket)
diff --git a/connectivity/netsocket/CMakeLists.txt b/connectivity/netsocket/CMakeLists.txt
new file mode 100644
index 0000000..fae480d
--- /dev/null
+++ b/connectivity/netsocket/CMakeLists.txt
@@ -0,0 +1,36 @@
+# 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}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/netsocket
+)
+
+target_sources(mbed-os
+    PRIVATE
+        source/CellularNonIPSocket.cpp
+        source/DTLSSocket.cpp
+        source/DTLSSocketWrapper.cpp
+        source/EMACInterface.cpp
+        source/EthernetInterface.cpp
+        source/ICMPSocket.cpp
+        source/InternetDatagramSocket.cpp
+        source/InternetSocket.cpp
+        source/L3IPInterface.cpp
+        source/NetStackMemoryManager.cpp
+        source/NetworkInterface.cpp
+        source/NetworkInterfaceDefaults.cpp
+        source/NetworkStack.cpp
+        source/PPPInterface.cpp
+        source/SocketAddress.cpp
+        source/SocketStats.cpp
+        source/TCPSocket.cpp
+        source/TLSSocket.cpp
+        source/TLSSocketWrapper.cpp
+        source/UDPSocket.cpp
+        source/WiFiAccessPoint.cpp
+        source/nsapi_dns.cpp
+        source/nsapi_ppp.cpp
+)
diff --git a/features/CMakeLists.txt b/features/CMakeLists.txt
index 0b01875..45c8b31 100644
--- a/features/CMakeLists.txt
+++ b/features/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_subdirectory(lwipstack)
 add_subdirectory(mbedtls)
 add_subdirectory(nanostack)
-add_subdirectory(netsocket)
+add_subdirectory(netsocket/emac-drivers)
 add_subdirectory(nfc)
 
 target_include_directories(mbed-os
diff --git a/features/netsocket/CMakeLists.txt b/features/netsocket/CMakeLists.txt
deleted file mode 100644
index eccb330..0000000
--- a/features/netsocket/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(emac-drivers)
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-target_sources(mbed-os
-    PRIVATE
-        CellularNonIPSocket.cpp
-        DTLSSocket.cpp
-        DTLSSocketWrapper.cpp
-        EMACInterface.cpp
-        EthernetInterface.cpp
-        ICMPSocket.cpp
-        InternetDatagramSocket.cpp
-        InternetSocket.cpp
-        L3IPInterface.cpp
-        NetStackMemoryManager.cpp
-        NetworkInterface.cpp
-        NetworkInterfaceDefaults.cpp
-        NetworkStack.cpp
-        PPPInterface.cpp
-        SocketAddress.cpp
-        SocketStats.cpp
-        TCPSocket.cpp
-        TLSSocket.cpp
-        TLSSocketWrapper.cpp
-        UDPSocket.cpp
-        WiFiAccessPoint.cpp
-        nsapi_dns.cpp
-)
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
index 88f81be..e35fcee 100644
--- a/storage/CMakeLists.txt
+++ b/storage/CMakeLists.txt
@@ -4,7 +4,7 @@
 add_subdirectory(blockdevice)
 add_subdirectory(filesystem)
 add_subdirectory(kvstore)
-add_subdirectory(system_storage)
+add_subdirectory(platform)
 
 target_include_directories(mbed-os
     PUBLIC
diff --git a/storage/platform/CMakeLists.txt b/storage/platform/CMakeLists.txt
new file mode 100644
index 0000000..96af304
--- /dev/null
+++ b/storage/platform/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_sources(mbed-os
+    PRIVATE
+        source/PlatformStorage.cpp
+)
diff --git a/storage/system_storage/CMakeLists.txt b/storage/system_storage/CMakeLists.txt
deleted file mode 100644
index 957b309..0000000
--- a/storage/system_storage/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-target_sources(mbed-os
-    PRIVATE
-        SystemStorage.cpp
-)