diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed/_closed.dm
similarity index 100%
rename from code/game/turfs/closed.dm
rename to code/game/turfs/closed/_closed.dm
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/closed/minerals.dm
similarity index 100%
rename from code/game/turfs/simulated/minerals.dm
rename to code/game/turfs/closed/minerals.dm
diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm
similarity index 100%
rename from code/game/turfs/simulated/wall/mineral_walls.dm
rename to code/game/turfs/closed/wall/mineral_walls.dm
diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm
similarity index 100%
rename from code/game/turfs/simulated/wall/misc_walls.dm
rename to code/game/turfs/closed/wall/misc_walls.dm
diff --git a/code/game/turfs/simulated/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm
similarity index 100%
rename from code/game/turfs/simulated/wall/reinf_walls.dm
rename to code/game/turfs/closed/wall/reinf_walls.dm
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/closed/walls.dm
similarity index 100%
rename from code/game/turfs/simulated/walls.dm
rename to code/game/turfs/closed/walls.dm
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open/_open.dm
similarity index 100%
rename from code/game/turfs/open.dm
rename to code/game/turfs/open/_open.dm
diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/open/chasm.dm
similarity index 100%
rename from code/game/turfs/simulated/chasm.dm
rename to code/game/turfs/open/chasm.dm
diff --git a/code/game/turfs/simulated/dirtystation.dm b/code/game/turfs/open/dirtystation.dm
similarity index 100%
rename from code/game/turfs/simulated/dirtystation.dm
rename to code/game/turfs/open/dirtystation.dm
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/open/floor.dm
similarity index 100%
rename from code/game/turfs/simulated/floor.dm
rename to code/game/turfs/open/floor.dm
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
similarity index 100%
rename from code/game/turfs/simulated/floor/fancy_floor.dm
rename to code/game/turfs/open/floor/fancy_floor.dm
diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/open/floor/light_floor.dm
similarity index 100%
rename from code/game/turfs/simulated/floor/light_floor.dm
rename to code/game/turfs/open/floor/light_floor.dm
diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm
similarity index 100%
rename from code/game/turfs/simulated/floor/mineral_floor.dm
rename to code/game/turfs/open/floor/mineral_floor.dm
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
similarity index 100%
rename from code/game/turfs/simulated/floor/misc_floor.dm
rename to code/game/turfs/open/floor/misc_floor.dm
diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/open/floor/plasteel_floor.dm
similarity index 100%
rename from code/game/turfs/simulated/floor/plasteel_floor.dm
rename to code/game/turfs/open/floor/plasteel_floor.dm
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/open/floor/plating.dm
similarity index 100%
rename from code/game/turfs/simulated/floor/plating.dm
rename to code/game/turfs/open/floor/plating.dm
diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/open/floor/plating/asteroid.dm
similarity index 100%
rename from code/game/turfs/simulated/floor/plating/asteroid.dm
rename to code/game/turfs/open/floor/plating/asteroid.dm
diff --git a/code/game/turfs/simulated/floor/plating/dirt.dm b/code/game/turfs/open/floor/plating/dirt.dm
similarity index 100%
rename from code/game/turfs/simulated/floor/plating/dirt.dm
rename to code/game/turfs/open/floor/plating/dirt.dm
diff --git a/code/game/turfs/simulated/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm
similarity index 100%
rename from code/game/turfs/simulated/floor/plating/misc_plating.dm
rename to code/game/turfs/open/floor/plating/misc_plating.dm
diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm
similarity index 100%
rename from code/game/turfs/simulated/floor/reinf_floor.dm
rename to code/game/turfs/open/floor/reinf_floor.dm
diff --git a/code/game/turfs/simulated/lava.dm b/code/game/turfs/open/lava.dm
similarity index 100%
rename from code/game/turfs/simulated/lava.dm
rename to code/game/turfs/open/lava.dm
diff --git a/code/game/turfs/openspace/openspace.dm b/code/game/turfs/open/openspace.dm
similarity index 100%
rename from code/game/turfs/openspace/openspace.dm
rename to code/game/turfs/open/openspace.dm
diff --git a/code/game/turfs/simulated/river.dm b/code/game/turfs/open/river.dm
similarity index 100%
rename from code/game/turfs/simulated/river.dm
rename to code/game/turfs/open/river.dm
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/open/space/space.dm
similarity index 100%
rename from code/game/turfs/space/space.dm
rename to code/game/turfs/open/space/space.dm
diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/open/space/transit.dm
similarity index 100%
rename from code/game/turfs/space/transit.dm
rename to code/game/turfs/open/space/transit.dm
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/open/water.dm
similarity index 100%
rename from code/game/turfs/simulated/water.dm
rename to code/game/turfs/open/water.dm
diff --git a/tgstation.dme b/tgstation.dme
index a746bc1eed4..3b2ade32958 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1151,33 +1151,33 @@
 #include "code\game\objects\structures\transit_tubes\transit_tube_pod.dm"
 #include "code\game\turfs\baseturf_skipover.dm"
 #include "code\game\turfs\change_turf.dm"
