diff --git a/storage/blockdevice/BlockDevice.h b/storage/blockdevice/include/blockdevice/BlockDevice.h
similarity index 100%
rename from storage/blockdevice/BlockDevice.h
rename to storage/blockdevice/include/blockdevice/BlockDevice.h
diff --git a/storage/blockdevice/BufferedBlockDevice.h b/storage/blockdevice/include/blockdevice/BufferedBlockDevice.h
similarity index 100%
rename from storage/blockdevice/BufferedBlockDevice.h
rename to storage/blockdevice/include/blockdevice/BufferedBlockDevice.h
diff --git a/storage/blockdevice/ChainingBlockDevice.h b/storage/blockdevice/include/blockdevice/ChainingBlockDevice.h
similarity index 100%
rename from storage/blockdevice/ChainingBlockDevice.h
rename to storage/blockdevice/include/blockdevice/ChainingBlockDevice.h
diff --git a/storage/blockdevice/ExhaustibleBlockDevice.h b/storage/blockdevice/include/blockdevice/ExhaustibleBlockDevice.h
similarity index 100%
rename from storage/blockdevice/ExhaustibleBlockDevice.h
rename to storage/blockdevice/include/blockdevice/ExhaustibleBlockDevice.h
diff --git a/storage/blockdevice/FlashSimBlockDevice.h b/storage/blockdevice/include/blockdevice/FlashSimBlockDevice.h
similarity index 100%
rename from storage/blockdevice/FlashSimBlockDevice.h
rename to storage/blockdevice/include/blockdevice/FlashSimBlockDevice.h
diff --git a/storage/blockdevice/HeapBlockDevice.h b/storage/blockdevice/include/blockdevice/HeapBlockDevice.h
similarity index 100%
rename from storage/blockdevice/HeapBlockDevice.h
rename to storage/blockdevice/include/blockdevice/HeapBlockDevice.h
diff --git a/storage/blockdevice/MBRBlockDevice.h b/storage/blockdevice/include/blockdevice/MBRBlockDevice.h
similarity index 100%
rename from storage/blockdevice/MBRBlockDevice.h
rename to storage/blockdevice/include/blockdevice/MBRBlockDevice.h
diff --git a/storage/blockdevice/ObservingBlockDevice.h b/storage/blockdevice/include/blockdevice/ObservingBlockDevice.h
similarity index 100%
rename from storage/blockdevice/ObservingBlockDevice.h
rename to storage/blockdevice/include/blockdevice/ObservingBlockDevice.h
diff --git a/storage/blockdevice/ProfilingBlockDevice.h b/storage/blockdevice/include/blockdevice/ProfilingBlockDevice.h
similarity index 100%
rename from storage/blockdevice/ProfilingBlockDevice.h
rename to storage/blockdevice/include/blockdevice/ProfilingBlockDevice.h
diff --git a/storage/blockdevice/ReadOnlyBlockDevice.h b/storage/blockdevice/include/blockdevice/ReadOnlyBlockDevice.h
similarity index 100%
rename from storage/blockdevice/ReadOnlyBlockDevice.h
rename to storage/blockdevice/include/blockdevice/ReadOnlyBlockDevice.h
diff --git a/storage/blockdevice/SlicingBlockDevice.h b/storage/blockdevice/include/blockdevice/SlicingBlockDevice.h
similarity index 100%
rename from storage/blockdevice/SlicingBlockDevice.h
rename to storage/blockdevice/include/blockdevice/SlicingBlockDevice.h
diff --git a/storage/blockdevice/BufferedBlockDevice.cpp b/storage/blockdevice/source/BufferedBlockDevice.cpp
similarity index 99%
rename from storage/blockdevice/BufferedBlockDevice.cpp
rename to storage/blockdevice/source/BufferedBlockDevice.cpp
index 8974af08a4..c6567355e1 100644
--- a/storage/blockdevice/BufferedBlockDevice.cpp
+++ b/storage/blockdevice/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/storage/blockdevice/ChainingBlockDevice.cpp b/storage/blockdevice/source/ChainingBlockDevice.cpp
similarity index 99%
rename from storage/blockdevice/ChainingBlockDevice.cpp
rename to storage/blockdevice/source/ChainingBlockDevice.cpp
index 591a785afc..0e3ceb1215 100644
--- a/storage/blockdevice/ChainingBlockDevice.cpp
+++ b/storage/blockdevice/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/storage/blockdevice/ExhaustibleBlockDevice.cpp b/storage/blockdevice/source/ExhaustibleBlockDevice.cpp
similarity index 98%
rename from storage/blockdevice/ExhaustibleBlockDevice.cpp
rename to storage/blockdevice/source/ExhaustibleBlockDevice.cpp
index 0e33ec2581..b5a5213a07 100644
--- a/storage/blockdevice/ExhaustibleBlockDevice.cpp
+++ b/storage/blockdevice/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"
 
@@ -209,4 +209,3 @@ const char *ExhaustibleBlockDevice::get_type() const
 }
 
 } // namespace mbed
