diff --git a/UNITTESTS/features/netsocket/cellular/CellularNonIPSocket/test_CellularNonIPSocket.cpp b/UNITTESTS/features/netsocket/CellularNonIPSocket/test_CellularNonIPSocket.cpp
similarity index 100%
rename from UNITTESTS/features/netsocket/cellular/CellularNonIPSocket/test_CellularNonIPSocket.cpp
rename to UNITTESTS/features/netsocket/CellularNonIPSocket/test_CellularNonIPSocket.cpp
diff --git a/UNITTESTS/features/netsocket/cellular/CellularNonIPSocket/unittest.cmake b/UNITTESTS/features/netsocket/CellularNonIPSocket/unittest.cmake
similarity index 100%
rename from UNITTESTS/features/netsocket/cellular/CellularNonIPSocket/unittest.cmake
rename to UNITTESTS/features/netsocket/CellularNonIPSocket/unittest.cmake
diff --git a/features/netsocket/cellular/CellularNonIPSocket.cpp b/features/netsocket/CellularNonIPSocket.cpp
similarity index 100%
rename from features/netsocket/cellular/CellularNonIPSocket.cpp
rename to features/netsocket/CellularNonIPSocket.cpp
diff --git a/features/netsocket/cellular/CellularNonIPSocket.h b/features/netsocket/CellularNonIPSocket.h
similarity index 100%
rename from features/netsocket/cellular/CellularNonIPSocket.h
rename to features/netsocket/CellularNonIPSocket.h
diff --git a/features/netsocket/cellular/ControlPlane_netif.h b/features/netsocket/ControlPlane_netif.h
similarity index 100%
rename from features/netsocket/cellular/ControlPlane_netif.h
rename to features/netsocket/ControlPlane_netif.h