diff --git a/docs/design-documents/features/filesystem/README.md b/docs/design-documents/features/filesystem/README.md
deleted file mode 100644
index 98a692c3a0..0000000000
--- a/docs/design-documents/features/filesystem/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Design Documents - Filesystem
diff --git a/docs/design-documents/features/security/README.md b/docs/design-documents/features/security/README.md
deleted file mode 100644
index f79eb328ae..0000000000
--- a/docs/design-documents/features/security/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Design Documents - Security
diff --git a/docs/design-documents/features/storage/README.md b/docs/design-documents/features/storage/README.md
deleted file mode 100644
index 4cb03d70f4..0000000000
--- a/docs/design-documents/features/storage/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Design Documents - Storage
diff --git a/docs/design-documents/tools/README.md b/docs/design-documents/tools/README.md
deleted file mode 100644
index 9eeb66df35..0000000000
--- a/docs/design-documents/tools/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Design Documents - Tools
diff --git a/docs/design-documents/features/storage/BlockDevices/get_type_method.md b/storage/docs/BlockDevices/get_type_method.md
similarity index 100%
rename from docs/design-documents/features/storage/BlockDevices/get_type_method.md
rename to storage/docs/BlockDevices/get_type_method.md
diff --git a/docs/design-documents/features/storage/Configuration/CONFIGURATION.md b/storage/docs/Configuration/CONFIGURATION.md
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/CONFIGURATION.md
rename to storage/docs/Configuration/CONFIGURATION.md
diff --git a/docs/design-documents/features/storage/Configuration/FILESYSTEM.jpg b/storage/docs/Configuration/FILESYSTEM.jpg
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/FILESYSTEM.jpg
rename to storage/docs/Configuration/FILESYSTEM.jpg
diff --git a/docs/design-documents/features/storage/Configuration/FILESYSTEM.xml b/storage/docs/Configuration/FILESYSTEM.xml
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/FILESYSTEM.xml
rename to storage/docs/Configuration/FILESYSTEM.xml
diff --git a/docs/design-documents/features/storage/Configuration/FILESYSTEM_no_rbp.jpg b/storage/docs/Configuration/FILESYSTEM_no_rbp.jpg
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/FILESYSTEM_no_rbp.jpg
rename to storage/docs/Configuration/FILESYSTEM_no_rbp.jpg
diff --git a/docs/design-documents/features/storage/Configuration/FILESYSTEM_no_rbp.xml b/storage/docs/Configuration/FILESYSTEM_no_rbp.xml
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/FILESYSTEM_no_rbp.xml
rename to storage/docs/Configuration/FILESYSTEM_no_rbp.xml
diff --git a/docs/design-documents/features/storage/Configuration/Internal.jpg b/storage/docs/Configuration/Internal.jpg
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/Internal.jpg
rename to storage/docs/Configuration/Internal.jpg
diff --git a/docs/design-documents/features/storage/Configuration/Internal.xml b/storage/docs/Configuration/Internal.xml
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/Internal.xml
rename to storage/docs/Configuration/Internal.xml
diff --git a/docs/design-documents/features/storage/Configuration/NewStorageDesign.jpg b/storage/docs/Configuration/NewStorageDesign.jpg
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/NewStorageDesign.jpg
rename to storage/docs/Configuration/NewStorageDesign.jpg
diff --git a/docs/design-documents/features/storage/Configuration/TDB_External.jpg b/storage/docs/Configuration/TDB_External.jpg
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/TDB_External.jpg
rename to storage/docs/Configuration/TDB_External.jpg
diff --git a/docs/design-documents/features/storage/Configuration/TDB_External.xml b/storage/docs/Configuration/TDB_External.xml
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/TDB_External.xml
rename to storage/docs/Configuration/TDB_External.xml
diff --git a/docs/design-documents/features/storage/Configuration/TDB_External_no_rbp.jpg b/storage/docs/Configuration/TDB_External_no_rbp.jpg
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/TDB_External_no_rbp.jpg
rename to storage/docs/Configuration/TDB_External_no_rbp.jpg
diff --git a/docs/design-documents/features/storage/Configuration/TDB_External_no_rbp.xml b/storage/docs/Configuration/TDB_External_no_rbp.xml
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/TDB_External_no_rbp.xml
rename to storage/docs/Configuration/TDB_External_no_rbp.xml
diff --git a/docs/design-documents/features/storage/Configuration/UserDefined.jpg b/storage/docs/Configuration/UserDefined.jpg
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/UserDefined.jpg
rename to storage/docs/Configuration/UserDefined.jpg
diff --git a/docs/design-documents/features/storage/Configuration/UserDefined.xml b/storage/docs/Configuration/UserDefined.xml
similarity index 100%
rename from docs/design-documents/features/storage/Configuration/UserDefined.xml
rename to storage/docs/Configuration/UserDefined.xml
diff --git a/docs/design-documents/features/storage/FileSystemStore/FileSystemStore_class_hierarchy.jpg b/storage/docs/FileSystemStore/FileSystemStore_class_hierarchy.jpg
similarity index 100%
rename from docs/design-documents/features/storage/FileSystemStore/FileSystemStore_class_hierarchy.jpg
rename to storage/docs/FileSystemStore/FileSystemStore_class_hierarchy.jpg
diff --git a/docs/design-documents/features/storage/FileSystemStore/FileSystemStore_class_hierarchy.xml b/storage/docs/FileSystemStore/FileSystemStore_class_hierarchy.xml
similarity index 100%
rename from docs/design-documents/features/storage/FileSystemStore/FileSystemStore_class_hierarchy.xml
rename to storage/docs/FileSystemStore/FileSystemStore_class_hierarchy.xml
diff --git a/docs/design-documents/features/storage/FileSystemStore/FileSystemStore_design.md b/storage/docs/FileSystemStore/FileSystemStore_design.md
similarity index 100%
rename from docs/design-documents/features/storage/FileSystemStore/FileSystemStore_design.md
rename to storage/docs/FileSystemStore/FileSystemStore_design.md
diff --git a/docs/design-documents/features/storage/FileSystemStore/FileSystemStore_record.jpg b/storage/docs/FileSystemStore/FileSystemStore_record.jpg
similarity index 100%
rename from docs/design-documents/features/storage/FileSystemStore/FileSystemStore_record.jpg
rename to storage/docs/FileSystemStore/FileSystemStore_record.jpg
diff --git a/docs/design-documents/features/storage/FileSystemStore/FileSystemStore_record.xml b/storage/docs/FileSystemStore/FileSystemStore_record.xml
similarity index 100%
rename from docs/design-documents/features/storage/FileSystemStore/FileSystemStore_record.xml
rename to storage/docs/FileSystemStore/FileSystemStore_record.xml
diff --git a/docs/design-documents/features/storage/KVStore/KVStore_classes.jpg b/storage/docs/KVStore/KVStore_classes.jpg
similarity index 100%
rename from docs/design-documents/features/storage/KVStore/KVStore_classes.jpg
rename to storage/docs/KVStore/KVStore_classes.jpg
diff --git a/docs/design-documents/features/storage/KVStore/KVStore_classes.xml b/storage/docs/KVStore/KVStore_classes.xml
similarity index 100%
rename from docs/design-documents/features/storage/KVStore/KVStore_classes.xml
rename to storage/docs/KVStore/KVStore_classes.xml
diff --git a/docs/design-documents/features/storage/KVStore/KVStore_design.md b/storage/docs/KVStore/KVStore_design.md
similarity index 100%
rename from docs/design-documents/features/storage/KVStore/KVStore_design.md
rename to storage/docs/KVStore/KVStore_design.md
diff --git a/docs/design-documents/features/storage/SecureStore/SecureStore_class_hierarchy.jpg b/storage/docs/SecureStore/SecureStore_class_hierarchy.jpg
similarity index 100%
rename from docs/design-documents/features/storage/SecureStore/SecureStore_class_hierarchy.jpg
rename to storage/docs/SecureStore/SecureStore_class_hierarchy.jpg
diff --git a/docs/design-documents/features/storage/SecureStore/SecureStore_class_hierarchy.xml b/storage/docs/SecureStore/SecureStore_class_hierarchy.xml
similarity index 100%
rename from docs/design-documents/features/storage/SecureStore/SecureStore_class_hierarchy.xml
rename to storage/docs/SecureStore/SecureStore_class_hierarchy.xml
diff --git a/docs/design-documents/features/storage/SecureStore/SecureStore_design.md b/storage/docs/SecureStore/SecureStore_design.md
similarity index 100%
rename from docs/design-documents/features/storage/SecureStore/SecureStore_design.md
rename to storage/docs/SecureStore/SecureStore_design.md
diff --git a/docs/design-documents/features/storage/SecureStore/SecureStore_layers.jpg b/storage/docs/SecureStore/SecureStore_layers.jpg
similarity index 100%
rename from docs/design-documents/features/storage/SecureStore/SecureStore_layers.jpg
rename to storage/docs/SecureStore/SecureStore_layers.jpg
diff --git a/docs/design-documents/features/storage/SecureStore/SecureStore_layers.xml b/storage/docs/SecureStore/SecureStore_layers.xml
similarity index 100%
rename from docs/design-documents/features/storage/SecureStore/SecureStore_layers.xml
rename to storage/docs/SecureStore/SecureStore_layers.xml
diff --git a/docs/design-documents/features/storage/SecureStore/SecureStore_record.jpg b/storage/docs/SecureStore/SecureStore_record.jpg
similarity index 100%
rename from docs/design-documents/features/storage/SecureStore/SecureStore_record.jpg
rename to storage/docs/SecureStore/SecureStore_record.jpg
diff --git a/docs/design-documents/features/storage/SecureStore/SecureStore_record.xml b/storage/docs/SecureStore/SecureStore_record.xml
similarity index 100%
rename from docs/design-documents/features/storage/SecureStore/SecureStore_record.xml
rename to storage/docs/SecureStore/SecureStore_record.xml
diff --git a/docs/design-documents/features/storage/TDBStore/TDBStore_areas.jpg b/storage/docs/TDBStore/TDBStore_areas.jpg
similarity index 100%
rename from docs/design-documents/features/storage/TDBStore/TDBStore_areas.jpg
rename to storage/docs/TDBStore/TDBStore_areas.jpg
diff --git a/docs/design-documents/features/storage/TDBStore/TDBStore_areas.xml b/storage/docs/TDBStore/TDBStore_areas.xml
similarity index 100%
rename from docs/design-documents/features/storage/TDBStore/TDBStore_areas.xml
rename to storage/docs/TDBStore/TDBStore_areas.xml
diff --git a/docs/design-documents/features/storage/TDBStore/TDBStore_class_hierarchy.jpg b/storage/docs/TDBStore/TDBStore_class_hierarchy.jpg
similarity index 100%
rename from docs/design-documents/features/storage/TDBStore/TDBStore_class_hierarchy.jpg
rename to storage/docs/TDBStore/TDBStore_class_hierarchy.jpg
diff --git a/docs/design-documents/features/storage/TDBStore/TDBStore_class_hierarchy.xml b/storage/docs/TDBStore/TDBStore_class_hierarchy.xml
similarity index 100%
rename from docs/design-documents/features/storage/TDBStore/TDBStore_class_hierarchy.xml
rename to storage/docs/TDBStore/TDBStore_class_hierarchy.xml
diff --git a/docs/design-documents/features/storage/TDBStore/TDBStore_design.md b/storage/docs/TDBStore/TDBStore_design.md
similarity index 100%
rename from docs/design-documents/features/storage/TDBStore/TDBStore_design.md
rename to storage/docs/TDBStore/TDBStore_design.md
diff --git a/docs/design-documents/features/storage/TDBStore/TDBStore_ram_table.jpg b/storage/docs/TDBStore/TDBStore_ram_table.jpg
similarity index 100%
rename from docs/design-documents/features/storage/TDBStore/TDBStore_ram_table.jpg
rename to storage/docs/TDBStore/TDBStore_ram_table.jpg
diff --git a/docs/design-documents/features/storage/TDBStore/TDBStore_ram_table.xml b/storage/docs/TDBStore/TDBStore_ram_table.xml
similarity index 100%
rename from docs/design-documents/features/storage/TDBStore/TDBStore_ram_table.xml
rename to storage/docs/TDBStore/TDBStore_ram_table.xml
diff --git a/docs/design-documents/features/storage/TDBStore/TDBStore_record.jpg b/storage/docs/TDBStore/TDBStore_record.jpg
similarity index 100%
rename from docs/design-documents/features/storage/TDBStore/TDBStore_record.jpg
rename to storage/docs/TDBStore/TDBStore_record.jpg
diff --git a/docs/design-documents/features/storage/TDBStore/TDBStore_record.xml b/storage/docs/TDBStore/TDBStore_record.xml
similarity index 100%
rename from docs/design-documents/features/storage/TDBStore/TDBStore_record.xml
rename to storage/docs/TDBStore/TDBStore_record.xml