diff --git a/features/storage/TESTS/blockdevice/buffered_block_device/main.cpp b/storage/TESTS/blockdevice/buffered_block_device/main.cpp
similarity index 100%
rename from features/storage/TESTS/blockdevice/buffered_block_device/main.cpp
rename to storage/TESTS/blockdevice/buffered_block_device/main.cpp
diff --git a/features/storage/TESTS/blockdevice/flashsim_block_device/main.cpp b/storage/TESTS/blockdevice/flashsim_block_device/main.cpp
similarity index 100%
rename from features/storage/TESTS/blockdevice/flashsim_block_device/main.cpp
rename to storage/TESTS/blockdevice/flashsim_block_device/main.cpp
diff --git a/features/storage/TESTS/blockdevice/general_block_device/README.md b/storage/TESTS/blockdevice/general_block_device/README.md
similarity index 100%
rename from features/storage/TESTS/blockdevice/general_block_device/README.md
rename to storage/TESTS/blockdevice/general_block_device/README.md
diff --git a/features/storage/TESTS/blockdevice/general_block_device/main.cpp b/storage/TESTS/blockdevice/general_block_device/main.cpp
similarity index 100%
rename from features/storage/TESTS/blockdevice/general_block_device/main.cpp
rename to storage/TESTS/blockdevice/general_block_device/main.cpp
diff --git a/features/storage/TESTS/blockdevice/heap_block_device/main.cpp b/storage/TESTS/blockdevice/heap_block_device/main.cpp
similarity index 100%
rename from features/storage/TESTS/blockdevice/heap_block_device/main.cpp
rename to storage/TESTS/blockdevice/heap_block_device/main.cpp
diff --git a/features/storage/TESTS/blockdevice/mbr_block_device/main.cpp b/storage/TESTS/blockdevice/mbr_block_device/main.cpp
similarity index 100%
rename from features/storage/TESTS/blockdevice/mbr_block_device/main.cpp
rename to storage/TESTS/blockdevice/mbr_block_device/main.cpp
diff --git a/features/storage/TESTS/blockdevice/util_block_device/main.cpp b/storage/TESTS/blockdevice/util_block_device/main.cpp
similarity index 100%
rename from features/storage/TESTS/blockdevice/util_block_device/main.cpp
rename to storage/TESTS/blockdevice/util_block_device/main.cpp
diff --git a/features/storage/TESTS/filesystem/fat_filesystem/main.cpp b/storage/TESTS/filesystem/fat_filesystem/main.cpp
similarity index 100%
rename from features/storage/TESTS/filesystem/fat_filesystem/main.cpp
rename to storage/TESTS/filesystem/fat_filesystem/main.cpp
diff --git a/features/storage/TESTS/filesystem/general_filesystem/main.cpp b/storage/TESTS/filesystem/general_filesystem/main.cpp
similarity index 100%
rename from features/storage/TESTS/filesystem/general_filesystem/main.cpp
rename to storage/TESTS/filesystem/general_filesystem/main.cpp
diff --git a/features/storage/TESTS/filesystem/multipart_fat_filesystem/main.cpp b/storage/TESTS/filesystem/multipart_fat_filesystem/main.cpp
similarity index 100%
rename from features/storage/TESTS/filesystem/multipart_fat_filesystem/main.cpp
rename to storage/TESTS/filesystem/multipart_fat_filesystem/main.cpp
diff --git a/features/storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp b/storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp
similarity index 100%
rename from features/storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp
rename to storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp
diff --git a/features/storage/TESTS/kvstore/filesystemstore_tests/main.cpp b/storage/TESTS/kvstore/filesystemstore_tests/main.cpp
similarity index 100%
rename from features/storage/TESTS/kvstore/filesystemstore_tests/main.cpp
rename to storage/TESTS/kvstore/filesystemstore_tests/main.cpp
diff --git a/features/storage/TESTS/kvstore/general_tests_phase_1/main.cpp b/storage/TESTS/kvstore/general_tests_phase_1/main.cpp
similarity index 100%
rename from features/storage/TESTS/kvstore/general_tests_phase_1/main.cpp
rename to storage/TESTS/kvstore/general_tests_phase_1/main.cpp
diff --git a/features/storage/TESTS/kvstore/general_tests_phase_2/main.cpp b/storage/TESTS/kvstore/general_tests_phase_2/main.cpp
similarity index 100%
rename from features/storage/TESTS/kvstore/general_tests_phase_2/main.cpp
rename to storage/TESTS/kvstore/general_tests_phase_2/main.cpp
diff --git a/features/storage/TESTS/kvstore/securestore_whitebox/main.cpp b/storage/TESTS/kvstore/securestore_whitebox/main.cpp
similarity index 100%
rename from features/storage/TESTS/kvstore/securestore_whitebox/main.cpp
rename to storage/TESTS/kvstore/securestore_whitebox/main.cpp
diff --git a/features/storage/TESTS/kvstore/static_tests/main.cpp b/storage/TESTS/kvstore/static_tests/main.cpp
similarity index 100%
rename from features/storage/TESTS/kvstore/static_tests/main.cpp
rename to storage/TESTS/kvstore/static_tests/main.cpp
diff --git a/features/storage/TESTS/kvstore/tdbstore_whitebox/main.cpp b/storage/TESTS/kvstore/tdbstore_whitebox/main.cpp
similarity index 100%
rename from features/storage/TESTS/kvstore/tdbstore_whitebox/main.cpp
rename to storage/TESTS/kvstore/tdbstore_whitebox/main.cpp
diff --git a/features/storage/blockdevice/BlockDevice.h b/storage/blockdevice/BlockDevice.h
similarity index 100%
rename from features/storage/blockdevice/BlockDevice.h
rename to storage/blockdevice/BlockDevice.h
diff --git a/features/storage/blockdevice/BufferedBlockDevice.cpp b/storage/blockdevice/BufferedBlockDevice.cpp
similarity index 100%
rename from features/storage/blockdevice/BufferedBlockDevice.cpp
rename to storage/blockdevice/BufferedBlockDevice.cpp
diff --git a/features/storage/blockdevice/BufferedBlockDevice.h b/storage/blockdevice/BufferedBlockDevice.h
similarity index 100%
rename from features/storage/blockdevice/BufferedBlockDevice.h
rename to storage/blockdevice/BufferedBlockDevice.h
diff --git a/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp b/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
rename to storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
diff --git a/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h b/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h
similarity index 99%
rename from components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h
rename to storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h
index eb69610c83..31ec8ba774 100644
--- a/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h
+++ b/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"
 
