diff --git a/.astyleignore b/.astyleignore
index bed8d33c616..1b0c743fe50 100644
--- a/.astyleignore
+++ b/.astyleignore
@@ -29,3 +29,4 @@
 ^tools
 ^UNITTESTS
 ^storage/blockdevice/tests/UNITTESTS
+^storage/kvstore/tests/UNITTESTS
diff --git a/TESTS/configs/baremetal.json b/TESTS/configs/baremetal.json
index 7d6fff2779b..b42a22142e9 100644
--- a/TESTS/configs/baremetal.json
+++ b/TESTS/configs/baremetal.json
@@ -22,15 +22,12 @@
         "network-emac",
         "flashiap-block-device",
         "system-storage",
-        "filesystemstore",
         "SecureStore",
         "storage",
-        "kv-map",
+        "kv-global-api",
         "direct-access-devicekey",
-        "tdbstore",
         "kv-config",
         "events",
-        "kv-global-api",
         "sd",
         "qspif",
         "spif-driver",
diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index aa05b4b18ce..121a0c833a5 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -118,6 +118,9 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
   "${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/include"
+  "${PROJECT_SOURCE_DIR}/../storage/kvstore/include"
+  "${PROJECT_SOURCE_DIR}/../storage/kvstore/kv_config"
+  "${PROJECT_SOURCE_DIR}/../storage/kvstore/kv_config/include"
   "${PROJECT_SOURCE_DIR}/../drivers"
   "${PROJECT_SOURCE_DIR}/../hal"
   "${PROJECT_SOURCE_DIR}/../events"
@@ -146,7 +149,6 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features/lorawan/system"
   "${PROJECT_SOURCE_DIR}/../features/mbedtls"
   "${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
-  "${PROJECT_SOURCE_DIR}/../storage/kvstore/conf"
 )
 
 # Create a list for test suites.
diff --git a/UNITTESTS/empty_baseline/unittest.cmake b/UNITTESTS/empty_baseline/unittest.cmake
index 332526a8b0c..2dc0fa46488 100644
--- a/UNITTESTS/empty_baseline/unittest.cmake
+++ b/UNITTESTS/empty_baseline/unittest.cmake
@@ -12,13 +12,6 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-    ../storage/kvstore/global_api/kvstore_global_api.cpp
-    ../storage/kvstore/securestore/SecureStore.cpp
-    ../storage/kvstore/kv_map/KVMap.cpp
-    ../storage/kvstore/tdbstore/TDBStore.cpp
-    ../storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
-    ../storage/kvstore/conf/kv_config.cpp
-    ../storage/kvstore/filesystemstore/FileSystemStore.cpp
     ../storage/system_storage/SystemStorage.cpp
 )
 
diff --git a/UNITTESTS/stubs/kv_config_stub.cpp b/UNITTESTS/stubs/kv_config_stub.cpp
index 4936a50d566..74eb2082481 100644
--- a/UNITTESTS/stubs/kv_config_stub.cpp
+++ b/UNITTESTS/stubs/kv_config_stub.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "storage/kvstore/conf/kv_config.h"
+#include "kv_config/kv_config.h"
 
 const char *get_filesystemstore_folder_path()
 {
diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/mbed_lib.json b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/mbed_lib.json
index ac6c4857730..e8e50477234 100644
--- a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/mbed_lib.json
+++ b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/mbed_lib.json
@@ -6,7 +6,7 @@
         "mbedtls",
         "storage",
         "flashiap-block-device",
-        "tdbstore",
+        "kv-global-api",
         "storage_tdb_internal"
     ]
 }
diff --git a/features/device_key/source/DeviceKey.cpp b/features/device_key/source/DeviceKey.cpp
index 354b68b41ee..6cf5784a3dc 100644
--- a/features/device_key/source/DeviceKey.cpp
+++ b/features/device_key/source/DeviceKey.cpp
@@ -19,10 +19,10 @@
 #if DEVICEKEY_ENABLED
 #include "mbedtls/cmac.h"
 #include "mbedtls/platform.h"
