ARMmbed · rajkan01 · Jul 6, 2020 · Jul 6, 2020 · Jul 6, 2020 · Jul 7, 2020
diff --git a/.astyleignore b/.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
@@ -27,3 +27,4 @@
 ^TESTS/mbed_hal/trng/pithy
 ^tools
 ^UNITTESTS
+^storage/blockdevice/tests/UNITTESTS
diff --git a/.travis.yml b/.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

diff --git a/LICENSE.md b/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

diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
@@ -113,6 +113,10 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features"
   "${PROJECT_SOURCE_DIR}/../features/netsocket"
   "${PROJECT_SOURCE_DIR}/../platform"
+  "${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include"
+  "${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
+  "${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
+  "${PROJECT_SOURCE_DIR}/../storage/filesystem/include"
   "${PROJECT_SOURCE_DIR}/../drivers"
   "${PROJECT_SOURCE_DIR}/../hal"
   "${PROJECT_SOURCE_DIR}/../events"
@@ -144,15 +148,15 @@ 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.
 set(TEST_SUITES)
 
 # Get all matched tests.
 file(GLOB_RECURSE unittest-file-list
-  "unittest.cmake"
+  "../unittest.cmake" # matches any ../**/unittest.cmake
 )
 
 if ("${unittest-file-list}" STREQUAL "")
@@ -175,10 +179,11 @@ foreach(testfile ${unittest-file-list})
   include("${testfile}")
 
   get_filename_component(TEST_SUITE_DIR ${testfile} DIRECTORY)
+  message( STATUS ${PROJECT_SOURCE_DIR} )
 
   file(RELATIVE_PATH
        TEST_SUITE_NAME # output
-       ${PROJECT_SOURCE_DIR} # root
+       "${PROJECT_SOURCE_DIR}/.." 
        ${TEST_SUITE_DIR} #abs dirpath
   )
 