diff --git a/components/storage/blockdevice/COMPONENT_DATAFLASH/mbed_lib.json b/storage/blockdevice/COMPONENT_DATAFLASH/mbed_lib.json
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_DATAFLASH/mbed_lib.json
rename to storage/blockdevice/COMPONENT_DATAFLASH/mbed_lib.json
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_debug.h b/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_debug.h
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_debug.h
rename to storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_debug.h
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c b/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c
rename to storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h b/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h
rename to storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp b/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
rename to storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h b/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h
similarity index 98%
rename from components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h
rename to storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h
index ae9e4cca0b..02ee17357a 100644
--- a/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h
+++ b/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
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/mbed_lib.json b/storage/blockdevice/COMPONENT_FLASHIAP/mbed_lib.json
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_FLASHIAP/mbed_lib.json
rename to storage/blockdevice/COMPONENT_FLASHIAP/mbed_lib.json
diff --git a/components/storage/blockdevice/COMPONENT_I2CEE/.travis.yml b/storage/blockdevice/COMPONENT_I2CEE/.travis.yml
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_I2CEE/.travis.yml
rename to storage/blockdevice/COMPONENT_I2CEE/.travis.yml
diff --git a/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp b/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
rename to storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
diff --git a/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h b/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h
similarity index 99%
rename from components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h
rename to storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h
index 54fc2ad196..ca6c802ec8 100644
--- a/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h
+++ b/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
diff --git a/components/storage/blockdevice/COMPONENT_I2CEE/LICENSE.md b/storage/blockdevice/COMPONENT_I2CEE/LICENSE.md
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_I2CEE/LICENSE.md
rename to storage/blockdevice/COMPONENT_I2CEE/LICENSE.md
diff --git a/components/storage/blockdevice/COMPONENT_I2CEE/README.md b/storage/blockdevice/COMPONENT_I2CEE/README.md
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_I2CEE/README.md
rename to storage/blockdevice/COMPONENT_I2CEE/README.md
diff --git a/components/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp b/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp
rename to storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp
diff --git a/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp b/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
rename to storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
diff --git a/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h b/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h
similarity index 99%
rename from components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h
rename to storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h
index 36c677b319..9011030969 100644
--- a/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h
+++ b/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
diff --git a/components/storage/blockdevice/COMPONENT_QSPIF/mbed_lib.json b/storage/blockdevice/COMPONENT_QSPIF/mbed_lib.json
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_QSPIF/mbed_lib.json
rename to storage/blockdevice/COMPONENT_QSPIF/mbed_lib.json
diff --git a/components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp b/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
rename to storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
diff --git a/components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h b/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h
similarity index 99%
rename from components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h
rename to storage/blockdevice/COMPONENT_SD/SDBlockDevice.h
index 012bc1e838..c395115f06 100644
--- a/components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h
+++ b/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"
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h b/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h
rename to storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c b/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
rename to storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h b/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
rename to storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp b/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp
rename to storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp b/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp
rename to storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp b/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp
rename to storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp b/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp
rename to storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/seek/main.cpp b/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/seek/main.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/seek/main.cpp
rename to storage/blockdevice/COMPONENT_SD/TESTS/filesystem/seek/main.cpp
diff --git a/components/storage/blockdevice/COMPONENT_SD/mbed_lib.json b/storage/blockdevice/COMPONENT_SD/mbed_lib.json
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/mbed_lib.json
rename to storage/blockdevice/COMPONENT_SD/mbed_lib.json
diff --git a/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp b/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
rename to storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
diff --git a/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h b/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h
similarity index 99%
rename from components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h
rename to storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h
index 37d2d88322..c98cf03d93 100644
--- a/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h
+++ b/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
diff --git a/components/storage/blockdevice/COMPONENT_SPIF/mbed_lib.json b/storage/blockdevice/COMPONENT_SPIF/mbed_lib.json
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SPIF/mbed_lib.json
rename to storage/blockdevice/COMPONENT_SPIF/mbed_lib.json
diff --git a/features/storage/blockdevice/ChainingBlockDevice.cpp b/storage/blockdevice/ChainingBlockDevice.cpp
similarity index 100%
rename from features/storage/blockdevice/ChainingBlockDevice.cpp
rename to storage/blockdevice/ChainingBlockDevice.cpp
diff --git a/features/storage/blockdevice/ChainingBlockDevice.h b/storage/blockdevice/ChainingBlockDevice.h
similarity index 100%
rename from features/storage/blockdevice/ChainingBlockDevice.h
rename to storage/blockdevice/ChainingBlockDevice.h
diff --git a/features/storage/blockdevice/ExhaustibleBlockDevice.cpp b/storage/blockdevice/ExhaustibleBlockDevice.cpp
similarity index 100%
rename from features/storage/blockdevice/ExhaustibleBlockDevice.cpp
rename to storage/blockdevice/ExhaustibleBlockDevice.cpp
diff --git a/features/storage/blockdevice/ExhaustibleBlockDevice.h b/storage/blockdevice/ExhaustibleBlockDevice.h
similarity index 100%
rename from features/storage/blockdevice/ExhaustibleBlockDevice.h
rename to storage/blockdevice/ExhaustibleBlockDevice.h
diff --git a/features/storage/blockdevice/FlashSimBlockDevice.cpp b/storage/blockdevice/FlashSimBlockDevice.cpp
similarity index 100%
rename from features/storage/blockdevice/FlashSimBlockDevice.cpp
rename to storage/blockdevice/FlashSimBlockDevice.cpp
diff --git a/features/storage/blockdevice/FlashSimBlockDevice.h b/storage/blockdevice/FlashSimBlockDevice.h
similarity index 100%
rename from features/storage/blockdevice/FlashSimBlockDevice.h
rename to storage/blockdevice/FlashSimBlockDevice.h
diff --git a/features/storage/blockdevice/HeapBlockDevice.cpp b/storage/blockdevice/HeapBlockDevice.cpp
similarity index 100%
rename from features/storage/blockdevice/HeapBlockDevice.cpp
rename to storage/blockdevice/HeapBlockDevice.cpp
diff --git a/features/storage/blockdevice/HeapBlockDevice.h b/storage/blockdevice/HeapBlockDevice.h
similarity index 100%
rename from features/storage/blockdevice/HeapBlockDevice.h
rename to storage/blockdevice/HeapBlockDevice.h
diff --git a/features/storage/blockdevice/MBRBlockDevice.cpp b/storage/blockdevice/MBRBlockDevice.cpp
similarity index 100%
rename from features/storage/blockdevice/MBRBlockDevice.cpp
rename to storage/blockdevice/MBRBlockDevice.cpp
diff --git a/features/storage/blockdevice/MBRBlockDevice.h b/storage/blockdevice/MBRBlockDevice.h
similarity index 100%
rename from features/storage/blockdevice/MBRBlockDevice.h
rename to storage/blockdevice/MBRBlockDevice.h
diff --git a/features/storage/blockdevice/ObservingBlockDevice.cpp b/storage/blockdevice/ObservingBlockDevice.cpp
similarity index 100%
rename from features/storage/blockdevice/ObservingBlockDevice.cpp
rename to storage/blockdevice/ObservingBlockDevice.cpp
diff --git a/features/storage/blockdevice/ObservingBlockDevice.h b/storage/blockdevice/ObservingBlockDevice.h
similarity index 100%
rename from features/storage/blockdevice/ObservingBlockDevice.h
rename to storage/blockdevice/ObservingBlockDevice.h
diff --git a/features/storage/blockdevice/ProfilingBlockDevice.cpp b/storage/blockdevice/ProfilingBlockDevice.cpp
similarity index 100%
rename from features/storage/blockdevice/ProfilingBlockDevice.cpp
rename to storage/blockdevice/ProfilingBlockDevice.cpp
diff --git a/features/storage/blockdevice/ProfilingBlockDevice.h b/storage/blockdevice/ProfilingBlockDevice.h
similarity index 100%
rename from features/storage/blockdevice/ProfilingBlockDevice.h
rename to storage/blockdevice/ProfilingBlockDevice.h
diff --git a/features/storage/blockdevice/ReadOnlyBlockDevice.cpp b/storage/blockdevice/ReadOnlyBlockDevice.cpp
similarity index 100%
rename from features/storage/blockdevice/ReadOnlyBlockDevice.cpp
rename to storage/blockdevice/ReadOnlyBlockDevice.cpp
diff --git a/features/storage/blockdevice/ReadOnlyBlockDevice.h b/storage/blockdevice/ReadOnlyBlockDevice.h
similarity index 100%
rename from features/storage/blockdevice/ReadOnlyBlockDevice.h
rename to storage/blockdevice/ReadOnlyBlockDevice.h
diff --git a/features/storage/blockdevice/SlicingBlockDevice.cpp b/storage/blockdevice/SlicingBlockDevice.cpp
similarity index 100%
rename from features/storage/blockdevice/SlicingBlockDevice.cpp
rename to storage/blockdevice/SlicingBlockDevice.cpp
diff --git a/features/storage/blockdevice/SlicingBlockDevice.h b/storage/blockdevice/SlicingBlockDevice.h
similarity index 100%
rename from features/storage/blockdevice/SlicingBlockDevice.h
rename to storage/blockdevice/SlicingBlockDevice.h
diff --git a/features/storage/filesystem/Dir.cpp b/storage/filesystem/Dir.cpp
similarity index 100%
rename from features/storage/filesystem/Dir.cpp
rename to storage/filesystem/Dir.cpp
diff --git a/features/storage/filesystem/Dir.h b/storage/filesystem/Dir.h
similarity index 98%
rename from features/storage/filesystem/Dir.h
rename to storage/filesystem/Dir.h
index 6592c0fac4..c7bc9cc708 100644
--- a/features/storage/filesystem/Dir.h
+++ b/storage/filesystem/Dir.h
@@ -17,7 +17,7 @@
 #ifndef DIR_H
 #define DIR_H
 