-#include "storage/kvstore/include/KVStore.h"
-#include "storage/kvstore/tdbstore/TDBStore.h"
-#include "storage/kvstore/kv_map/KVMap.h"
-#include "storage/kvstore/conf/kv_config.h"
+#include "kvstore/KVStore.h"
+#include "kvstore/TDBStore.h"
+#include "kvstore/KVMap.h"
+#include "kv_config/kv_config.h"
 #include "mbed_wait_api.h"
 #include <stdlib.h>
 #include "platform/mbed_error.h"
diff --git a/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h b/storage/kvstore/direct_access_devicekey/include/direct_access_devicekey/DirectAccessDevicekey.h
similarity index 100%
rename from storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h
rename to storage/kvstore/direct_access_devicekey/include/direct_access_devicekey/DirectAccessDevicekey.h
diff --git a/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp b/storage/kvstore/direct_access_devicekey/source/DirectAccessDevicekey.cpp
similarity index 99%
rename from storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
rename to storage/kvstore/direct_access_devicekey/source/DirectAccessDevicekey.cpp
index 2bd1930dfd5..5a4c9522e0d 100644
--- a/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
+++ b/storage/kvstore/direct_access_devicekey/source/DirectAccessDevicekey.cpp
@@ -16,7 +16,7 @@
 
 // ----------------------------------------------------------- Includes -----------------------------------------------------------
 #if DEVICE_FLASH
-#include "DirectAccessDevicekey.h"
+#include "direct_access_devicekey/DirectAccessDevicekey.h"
 #include "drivers/FlashIAP.h"
 #include <string.h>
 #include <stdio.h>
diff --git a/storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp b/storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/direct_access_devicekey_tdb/main.cpp
similarity index 98%
rename from storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp
rename to storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/direct_access_devicekey_tdb/main.cpp
index 869e335f0b6..204670ff03f 100644
--- a/storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp
+++ b/storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/direct_access_devicekey_tdb/main.cpp
@@ -23,13 +23,13 @@
 #include <stdio.h>
 #include <string.h>
 #include "DeviceKey.h"
-#include "KVStore.h"
-#include "KVMap.h"
-#include "kv_config.h"
-#include "TDBStore.h"
+#include "kvstore/KVStore.h"
+#include "kvstore/KVMap.h"
+#include "kv_config/kv_config.h"
+#include "kvstore/TDBStore.h"
 #include "FlashIAP.h"
 #include "FlashIAPBlockDevice.h"
-#include "DirectAccessDevicekey.h"
+#include "direct_access_devicekey/DirectAccessDevicekey.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
diff --git a/storage/kvstore/filesystemstore/mbed_lib.json b/storage/kvstore/filesystemstore/mbed_lib.json
deleted file mode 100644
index dbcba1eacf8..00000000000
--- a/storage/kvstore/filesystemstore/mbed_lib.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "filesystemstore"
-}
diff --git a/storage/kvstore/filesystemstore/FileSystemStore.h b/storage/kvstore/include/kvstore/FileSystemStore.h
similarity index 99%
rename from storage/kvstore/filesystemstore/FileSystemStore.h
rename to storage/kvstore/include/kvstore/FileSystemStore.h
index dd0b10250e5..ef1fc5d2b3f 100644
--- a/storage/kvstore/filesystemstore/FileSystemStore.h
+++ b/storage/kvstore/include/kvstore/FileSystemStore.h
@@ -18,7 +18,7 @@
 #ifndef MBED_FILE_SYSTEM_STORE_H
 #define MBED_FILE_SYSTEM_STORE_H
 