-
diff --git a/storage/blockdevice/FlashSimBlockDevice.cpp b/storage/blockdevice/source/FlashSimBlockDevice.cpp
similarity index 99%
rename from storage/blockdevice/FlashSimBlockDevice.cpp
rename to storage/blockdevice/source/FlashSimBlockDevice.cpp
index 726103920e..f13f71a423 100644
--- a/storage/blockdevice/FlashSimBlockDevice.cpp
+++ b/storage/blockdevice/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>
@@ -230,4 +230,3 @@ const char *FlashSimBlockDevice::get_type() const
 }
 
 } // namespace mbed
-
diff --git a/storage/blockdevice/HeapBlockDevice.cpp b/storage/blockdevice/source/HeapBlockDevice.cpp
similarity index 99%
rename from storage/blockdevice/HeapBlockDevice.cpp
rename to storage/blockdevice/source/HeapBlockDevice.cpp
index 3951f324f8..0b8e978808 100644
--- a/storage/blockdevice/HeapBlockDevice.cpp
+++ b/storage/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/storage/blockdevice/MBRBlockDevice.cpp b/storage/blockdevice/source/MBRBlockDevice.cpp
similarity index 99%
rename from storage/blockdevice/MBRBlockDevice.cpp
rename to storage/blockdevice/source/MBRBlockDevice.cpp
index 6e6b243499..3026f0779a 100644
--- a/storage/blockdevice/MBRBlockDevice.cpp
+++ b/storage/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"
@@ -453,4 +453,3 @@ const char *MBRBlockDevice::get_type() const
 }
 
 } // namespace mbed
-
diff --git a/storage/blockdevice/ObservingBlockDevice.cpp b/storage/blockdevice/source/ObservingBlockDevice.cpp
similarity index 96%
rename from storage/blockdevice/ObservingBlockDevice.cpp
rename to storage/blockdevice/source/ObservingBlockDevice.cpp
index c9ea0649ea..6b2141df84 100644
--- a/storage/blockdevice/ObservingBlockDevice.cpp
+++ b/storage/blockdevice/source/ObservingBlockDevice.cpp
@@ -20,8 +20,8 @@
  * SOFTWARE.
  */
 
-#include "ObservingBlockDevice.h"
-#include "ReadOnlyBlockDevice.h"
+#include "blockdevice/ObservingBlockDevice.h"
+#include "blockdevice/ReadOnlyBlockDevice.h"
 
 namespace mbed {
 
@@ -121,4 +121,3 @@ const char *ObservingBlockDevice::get_type() const
 }
 
 } // namespace mbed
-
diff --git a/storage/blockdevice/ProfilingBlockDevice.cpp b/storage/blockdevice/source/ProfilingBlockDevice.cpp
similarity index 98%
rename from storage/blockdevice/ProfilingBlockDevice.cpp
rename to storage/blockdevice/source/ProfilingBlockDevice.cpp
index 9b7110e53f..794c6b78bc 100644
--- a/storage/blockdevice/ProfilingBlockDevice.cpp
+++ b/storage/blockdevice/source/ProfilingBlockDevice.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ProfilingBlockDevice.h"
+#include "blockdevice/ProfilingBlockDevice.h"
 #include "stddef.h"
 
 namespace mbed {
@@ -131,4 +131,3 @@ const char *ProfilingBlockDevice::get_type() const
 }
 
 } // namespace mbed
-
diff --git a/storage/blockdevice/ReadOnlyBlockDevice.cpp b/storage/blockdevice/source/ReadOnlyBlockDevice.cpp
similarity index 98%
rename from storage/blockdevice/ReadOnlyBlockDevice.cpp
rename to storage/blockdevice/source/ReadOnlyBlockDevice.cpp
index 4f767b1fb9..08a1b35331 100644
--- a/storage/blockdevice/ReadOnlyBlockDevice.cpp
+++ b/storage/blockdevice/source/ReadOnlyBlockDevice.cpp
@@ -23,7 +23,7 @@
 /** \addtogroup storage */
 /** @{*/
 
-#include "ReadOnlyBlockDevice.h"
+#include "blockdevice/ReadOnlyBlockDevice.h"
 #include "platform/mbed_error.h"
 
 namespace mbed {
@@ -111,5 +111,3 @@ const char *ReadOnlyBlockDevice::get_type() const
 } // namespace mbed
 
 /** @}*/
-
-
diff --git a/storage/blockdevice/SlicingBlockDevice.cpp b/storage/blockdevice/source/SlicingBlockDevice.cpp
similarity index 98%
rename from storage/blockdevice/SlicingBlockDevice.cpp
rename to storage/blockdevice/source/SlicingBlockDevice.cpp
index 994224e524..a57ba2f71c 100644
--- a/storage/blockdevice/SlicingBlockDevice.cpp
+++ b/storage/blockdevice/source/SlicingBlockDevice.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "SlicingBlockDevice.h"
+#include "blockdevice/SlicingBlockDevice.h"
 #include "platform/mbed_assert.h"
 #include "stddef.h"
 #include <stdio.h>