diff --git a/UNITTESTS/empty_baseline/unittest.cmake b/UNITTESTS/empty_baseline/unittest.cmake
@@ -12,34 +12,14 @@ 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/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
 )
 
 set(unittest-test-sources

diff --git a/UNITTESTS/moduletests/storage/blockdevice/SlicingBlockDevice/unittest.cmake b/UNITTESTS/moduletests/storage/blockdevice/SlicingBlockDevice/unittest.cmake
diff --git a/UNITTESTS/moduletests/storage/kvstore/FileSystemStore/moduletest.cpp b/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 "blockdevice/HeapBlockDevice.h"
+#include "storage/kvstore/filesystemstore/FileSystemStore.h"
+#include "littlefs/LittleFileSystem.h"
 #include "mbed_error.h"
 #include <stdlib.h>
 

diff --git a/UNITTESTS/moduletests/storage/kvstore/FileSystemStore/unittest.cmake b/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/source/HeapBlockDevice.cpp
+  ../storage/kvstore/filesystemstore/FileSystemStore.cpp
+  ../storage/filesystem/littlefs/source/LittleFileSystem.cpp
+  ../storage/filesystem/source/Dir.cpp
+  ../storage/filesystem/source/File.cpp
+  ../storage/filesystem/source/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

diff --git a/UNITTESTS/moduletests/storage/kvstore/TDBStore/moduletest.cpp b/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 "blockdevice/HeapBlockDevice.h"
+#include "blockdevice/FlashSimBlockDevice.h"
+#include "storage/kvstore/tdbstore/TDBStore.h"
 #include <stdlib.h>
 
 #define BLOCK_SIZE (512)

diff --git a/UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake b/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/source/FlashSimBlockDevice.cpp
+  ../storage/blockdevice/source/HeapBlockDevice.cpp
+  ../storage/blockdevice/source/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

diff --git a/UNITTESTS/stubs/BlockDevice_mock.h b/UNITTESTS/stubs/BlockDevice_mock.h
@@ -20,7 +20,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "blockdevice/BlockDevice.h"
 
 class BlockDeviceMock : public BlockDevice {
 public:

diff --git a/UNITTESTS/stubs/EmulatedSD.h b/UNITTESTS/stubs/EmulatedSD.h
@@ -17,7 +17,7 @@
 #ifndef EMULATEDSD_H
 #define EMULATEDSD_H
 
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "blockdevice/BlockDevice.h"
 
 class EmulatedSD_Private;
 

diff --git a/UNITTESTS/stubs/kv_config_stub.cpp b/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()
 {

diff --git a/drivers/internal/SFDP.h b/drivers/internal/SFDP.h
@@ -20,7 +20,7 @@
 
 #include <cstddef>
 #include <cstdint>
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "blockdevice/BlockDevice.h"
 #include "platform/Callback.h"
 
 namespace mbed {

diff --git 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 "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"

diff --git a/...ore/direct_access_devicekey_test/main.cpp → ...ore/direct_access_devicekey_test/main.cpp b/...ore/direct_access_devicekey_test/main.cpp → ...ore/direct_access_devicekey_test/main.cpp
diff --git a/...TS/kvstore/filesystemstore_tests/main.cpp → ...TS/kvstore/filesystemstore_tests/main.cpp b/...TS/kvstore/filesystemstore_tests/main.cpp → ...TS/kvstore/filesystemstore_tests/main.cpp
diff --git a/...TS/kvstore/general_tests_phase_1/main.cpp → ...TS/kvstore/general_tests_phase_1/main.cpp b/...TS/kvstore/general_tests_phase_1/main.cpp → ...TS/kvstore/general_tests_phase_1/main.cpp
diff --git a/...TS/kvstore/general_tests_phase_2/main.cpp → ...TS/kvstore/general_tests_phase_2/main.cpp b/...TS/kvstore/general_tests_phase_2/main.cpp → ...TS/kvstore/general_tests_phase_2/main.cpp
diff --git a/...STS/kvstore/securestore_whitebox/main.cpp → ...STS/kvstore/securestore_whitebox/main.cpp b/...STS/kvstore/securestore_whitebox/main.cpp → ...STS/kvstore/securestore_whitebox/main.cpp
diff --git a/...orage/TESTS/kvstore/static_tests/main.cpp → storage/TESTS/kvstore/static_tests/main.cpp b/...orage/TESTS/kvstore/static_tests/main.cpp → storage/TESTS/kvstore/static_tests/main.cpp
diff --git a/.../TESTS/kvstore/tdbstore_whitebox/main.cpp → .../TESTS/kvstore/tdbstore_whitebox/main.cpp b/.../TESTS/kvstore/tdbstore_whitebox/main.cpp → .../TESTS/kvstore/tdbstore_whitebox/main.cpp
diff --git a/...PONENT_DATAFLASH/DataFlashBlockDevice.cpp → ...PONENT_DATAFLASH/DataFlashBlockDevice.cpp b/...PONENT_DATAFLASH/DataFlashBlockDevice.cpp → ...PONENT_DATAFLASH/DataFlashBlockDevice.cpp
diff --git a/...OMPONENT_DATAFLASH/DataFlashBlockDevice.h → ...OMPONENT_DATAFLASH/DataFlashBlockDevice.h b/...OMPONENT_DATAFLASH/DataFlashBlockDevice.h → ...OMPONENT_DATAFLASH/DataFlashBlockDevice.h
@@ -20,7 +20,7 @@
 
 #include "platform/PlatformMutex.h"
 #include "PinNames.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "blockdevice/BlockDevice.h"
 #include "drivers/SPI.h"
 #include "drivers/DigitalOut.h"
 

diff --git a/...kdevice/COMPONENT_DATAFLASH/mbed_lib.json → ...kdevice/COMPONENT_DATAFLASH/mbed_lib.json b/...kdevice/COMPONENT_DATAFLASH/mbed_lib.json → ...kdevice/COMPONENT_DATAFLASH/mbed_lib.json
diff --git a/...OMPONENT_FLASHIAP/COMMON/fslittle_debug.h → ...OMPONENT_FLASHIAP/COMMON/fslittle_debug.h b/...OMPONENT_FLASHIAP/COMMON/fslittle_debug.h → ...OMPONENT_FLASHIAP/COMMON/fslittle_debug.h
diff --git a/...COMPONENT_FLASHIAP/COMMON/fslittle_test.c → ...COMPONENT_FLASHIAP/COMMON/fslittle_test.c b/...COMPONENT_FLASHIAP/COMMON/fslittle_test.c → ...COMPONENT_FLASHIAP/COMMON/fslittle_test.c
diff --git a/...COMPONENT_FLASHIAP/COMMON/fslittle_test.h → ...COMPONENT_FLASHIAP/COMMON/fslittle_test.h b/...COMPONENT_FLASHIAP/COMMON/fslittle_test.h → ...COMPONENT_FLASHIAP/COMMON/fslittle_test.h
diff --git a/...OMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp → ...OMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp b/...OMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp → ...OMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
diff --git a/.../COMPONENT_FLASHIAP/FlashIAPBlockDevice.h → .../COMPONENT_FLASHIAP/FlashIAPBlockDevice.h b/.../COMPONENT_FLASHIAP/FlashIAPBlockDevice.h → .../COMPONENT_FLASHIAP/FlashIAPBlockDevice.h
@@ -21,7 +21,7 @@
 #if DEVICE_FLASH
 
 #include "FlashIAP.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "blockdevice/BlockDevice.h"
 #include "platform/mbed_toolchain.h"
 
 /** BlockDevice using the FlashIAP API

diff --git a/...ckdevice/COMPONENT_FLASHIAP/mbed_lib.json → ...ckdevice/COMPONENT_FLASHIAP/mbed_lib.json b/...ckdevice/COMPONENT_FLASHIAP/mbed_lib.json → ...ckdevice/COMPONENT_FLASHIAP/mbed_lib.json
diff --git a/...e/blockdevice/COMPONENT_I2CEE/.travis.yml → ...e/blockdevice/COMPONENT_I2CEE/.travis.yml b/...e/blockdevice/COMPONENT_I2CEE/.travis.yml → ...e/blockdevice/COMPONENT_I2CEE/.travis.yml
diff --git a/...vice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp → ...vice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp b/...vice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp → ...vice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
diff --git a/...device/COMPONENT_I2CEE/I2CEEBlockDevice.h → ...device/COMPONENT_I2CEE/I2CEEBlockDevice.h b/...device/COMPONENT_I2CEE/I2CEEBlockDevice.h → ...device/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 "blockdevice/BlockDevice.h"
 #include "drivers/I2C.h"
 
 /** BlockDevice for I2C based flash device such as

diff --git a/...ge/blockdevice/COMPONENT_I2CEE/LICENSE.md → ...ge/blockdevice/COMPONENT_I2CEE/LICENSE.md b/...ge/blockdevice/COMPONENT_I2CEE/LICENSE.md → ...ge/blockdevice/COMPONENT_I2CEE/LICENSE.md
diff --git a/...age/blockdevice/COMPONENT_I2CEE/README.md → ...age/blockdevice/COMPONENT_I2CEE/README.md b/...age/blockdevice/COMPONENT_I2CEE/README.md → ...age/blockdevice/COMPONENT_I2CEE/README.md
diff --git a/...T_I2CEE/TESTS/block_device/i2cee/main.cpp → ...T_I2CEE/TESTS/block_device/i2cee/main.cpp b/...T_I2CEE/TESTS/block_device/i2cee/main.cpp → ...T_I2CEE/TESTS/block_device/i2cee/main.cpp
diff --git a/...vice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp → ...vice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp b/...vice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp → ...vice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
diff --git a/...device/COMPONENT_QSPIF/QSPIFBlockDevice.h → ...device/COMPONENT_QSPIF/QSPIFBlockDevice.h b/...device/COMPONENT_QSPIF/QSPIFBlockDevice.h → ...device/COMPONENT_QSPIF/QSPIFBlockDevice.h
@@ -19,7 +19,7 @@
 
 #include "drivers/QSPI.h"
 #include "drivers/internal/SFDP.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "blockdevice/BlockDevice.h"
 #include "platform/Callback.h"
 
 #ifndef MBED_CONF_QSPIF_QSPI_IO0

diff --git a/...blockdevice/COMPONENT_QSPIF/mbed_lib.json → ...blockdevice/COMPONENT_QSPIF/mbed_lib.json b/...blockdevice/COMPONENT_QSPIF/mbed_lib.json → ...blockdevice/COMPONENT_QSPIF/mbed_lib.json
diff --git a/...lockdevice/COMPONENT_SD/SDBlockDevice.cpp → ...lockdevice/COMPONENT_SD/SDBlockDevice.cpp b/...lockdevice/COMPONENT_SD/SDBlockDevice.cpp → ...lockdevice/COMPONENT_SD/SDBlockDevice.cpp
diff --git a/.../blockdevice/COMPONENT_SD/SDBlockDevice.h → .../blockdevice/COMPONENT_SD/SDBlockDevice.h b/.../blockdevice/COMPONENT_SD/SDBlockDevice.h → .../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 "blockdevice/BlockDevice.h"
 #include "drivers/SPI.h"
 #include "drivers/Timer.h"
 #include "drivers/MbedCRC.h"

diff --git a/...e/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h → ...e/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h b/...e/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h → ...e/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h
diff --git a/...ce/COMPONENT_SD/TESTS/COMMON/fsfat_test.c → ...ce/COMPONENT_SD/TESTS/COMMON/fsfat_test.c b/...ce/COMPONENT_SD/TESTS/COMMON/fsfat_test.c → ...ce/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
diff --git a/...ce/COMPONENT_SD/TESTS/COMMON/fsfat_test.h → ...ce/COMPONENT_SD/TESTS/COMMON/fsfat_test.h b/...ce/COMPONENT_SD/TESTS/COMMON/fsfat_test.h → ...ce/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
diff --git a/...MPONENT_SD/TESTS/filesystem/dirs/main.cpp → ...MPONENT_SD/TESTS/filesystem/dirs/main.cpp b/...MPONENT_SD/TESTS/filesystem/dirs/main.cpp → ...MPONENT_SD/TESTS/filesystem/dirs/main.cpp
diff --git a/...PONENT_SD/TESTS/filesystem/files/main.cpp → ...PONENT_SD/TESTS/filesystem/files/main.cpp b/...PONENT_SD/TESTS/filesystem/files/main.cpp → ...PONENT_SD/TESTS/filesystem/files/main.cpp
diff --git a/...ONENT_SD/TESTS/filesystem/fopen/fopen.cpp → ...ONENT_SD/TESTS/filesystem/fopen/fopen.cpp b/...ONENT_SD/TESTS/filesystem/fopen/fopen.cpp → ...ONENT_SD/TESTS/filesystem/fopen/fopen.cpp
diff --git a/...ENT_SD/TESTS/filesystem/parallel/main.cpp → ...ENT_SD/TESTS/filesystem/parallel/main.cpp b/...ENT_SD/TESTS/filesystem/parallel/main.cpp → ...ENT_SD/TESTS/filesystem/parallel/main.cpp
diff --git a/...MPONENT_SD/TESTS/filesystem/seek/main.cpp → ...MPONENT_SD/TESTS/filesystem/seek/main.cpp b/...MPONENT_SD/TESTS/filesystem/seek/main.cpp → ...MPONENT_SD/TESTS/filesystem/seek/main.cpp
diff --git a/...ge/blockdevice/COMPONENT_SD/mbed_lib.json → ...ge/blockdevice/COMPONENT_SD/mbed_lib.json b/...ge/blockdevice/COMPONENT_SD/mbed_lib.json → ...ge/blockdevice/COMPONENT_SD/mbed_lib.json
diff --git a/...device/COMPONENT_SPIF/SPIFBlockDevice.cpp → ...device/COMPONENT_SPIF/SPIFBlockDevice.cpp b/...device/COMPONENT_SPIF/SPIFBlockDevice.cpp → ...device/COMPONENT_SPIF/SPIFBlockDevice.cpp
diff --git a/...ckdevice/COMPONENT_SPIF/SPIFBlockDevice.h → ...ckdevice/COMPONENT_SPIF/SPIFBlockDevice.h b/...ckdevice/COMPONENT_SPIF/SPIFBlockDevice.h → ...ckdevice/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 "blockdevice/BlockDevice.h"
 
 #ifndef MBED_CONF_SPIF_DRIVER_SPI_MOSI
 #define MBED_CONF_SPIF_DRIVER_SPI_MOSI NC

diff --git a/.../blockdevice/COMPONENT_SPIF/mbed_lib.json → .../blockdevice/COMPONENT_SPIF/mbed_lib.json b/.../blockdevice/COMPONENT_SPIF/mbed_lib.json → .../blockdevice/COMPONENT_SPIF/mbed_lib.json
diff --git a/features/storage/blockdevice/BlockDevice.h → ...kdevice/include/blockdevice/BlockDevice.h b/features/storage/blockdevice/BlockDevice.h → ...kdevice/include/blockdevice/BlockDevice.h
diff --git a/...storage/blockdevice/BufferedBlockDevice.h → ...include/blockdevice/BufferedBlockDevice.h b/...storage/blockdevice/BufferedBlockDevice.h → ...include/blockdevice/BufferedBlockDevice.h
diff --git a/...storage/blockdevice/ChainingBlockDevice.h → ...include/blockdevice/ChainingBlockDevice.h b/...storage/blockdevice/ChainingBlockDevice.h → ...include/blockdevice/ChainingBlockDevice.h
diff --git a/...rage/blockdevice/ExhaustibleBlockDevice.h → ...lude/blockdevice/ExhaustibleBlockDevice.h b/...rage/blockdevice/ExhaustibleBlockDevice.h → ...lude/blockdevice/ExhaustibleBlockDevice.h
diff --git a/...storage/blockdevice/FlashSimBlockDevice.h → ...include/blockdevice/FlashSimBlockDevice.h b/...storage/blockdevice/FlashSimBlockDevice.h → ...include/blockdevice/FlashSimBlockDevice.h
diff --git a/...res/storage/blockdevice/HeapBlockDevice.h → ...ice/include/blockdevice/HeapBlockDevice.h b/...res/storage/blockdevice/HeapBlockDevice.h → ...ice/include/blockdevice/HeapBlockDevice.h
diff --git a/...ures/storage/blockdevice/MBRBlockDevice.h → ...vice/include/blockdevice/MBRBlockDevice.h b/...ures/storage/blockdevice/MBRBlockDevice.h → ...vice/include/blockdevice/MBRBlockDevice.h
diff --git a/...torage/blockdevice/ObservingBlockDevice.h → ...nclude/blockdevice/ObservingBlockDevice.h b/...torage/blockdevice/ObservingBlockDevice.h → ...nclude/blockdevice/ObservingBlockDevice.h
diff --git a/...torage/blockdevice/ProfilingBlockDevice.h → ...nclude/blockdevice/ProfilingBlockDevice.h b/...torage/blockdevice/ProfilingBlockDevice.h → ...nclude/blockdevice/ProfilingBlockDevice.h
diff --git a/...storage/blockdevice/ReadOnlyBlockDevice.h → ...include/blockdevice/ReadOnlyBlockDevice.h b/...storage/blockdevice/ReadOnlyBlockDevice.h → ...include/blockdevice/ReadOnlyBlockDevice.h
diff --git a/.../storage/blockdevice/SlicingBlockDevice.h → .../include/blockdevice/SlicingBlockDevice.h b/.../storage/blockdevice/SlicingBlockDevice.h → .../include/blockdevice/SlicingBlockDevice.h
diff --git a/...orage/blockdevice/BufferedBlockDevice.cpp → ...lockdevice/source/BufferedBlockDevice.cpp b/...orage/blockdevice/BufferedBlockDevice.cpp → ...lockdevice/source/BufferedBlockDevice.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "BufferedBlockDevice.h"
+#include "blockdevice/BufferedBlockDevice.h"
 #include "platform/mbed_assert.h"
 #include "platform/mbed_atomic.h"
 #include <algorithm>

diff --git a/...orage/blockdevice/ChainingBlockDevice.cpp → ...lockdevice/source/ChainingBlockDevice.cpp b/...orage/blockdevice/ChainingBlockDevice.cpp → ...lockdevice/source/ChainingBlockDevice.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ChainingBlockDevice.h"
+#include "blockdevice/ChainingBlockDevice.h"
 #include "platform/mbed_atomic.h"
 #include "platform/mbed_assert.h"
 

diff --git a/...ge/blockdevice/ExhaustibleBlockDevice.cpp → ...kdevice/source/ExhaustibleBlockDevice.cpp b/...ge/blockdevice/ExhaustibleBlockDevice.cpp → ...kdevice/source/ExhaustibleBlockDevice.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ExhaustibleBlockDevice.h"
+#include "blockdevice/ExhaustibleBlockDevice.h"
 #include "platform/mbed_atomic.h"
 #include "platform/mbed_assert.h"
 

diff --git a/...orage/blockdevice/FlashSimBlockDevice.cpp → ...lockdevice/source/FlashSimBlockDevice.cpp b/...orage/blockdevice/FlashSimBlockDevice.cpp → ...lockdevice/source/FlashSimBlockDevice.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "FlashSimBlockDevice.h"
+#include "blockdevice/FlashSimBlockDevice.h"
 #include "platform/mbed_assert.h"
 #include "platform/mbed_atomic.h"
 #include <algorithm>

diff --git a/...s/storage/blockdevice/HeapBlockDevice.cpp → ...ge/blockdevice/source/HeapBlockDevice.cpp b/...s/storage/blockdevice/HeapBlockDevice.cpp → ...ge/blockdevice/source/HeapBlockDevice.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "HeapBlockDevice.h"
+#include "blockdevice/HeapBlockDevice.h"
 #include "platform/mbed_atomic.h"
 #include <stdlib.h>
 #include <string.h>

diff --git a/...es/storage/blockdevice/MBRBlockDevice.cpp → ...age/blockdevice/source/MBRBlockDevice.cpp b/...es/storage/blockdevice/MBRBlockDevice.cpp → ...age/blockdevice/source/MBRBlockDevice.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "MBRBlockDevice.h"
+#include "blockdevice/MBRBlockDevice.h"
 #include "platform/mbed_atomic.h"
 #include "platform/mbed_toolchain.h"
 #include "platform/mbed_assert.h"

diff --git a/...rage/blockdevice/ObservingBlockDevice.cpp → ...ockdevice/source/ObservingBlockDevice.cpp b/...rage/blockdevice/ObservingBlockDevice.cpp → ...ockdevice/source/ObservingBlockDevice.cpp
@@ -20,8 +20,8 @@
  * SOFTWARE.
  */
 
-#include "ObservingBlockDevice.h"
-#include "ReadOnlyBlockDevice.h"
+#include "blockdevice/ObservingBlockDevice.h"
+#include "blockdevice/ReadOnlyBlockDevice.h"
 
 namespace mbed {
 

diff --git a/...rage/blockdevice/ProfilingBlockDevice.cpp → ...ockdevice/source/ProfilingBlockDevice.cpp b/...rage/blockdevice/ProfilingBlockDevice.cpp → ...ockdevice/source/ProfilingBlockDevice.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ProfilingBlockDevice.h"
+#include "blockdevice/ProfilingBlockDevice.h"
 #include "stddef.h"
 
 namespace mbed {

diff --git a/...orage/blockdevice/ReadOnlyBlockDevice.cpp → ...lockdevice/source/ReadOnlyBlockDevice.cpp b/...orage/blockdevice/ReadOnlyBlockDevice.cpp → ...lockdevice/source/ReadOnlyBlockDevice.cpp
@@ -23,7 +23,7 @@
 /** \addtogroup storage */
 /** @{*/
 
-#include "ReadOnlyBlockDevice.h"
+#include "blockdevice/ReadOnlyBlockDevice.h"
 #include "platform/mbed_error.h"
 
 namespace mbed {