-#include "storage/kvstore/include/KVStore.h"
+#include "kvstore/KVStore.h"
 #include "filesystem/FileSystem.h"
 
 namespace mbed {
diff --git a/storage/kvstore/kv_map/KVMap.h b/storage/kvstore/include/kvstore/KVMap.h
similarity index 99%
rename from storage/kvstore/kv_map/KVMap.h
rename to storage/kvstore/include/kvstore/KVMap.h
index 3d8189fa4ea..0d030b92ee9 100644
--- a/storage/kvstore/kv_map/KVMap.h
+++ b/storage/kvstore/include/kvstore/KVMap.h
@@ -16,7 +16,7 @@
 #ifndef _KV_MAP
 #define _KV_MAP
 
-#include "storage/kvstore/include/KVStore.h"
+#include "kvstore/KVStore.h"
 #include "platform/PlatformMutex.h"
 #include "platform/SingletonPtr.h"
 #include "blockdevice/BlockDevice.h"
diff --git a/storage/kvstore/include/KVStore.h b/storage/kvstore/include/kvstore/KVStore.h
similarity index 100%
rename from storage/kvstore/include/KVStore.h
rename to storage/kvstore/include/kvstore/KVStore.h
diff --git a/storage/kvstore/tdbstore/TDBStore.h b/storage/kvstore/include/kvstore/TDBStore.h
similarity index 99%
rename from storage/kvstore/tdbstore/TDBStore.h
rename to storage/kvstore/include/kvstore/TDBStore.h
index 19844bb7969..8a823a1c660 100644
--- a/storage/kvstore/tdbstore/TDBStore.h
+++ b/storage/kvstore/include/kvstore/TDBStore.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include "storage/kvstore/include/KVStore.h"
+#include "kvstore/KVStore.h"
 #include "blockdevice/BlockDevice.h"
 #include "blockdevice/BufferedBlockDevice.h"
 #include "PlatformMutex.h"
diff --git a/storage/kvstore/global_api/kvstore_global_api.h b/storage/kvstore/include/kvstore/kvstore_global_api.h
similarity index 100%
rename from storage/kvstore/global_api/kvstore_global_api.h
rename to storage/kvstore/include/kvstore/kvstore_global_api.h
diff --git a/storage/kvstore/conf/filesystem/mbed_lib.json b/storage/kvstore/kv_config/filesystem/mbed_lib.json
similarity index 99%
rename from storage/kvstore/conf/filesystem/mbed_lib.json
rename to storage/kvstore/kv_config/filesystem/mbed_lib.json
index 836da52074c..e89f304010e 100644
--- a/storage/kvstore/conf/filesystem/mbed_lib.json
+++ b/storage/kvstore/kv_config/filesystem/mbed_lib.json
@@ -24,7 +24,7 @@
         "external_base_address": {
             "help": "The default will set start address to address 0",
             "value": "0"
-        },    
+        },
         "mount_point": {
             "help": "Where to mount the filesystem.",
             "value": "kv"
diff --git a/storage/kvstore/conf/filesystem_no_rbp/mbed_lib.json b/storage/kvstore/kv_config/filesystem_no_rbp/mbed_lib.json
similarity index 98%
rename from storage/kvstore/conf/filesystem_no_rbp/mbed_lib.json
rename to storage/kvstore/kv_config/filesystem_no_rbp/mbed_lib.json
index 8202a681fd3..db0eed84fa9 100644
--- a/storage/kvstore/conf/filesystem_no_rbp/mbed_lib.json
+++ b/storage/kvstore/kv_config/filesystem_no_rbp/mbed_lib.json
@@ -16,7 +16,7 @@
         "external_base_address": {
             "help": "The default will set start address to address 0",
             "value": "0"
-        },    
+        },
         "mount_point": {
             "help": "Where to mount the filesystem.",
             "value": "kv"
diff --git a/storage/kvstore/conf/global/mbed_lib.json b/storage/kvstore/kv_config/global/mbed_lib.json
similarity index 100%
rename from storage/kvstore/conf/global/mbed_lib.json
rename to storage/kvstore/kv_config/global/mbed_lib.json
diff --git a/storage/kvstore/conf/kv_config.h b/storage/kvstore/kv_config/include/kv_config/kv_config.h
similarity index 100%
rename from storage/kvstore/conf/kv_config.h
rename to storage/kvstore/kv_config/include/kv_config/kv_config.h
diff --git a/storage/kvstore/conf/mbed_lib.json b/storage/kvstore/kv_config/mbed_lib.json
similarity index 100%
rename from storage/kvstore/conf/mbed_lib.json
rename to storage/kvstore/kv_config/mbed_lib.json
diff --git a/storage/kvstore/conf/kv_config.cpp b/storage/kvstore/kv_config/source/kv_config.cpp
similarity index 99%
rename from storage/kvstore/conf/kv_config.cpp
rename to storage/kvstore/kv_config/source/kv_config.cpp
index a6fe209806a..8114a68b05b 100644
--- a/storage/kvstore/conf/kv_config.cpp
+++ b/storage/kvstore/kv_config/source/kv_config.cpp
@@ -15,20 +15,20 @@
  */
 
 #include "kv_config.h"
-#include "storage/kvstore/include/KVStore.h"
-#include "storage/kvstore/kv_map/KVMap.h"
+#include "kvstore/KVStore.h"
+#include "kvstore/KVMap.h"
 #include "blockdevice/BlockDevice.h"
 #include "filesystem/FileSystem.h"
-#include "storage/kvstore/filesystemstore/FileSystemStore.h"
+#include "kvstore/FileSystemStore.h"
 #include "blockdevice/SlicingBlockDevice.h"
 #include "fat/FATFileSystem.h"
 #include "littlefs/LittleFileSystem.h"
-#include "storage/kvstore/tdbstore/TDBStore.h"
+#include "kvstore/TDBStore.h"
 #include "mbed_error.h"
 #include "drivers/FlashIAP.h"
 #include "blockdevice/FlashSimBlockDevice.h"
 #include "mbed_trace.h"
-#include "storage/kvstore/securestore/SecureStore.h"
+#include "securestore/SecureStore.h"
 #define TRACE_GROUP "KVCFG"
 
 #if COMPONENT_FLASHIAP
diff --git a/storage/kvstore/conf/tdb_external/mbed_lib.json b/storage/kvstore/kv_config/tdb_external/mbed_lib.json
similarity index 100%
rename from storage/kvstore/conf/tdb_external/mbed_lib.json
rename to storage/kvstore/kv_config/tdb_external/mbed_lib.json
diff --git a/storage/kvstore/conf/tdb_external_no_rbp/mbed_lib.json b/storage/kvstore/kv_config/tdb_external_no_rbp/mbed_lib.json
similarity index 100%
rename from storage/kvstore/conf/tdb_external_no_rbp/mbed_lib.json
rename to storage/kvstore/kv_config/tdb_external_no_rbp/mbed_lib.json
diff --git a/storage/kvstore/conf/tdb_internal/mbed_lib.json b/storage/kvstore/kv_config/tdb_internal/mbed_lib.json
similarity index 100%
rename from storage/kvstore/conf/tdb_internal/mbed_lib.json
rename to storage/kvstore/kv_config/tdb_internal/mbed_lib.json
diff --git a/storage/kvstore/kv_map/mbed_lib.json b/storage/kvstore/kv_map/mbed_lib.json
deleted file mode 100644
index 07dc74cdca4..00000000000
--- a/storage/kvstore/kv_map/mbed_lib.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "kv-map"
-}
diff --git a/storage/kvstore/global_api/mbed_lib.json b/storage/kvstore/mbed_lib.json
similarity index 100%
rename from storage/kvstore/global_api/mbed_lib.json
rename to storage/kvstore/mbed_lib.json
diff --git a/storage/kvstore/securestore/SecureStore.h b/storage/kvstore/securestore/include/securestore/SecureStore.h
similarity index 100%
rename from storage/kvstore/securestore/SecureStore.h
rename to storage/kvstore/securestore/include/securestore/SecureStore.h
diff --git a/storage/kvstore/securestore/SecureStore.cpp b/storage/kvstore/securestore/source/SecureStore.cpp
similarity index 99%
rename from storage/kvstore/securestore/SecureStore.cpp
rename to storage/kvstore/securestore/source/SecureStore.cpp
index 394e7d1573d..b3c792991c5 100644
--- a/storage/kvstore/securestore/SecureStore.cpp
+++ b/storage/kvstore/securestore/source/SecureStore.cpp
@@ -16,7 +16,7 @@
 
 // ----------------------------------------------------------- Includes -----------------------------------------------------------
 
