Merge pull request #13244 from rajkan01/storage_restructure_initial

Move storage from features into mbed-os root directory

.astyleignore

@@ -14,9 +14,9 @@
 ^features/netsocket/ppp/include
 ^features/netsocket/ppp/polarssl
 ^features/netsocket/ppp/source
-^features/storage/filesystem/fat/ChaN
-^features/storage/filesystem/littlefs/littlefs/
-^features/storage/filesystem/littlefsv2/littlefs/
+^storage/filesystem/fat/ChaN
+^storage/filesystem/littlefs/littlefs/
+^storage/filesystem/littlefsv2/littlefs/
 ^features/unsupported/
 ^hal/storage_abstraction
 ^platform/cxxsupport

.travis.yml

@@ -271,7 +271,7 @@ matrix:
 
     - <<: *extended-vm
       name: "littlefs"
-      env: NAME=littlefs LITTLEFS=features/storage/filesystem/littlefs
+      env: NAME=littlefs LITTLEFS=storage/filesystem/littlefs
       install:
         # Install gcc
         - source_pkg gcc

LICENSE.md

@@ -14,10 +14,10 @@ Folders containing files under different permissive license than Apache 2.0 are
 - [features/lorawan](./features/lorawan) - Revised BSD
 - [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style
 - [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause
-- [features/storage](./features/storage) - BSD-style, MIT
 - [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style
 - [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
 - [features/unsupported](./features/unsupported) - MIT-style, BSD-style
+- [storage](./storage) - BSD-style, MIT
 - [rtos](./rtos) - MIT
 - [drivers](./drivers) - MIT
 - [TESTS/mbed_hal/trng/pithy](./TESTS/mbed_hal/trng/pithy) - BSD-3-Clause

UNITTESTS/CMakeLists.txt

@@ -113,6 +113,7 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features"
   "${PROJECT_SOURCE_DIR}/../features/netsocket"
   "${PROJECT_SOURCE_DIR}/../platform"
+  "${PROJECT_SOURCE_DIR}/../storage"
   "${PROJECT_SOURCE_DIR}/../drivers"
   "${PROJECT_SOURCE_DIR}/../hal"
   "${PROJECT_SOURCE_DIR}/../events"
@@ -144,7 +145,7 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features/lorawan/system"
   "${PROJECT_SOURCE_DIR}/../features/mbedtls"
   "${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
-  "${PROJECT_SOURCE_DIR}/../features/storage/kvstore/conf"
+  "${PROJECT_SOURCE_DIR}/../storage/kvstore/conf"
 )
 
 # Create a list for test suites.

UNITTESTS/empty_baseline/unittest.cmake

@@ -13,33 +13,33 @@ set(unittest-includes ${unittest-includes}
 
 set(unittest-sources
     ../features/device_key/source/DeviceKey.cpp
-    ../components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
-    ../components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
-    ../components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
-    ../components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
-    ../components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
-    ../components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
-    ../features/storage/filesystem/Dir.cpp
-    ../features/storage/filesystem/FileSystem.cpp
-    ../features/storage/filesystem/File.cpp
-    ../features/storage/kvstore/global_api/kvstore_global_api.cpp
-    ../features/storage/kvstore/securestore/SecureStore.cpp
-    ../features/storage/kvstore/kv_map/KVMap.cpp
-    ../features/storage/kvstore/tdbstore/TDBStore.cpp
-    ../features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
-    ../features/storage/kvstore/conf/kv_config.cpp
-    ../features/storage/kvstore/filesystemstore/FileSystemStore.cpp
-    ../features/storage/system_storage/SystemStorage.cpp
-    ../features/storage/blockdevice/ChainingBlockDevice.cpp
-    ../features/storage/blockdevice/ReadOnlyBlockDevice.cpp
-    ../features/storage/blockdevice/SlicingBlockDevice.cpp
-    ../features/storage/blockdevice/MBRBlockDevice.cpp
-    ../features/storage/blockdevice/HeapBlockDevice.cpp
-    ../features/storage/blockdevice/FlashSimBlockDevice.cpp
-    ../features/storage/blockdevice/ObservingBlockDevice.cpp
-    ../features/storage/blockdevice/ProfilingBlockDevice.cpp
-    ../features/storage/blockdevice/BufferedBlockDevice.cpp
-    ../features/storage/blockdevice/ExhaustibleBlockDevice.cpp
+    ../storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
+    ../storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
+    ../storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
+    ../storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
+    ../storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
+    ../storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
+    ../storage/filesystem/Dir.cpp
+    ../storage/filesystem/FileSystem.cpp
+    ../storage/filesystem/File.cpp
+    ../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
+    ../storage/blockdevice/ChainingBlockDevice.cpp
+    ../storage/blockdevice/ReadOnlyBlockDevice.cpp
+    ../storage/blockdevice/SlicingBlockDevice.cpp
+    ../storage/blockdevice/MBRBlockDevice.cpp
+    ../storage/blockdevice/HeapBlockDevice.cpp
+    ../storage/blockdevice/FlashSimBlockDevice.cpp
+    ../storage/blockdevice/ObservingBlockDevice.cpp
+    ../storage/blockdevice/ProfilingBlockDevice.cpp
+    ../storage/blockdevice/BufferedBlockDevice.cpp
+    ../storage/blockdevice/ExhaustibleBlockDevice.cpp
 )
 
 set(unittest-test-sources

UNITTESTS/features/storage/blockdevice/ChainingBlockDevice/unittest.cmake

@@ -1,20 +0,0 @@
-
-####################
-# UNIT TESTS
-####################
-
-set(unittest-includes ${unittest-includes}
-  .
-  ..
-)
-
-set(unittest-sources
-  ../features/storage/blockdevice/ChainingBlockDevice.cpp
-  ../features/storage/blockdevice/HeapBlockDevice.cpp
-  stubs/mbed_atomic_stub.c
-  stubs/mbed_assert_stub.cpp
-)
-
-set(unittest-test-sources
-  features/storage/blockdevice/ChainingBlockDevice/test_ChainingBlockDevice.cpp
-)

UNITTESTS/moduletests/storage/blockdevice/SlicingBlockDevice/moduletest.cpp

@@ -15,8 +15,8 @@
  */
 
 #include "gtest/gtest.h"
-#include "features/storage/blockdevice/HeapBlockDevice.h"
-#include "features/storage/blockdevice/SlicingBlockDevice.h"
+#include "storage/blockdevice/HeapBlockDevice.h"
+#include "storage/blockdevice/SlicingBlockDevice.h"
 
 #define BLOCK_SIZE (512)
 #define DEVICE_SIZE (BLOCK_SIZE*10)

UNITTESTS/moduletests/storage/blockdevice/SlicingBlockDevice/unittest.cmake

@@ -9,8 +9,8 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../features/storage/blockdevice/SlicingBlockDevice.cpp
-  ../features/storage/blockdevice/HeapBlockDevice.cpp
+  ../storage/blockdevice/SlicingBlockDevice.cpp
+  ../storage/blockdevice/HeapBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )

UNITTESTS/moduletests/storage/kvstore/FileSystemStore/moduletest.cpp

@@ -15,9 +15,9 @@
  */
 
 #include "gtest/gtest.h"
-#include "features/storage/blockdevice/HeapBlockDevice.h"
-#include "features/storage/kvstore/filesystemstore/FileSystemStore.h"
-#include "features/storage/filesystem/littlefs/LittleFileSystem.h"
+#include "storage/blockdevice/HeapBlockDevice.h"
+#include "storage/kvstore/filesystemstore/FileSystemStore.h"
+#include "storage/filesystem/littlefs/LittleFileSystem.h"
 #include "mbed_error.h"
 #include <stdlib.h>
 

UNITTESTS/moduletests/storage/kvstore/FileSystemStore/unittest.cmake

@@ -9,15 +9,15 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../features/storage/blockdevice/HeapBlockDevice.cpp
-  ../features/storage/kvstore/filesystemstore/FileSystemStore.cpp
-  ../features/storage/filesystem/littlefs/LittleFileSystem.cpp
-  ../features/storage/filesystem/Dir.cpp
-  ../features/storage/filesystem/File.cpp
-  ../features/storage/filesystem/FileSystem.cpp
+  ../storage/blockdevice/HeapBlockDevice.cpp
+  ../storage/kvstore/filesystemstore/FileSystemStore.cpp
+  ../storage/filesystem/littlefs/LittleFileSystem.cpp
+  ../storage/filesystem/Dir.cpp
+  ../storage/filesystem/File.cpp
+  ../storage/filesystem/FileSystem.cpp
   ../features/frameworks/mbed-trace/source/mbed_trace.c
-  ../features/storage/filesystem/littlefs/littlefs/lfs_util.c
-  ../features/storage/filesystem/littlefs/littlefs/lfs.c
+  ../storage/filesystem/littlefs/littlefs/lfs_util.c
+  ../storage/filesystem/littlefs/littlefs/lfs.c
   ../platform/source/FileBase.cpp
   ../platform/source/FileSystemHandle.cpp
   ../platform/source/FileHandle.cpp

UNITTESTS/moduletests/storage/kvstore/TDBStore/moduletest.cpp

@@ -15,9 +15,9 @@
  */
 
 #include "gtest/gtest.h"
-#include "features/storage/blockdevice/HeapBlockDevice.h"
-#include "features/storage/blockdevice/FlashSimBlockDevice.h"
-#include "features/storage/kvstore/tdbstore/TDBStore.h"
+#include "storage/blockdevice/HeapBlockDevice.h"
+#include "storage/blockdevice/FlashSimBlockDevice.h"
+#include "storage/kvstore/tdbstore/TDBStore.h"
 #include <stdlib.h>
 
 #define BLOCK_SIZE (512)

UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake

@@ -10,10 +10,10 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../features/storage/blockdevice/FlashSimBlockDevice.cpp
-  ../features/storage/blockdevice/HeapBlockDevice.cpp
-  ../features/storage/blockdevice/BufferedBlockDevice.cpp
-  ../features/storage/kvstore/tdbstore/TDBStore.cpp
+  ../storage/blockdevice/FlashSimBlockDevice.cpp
+  ../storage/blockdevice/HeapBlockDevice.cpp
+  ../storage/blockdevice/BufferedBlockDevice.cpp
+  ../storage/kvstore/tdbstore/TDBStore.cpp
   ../features/frameworks/mbed-trace/source/mbed_trace.c
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp

UNITTESTS/storage/blockdevice/BufferedBlockDevice/test_BufferedBlockDevice.cpp

@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "features/storage/blockdevice/BufferedBlockDevice.h"
+#include "storage/blockdevice/BufferedBlockDevice.h"
 #include "stubs/BlockDevice_mock.h"
 
 using ::testing::_;

UNITTESTS/storage/blockdevice/BufferedBlockDevice/unittest.cmake

@@ -9,12 +9,12 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../features/storage/blockdevice/BufferedBlockDevice.cpp
+  ../storage/blockdevice/BufferedBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  features/storage/blockdevice/BufferedBlockDevice/test_BufferedBlockDevice.cpp
+  storage/blockdevice/BufferedBlockDevice/test_BufferedBlockDevice.cpp
   stubs/BlockDevice_mock.h
 )

UNITTESTS/storage/blockdevice/ChainingBlockDevice/test_ChainingBlockDevice.cpp

@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "features/storage/blockdevice/ChainingBlockDevice.cpp"
+#include "storage/blockdevice/ChainingBlockDevice.cpp"
 #include "stubs/BlockDevice_mock.h"
 
 using ::testing::_;

UNITTESTS/storage/blockdevice/ChainingBlockDevice/unittest.cmake

@@ -0,0 +1,20 @@
+
+####################
+# UNIT TESTS
+####################
+
+set(unittest-includes ${unittest-includes}
+  .
+  ..
+)
+
+set(unittest-sources
+  ../storage/blockdevice/ChainingBlockDevice.cpp
+  ../storage/blockdevice/HeapBlockDevice.cpp
+  stubs/mbed_atomic_stub.c
+  stubs/mbed_assert_stub.cpp
+)
+
+set(unittest-test-sources
+  storage/blockdevice/ChainingBlockDevice/test_ChainingBlockDevice.cpp
+)

UNITTESTS/storage/blockdevice/ExhaustibleBlockDevice/test_ExhaustibleBlockDevice.cpp

@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "features/storage/blockdevice/ExhaustibleBlockDevice.h"
+#include "storage/blockdevice/ExhaustibleBlockDevice.h"
 #include "stubs/BlockDevice_mock.h"
 
 #define BLOCK_SIZE (512)

UNITTESTS/storage/blockdevice/ExhaustibleBlockDevice/unittest.cmake

@@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../features/storage/blockdevice/FlashSimBlockDevice.cpp
+  ../storage/blockdevice/ExhaustibleBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  features/storage/blockdevice/FlashSimBlockDevice/test_FlashSimBlockDevice.cpp
+  storage/blockdevice/ExhaustibleBlockDevice/test_ExhaustibleBlockDevice.cpp
 )

UNITTESTS/storage/blockdevice/FlashSimBlockDevice/test_FlashSimBlockDevice.cpp

@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "features/storage/blockdevice/FlashSimBlockDevice.h"
+#include "storage/blockdevice/FlashSimBlockDevice.h"
 #include "stubs/BlockDevice_mock.h"
 
 #define BLOCK_SIZE (512)

UNITTESTS/storage/blockdevice/FlashSimBlockDevice/unittest.cmake

@@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../features/storage/blockdevice/MBRBlockDevice.cpp
+  ../storage/blockdevice/FlashSimBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  features/storage/blockdevice/MBRBlockDevice/test_MBRBlockDevice.cpp
+  storage/blockdevice/FlashSimBlockDevice/test_FlashSimBlockDevice.cpp
 )

UNITTESTS/storage/blockdevice/HeapBlockDevice/test.cpp

@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "features/storage/blockdevice/HeapBlockDevice.h"
+#include "storage/blockdevice/HeapBlockDevice.h"
 #include <string.h>
 #include "mbed_assert.h"
 

UNITTESTS/storage/blockdevice/HeapBlockDevice/unittest.cmake

@@ -9,13 +9,13 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../features/storage/blockdevice/HeapBlockDevice.cpp
+  ../storage/blockdevice/HeapBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  features/storage/blockdevice/HeapBlockDevice/test.cpp
+  storage/blockdevice/HeapBlockDevice/test.cpp
 )
 
 set(unittest-test-flags

UNITTESTS/storage/blockdevice/MBRBlockDevice/test_MBRBlockDevice.cpp

@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "features/storage/blockdevice/MBRBlockDevice.h"
+#include "storage/blockdevice/MBRBlockDevice.h"
 #include "stubs/BlockDevice_mock.h"
 
 #define BLOCK_SIZE (512)

UNITTESTS/storage/blockdevice/MBRBlockDevice/unittest.cmake

@@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../features/storage/blockdevice/ExhaustibleBlockDevice.cpp
+  ../storage/blockdevice/MBRBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  features/storage/blockdevice/ExhaustibleBlockDevice/test_ExhaustibleBlockDevice.cpp
+  storage/blockdevice/MBRBlockDevice/test_MBRBlockDevice.cpp
 )