-#include "code\game\turfs\closed.dm"
-#include "code\game\turfs\open.dm"
 #include "code\game\turfs\turf.dm"
-#include "code\game\turfs\openspace\openspace.dm"
-#include "code\game\turfs\simulated\chasm.dm"
-#include "code\game\turfs\simulated\dirtystation.dm"
-#include "code\game\turfs\simulated\floor.dm"
-#include "code\game\turfs\simulated\lava.dm"
-#include "code\game\turfs\simulated\minerals.dm"
-#include "code\game\turfs\simulated\river.dm"
-#include "code\game\turfs\simulated\walls.dm"
-#include "code\game\turfs\simulated\water.dm"
-#include "code\game\turfs\simulated\floor\fancy_floor.dm"
-#include "code\game\turfs\simulated\floor\light_floor.dm"
-#include "code\game\turfs\simulated\floor\mineral_floor.dm"
-#include "code\game\turfs\simulated\floor\misc_floor.dm"
-#include "code\game\turfs\simulated\floor\plasteel_floor.dm"
-#include "code\game\turfs\simulated\floor\plating.dm"
-#include "code\game\turfs\simulated\floor\reinf_floor.dm"
-#include "code\game\turfs\simulated\floor\plating\asteroid.dm"
-#include "code\game\turfs\simulated\floor\plating\dirt.dm"
-#include "code\game\turfs\simulated\floor\plating\misc_plating.dm"
-#include "code\game\turfs\simulated\wall\mineral_walls.dm"
-#include "code\game\turfs\simulated\wall\misc_walls.dm"
-#include "code\game\turfs\simulated\wall\reinf_walls.dm"
-#include "code\game\turfs\space\space.dm"
-#include "code\game\turfs\space\transit.dm"
+#include "code\game\turfs\closed\_closed.dm"
+#include "code\game\turfs\closed\minerals.dm"
+#include "code\game\turfs\closed\walls.dm"
+#include "code\game\turfs\closed\wall\mineral_walls.dm"
+#include "code\game\turfs\closed\wall\misc_walls.dm"
+#include "code\game\turfs\closed\wall\reinf_walls.dm"
+#include "code\game\turfs\open\_open.dm"
+#include "code\game\turfs\open\chasm.dm"
+#include "code\game\turfs\open\dirtystation.dm"
+#include "code\game\turfs\open\floor.dm"
+#include "code\game\turfs\open\lava.dm"
+#include "code\game\turfs\open\openspace.dm"
+#include "code\game\turfs\open\river.dm"
+#include "code\game\turfs\open\water.dm"
+#include "code\game\turfs\open\floor\fancy_floor.dm"
+#include "code\game\turfs\open\floor\light_floor.dm"
+#include "code\game\turfs\open\floor\mineral_floor.dm"
+#include "code\game\turfs\open\floor\misc_floor.dm"
+#include "code\game\turfs\open\floor\plasteel_floor.dm"
+#include "code\game\turfs\open\floor\plating.dm"
+#include "code\game\turfs\open\floor\reinf_floor.dm"
+#include "code\game\turfs\open\floor\plating\asteroid.dm"
+#include "code\game\turfs\open\floor\plating\dirt.dm"
+#include "code\game\turfs\open\floor\plating\misc_plating.dm"
+#include "code\game\turfs\open\space\space.dm"
+#include "code\game\turfs\open\space\transit.dm"
 #include "code\modules\admin\admin.dm"
 #include "code\modules\admin\admin_investigate.dm"
 #include "code\modules\admin\admin_ranks.dm"