-#include "SecureStore.h"
+#include "securestore/SecureStore.h"
 
 #if SECURESTORE_ENABLED
 
diff --git a/storage/TESTS/kvstore/securestore_whitebox/main.cpp b/storage/kvstore/securestore/tests/TESTS/securestore/securestore_whitebox/main.cpp
similarity index 99%
rename from storage/TESTS/kvstore/securestore_whitebox/main.cpp
rename to storage/kvstore/securestore/tests/TESTS/securestore/securestore_whitebox/main.cpp
index 15d84324196..5cb1b2183f8 100644
--- a/storage/TESTS/kvstore/securestore_whitebox/main.cpp
+++ b/storage/kvstore/securestore/tests/TESTS/securestore/securestore_whitebox/main.cpp
@@ -16,8 +16,8 @@
 * limitations under the License.
 */
 
-#include "SecureStore.h"
-#include "TDBStore.h"
+#include "securestore/SecureStore.h"
+#include "kvstore/TDBStore.h"
 #ifdef MBED_CONF_RTOS_PRESENT
 #include "Thread.h"
 #endif
diff --git a/storage/kvstore/filesystemstore/FileSystemStore.cpp b/storage/kvstore/source/FileSystemStore.cpp
similarity index 99%
rename from storage/kvstore/filesystemstore/FileSystemStore.cpp
rename to storage/kvstore/source/FileSystemStore.cpp
index bc1537bcfc4..828ff5915bd 100644
--- a/storage/kvstore/filesystemstore/FileSystemStore.cpp
+++ b/storage/kvstore/source/FileSystemStore.cpp
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-#include "FileSystemStore.h"
-#include "storage/kvstore/conf/kv_config.h"
+#include "kvstore/FileSystemStore.h"
+#include "kv_config/kv_config.h"
 #include "filesystem/Dir.h"
 #include "filesystem/File.h"
 #include "blockdevice/BlockDevice.h"
