diff --git a/code/datums/extensions/storage/_storage.dm b/code/datums/storage/_storage.dm
similarity index 100%
rename from code/datums/extensions/storage/_storage.dm
rename to code/datums/storage/_storage.dm
diff --git a/code/datums/extensions/storage/_storage_ui.dm b/code/datums/storage/_storage_ui.dm
similarity index 100%
rename from code/datums/extensions/storage/_storage_ui.dm
rename to code/datums/storage/_storage_ui.dm
diff --git a/code/datums/extensions/storage/subtypes_backpack.dm b/code/datums/storage/subtypes_backpack.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_backpack.dm
rename to code/datums/storage/subtypes_backpack.dm
diff --git a/code/datums/extensions/storage/subtypes_bag.dm b/code/datums/storage/subtypes_bag.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_bag.dm
rename to code/datums/storage/subtypes_bag.dm
diff --git a/code/datums/extensions/storage/subtypes_basket.dm b/code/datums/storage/subtypes_basket.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_basket.dm
rename to code/datums/storage/subtypes_basket.dm
diff --git a/code/datums/extensions/storage/subtypes_belt.dm b/code/datums/storage/subtypes_belt.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_belt.dm
rename to code/datums/storage/subtypes_belt.dm
diff --git a/code/datums/extensions/storage/subtypes_box.dm b/code/datums/storage/subtypes_box.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_box.dm
rename to code/datums/storage/subtypes_box.dm
diff --git a/code/datums/extensions/storage/subtypes_excavation.dm b/code/datums/storage/subtypes_excavation.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_excavation.dm
rename to code/datums/storage/subtypes_excavation.dm
diff --git a/code/datums/extensions/storage/subtypes_firstaid.dm b/code/datums/storage/subtypes_firstaid.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_firstaid.dm
rename to code/datums/storage/subtypes_firstaid.dm
diff --git a/code/datums/extensions/storage/subtypes_holster.dm b/code/datums/storage/subtypes_holster.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_holster.dm
rename to code/datums/storage/subtypes_holster.dm
diff --git a/code/datums/extensions/storage/subtypes_misc.dm b/code/datums/storage/subtypes_misc.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_misc.dm
rename to code/datums/storage/subtypes_misc.dm
diff --git a/code/datums/extensions/storage/subtypes_mre.dm b/code/datums/storage/subtypes_mre.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_mre.dm
rename to code/datums/storage/subtypes_mre.dm
diff --git a/code/datums/extensions/storage/subtypes_part_replacer.dm b/code/datums/storage/subtypes_part_replacer.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_part_replacer.dm
rename to code/datums/storage/subtypes_part_replacer.dm
diff --git a/code/datums/extensions/storage/subtypes_pills.dm b/code/datums/storage/subtypes_pills.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_pills.dm
rename to code/datums/storage/subtypes_pills.dm
diff --git a/code/datums/extensions/storage/subtypes_pockets.dm b/code/datums/storage/subtypes_pockets.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_pockets.dm
rename to code/datums/storage/subtypes_pockets.dm
diff --git a/code/datums/extensions/storage/subtypes_secure.dm b/code/datums/storage/subtypes_secure.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_secure.dm
rename to code/datums/storage/subtypes_secure.dm
diff --git a/code/datums/extensions/storage/subtypes_sheets.dm b/code/datums/storage/subtypes_sheets.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_sheets.dm
rename to code/datums/storage/subtypes_sheets.dm
diff --git a/code/datums/extensions/storage/subtypes_slides.dm b/code/datums/storage/subtypes_slides.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_slides.dm
rename to code/datums/storage/subtypes_slides.dm
diff --git a/code/datums/extensions/storage/subtypes_specialized.dm b/code/datums/storage/subtypes_specialized.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_specialized.dm
rename to code/datums/storage/subtypes_specialized.dm
diff --git a/code/datums/extensions/storage/subtypes_structure.dm b/code/datums/storage/subtypes_structure.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_structure.dm
rename to code/datums/storage/subtypes_structure.dm
diff --git a/code/datums/extensions/storage/subtypes_tray.dm b/code/datums/storage/subtypes_tray.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_tray.dm
rename to code/datums/storage/subtypes_tray.dm
diff --git a/code/datums/extensions/storage/subtypes_wallet.dm b/code/datums/storage/subtypes_wallet.dm
similarity index 100%
rename from code/datums/extensions/storage/subtypes_wallet.dm
rename to code/datums/storage/subtypes_wallet.dm
diff --git a/nebula.dme b/nebula.dme
index fb97f12f90c..01ffa95cb81 100644
--- a/nebula.dme
+++ b/nebula.dme
@@ -476,28 +476,6 @@
 #include "code\datums\extensions\scent\scent_candle.dm"
 #include "code\datums\extensions\scent\scent_misc.dm"
 #include "code\datums\extensions\shearable\shearable.dm"
