diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index 5acba3ae85..9309fe8ec5 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -134,11 +134,11 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features/filesystem/"
   "${PROJECT_SOURCE_DIR}/../features/filesystem/littlefs"
   "${PROJECT_SOURCE_DIR}/../features/filesystem/littlefs/littlefs"
-  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/API"
-  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/AT"
-  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/device"
-  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework"
-  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/common"
+  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/API"
+  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/AT"
+  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/device"
+  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework"
+  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/common"
   "${PROJECT_SOURCE_DIR}/../features/lorawan"
   "${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack"
   "${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/mac"
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/unittest.cmake
index f0e127e5de..f9b709ff26 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/unittest.cmake
@@ -5,21 +5,21 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  connectivity/cellular/framework/common/util
-  ../connectivity/cellular/framework/common
-  ../connectivity/cellular/framework/AT
-  ../connectivity/cellular/framework/device
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
+  ../connectivity/cellular/include/cellular/framework/device
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../connectivity/cellular/framework/AT/AT_CellularContext.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularContext.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/AT/at_cellularcontext/at_cellularcontexttest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellularcontexttest.cpp
   stubs/ATHandler_stub.cpp
   stubs/AT_CellularDevice_stub.cpp
   stubs/AT_CellularStack_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake
index b0a16a8fb9..28f6b83fcb 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake
@@ -5,10 +5,10 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  ../connectivity/cellular/framework/common/util
-  ../connectivity/cellular/framework/common
-  ../connectivity/cellular/framework/AT
-  ../connectivity/cellular/framework/device
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
+  ../connectivity/cellular/include/cellular/framework/device
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../drivers
   ../hal