-#include "features/storage/filesystem/FileSystem.h"
+#include "storage/filesystem/FileSystem.h"
 #include "platform/DirHandle.h"
 
 namespace mbed {
diff --git a/features/storage/filesystem/File.cpp b/storage/filesystem/File.cpp
similarity index 100%
rename from features/storage/filesystem/File.cpp
rename to storage/filesystem/File.cpp
diff --git a/features/storage/filesystem/File.h b/storage/filesystem/File.h
similarity index 98%
rename from features/storage/filesystem/File.h
rename to storage/filesystem/File.h
index b3f151f8e9..94e98933de 100644
--- a/features/storage/filesystem/File.h
+++ b/storage/filesystem/File.h
@@ -17,7 +17,7 @@
 #ifndef FILE_H
 #define FILE_H
 
-#include "features/storage/filesystem/FileSystem.h"
+#include "storage/filesystem/FileSystem.h"
 #include "platform/FileHandle.h"
 
 namespace mbed {
diff --git a/features/storage/filesystem/FileSystem.cpp b/storage/filesystem/FileSystem.cpp
similarity index 95%
rename from features/storage/filesystem/FileSystem.cpp
rename to storage/filesystem/FileSystem.cpp
index bac78eb4e1..e27e7b8454 100644
--- a/features/storage/filesystem/FileSystem.cpp
+++ b/storage/filesystem/FileSystem.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "features/storage/filesystem/Dir.h"
-#include "features/storage/filesystem/File.h"
-#include "features/storage/filesystem/FileSystem.h"
+#include "storage/filesystem/Dir.h"
+#include "storage/filesystem/File.h"
+#include "storage/filesystem/FileSystem.h"
 #include <errno.h>
 
 namespace mbed {
diff --git a/features/storage/filesystem/FileSystem.h b/storage/filesystem/FileSystem.h
similarity index 99%
rename from features/storage/filesystem/FileSystem.h
rename to storage/filesystem/FileSystem.h
index 7096810c45..b0ec3e6eb2 100644
--- a/features/storage/filesystem/FileSystem.h
+++ b/storage/filesystem/FileSystem.h
@@ -23,7 +23,7 @@
 #include "platform/FileHandle.h"
 #include "platform/DirHandle.h"
 #include "platform/FileSystemLike.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 
 namespace mbed {
 /** \addtogroup file system */
diff --git a/features/storage/filesystem/fat/ChaN/diskio.h b/storage/filesystem/fat/ChaN/diskio.h
similarity index 100%
rename from features/storage/filesystem/fat/ChaN/diskio.h
rename to storage/filesystem/fat/ChaN/diskio.h
diff --git a/features/storage/filesystem/fat/ChaN/ff.cpp b/storage/filesystem/fat/ChaN/ff.cpp
similarity index 100%
rename from features/storage/filesystem/fat/ChaN/ff.cpp
rename to storage/filesystem/fat/ChaN/ff.cpp
diff --git a/features/storage/filesystem/fat/ChaN/ff.h b/storage/filesystem/fat/ChaN/ff.h
similarity index 100%
rename from features/storage/filesystem/fat/ChaN/ff.h
rename to storage/filesystem/fat/ChaN/ff.h
diff --git a/features/storage/filesystem/fat/ChaN/ffconf.h b/storage/filesystem/fat/ChaN/ffconf.h
similarity index 100%
rename from features/storage/filesystem/fat/ChaN/ffconf.h
rename to storage/filesystem/fat/ChaN/ffconf.h
diff --git a/features/storage/filesystem/fat/ChaN/ffunicode.cpp b/storage/filesystem/fat/ChaN/ffunicode.cpp
similarity index 100%
rename from features/storage/filesystem/fat/ChaN/ffunicode.cpp
rename to storage/filesystem/fat/ChaN/ffunicode.cpp
diff --git a/features/storage/filesystem/fat/ChaN/integer.h b/storage/filesystem/fat/ChaN/integer.h
similarity index 100%
rename from features/storage/filesystem/fat/ChaN/integer.h
rename to storage/filesystem/fat/ChaN/integer.h
diff --git a/features/storage/filesystem/fat/ChaN/mbed_lib.json b/storage/filesystem/fat/ChaN/mbed_lib.json
similarity index 100%
rename from features/storage/filesystem/fat/ChaN/mbed_lib.json
rename to storage/filesystem/fat/ChaN/mbed_lib.json
diff --git a/features/storage/filesystem/fat/FATFileSystem.cpp b/storage/filesystem/fat/FATFileSystem.cpp
similarity index 98%
rename from features/storage/filesystem/fat/FATFileSystem.cpp
rename to storage/filesystem/fat/FATFileSystem.cpp
index 88dbdebcbd..cbc656eefb 100644
--- a/features/storage/filesystem/fat/FATFileSystem.cpp
+++ b/storage/filesystem/fat/FATFileSystem.cpp
@@ -19,12 +19,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "features/storage/filesystem/fat/ChaN/diskio.h"
-#include "features/storage/filesystem/fat/ChaN/ffconf.h"
-#include "features/storage/filesystem/fat/ChaN/ff.h"
+#include "storage/filesystem/fat/ChaN/diskio.h"
+#include "storage/filesystem/fat/ChaN/ffconf.h"
+#include "storage/filesystem/fat/ChaN/ff.h"
 #include "platform/mbed_debug.h"
 #include "platform/mbed_critical.h"
-#include "features/storage/filesystem/mbed_filesystem.h"
+#include "storage/filesystem/mbed_filesystem.h"
 #include "FATFileSystem.h"
 
 #include <errno.h>
diff --git a/features/storage/filesystem/fat/FATFileSystem.h b/storage/filesystem/fat/FATFileSystem.h
similarity index 98%
rename from features/storage/filesystem/fat/FATFileSystem.h
rename to storage/filesystem/fat/FATFileSystem.h
index b5177063d9..ed464f09b8 100644
--- a/features/storage/filesystem/fat/FATFileSystem.h
+++ b/storage/filesystem/fat/FATFileSystem.h
@@ -26,12 +26,12 @@
 #ifndef MBED_FATFILESYSTEM_H
 #define MBED_FATFILESYSTEM_H
 
-#include "features/storage/filesystem/FileSystem.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/filesystem/FileSystem.h"
+#include "storage/blockdevice/BlockDevice.h"
 #include "FileHandle.h"
 #include <stdint.h>
 #include "PlatformMutex.h"
-#include "features/storage/filesystem/fat/ChaN/ff.h"
+#include "storage/filesystem/fat/ChaN/ff.h"
 
 namespace mbed {
 
diff --git a/features/storage/filesystem/littlefs/.mbedignore b/storage/filesystem/littlefs/.mbedignore
similarity index 100%
rename from features/storage/filesystem/littlefs/.mbedignore
rename to storage/filesystem/littlefs/.mbedignore
diff --git a/features/storage/filesystem/littlefs/.travis.yml b/storage/filesystem/littlefs/.travis.yml
similarity index 100%
rename from features/storage/filesystem/littlefs/.travis.yml
rename to storage/filesystem/littlefs/.travis.yml
diff --git a/features/storage/filesystem/littlefs/LittleFileSystem.cpp b/storage/filesystem/littlefs/LittleFileSystem.cpp
similarity index 98%
rename from features/storage/filesystem/littlefs/LittleFileSystem.cpp
rename to storage/filesystem/littlefs/LittleFileSystem.cpp
index bb2fb6fe79..259192ec51 100644
--- a/features/storage/filesystem/littlefs/LittleFileSystem.cpp
+++ b/storage/filesystem/littlefs/LittleFileSystem.cpp
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "features/storage/filesystem/mbed_filesystem.h"
+#include "storage/filesystem/mbed_filesystem.h"
 #include "LittleFileSystem.h"
 #include "errno.h"
-#include "features/storage/filesystem/littlefs/littlefs/lfs.h"
-#include "features/storage/filesystem/littlefs/littlefs/lfs_util.h"
+#include "storage/filesystem/littlefs/littlefs/lfs.h"
+#include "storage/filesystem/littlefs/littlefs/lfs_util.h"
 #include "MbedCRC.h"
 
 namespace mbed {
diff --git a/features/storage/filesystem/littlefs/LittleFileSystem.h b/storage/filesystem/littlefs/LittleFileSystem.h
similarity index 98%
rename from features/storage/filesystem/littlefs/LittleFileSystem.h
rename to storage/filesystem/littlefs/LittleFileSystem.h
index 8e34c794f4..2da3a49339 100644
--- a/features/storage/filesystem/littlefs/LittleFileSystem.h
+++ b/storage/filesystem/littlefs/LittleFileSystem.h
@@ -20,10 +20,10 @@
 #ifndef MBED_LFSFILESYSTEM_H
 #define MBED_LFSFILESYSTEM_H
 
-#include "features/storage/filesystem/FileSystem.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/filesystem/FileSystem.h"
+#include "storage/blockdevice/BlockDevice.h"
 #include "platform/PlatformMutex.h"
-#include "features/storage/filesystem/littlefs/littlefs/lfs.h"
+#include "storage/filesystem/littlefs/littlefs/lfs.h"
 
 namespace mbed {
 
diff --git a/features/storage/filesystem/littlefs/README.md b/storage/filesystem/littlefs/README.md
similarity index 100%
rename from features/storage/filesystem/littlefs/README.md
rename to storage/filesystem/littlefs/README.md
diff --git a/features/storage/filesystem/littlefs/TESTS/COMMON/atomic_usage.cpp b/storage/filesystem/littlefs/TESTS/COMMON/atomic_usage.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/COMMON/atomic_usage.cpp
rename to storage/filesystem/littlefs/TESTS/COMMON/atomic_usage.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/COMMON/atomic_usage.h b/storage/filesystem/littlefs/TESTS/COMMON/atomic_usage.h
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/COMMON/atomic_usage.h
rename to storage/filesystem/littlefs/TESTS/COMMON/atomic_usage.h
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem/dirs/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem/dirs/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem/dirs/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem/dirs/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem/files/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem/files/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem/files/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem/files/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem/interspersed/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem/interspersed/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem/interspersed/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem/interspersed/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem/seek/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem/seek/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem/seek/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem/seek/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem_integration/format/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem_integration/format/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem_integration/format/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem_integration/format/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem_recovery/resilience/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem_recovery/resilience/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem_recovery/resilience/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem_recovery/resilience/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem_recovery/resilience_functional/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem_recovery/resilience_functional/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem_recovery/resilience_functional/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem_recovery/resilience_functional/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem_recovery/wear_leveling/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem_recovery/wear_leveling/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem_recovery/wear_leveling/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem_recovery/wear_leveling/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem_retarget/dirs/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem_retarget/dirs/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem_retarget/dirs/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem_retarget/dirs/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem_retarget/files/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem_retarget/files/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem_retarget/files/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem_retarget/files/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem_retarget/interspersed/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem_retarget/interspersed/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem_retarget/interspersed/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem_retarget/interspersed/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/filesystem_retarget/seek/main.cpp b/storage/filesystem/littlefs/TESTS/filesystem_retarget/seek/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/filesystem_retarget/seek/main.cpp
rename to storage/filesystem/littlefs/TESTS/filesystem_retarget/seek/main.cpp
diff --git a/features/storage/filesystem/littlefs/TESTS/host_tests/unexpected_reset.py b/storage/filesystem/littlefs/TESTS/host_tests/unexpected_reset.py
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/host_tests/unexpected_reset.py
rename to storage/filesystem/littlefs/TESTS/host_tests/unexpected_reset.py
diff --git a/features/storage/filesystem/littlefs/TESTS/util/Makefile b/storage/filesystem/littlefs/TESTS/util/Makefile
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/util/Makefile
rename to storage/filesystem/littlefs/TESTS/util/Makefile
diff --git a/features/storage/filesystem/littlefs/TESTS/util/clean.sh b/storage/filesystem/littlefs/TESTS/util/clean.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/util/clean.sh
rename to storage/filesystem/littlefs/TESTS/util/clean.sh
diff --git a/features/storage/filesystem/littlefs/TESTS/util/echo.py b/storage/filesystem/littlefs/TESTS/util/echo.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/util/echo.py
rename to storage/filesystem/littlefs/TESTS/util/echo.py
diff --git a/features/storage/filesystem/littlefs/TESTS/util/replacements_mbed.yml b/storage/filesystem/littlefs/TESTS/util/replacements_mbed.yml
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/util/replacements_mbed.yml
rename to storage/filesystem/littlefs/TESTS/util/replacements_mbed.yml
diff --git a/features/storage/filesystem/littlefs/TESTS/util/replacements_retarget.yml b/storage/filesystem/littlefs/TESTS/util/replacements_retarget.yml
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/util/replacements_retarget.yml
rename to storage/filesystem/littlefs/TESTS/util/replacements_retarget.yml
diff --git a/features/storage/filesystem/littlefs/TESTS/util/stats.py b/storage/filesystem/littlefs/TESTS/util/stats.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/util/stats.py
rename to storage/filesystem/littlefs/TESTS/util/stats.py
diff --git a/features/storage/filesystem/littlefs/TESTS/util/template_subunit.fmt b/storage/filesystem/littlefs/TESTS/util/template_subunit.fmt
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/util/template_subunit.fmt
rename to storage/filesystem/littlefs/TESTS/util/template_subunit.fmt
diff --git a/features/storage/filesystem/littlefs/TESTS/util/template_unit.fmt b/storage/filesystem/littlefs/TESTS/util/template_unit.fmt
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/util/template_unit.fmt
rename to storage/filesystem/littlefs/TESTS/util/template_unit.fmt
diff --git a/features/storage/filesystem/littlefs/TESTS/util/template_wrapper.fmt b/storage/filesystem/littlefs/TESTS/util/template_wrapper.fmt
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/util/template_wrapper.fmt
rename to storage/filesystem/littlefs/TESTS/util/template_wrapper.fmt
diff --git a/features/storage/filesystem/littlefs/TESTS/util/test.py b/storage/filesystem/littlefs/TESTS/util/test.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/TESTS/util/test.py
rename to storage/filesystem/littlefs/TESTS/util/test.py
diff --git a/features/storage/filesystem/littlefs/littlefs/.gitignore b/storage/filesystem/littlefs/littlefs/.gitignore
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/.gitignore
rename to storage/filesystem/littlefs/littlefs/.gitignore
diff --git a/features/storage/filesystem/littlefs/littlefs/.travis.yml b/storage/filesystem/littlefs/littlefs/.travis.yml
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/.travis.yml
rename to storage/filesystem/littlefs/littlefs/.travis.yml
diff --git a/features/storage/filesystem/littlefs/littlefs/DESIGN.md b/storage/filesystem/littlefs/littlefs/DESIGN.md
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/DESIGN.md
rename to storage/filesystem/littlefs/littlefs/DESIGN.md
diff --git a/features/storage/filesystem/littlefs/littlefs/LICENSE.md b/storage/filesystem/littlefs/littlefs/LICENSE.md
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/LICENSE.md
rename to storage/filesystem/littlefs/littlefs/LICENSE.md
diff --git a/features/storage/filesystem/littlefs/littlefs/Makefile b/storage/filesystem/littlefs/littlefs/Makefile
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/Makefile
rename to storage/filesystem/littlefs/littlefs/Makefile
diff --git a/features/storage/filesystem/littlefs/littlefs/README.md b/storage/filesystem/littlefs/littlefs/README.md
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/README.md
rename to storage/filesystem/littlefs/littlefs/README.md
diff --git a/features/storage/filesystem/littlefs/littlefs/SPEC.md b/storage/filesystem/littlefs/littlefs/SPEC.md
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/SPEC.md
rename to storage/filesystem/littlefs/littlefs/SPEC.md
diff --git a/features/storage/filesystem/littlefs/littlefs/emubd/.mbedignore b/storage/filesystem/littlefs/littlefs/emubd/.mbedignore
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/emubd/.mbedignore
rename to storage/filesystem/littlefs/littlefs/emubd/.mbedignore
diff --git a/features/storage/filesystem/littlefs/littlefs/emubd/lfs_emubd.c b/storage/filesystem/littlefs/littlefs/emubd/lfs_emubd.c
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/emubd/lfs_emubd.c
rename to storage/filesystem/littlefs/littlefs/emubd/lfs_emubd.c
diff --git a/features/storage/filesystem/littlefs/littlefs/emubd/lfs_emubd.h b/storage/filesystem/littlefs/littlefs/emubd/lfs_emubd.h
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/emubd/lfs_emubd.h
rename to storage/filesystem/littlefs/littlefs/emubd/lfs_emubd.h
diff --git a/features/storage/filesystem/littlefs/littlefs/lfs.c b/storage/filesystem/littlefs/littlefs/lfs.c
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/lfs.c
rename to storage/filesystem/littlefs/littlefs/lfs.c
diff --git a/features/storage/filesystem/littlefs/littlefs/lfs.h b/storage/filesystem/littlefs/littlefs/lfs.h
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/lfs.h
rename to storage/filesystem/littlefs/littlefs/lfs.h
diff --git a/features/storage/filesystem/littlefs/littlefs/lfs_util.c b/storage/filesystem/littlefs/littlefs/lfs_util.c
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/lfs_util.c
rename to storage/filesystem/littlefs/littlefs/lfs_util.c
diff --git a/features/storage/filesystem/littlefs/littlefs/lfs_util.h b/storage/filesystem/littlefs/littlefs/lfs_util.h
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/lfs_util.h
rename to storage/filesystem/littlefs/littlefs/lfs_util.h
diff --git a/features/storage/filesystem/littlefs/littlefs/scripts/prefix.py b/storage/filesystem/littlefs/littlefs/scripts/prefix.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/scripts/prefix.py
rename to storage/filesystem/littlefs/littlefs/scripts/prefix.py
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/stats.py b/storage/filesystem/littlefs/littlefs/tests/stats.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/stats.py
rename to storage/filesystem/littlefs/littlefs/tests/stats.py
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/template.fmt b/storage/filesystem/littlefs/littlefs/tests/template.fmt
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/template.fmt
rename to storage/filesystem/littlefs/littlefs/tests/template.fmt
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test.py b/storage/filesystem/littlefs/littlefs/tests/test.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test.py
rename to storage/filesystem/littlefs/littlefs/tests/test.py
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test_alloc.sh b/storage/filesystem/littlefs/littlefs/tests/test_alloc.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test_alloc.sh
rename to storage/filesystem/littlefs/littlefs/tests/test_alloc.sh
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test_corrupt.sh b/storage/filesystem/littlefs/littlefs/tests/test_corrupt.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test_corrupt.sh
rename to storage/filesystem/littlefs/littlefs/tests/test_corrupt.sh
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test_dirs.sh b/storage/filesystem/littlefs/littlefs/tests/test_dirs.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test_dirs.sh
rename to storage/filesystem/littlefs/littlefs/tests/test_dirs.sh
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test_files.sh b/storage/filesystem/littlefs/littlefs/tests/test_files.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test_files.sh
rename to storage/filesystem/littlefs/littlefs/tests/test_files.sh
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test_format.sh b/storage/filesystem/littlefs/littlefs/tests/test_format.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test_format.sh
rename to storage/filesystem/littlefs/littlefs/tests/test_format.sh
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test_interspersed.sh b/storage/filesystem/littlefs/littlefs/tests/test_interspersed.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test_interspersed.sh
rename to storage/filesystem/littlefs/littlefs/tests/test_interspersed.sh
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test_move.sh b/storage/filesystem/littlefs/littlefs/tests/test_move.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test_move.sh
rename to storage/filesystem/littlefs/littlefs/tests/test_move.sh
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test_orphan.sh b/storage/filesystem/littlefs/littlefs/tests/test_orphan.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test_orphan.sh
rename to storage/filesystem/littlefs/littlefs/tests/test_orphan.sh
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test_paths.sh b/storage/filesystem/littlefs/littlefs/tests/test_paths.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test_paths.sh
rename to storage/filesystem/littlefs/littlefs/tests/test_paths.sh
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test_seek.sh b/storage/filesystem/littlefs/littlefs/tests/test_seek.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test_seek.sh
rename to storage/filesystem/littlefs/littlefs/tests/test_seek.sh
diff --git a/features/storage/filesystem/littlefs/littlefs/tests/test_truncate.sh b/storage/filesystem/littlefs/littlefs/tests/test_truncate.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefs/littlefs/tests/test_truncate.sh
rename to storage/filesystem/littlefs/littlefs/tests/test_truncate.sh
diff --git a/features/storage/filesystem/littlefs/mbed_lib.json b/storage/filesystem/littlefs/mbed_lib.json
similarity index 100%
rename from features/storage/filesystem/littlefs/mbed_lib.json
rename to storage/filesystem/littlefs/mbed_lib.json
diff --git a/features/storage/filesystem/littlefsv2/.mbedignore b/storage/filesystem/littlefsv2/.mbedignore
similarity index 100%
rename from features/storage/filesystem/littlefsv2/.mbedignore
rename to storage/filesystem/littlefsv2/.mbedignore
diff --git a/features/storage/filesystem/littlefsv2/.travis.yml b/storage/filesystem/littlefsv2/.travis.yml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/.travis.yml
rename to storage/filesystem/littlefsv2/.travis.yml
diff --git a/features/storage/filesystem/littlefsv2/LittleFileSystem2.cpp b/storage/filesystem/littlefsv2/LittleFileSystem2.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/LittleFileSystem2.cpp
rename to storage/filesystem/littlefsv2/LittleFileSystem2.cpp
diff --git a/features/storage/filesystem/littlefsv2/LittleFileSystem2.h b/storage/filesystem/littlefsv2/LittleFileSystem2.h
similarity index 100%
rename from features/storage/filesystem/littlefsv2/LittleFileSystem2.h
rename to storage/filesystem/littlefsv2/LittleFileSystem2.h
diff --git a/features/storage/filesystem/littlefsv2/README.md b/storage/filesystem/littlefsv2/README.md
similarity index 100%
rename from features/storage/filesystem/littlefsv2/README.md
rename to storage/filesystem/littlefsv2/README.md
diff --git a/features/storage/filesystem/littlefsv2/TESTS/COMMON/atomic_usage.cpp b/storage/filesystem/littlefsv2/TESTS/COMMON/atomic_usage.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/COMMON/atomic_usage.cpp
rename to storage/filesystem/littlefsv2/TESTS/COMMON/atomic_usage.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/COMMON/atomic_usage.h b/storage/filesystem/littlefsv2/TESTS/COMMON/atomic_usage.h
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/COMMON/atomic_usage.h
rename to storage/filesystem/littlefsv2/TESTS/COMMON/atomic_usage.h
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem/dirs/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem/dirs/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem/dirs/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem/dirs/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem/files/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem/files/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem/files/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem/files/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem/interspersed/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem/interspersed/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem/interspersed/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem/interspersed/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem/seek/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem/seek/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem/seek/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem/seek/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem_integration/format/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem_integration/format/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem_integration/format/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem_integration/format/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem_recovery/resilience/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem_recovery/resilience/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem_recovery/resilience/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem_recovery/resilience/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem_recovery/resilience_functional/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem_recovery/resilience_functional/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem_recovery/resilience_functional/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem_recovery/resilience_functional/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem_recovery/wear_leveling/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem_recovery/wear_leveling/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem_recovery/wear_leveling/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem_recovery/wear_leveling/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/dirs/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/dirs/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/dirs/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem_retarget/dirs/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/files/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/files/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/files/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem_retarget/files/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/interspersed/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/interspersed/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/interspersed/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem_retarget/interspersed/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/seek/main.cpp b/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/seek/main.cpp
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/filesystem_retarget/seek/main.cpp
rename to storage/filesystem/littlefsv2/TESTS/filesystem_retarget/seek/main.cpp
diff --git a/features/storage/filesystem/littlefsv2/TESTS/host_tests/unexpected_reset.py b/storage/filesystem/littlefsv2/TESTS/host_tests/unexpected_reset.py
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/host_tests/unexpected_reset.py
rename to storage/filesystem/littlefsv2/TESTS/host_tests/unexpected_reset.py
diff --git a/features/storage/filesystem/littlefsv2/TESTS/util/Makefile b/storage/filesystem/littlefsv2/TESTS/util/Makefile
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/util/Makefile
rename to storage/filesystem/littlefsv2/TESTS/util/Makefile
diff --git a/features/storage/filesystem/littlefsv2/TESTS/util/clean.sh b/storage/filesystem/littlefsv2/TESTS/util/clean.sh
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/util/clean.sh
rename to storage/filesystem/littlefsv2/TESTS/util/clean.sh
diff --git a/features/storage/filesystem/littlefsv2/TESTS/util/echo.py b/storage/filesystem/littlefsv2/TESTS/util/echo.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/util/echo.py
rename to storage/filesystem/littlefsv2/TESTS/util/echo.py
diff --git a/features/storage/filesystem/littlefsv2/TESTS/util/replacements_mbed.yml b/storage/filesystem/littlefsv2/TESTS/util/replacements_mbed.yml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/util/replacements_mbed.yml
rename to storage/filesystem/littlefsv2/TESTS/util/replacements_mbed.yml
diff --git a/features/storage/filesystem/littlefsv2/TESTS/util/replacements_retarget.yml b/storage/filesystem/littlefsv2/TESTS/util/replacements_retarget.yml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/util/replacements_retarget.yml
rename to storage/filesystem/littlefsv2/TESTS/util/replacements_retarget.yml
diff --git a/features/storage/filesystem/littlefsv2/TESTS/util/stats.py b/storage/filesystem/littlefsv2/TESTS/util/stats.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/util/stats.py
rename to storage/filesystem/littlefsv2/TESTS/util/stats.py
diff --git a/features/storage/filesystem/littlefsv2/TESTS/util/template_subunit.fmt b/storage/filesystem/littlefsv2/TESTS/util/template_subunit.fmt
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/util/template_subunit.fmt
rename to storage/filesystem/littlefsv2/TESTS/util/template_subunit.fmt
diff --git a/features/storage/filesystem/littlefsv2/TESTS/util/template_unit.fmt b/storage/filesystem/littlefsv2/TESTS/util/template_unit.fmt
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/util/template_unit.fmt
rename to storage/filesystem/littlefsv2/TESTS/util/template_unit.fmt
diff --git a/features/storage/filesystem/littlefsv2/TESTS/util/template_wrapper.fmt b/storage/filesystem/littlefsv2/TESTS/util/template_wrapper.fmt
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/util/template_wrapper.fmt
rename to storage/filesystem/littlefsv2/TESTS/util/template_wrapper.fmt
diff --git a/features/storage/filesystem/littlefsv2/TESTS/util/test.py b/storage/filesystem/littlefsv2/TESTS/util/test.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefsv2/TESTS/util/test.py
rename to storage/filesystem/littlefsv2/TESTS/util/test.py
diff --git a/features/storage/filesystem/littlefsv2/littlefs/.gitignore b/storage/filesystem/littlefsv2/littlefs/.gitignore
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/.gitignore
rename to storage/filesystem/littlefsv2/littlefs/.gitignore
diff --git a/features/storage/filesystem/littlefsv2/littlefs/.travis.yml b/storage/filesystem/littlefsv2/littlefs/.travis.yml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/.travis.yml
rename to storage/filesystem/littlefsv2/littlefs/.travis.yml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/DESIGN.md b/storage/filesystem/littlefsv2/littlefs/DESIGN.md
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/DESIGN.md
rename to storage/filesystem/littlefsv2/littlefs/DESIGN.md
diff --git a/features/storage/filesystem/littlefsv2/littlefs/LICENSE.md b/storage/filesystem/littlefsv2/littlefs/LICENSE.md
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/LICENSE.md
rename to storage/filesystem/littlefsv2/littlefs/LICENSE.md
diff --git a/features/storage/filesystem/littlefsv2/littlefs/Makefile b/storage/filesystem/littlefsv2/littlefs/Makefile
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/Makefile
rename to storage/filesystem/littlefsv2/littlefs/Makefile
diff --git a/features/storage/filesystem/littlefsv2/littlefs/README.md b/storage/filesystem/littlefsv2/littlefs/README.md
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/README.md
rename to storage/filesystem/littlefsv2/littlefs/README.md
diff --git a/features/storage/filesystem/littlefsv2/littlefs/SPEC.md b/storage/filesystem/littlefsv2/littlefs/SPEC.md
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/SPEC.md
rename to storage/filesystem/littlefsv2/littlefs/SPEC.md
diff --git a/features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_filebd.c b/storage/filesystem/littlefsv2/littlefs/bd/lfs2_filebd.c
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_filebd.c
rename to storage/filesystem/littlefsv2/littlefs/bd/lfs2_filebd.c
diff --git a/features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_filebd.h b/storage/filesystem/littlefsv2/littlefs/bd/lfs2_filebd.h
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_filebd.h
rename to storage/filesystem/littlefsv2/littlefs/bd/lfs2_filebd.h
diff --git a/features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_rambd.c b/storage/filesystem/littlefsv2/littlefs/bd/lfs2_rambd.c
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_rambd.c
rename to storage/filesystem/littlefsv2/littlefs/bd/lfs2_rambd.c
diff --git a/features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_rambd.h b/storage/filesystem/littlefsv2/littlefs/bd/lfs2_rambd.h
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_rambd.h
rename to storage/filesystem/littlefsv2/littlefs/bd/lfs2_rambd.h
diff --git a/features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_testbd.c b/storage/filesystem/littlefsv2/littlefs/bd/lfs2_testbd.c
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_testbd.c
rename to storage/filesystem/littlefsv2/littlefs/bd/lfs2_testbd.c
diff --git a/features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_testbd.h b/storage/filesystem/littlefsv2/littlefs/bd/lfs2_testbd.h
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/bd/lfs2_testbd.h
rename to storage/filesystem/littlefsv2/littlefs/bd/lfs2_testbd.h
diff --git a/features/storage/filesystem/littlefsv2/littlefs/lfs2.c b/storage/filesystem/littlefsv2/littlefs/lfs2.c
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/lfs2.c
rename to storage/filesystem/littlefsv2/littlefs/lfs2.c
diff --git a/features/storage/filesystem/littlefsv2/littlefs/lfs2.h b/storage/filesystem/littlefsv2/littlefs/lfs2.h
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/lfs2.h
rename to storage/filesystem/littlefsv2/littlefs/lfs2.h
diff --git a/features/storage/filesystem/littlefsv2/littlefs/lfs2_util.c b/storage/filesystem/littlefsv2/littlefs/lfs2_util.c
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/lfs2_util.c
rename to storage/filesystem/littlefsv2/littlefs/lfs2_util.c
diff --git a/features/storage/filesystem/littlefsv2/littlefs/lfs2_util.h b/storage/filesystem/littlefsv2/littlefs/lfs2_util.h
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/lfs2_util.h
rename to storage/filesystem/littlefsv2/littlefs/lfs2_util.h
diff --git a/features/storage/filesystem/littlefsv2/littlefs/scripts/explode_asserts.py b/storage/filesystem/littlefsv2/littlefs/scripts/explode_asserts.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/scripts/explode_asserts.py
rename to storage/filesystem/littlefsv2/littlefs/scripts/explode_asserts.py
diff --git a/features/storage/filesystem/littlefsv2/littlefs/scripts/prefix.py b/storage/filesystem/littlefsv2/littlefs/scripts/prefix.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/scripts/prefix.py
rename to storage/filesystem/littlefsv2/littlefs/scripts/prefix.py
diff --git a/features/storage/filesystem/littlefsv2/littlefs/scripts/readblock.py b/storage/filesystem/littlefsv2/littlefs/scripts/readblock.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/scripts/readblock.py
rename to storage/filesystem/littlefsv2/littlefs/scripts/readblock.py
diff --git a/features/storage/filesystem/littlefsv2/littlefs/scripts/readmdir.py b/storage/filesystem/littlefsv2/littlefs/scripts/readmdir.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/scripts/readmdir.py
rename to storage/filesystem/littlefsv2/littlefs/scripts/readmdir.py
diff --git a/features/storage/filesystem/littlefsv2/littlefs/scripts/readtree.py b/storage/filesystem/littlefsv2/littlefs/scripts/readtree.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/scripts/readtree.py
rename to storage/filesystem/littlefsv2/littlefs/scripts/readtree.py
diff --git a/features/storage/filesystem/littlefsv2/littlefs/scripts/test.py b/storage/filesystem/littlefsv2/littlefs/scripts/test.py
old mode 100755
new mode 100644
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/scripts/test.py
rename to storage/filesystem/littlefsv2/littlefs/scripts/test.py
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_alloc.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_alloc.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_alloc.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_alloc.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_attrs.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_attrs.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_attrs.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_attrs.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_badblocks.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_badblocks.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_badblocks.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_badblocks.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_dirs.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_dirs.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_dirs.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_dirs.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_entries.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_entries.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_entries.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_entries.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_evil.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_evil.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_evil.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_evil.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_exhaustion.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_exhaustion.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_exhaustion.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_exhaustion.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_files.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_files.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_files.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_files.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_interspersed.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_interspersed.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_interspersed.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_interspersed.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_move.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_move.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_move.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_move.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_orphans.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_orphans.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_orphans.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_orphans.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_paths.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_paths.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_paths.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_paths.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_relocations.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_relocations.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_relocations.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_relocations.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_seek.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_seek.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_seek.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_seek.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_superblocks.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_superblocks.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_superblocks.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_superblocks.toml
diff --git a/features/storage/filesystem/littlefsv2/littlefs/tests/test_truncate.toml b/storage/filesystem/littlefsv2/littlefs/tests/test_truncate.toml
similarity index 100%
rename from features/storage/filesystem/littlefsv2/littlefs/tests/test_truncate.toml
rename to storage/filesystem/littlefsv2/littlefs/tests/test_truncate.toml
diff --git a/features/storage/filesystem/littlefsv2/mbed_lib.json b/storage/filesystem/littlefsv2/mbed_lib.json
similarity index 100%
rename from features/storage/filesystem/littlefsv2/mbed_lib.json
rename to storage/filesystem/littlefsv2/mbed_lib.json
diff --git a/features/storage/filesystem/mbed_filesystem.h b/storage/filesystem/mbed_filesystem.h
similarity index 68%
rename from features/storage/filesystem/mbed_filesystem.h
rename to storage/filesystem/mbed_filesystem.h
index 5ea5b724ca..4e8f631cfd 100644
--- a/features/storage/filesystem/mbed_filesystem.h
+++ b/storage/filesystem/mbed_filesystem.h
@@ -23,15 +23,15 @@
 #include "platform/platform.h"
 
 // FileSystem classes
-#include "features/storage/filesystem/FileSystem.h"
-#include "features/storage/filesystem/File.h"
-#include "features/storage/filesystem/Dir.h"
+#include "storage/filesystem/FileSystem.h"
+#include "storage/filesystem/File.h"
+#include "storage/filesystem/Dir.h"
 
 // BlockDevice classes
-#include "features/storage/blockdevice/BlockDevice.h"
-#include "features/storage/blockdevice/ChainingBlockDevice.h"
-#include "features/storage/blockdevice/SlicingBlockDevice.h"
-#include "features/storage/blockdevice/HeapBlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/ChainingBlockDevice.h"
+#include "storage/blockdevice/SlicingBlockDevice.h"
+#include "storage/blockdevice/HeapBlockDevice.h"
 
 /** @}*/
 #endif
diff --git a/features/storage/filesystem/mbed_lib.json b/storage/filesystem/mbed_lib.json
similarity index 100%
rename from features/storage/filesystem/mbed_lib.json
rename to storage/filesystem/mbed_lib.json
diff --git a/features/storage/kvstore/conf/filesystem/mbed_lib.json b/storage/kvstore/conf/filesystem/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/conf/filesystem/mbed_lib.json
rename to storage/kvstore/conf/filesystem/mbed_lib.json
diff --git a/features/storage/kvstore/conf/filesystem_no_rbp/mbed_lib.json b/storage/kvstore/conf/filesystem_no_rbp/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/conf/filesystem_no_rbp/mbed_lib.json
rename to storage/kvstore/conf/filesystem_no_rbp/mbed_lib.json
diff --git a/features/storage/kvstore/conf/global/mbed_lib.json b/storage/kvstore/conf/global/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/conf/global/mbed_lib.json
rename to storage/kvstore/conf/global/mbed_lib.json
diff --git a/features/storage/kvstore/conf/kv_config.cpp b/storage/kvstore/conf/kv_config.cpp
similarity index 97%
rename from features/storage/kvstore/conf/kv_config.cpp
rename to storage/kvstore/conf/kv_config.cpp
index e8ae09b256..a75db9925f 100644
--- a/features/storage/kvstore/conf/kv_config.cpp
+++ b/storage/kvstore/conf/kv_config.cpp
@@ -15,40 +15,40 @@
  */
 
 #include "kv_config.h"
-#include "features/storage/kvstore/include/KVStore.h"
-#include "features/storage/kvstore/kv_map/KVMap.h"
-#include "features/storage/blockdevice/BlockDevice.h"
-#include "features/storage/filesystem/FileSystem.h"
-#include "features/storage/kvstore/filesystemstore/FileSystemStore.h"
-#include "features/storage/blockdevice/SlicingBlockDevice.h"
-#include "features/storage/filesystem/fat/FATFileSystem.h"
-#include "features/storage/filesystem/littlefs/LittleFileSystem.h"
-#include "features/storage/kvstore/tdbstore/TDBStore.h"
+#include "storage/kvstore/include/KVStore.h"
+#include "storage/kvstore/kv_map/KVMap.h"
+#include "storage/blockdevice/BlockDevice.h"
+#include "storage/filesystem/FileSystem.h"
+#include "storage/kvstore/filesystemstore/FileSystemStore.h"
+#include "storage/blockdevice/SlicingBlockDevice.h"
+#include "storage/filesystem/fat/FATFileSystem.h"
+#include "storage/filesystem/littlefs/LittleFileSystem.h"
+#include "storage/kvstore/tdbstore/TDBStore.h"
 #include "mbed_error.h"
 #include "drivers/FlashIAP.h"
-#include "features/storage/blockdevice/FlashSimBlockDevice.h"
+#include "storage/blockdevice/FlashSimBlockDevice.h"
 #include "mbed_trace.h"
-#include "features/storage/kvstore/securestore/SecureStore.h"
+#include "storage/kvstore/securestore/SecureStore.h"
 #define TRACE_GROUP "KVCFG"
 
 #if COMPONENT_FLASHIAP
-#include "components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h"
+#include "storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h"
 #endif
 
 #if COMPONENT_QSPIF
-#include "components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h"
+#include "storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h"
 #endif
 
 #if COMPONENT_SPIF
-#include "components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h"
+#include "storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h"
 #endif
 
 #if COMPONENT_DATAFLASH
-#include "components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h"
+#include "storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h"
 #endif
 
 #if COMPONENT_SD
-#include "components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h"
+#include "storage/blockdevice/COMPONENT_SD/SDBlockDevice.h"
 
 #if (STATIC_PINMAP_READY)
 const spi_pinmap_t static_spi_pinmap = get_spi_pinmap(MBED_CONF_SD_SPI_MOSI, MBED_CONF_SD_SPI_MISO, MBED_CONF_SD_SPI_CLK, NC);
diff --git a/features/storage/kvstore/conf/kv_config.h b/storage/kvstore/conf/kv_config.h
similarity index 98%
rename from features/storage/kvstore/conf/kv_config.h
rename to storage/kvstore/conf/kv_config.h
index f16688fd5e..eb9471acdf 100644
--- a/features/storage/kvstore/conf/kv_config.h
+++ b/storage/kvstore/conf/kv_config.h
@@ -16,7 +16,7 @@
 #ifndef _KV_CONFIG
 #define _KV_CONFIG
 
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/features/storage/kvstore/conf/mbed_lib.json b/storage/kvstore/conf/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/conf/mbed_lib.json
rename to storage/kvstore/conf/mbed_lib.json
diff --git a/features/storage/kvstore/conf/tdb_external/mbed_lib.json b/storage/kvstore/conf/tdb_external/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/conf/tdb_external/mbed_lib.json
rename to storage/kvstore/conf/tdb_external/mbed_lib.json
diff --git a/features/storage/kvstore/conf/tdb_external_no_rbp/mbed_lib.json b/storage/kvstore/conf/tdb_external_no_rbp/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/conf/tdb_external_no_rbp/mbed_lib.json
rename to storage/kvstore/conf/tdb_external_no_rbp/mbed_lib.json
diff --git a/features/storage/kvstore/conf/tdb_internal/mbed_lib.json b/storage/kvstore/conf/tdb_internal/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/conf/tdb_internal/mbed_lib.json
rename to storage/kvstore/conf/tdb_internal/mbed_lib.json
diff --git a/features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp b/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
similarity index 100%
rename from features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
rename to storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
diff --git a/features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h b/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h
similarity index 100%
rename from features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h
rename to storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h
diff --git a/features/storage/kvstore/direct_access_devicekey/mbed_lib.json b/storage/kvstore/direct_access_devicekey/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/direct_access_devicekey/mbed_lib.json
rename to storage/kvstore/direct_access_devicekey/mbed_lib.json
diff --git a/features/storage/kvstore/filesystemstore/FileSystemStore.cpp b/storage/kvstore/filesystemstore/FileSystemStore.cpp
similarity index 98%
rename from features/storage/kvstore/filesystemstore/FileSystemStore.cpp
rename to storage/kvstore/filesystemstore/FileSystemStore.cpp
index 1bd57acda0..524ea2c979 100644
--- a/features/storage/kvstore/filesystemstore/FileSystemStore.cpp
+++ b/storage/kvstore/filesystemstore/FileSystemStore.cpp
@@ -17,10 +17,10 @@
  */
 
 #include "FileSystemStore.h"
-#include "features/storage/kvstore/conf/kv_config.h"
-#include "features/storage/filesystem/Dir.h"
-#include "features/storage/filesystem/File.h"
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/kvstore/conf/kv_config.h"
+#include "storage/filesystem/Dir.h"
+#include "storage/filesystem/File.h"
+#include "storage/blockdevice/BlockDevice.h"
 #include "mbed_error.h"
 #include <string.h>
 #include <stdio.h>
diff --git a/features/storage/kvstore/filesystemstore/FileSystemStore.h b/storage/kvstore/filesystemstore/FileSystemStore.h
similarity index 99%
rename from features/storage/kvstore/filesystemstore/FileSystemStore.h
rename to storage/kvstore/filesystemstore/FileSystemStore.h
index a9e32aa678..0c9f4e31ce 100644
--- a/features/storage/kvstore/filesystemstore/FileSystemStore.h
+++ b/storage/kvstore/filesystemstore/FileSystemStore.h
@@ -18,8 +18,8 @@
 #ifndef MBED_FILE_SYSTEM_STORE_H
 #define MBED_FILE_SYSTEM_STORE_H
 
-#include "features/storage/kvstore/include/KVStore.h"
-#include "features/storage/filesystem/FileSystem.h"
+#include "storage/kvstore/include/KVStore.h"
+#include "storage/filesystem/FileSystem.h"
 
 namespace mbed {
 
diff --git a/features/storage/kvstore/filesystemstore/mbed_lib.json b/storage/kvstore/filesystemstore/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/filesystemstore/mbed_lib.json
rename to storage/kvstore/filesystemstore/mbed_lib.json
diff --git a/features/storage/kvstore/global_api/kvstore_global_api.cpp b/storage/kvstore/global_api/kvstore_global_api.cpp
similarity index 97%
rename from features/storage/kvstore/global_api/kvstore_global_api.cpp
rename to storage/kvstore/global_api/kvstore_global_api.cpp
index ce67a28fa7..5004a7f353 100644
--- a/features/storage/kvstore/global_api/kvstore_global_api.cpp
+++ b/storage/kvstore/global_api/kvstore_global_api.cpp
@@ -15,9 +15,9 @@
  */
 #include "kvstore_global_api.h"
 
-#include "features/storage/kvstore/conf/kv_config.h"
-#include "features/storage/kvstore/kv_map/KVMap.h"
-#include "features/storage/kvstore/include/KVStore.h"
+#include "storage/kvstore/conf/kv_config.h"
+#include "storage/kvstore/kv_map/KVMap.h"
+#include "storage/kvstore/include/KVStore.h"
 #include "mbed_error.h"
 
 using namespace mbed;
diff --git a/features/storage/kvstore/global_api/kvstore_global_api.h b/storage/kvstore/global_api/kvstore_global_api.h
similarity index 100%
rename from features/storage/kvstore/global_api/kvstore_global_api.h
rename to storage/kvstore/global_api/kvstore_global_api.h
diff --git a/features/storage/kvstore/global_api/mbed_lib.json b/storage/kvstore/global_api/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/global_api/mbed_lib.json
rename to storage/kvstore/global_api/mbed_lib.json
diff --git a/features/storage/kvstore/include/KVStore.h b/storage/kvstore/include/KVStore.h
similarity index 100%
rename from features/storage/kvstore/include/KVStore.h
rename to storage/kvstore/include/KVStore.h
diff --git a/features/storage/kvstore/kv_map/KVMap.cpp b/storage/kvstore/kv_map/KVMap.cpp
similarity index 97%
rename from features/storage/kvstore/kv_map/KVMap.cpp
rename to storage/kvstore/kv_map/KVMap.cpp
index a9dcb48980..dbfb5e2926 100644
--- a/features/storage/kvstore/kv_map/KVMap.cpp
+++ b/storage/kvstore/kv_map/KVMap.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "features/storage/kvstore/include/KVStore.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/kv_map/KVMap.h"
+#include "storage/kvstore/conf/kv_config.h"
 #include <stdlib.h>
 #include "string.h"
 #include "mbed_error.h"
diff --git a/features/storage/kvstore/kv_map/KVMap.h b/storage/kvstore/kv_map/KVMap.h
similarity index 98%
rename from features/storage/kvstore/kv_map/KVMap.h
rename to storage/kvstore/kv_map/KVMap.h
index d45731ee3c..69f9f3d8c2 100644
--- a/features/storage/kvstore/kv_map/KVMap.h
+++ b/storage/kvstore/kv_map/KVMap.h
@@ -16,11 +16,11 @@
 #ifndef _KV_MAP
 #define _KV_MAP
 
-#include "features/storage/kvstore/include/KVStore.h"
+#include "storage/kvstore/include/KVStore.h"
 #include "platform/PlatformMutex.h"
 #include "platform/SingletonPtr.h"
-#include "features/storage/blockdevice/BlockDevice.h"
-#include "features/storage/filesystem/FileSystem.h"
+#include "storage/blockdevice/BlockDevice.h"
+#include "storage/filesystem/FileSystem.h"
 
 namespace mbed {
 
diff --git a/features/storage/kvstore/kv_map/mbed_lib.json b/storage/kvstore/kv_map/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/kv_map/mbed_lib.json
rename to storage/kvstore/kv_map/mbed_lib.json
diff --git a/features/storage/kvstore/securestore/SecureStore.cpp b/storage/kvstore/securestore/SecureStore.cpp
similarity index 100%
rename from features/storage/kvstore/securestore/SecureStore.cpp
rename to storage/kvstore/securestore/SecureStore.cpp
diff --git a/features/storage/kvstore/securestore/SecureStore.h b/storage/kvstore/securestore/SecureStore.h
similarity index 100%
rename from features/storage/kvstore/securestore/SecureStore.h
rename to storage/kvstore/securestore/SecureStore.h
diff --git a/features/storage/kvstore/securestore/mbed_lib.json b/storage/kvstore/securestore/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/securestore/mbed_lib.json
rename to storage/kvstore/securestore/mbed_lib.json
diff --git a/features/storage/kvstore/tdbstore/TDBStore.cpp b/storage/kvstore/tdbstore/TDBStore.cpp
similarity index 100%
rename from features/storage/kvstore/tdbstore/TDBStore.cpp
rename to storage/kvstore/tdbstore/TDBStore.cpp
diff --git a/features/storage/kvstore/tdbstore/TDBStore.h b/storage/kvstore/tdbstore/TDBStore.h
similarity index 99%
rename from features/storage/kvstore/tdbstore/TDBStore.h
rename to storage/kvstore/tdbstore/TDBStore.h
index 71b92b1fa4..917c6beab2 100644
--- a/features/storage/kvstore/tdbstore/TDBStore.h
+++ b/storage/kvstore/tdbstore/TDBStore.h
@@ -19,9 +19,9 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include "features/storage/kvstore/include/KVStore.h"
-#include "features/storage/blockdevice/BlockDevice.h"
-#include "features/storage/blockdevice/BufferedBlockDevice.h"
+#include "storage/kvstore/include/KVStore.h"
+#include "storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BufferedBlockDevice.h"
 #include "PlatformMutex.h"
 #include "mbed_error.h"
 
diff --git a/features/storage/kvstore/tdbstore/mbed_lib.json b/storage/kvstore/tdbstore/mbed_lib.json
similarity index 100%
rename from features/storage/kvstore/tdbstore/mbed_lib.json
rename to storage/kvstore/tdbstore/mbed_lib.json
diff --git a/features/storage/system_storage/SystemStorage.cpp b/storage/system_storage/SystemStorage.cpp
similarity index 84%
rename from features/storage/system_storage/SystemStorage.cpp
rename to storage/system_storage/SystemStorage.cpp
index 3e3109975b..f25400fe90 100644
--- a/features/storage/system_storage/SystemStorage.cpp
+++ b/storage/system_storage/SystemStorage.cpp
@@ -13,27 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "features/storage/blockdevice/BlockDevice.h"
-#include "features/storage/filesystem/FileSystem.h"
-#include "features/storage/filesystem/fat/FATFileSystem.h"
-#include "features/storage/filesystem/littlefs/LittleFileSystem.h"
+#include "storage/blockdevice/BlockDevice.h"
+#include "storage/filesystem/FileSystem.h"
+#include "storage/filesystem/fat/FATFileSystem.h"
+#include "storage/filesystem/littlefs/LittleFileSystem.h"
 #include "mbed_error.h"
 
 
 #if COMPONENT_SPIF
-#include "components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h"
+#include "storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h"
 #endif
 
 #if COMPONENT_QSPIF
-#include "components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h"
+#include "storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h"
 #endif
 
 #if COMPONENT_DATAFLASH
-#include "components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h"
+#include "storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h"
 #endif
 
 #if COMPONENT_SD
-#include "components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h"
+#include "storage/blockdevice/COMPONENT_SD/SDBlockDevice.h"
 
 #if (STATIC_PINMAP_READY)
 const spi_pinmap_t static_spi_pinmap = get_spi_pinmap(MBED_CONF_SD_SPI_MOSI, MBED_CONF_SD_SPI_MISO, MBED_CONF_SD_SPI_CLK, NC);
@@ -41,7 +41,7 @@ const spi_pinmap_t static_spi_pinmap = get_spi_pinmap(MBED_CONF_SD_SPI_MOSI, MBE
 #endif
 
 #if COMPONENT_FLASHIAP
-#include "components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h"
+#include "storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h"
 #endif
 
 using namespace mbed;
diff --git a/features/storage/system_storage/mbed_lib.json b/storage/system_storage/mbed_lib.json
similarity index 100%
rename from features/storage/system_storage/mbed_lib.json
rename to storage/system_storage/mbed_lib.json