@@ -635,6 +635,3 @@ static char *string_ndup(const char *src, size_t size)
     string_copy[size] = '\0';
     return string_copy;
 }
-
-
-
diff --git a/storage/kvstore/kv_map/KVMap.cpp b/storage/kvstore/source/KVMap.cpp
similarity index 98%
rename from storage/kvstore/kv_map/KVMap.cpp
rename to storage/kvstore/source/KVMap.cpp
index dbfb5e2926a..506f0fb02d4 100644
--- a/storage/kvstore/kv_map/KVMap.cpp
+++ b/storage/kvstore/source/KVMap.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "storage/kvstore/include/KVStore.h"
-#include "storage/kvstore/kv_map/KVMap.h"
-#include "storage/kvstore/conf/kv_config.h"
+#include "kvstore/KVStore.h"
+#include "kvstore/KVMap.h"
+#include "kv_config/kv_config.h"
 #include <stdlib.h>
 #include "string.h"
 #include "mbed_error.h"
@@ -333,4 +333,3 @@ FileSystem *KVMap::get_external_filesystem_instance(const char *name)
 }
 
 } // namespace mbed
-
diff --git a/storage/kvstore/tdbstore/TDBStore.cpp b/storage/kvstore/source/TDBStore.cpp
similarity index 99%
rename from storage/kvstore/tdbstore/TDBStore.cpp
rename to storage/kvstore/source/TDBStore.cpp
index 88e1bad6893..b8f2e530dce 100644
--- a/storage/kvstore/tdbstore/TDBStore.cpp
+++ b/storage/kvstore/source/TDBStore.cpp
@@ -16,7 +16,7 @@
 
 // ----------------------------------------------------------- Includes -----------------------------------------------------------
 
-#include "TDBStore.h"
+#include "kvstore/TDBStore.h"
 
 #include <algorithm>
 #include <string.h>