UNITTESTS/storage/blockdevice/ObservingBlockDevice/test_ObservingBlockDevice.cpp

@@ -15,8 +15,8 @@
  */
 
 #include "gtest/gtest.h"
-#include "features/storage/blockdevice/ObservingBlockDevice.h"
-#include "features/storage/blockdevice/ReadOnlyBlockDevice.h"
+#include "storage/blockdevice/ObservingBlockDevice.h"
+#include "storage/blockdevice/ReadOnlyBlockDevice.h"
 #include "stubs/BlockDevice_mock.h"
 
 using ::testing::_;

UNITTESTS/storage/blockdevice/ObservingBlockDevice/unittest.cmake

@@ -9,14 +9,14 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../features/storage/blockdevice/ObservingBlockDevice.cpp
-  ../features/storage/blockdevice/ReadOnlyBlockDevice.cpp
+  ../storage/blockdevice/ObservingBlockDevice.cpp
+  ../storage/blockdevice/ReadOnlyBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
   stubs/mbed_error.c
 )
 
 set(unittest-test-sources
-  features/storage/blockdevice/ObservingBlockDevice/test_ObservingBlockDevice.cpp
+  storage/blockdevice/ObservingBlockDevice/test_ObservingBlockDevice.cpp
   stubs/BlockDevice_mock.h
 )