-#include "code\datums\extensions\storage\_storage.dm"
-#include "code\datums\extensions\storage\_storage_ui.dm"
-#include "code\datums\extensions\storage\subtypes_backpack.dm"
-#include "code\datums\extensions\storage\subtypes_bag.dm"
-#include "code\datums\extensions\storage\subtypes_basket.dm"
-#include "code\datums\extensions\storage\subtypes_belt.dm"
-#include "code\datums\extensions\storage\subtypes_box.dm"
-#include "code\datums\extensions\storage\subtypes_excavation.dm"
-#include "code\datums\extensions\storage\subtypes_firstaid.dm"
-#include "code\datums\extensions\storage\subtypes_holster.dm"
-#include "code\datums\extensions\storage\subtypes_misc.dm"
-#include "code\datums\extensions\storage\subtypes_mre.dm"
-#include "code\datums\extensions\storage\subtypes_part_replacer.dm"
-#include "code\datums\extensions\storage\subtypes_pills.dm"
-#include "code\datums\extensions\storage\subtypes_pockets.dm"
-#include "code\datums\extensions\storage\subtypes_secure.dm"
-#include "code\datums\extensions\storage\subtypes_sheets.dm"
-#include "code\datums\extensions\storage\subtypes_slides.dm"
-#include "code\datums\extensions\storage\subtypes_specialized.dm"
-#include "code\datums\extensions\storage\subtypes_structure.dm"
-#include "code\datums\extensions\storage\subtypes_tray.dm"
-#include "code\datums\extensions\storage\subtypes_wallet.dm"
 #include "code\datums\genetics\genetic_conditions.dm"
 #include "code\datums\graph\graph.dm"
 #include "code\datums\graph\node.dm"
@@ -650,6 +628,28 @@
 #include "code\datums\state_machine\paper_fortune_fsm.dm"
 #include "code\datums\state_machine\state.dm"
 #include "code\datums\state_machine\transition.dm"
+#include "code\datums\storage\_storage.dm"
+#include "code\datums\storage\_storage_ui.dm"
+#include "code\datums\storage\subtypes_backpack.dm"
+#include "code\datums\storage\subtypes_bag.dm"
+#include "code\datums\storage\subtypes_basket.dm"
+#include "code\datums\storage\subtypes_belt.dm"
+#include "code\datums\storage\subtypes_box.dm"
+#include "code\datums\storage\subtypes_excavation.dm"
+#include "code\datums\storage\subtypes_firstaid.dm"
+#include "code\datums\storage\subtypes_holster.dm"
+#include "code\datums\storage\subtypes_misc.dm"
+#include "code\datums\storage\subtypes_mre.dm"
+#include "code\datums\storage\subtypes_part_replacer.dm"
+#include "code\datums\storage\subtypes_pills.dm"
+#include "code\datums\storage\subtypes_pockets.dm"
+#include "code\datums\storage\subtypes_secure.dm"
+#include "code\datums\storage\subtypes_sheets.dm"
+#include "code\datums\storage\subtypes_slides.dm"
+#include "code\datums\storage\subtypes_specialized.dm"
+#include "code\datums\storage\subtypes_structure.dm"
+#include "code\datums\storage\subtypes_tray.dm"
+#include "code\datums\storage\subtypes_wallet.dm"
 #include "code\datums\supplypacks\atmospherics.dm"
 #include "code\datums\supplypacks\custodial.dm"
 #include "code\datums\supplypacks\dispcarts.dm"