diff --git a/storage/kvstore/global_api/kvstore_global_api.cpp b/storage/kvstore/source/kvstore_global_api.cpp
similarity index 97%
rename from storage/kvstore/global_api/kvstore_global_api.cpp
rename to storage/kvstore/source/kvstore_global_api.cpp
index 5004a7f3539..9a9dcc78e34 100644
--- a/storage/kvstore/global_api/kvstore_global_api.cpp
+++ b/storage/kvstore/source/kvstore_global_api.cpp
@@ -15,9 +15,9 @@
  */
 #include "kvstore_global_api.h"
 
-#include "storage/kvstore/conf/kv_config.h"
-#include "storage/kvstore/kv_map/KVMap.h"
-#include "storage/kvstore/include/KVStore.h"
+#include "kv_config/kv_config.h"
+#include "kvstore/KVMap.h"
+#include "kvstore/KVStore.h"
 #include "mbed_error.h"
 
 using namespace mbed;
@@ -201,4 +201,3 @@ int kv_reset(const char *kvstore_name)
     return ret;
 
 }
-
diff --git a/storage/kvstore/tdbstore/mbed_lib.json b/storage/kvstore/tdbstore/mbed_lib.json
deleted file mode 100644
index 9ae5f7a8895..00000000000
--- a/storage/kvstore/tdbstore/mbed_lib.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "tdbstore"
-}
diff --git a/storage/TESTS/kvstore/filesystemstore_tests/main.cpp b/storage/kvstore/tests/TESTS/kvstore/filesystemstore_tests/main.cpp
similarity index 100%
rename from storage/TESTS/kvstore/filesystemstore_tests/main.cpp
rename to storage/kvstore/tests/TESTS/kvstore/filesystemstore_tests/main.cpp
diff --git a/storage/TESTS/kvstore/general_tests_phase_1/main.cpp b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp
similarity index 99%
rename from storage/TESTS/kvstore/general_tests_phase_1/main.cpp
rename to storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp
index f4bb81eeee6..add632f1b8b 100644
--- a/storage/TESTS/kvstore/general_tests_phase_1/main.cpp
+++ b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp
@@ -14,8 +14,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#include "SecureStore.h"
-#include "TDBStore.h"
+#include "securestore/SecureStore.h"
+#include "kvstore/TDBStore.h"
 #ifdef MBED_CONF_RTOS_PRESENT
 #include "Thread.h"
 #endif
diff --git a/storage/TESTS/kvstore/general_tests_phase_2/main.cpp b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp
similarity index 99%
rename from storage/TESTS/kvstore/general_tests_phase_2/main.cpp
rename to storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp
index 0a713e79f1b..eb295b9611d 100644
--- a/storage/TESTS/kvstore/general_tests_phase_2/main.cpp
+++ b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp
@@ -14,8 +14,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#include "SecureStore.h"
-#include "TDBStore.h"
+#include "securestore/SecureStore.h"
+#include "kvstore/TDBStore.h"
 #include "mbed_error.h"
 #include "FlashSimBlockDevice.h"
 #include "SlicingBlockDevice.h"
diff --git a/storage/TESTS/kvstore/static_tests/main.cpp b/storage/kvstore/tests/TESTS/kvstore/static_tests/main.cpp
similarity index 100%
rename from storage/TESTS/kvstore/static_tests/main.cpp
rename to storage/kvstore/tests/TESTS/kvstore/static_tests/main.cpp
diff --git a/storage/TESTS/kvstore/tdbstore_whitebox/main.cpp b/storage/kvstore/tests/TESTS/kvstore/tdbstore_whitebox/main.cpp
similarity index 100%
rename from storage/TESTS/kvstore/tdbstore_whitebox/main.cpp
rename to storage/kvstore/tests/TESTS/kvstore/tdbstore_whitebox/main.cpp
diff --git a/storage/kvstore/tests/UNITTESTS/.mbedignore b/storage/kvstore/tests/UNITTESTS/.mbedignore
new file mode 100644
index 00000000000..72e8ffc0db8
--- /dev/null
+++ b/storage/kvstore/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/UNITTESTS/moduletests/storage/kvstore/FileSystemStore/moduletest.cpp b/storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp
similarity index 98%
rename from UNITTESTS/moduletests/storage/kvstore/FileSystemStore/moduletest.cpp
rename to storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp
index 83650dbd2dd..531c60e42ac 100644
--- a/UNITTESTS/moduletests/storage/kvstore/FileSystemStore/moduletest.cpp
+++ b/storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 #include "blockdevice/HeapBlockDevice.h"
-#include "storage/kvstore/filesystemstore/FileSystemStore.h"
+#include "kvstore/FileSystemStore.h"
 #include "littlefs/LittleFileSystem.h"
 #include "mbed_error.h"
 #include <stdlib.h>