UNITTESTS/storage/blockdevice/ProfilingBlockDevice/test_ProfilingBlockDevice.cpp

@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 #include "stubs/BlockDevice_mock.h"
-#include "features/storage/blockdevice/ProfilingBlockDevice.h"
+#include "storage/blockdevice/ProfilingBlockDevice.h"
 
 #define BLOCK_SIZE (512)
 #define DEVICE_SIZE (BLOCK_SIZE*10)

UNITTESTS/storage/blockdevice/ProfilingBlockDevice/unittest.cmake

@@ -9,13 +9,13 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../features/storage/blockdevice/ReadOnlyBlockDevice.cpp
-  ../features/storage/blockdevice/HeapBlockDevice.cpp
+  ../storage/blockdevice/ProfilingBlockDevice.cpp
+  ../storage/blockdevice/HeapBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  features/storage/blockdevice/ReadOnlyBlockDevice/test_ReadOnlyBlockDevice.cpp
+  storage/blockdevice/ProfilingBlockDevice/test_ProfilingBlockDevice.cpp
   stubs/mbed_error.c
 )

UNITTESTS/storage/blockdevice/ReadOnlyBlockDevice/test_ReadOnlyBlockDevice.cpp

@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 #include "stubs/BlockDevice_mock.h"
-#include "features/storage/blockdevice/ReadOnlyBlockDevice.h"
+#include "storage/blockdevice/ReadOnlyBlockDevice.h"
 #include "platform/mbed_error.h"
 
 #define BLOCK_SIZE (512)

