diff --git a/features/storage/kvstore/tdbstore/DirectAccessDevicekey.cpp b/features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
similarity index 100%
rename from features/storage/kvstore/tdbstore/DirectAccessDevicekey.cpp
rename to features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
diff --git a/features/storage/kvstore/tdbstore/DirectAccessDevicekey.h b/features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h
similarity index 100%
rename from features/storage/kvstore/tdbstore/DirectAccessDevicekey.h
rename to features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h
diff --git a/features/storage/kvstore/KVStore.h b/features/storage/kvstore/include/KVStore.h
similarity index 100%
rename from features/storage/kvstore/KVStore.h
rename to features/storage/kvstore/include/KVStore.h
diff --git a/features/storage/kvstore/tdbstore/TDBStore.cpp b/features/storage/kvstore/tdbstore/TDBStore.cpp
index 60d107407e..0ab8dcecb3 100644
--- a/features/storage/kvstore/tdbstore/TDBStore.cpp
+++ b/features/storage/kvstore/tdbstore/TDBStore.cpp
@@ -24,7 +24,10 @@
 #include "mbed_error.h"
 #include "mbed_wait_api.h"
 #include "MbedCRC.h"
+//Bypass the check of NVStore co existance if compiled for TARGET_TFM
+#if !(BYPASS_NVSTORE_CHECK)
 #include "SystemStorage.h"
+#endif
 
 using namespace mbed;
 
@@ -990,6 +993,9 @@ int TDBStore::init()
         goto end;
     }
 
+//Bypass the check of NVStore co existance if compiled for TARGET_TFM
+#if !(BYPASS_NVSTORE_CHECK)
+
     //Check if we are on internal memory && try to set the internal memory for TDBStore use.
     if (strcmp(_bd->get_type(), "FLASHIAP") == 0 &&
             avoid_conflict_nvstore_tdbstore(TDBSTORE) == MBED_ERROR_ALREADY_INITIALIZED) {
@@ -997,6 +1003,8 @@ int TDBStore::init()
         MBED_ERROR(MBED_ERROR_ALREADY_INITIALIZED, "TDBStore in internal memory can not be initialize when NVStore is in use");
     }
 
+#endif
+
     _max_keys = initial_max_keys;
 
     ram_table = new ram_table_entry_t[_max_keys];