diff --git a/UNITTESTS/moduletests/storage/kvstore/FileSystemStore/unittest.cmake b/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
similarity index 89%
rename from UNITTESTS/moduletests/storage/kvstore/FileSystemStore/unittest.cmake
rename to storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
index 2c2286914c3..e9246278e94 100644
--- a/UNITTESTS/moduletests/storage/kvstore/FileSystemStore/unittest.cmake
+++ b/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
@@ -10,7 +10,7 @@ set(unittest-includes ${unittest-includes}
 
 set(unittest-sources
   ../storage/blockdevice/source/HeapBlockDevice.cpp
-  ../storage/kvstore/filesystemstore/FileSystemStore.cpp
+  ../storage/kvstore/source/FileSystemStore.cpp
   ../storage/filesystem/littlefs/source/LittleFileSystem.cpp
   ../storage/filesystem/source/Dir.cpp
   ../storage/filesystem/source/File.cpp
@@ -24,7 +24,7 @@ set(unittest-sources
 )
 
 set(unittest-test-sources
-  moduletests/storage/kvstore/FileSystemStore/moduletest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/moduletest.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
   stubs/mbed_error.c
@@ -37,4 +37,4 @@ set(unittest-test-flags
   -DMBED_LFS_PROG_SIZE=64
   -DMBED_LFS_BLOCK_SIZE=512
   -DMBED_LFS_LOOKAHEAD=512
-)
\ No newline at end of file
+)
diff --git a/UNITTESTS/moduletests/storage/kvstore/TDBStore/moduletest.cpp b/storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp
similarity index 99%
rename from UNITTESTS/moduletests/storage/kvstore/TDBStore/moduletest.cpp
rename to storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp
index 8b536d0c96d..bab14221924 100644
--- a/UNITTESTS/moduletests/storage/kvstore/TDBStore/moduletest.cpp
+++ b/storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp
@@ -17,7 +17,7 @@
 #include "gtest/gtest.h"
 #include "blockdevice/HeapBlockDevice.h"
 #include "blockdevice/FlashSimBlockDevice.h"
-#include "storage/kvstore/tdbstore/TDBStore.h"
+#include "kvstore/TDBStore.h"
 #include <stdlib.h>
 
 #define BLOCK_SIZE (512)
diff --git a/UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake b/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake
similarity index 85%
rename from UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake
rename to storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake
index 2c65800c0b4..373173ef2d2 100644
--- a/UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake
+++ b/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake
@@ -13,7 +13,7 @@ set(unittest-sources
   ../storage/blockdevice/source/FlashSimBlockDevice.cpp
   ../storage/blockdevice/source/HeapBlockDevice.cpp
   ../storage/blockdevice/source/BufferedBlockDevice.cpp
-  ../storage/kvstore/tdbstore/TDBStore.cpp
+  ../storage/kvstore/source/TDBStore.cpp
   ../features/frameworks/mbed-trace/source/mbed_trace.c
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
@@ -21,7 +21,7 @@ set(unittest-sources
 )
 
 set(unittest-test-sources
-  moduletests/storage/kvstore/TDBStore/moduletest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/moduletest.cpp
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")