@@ -18,12 +18,12 @@ set(unittest-includes ${unittest-includes}
 # Source files
 set(unittest-sources
   stubs/randLIB_stub.c
-  ../connectivity/cellular/framework/AT/AT_CellularDevice.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularDevice.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/AT/at_cellulardevice/at_cellulardevicetest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellulardevicetest.cpp
   stubs/AT_CellularNetwork_stub.cpp
   stubs/ATHandler_stub.cpp
   stubs/AT_CellularSMS_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake
index fda718ed3c..e95d15a5a7 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake
@@ -5,9 +5,9 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  connectivity/cellular/framework/common/util
-  ../connectivity/cellular/framework/common
-  ../connectivity/cellular/framework/AT
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../features/netsocket/cellular
 )
@@ -15,12 +15,12 @@ set(unittest-includes ${unittest-includes}
 # Source files
 set(unittest-sources
   stubs/randLIB_stub.c
-  ../connectivity/cellular/framework/AT/AT_CellularInformation.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularInformation.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/AT//at_cellularinformation/at_cellularinformationtest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellularinformationtest.cpp
   stubs/ATHandler_stub.cpp
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake
index 23a679f79b..f97a15ba3b 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake
@@ -5,22 +5,22 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  connectivity/cellular/framework/common/util
-  ../connectivity/cellular/framework/common
-  ../connectivity/cellular/framework/AT
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../connectivity/cellular/framework/AT/AT_CellularNetwork.cpp
-  ../connectivity/cellular/framework/common/CellularUtil.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularNetwork.cpp
+  ../connectivity/cellular/source/framework/common/CellularUtil.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/AT/at_cellularnetwork/at_cellularnetworktest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellularnetworktest.cpp
   stubs/ATHandler_stub.cpp
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake
index 2df08aec0c..5c22bde875 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake
@@ -5,21 +5,21 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  connectivity/cellular/framework/common/util
-  ../connectivity/cellular/framework/common
-  ../connectivity/cellular/framework/AT
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../connectivity/cellular/framework/AT/AT_CellularSMS.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularSMS.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/AT/at_cellularsms/at_cellularsmstest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellularsmstest.cpp
   stubs/ATHandler_stub.cpp
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake
index c23e7bd4c4..e03da21bc1 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake
@@ -5,16 +5,16 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  connectivity/cellular/framework/common/util
-  ../connectivity/cellular/framework/common
-  ../connectivity/cellular/framework/AT
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../connectivity/cellular/framework/AT/AT_CellularStack.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularStack.cpp
   ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
   ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
   ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
@@ -25,7 +25,7 @@ set(unittest-sources
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/AT/at_cellularstack/at_cellularstacktest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellularstacktest.cpp
   stubs/ATHandler_stub.cpp
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/list/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/common/list/unittest.cmake
index 475b67955b..2325fb0e89 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/common/list/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/common/list/unittest.cmake
@@ -5,8 +5,8 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  connectivity/cellular/framework/common/util
-  ../connectivity/cellular/framework/common
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
 )
 
 # Source files
@@ -15,5 +15,5 @@ set(unittest-sources
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/common/list/listtest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/listtest.cpp
 )
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/util/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/common/util/unittest.cmake
index 5c06691803..7116a1d85d 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/common/util/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/common/util/unittest.cmake
@@ -5,18 +5,18 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  connectivity/cellular/framework/common/util
-  ../connectivity/cellular/framework/common
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
 )
 
 # Source files
 set(unittest-sources
-  ../connectivity/cellular/framework/common/CellularUtil.cpp
+  ../connectivity/cellular/source/framework/common/CellularUtil.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/common/util/utiltest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/utiltest.cpp
   stubs/randLIB_stub.cpp
 )
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/unittest.cmake
index afe41e1cfc..da1bb40f2d 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/unittest.cmake
@@ -6,21 +6,21 @@
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   ../platform
-  ../connectivity/cellular/framework/common/util
-  ../connectivity/cellular/framework/common
-  ../connectivity/cellular/framework/AT
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
 
 )
 
 # Source files
 set(unittest-sources
-  ../connectivity/cellular/framework/device/ATHandler.cpp
+  ../connectivity/cellular/source/framework/device/ATHandler.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/device/athandler/athandlertest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/athandlertest.cpp
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp
   stubs/us_ticker_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/unittest.cmake
index ddb2cd6d8b..f25b44fe08 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/unittest.cmake
@@ -5,15 +5,15 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-    /connectivity/cellular/framework/device/cellulardevice
-  ../connectivity/cellular/framework/device
-  ../connectivity/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/device/cellulardevice
+  ../connectivity/cellular/include/cellular/framework/device
+  ../connectivity/cellular/include/cellular/framework/common
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../connectivity/cellular/framework/device/CellularContext.cpp
+  ../connectivity/cellular/source/framework/device/CellularContext.cpp
   ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
   ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
   ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
@@ -24,7 +24,7 @@ set(unittest-sources
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/device/cellularcontext/cellularcontexttest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/cellularcontexttest.cpp
   stubs/FileHandle_stub.cpp
   stubs/CellularStateMachine_stub.cpp
   stubs/EventQueue_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/unittest.cmake
index 7e2f2250df..3ccb01ca12 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/unittest.cmake
@@ -5,20 +5,20 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-    /connectivity/cellular/framework/device/cellulardevice
-  ../connectivity/cellular/framework/device
-  ../connectivity/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/device/cellulardevice
+  ../connectivity/cellular/include/cellular/framework/device
+  ../connectivity/cellular/include/cellular/framework/common
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../connectivity/cellular/framework/device/CellularDevice.cpp
+  ../connectivity/cellular/source/framework/device/CellularDevice.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/device/cellulardevice/cellulardevicetest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/cellulardevicetest.cpp
   stubs/FileHandle_stub.cpp
   stubs/CellularStateMachine_stub.cpp
   stubs/EventQueue_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/unittest.cmake
index 3a66a45739..c556ee2367 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/unittest.cmake
@@ -5,20 +5,20 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-    /connectivity/cellular/framework/device/cellularstatemachine
-  ../connectivity/cellular/framework/device
-  ../connectivity/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/device/cellularstatemachine
+  ../connectivity/cellular/include/cellular/framework/device
+  ../connectivity/cellular/include/cellular/framework/common
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../connectivity/cellular/framework/device/CellularStateMachine.cpp
+  ../connectivity/cellular/source/framework/device/CellularStateMachine.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  connectivity/cellular/framework/device/cellularstatemachine/cellularstatemachinetest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/cellularstatemachinetest.cpp
   stubs/FileHandle_stub.cpp
   stubs/CellularDevice_stub.cpp
   stubs/EventQueue_stub.cpp