UNITTESTS/storage/blockdevice/ReadOnlyBlockDevice/unittest.cmake

@@ -9,13 +9,13 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../features/storage/blockdevice/ProfilingBlockDevice.cpp
-  ../features/storage/blockdevice/HeapBlockDevice.cpp
+  ../storage/blockdevice/ReadOnlyBlockDevice.cpp
+  ../storage/blockdevice/HeapBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  features/storage/blockdevice/ProfilingBlockDevice/test_ProfilingBlockDevice.cpp
+  storage/blockdevice/ReadOnlyBlockDevice/test_ReadOnlyBlockDevice.cpp
   stubs/mbed_error.c
 )

UNITTESTS/stubs/BlockDevice_mock.h

@@ -20,7 +20,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 
 class BlockDeviceMock : public BlockDevice {
 public:

UNITTESTS/stubs/EmulatedSD.h

@@ -17,7 +17,7 @@
 #ifndef EMULATEDSD_H
 #define EMULATEDSD_H
 
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 
 class EmulatedSD_Private;
 

UNITTESTS/stubs/kv_config_stub.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "features/storage/kvstore/conf/kv_config.h"
+#include "storage/kvstore/conf/kv_config.h"
 
 const char *get_filesystemstore_folder_path()
 {

drivers/internal/SFDP.h

@@ -20,7 +20,7 @@
 
 #include <cstddef>
 #include <cstdint>
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 #include "platform/Callback.h"
 
 namespace mbed {

features/device_key/source/DeviceKey.cpp

@@ -19,10 +19,10 @@
 #if DEVICEKEY_ENABLED
 #include "mbedtls/cmac.h"
 #include "mbedtls/platform.h"
-#include "features/storage/kvstore/include/KVStore.h"
-#include "features/storage/kvstore/tdbstore/TDBStore.h"
-#include "features/storage/kvstore/kv_map/KVMap.h"
-#include "features/storage/kvstore/conf/kv_config.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 "mbed_wait_api.h"
 #include <stdlib.h>
 #include "platform/mbed_error.h"

storage/TESTS/blockdevice/general_block_device/README.md

@@ -43,9 +43,9 @@ Please review the [documentation](https://os.mbed.com/docs/latest/tutorials/debu
 
 In Mbed OS, a C++ class that inherits from the [BlockDevice](https://os.mbed.com/docs/latest/reference/storage.html#block-devices) interface represents each block device.
 
-This test uses the default block device that the function `get_default_instance()` receives. [SystemStorage.cpp](https://github.com/ARMmbed/mbed-os/blob/master/features/storage/system_storage/SystemStorage.cpp#L35-L77) defines this as `MBED_WEAK`. If you would like to test a new block device, you have to override it.
+This test uses the default block device that the function `get_default_instance()` receives. [SystemStorage.cpp](https://github.com/ARMmbed/mbed-os/blob/master/storage/system_storage/SystemStorage.cpp#L35-L77) defines this as `MBED_WEAK`. If you would like to test a new block device, you have to override it.
 
-First add the new block device .cpp and header files to the [blockdevice folder](https://github.com/ARMmbed/mbed-os/tree/master/features/storage/blockdevice). Then, implement `get_default_instance()` inside the test `main.cpp`.
+First add the new block device .cpp and header files to the [blockdevice folder](https://github.com/ARMmbed/mbed-os/tree/master/storage/blockdevice). Then, implement `get_default_instance()` inside the test `main.cpp`.
 
 For example, to test the HeapBlockDevice, add:
 

storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h

@@ -20,7 +20,7 @@
 
 #include "platform/PlatformMutex.h"
 #include "PinNames.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 #include "drivers/SPI.h"
 #include "drivers/DigitalOut.h"
 

storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h

@@ -21,7 +21,7 @@
 #if DEVICE_FLASH
 
 #include "FlashIAP.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 #include "platform/mbed_toolchain.h"
 
 /** BlockDevice using the FlashIAP API

storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h

@@ -17,7 +17,7 @@
 #ifndef MBED_I2CEEPROM_BLOCK_DEVICE_H
 #define MBED_I2CEEPROM_BLOCK_DEVICE_H
 
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 #include "drivers/I2C.h"
 
 /** BlockDevice for I2C based flash device such as

storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h

@@ -19,7 +19,7 @@
 
 #include "drivers/QSPI.h"
 #include "drivers/internal/SFDP.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 #include "platform/Callback.h"
 
 #ifndef MBED_CONF_QSPIF_QSPI_IO0

storage/blockdevice/COMPONENT_SD/SDBlockDevice.h

@@ -21,7 +21,7 @@
 /* If the target has no SPI support, then SD Card is not supported. */
 #if DEVICE_SPI
 
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 #include "drivers/SPI.h"
 #include "drivers/Timer.h"
 #include "drivers/MbedCRC.h"

storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h

@@ -21,7 +21,7 @@
 #include "drivers/SPI.h"
 #include "drivers/DigitalOut.h"
 #include "drivers/internal/SFDP.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 
 #ifndef MBED_CONF_SPIF_DRIVER_SPI_MOSI
 #define MBED_CONF_SPIF_DRIVER_SPI_MOSI NC