diff --git a/baystation12.dme b/baystation12.dme
index 6c2d38aaef..04a5375f1f 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -379,6 +379,7 @@
 #include "code\game\machinery\computer\communications.dm"
 #include "code\game\machinery\computer\computer.dm"
 #include "code\game\machinery\computer\crew.dm"
+#include "code\game\machinery\computer\guestpass.dm"
 #include "code\game\machinery\computer\HolodeckControl.dm"
 #include "code\game\machinery\computer\hologram.dm"
 #include "code\game\machinery\computer\law.dm"
@@ -494,6 +495,7 @@
 #include "code\game\objects\effects\spawners\gibspawner.dm"
 #include "code\game\objects\effects\spawners\vaultspawner.dm"
 #include "code\game\objects\items\apc_frame.dm"
+#include "code\game\objects\items\ashtray.dm"
 #include "code\game\objects\items\blueprints.dm"
 #include "code\game\objects\items\bodybag.dm"
 #include "code\game\objects\items\contraband.dm"
@@ -1182,6 +1184,14 @@
 #include "code\modules\organs\organ_objects.dm"
 #include "code\modules\organs\pain.dm"
 #include "code\modules\organs\wound.dm"
+#include "code\modules\overmap\_defines.dm"
+#include "code\modules\overmap\sectors.dm"
+#include "code\modules\overmap\ships\ship.dm"
+#include "code\modules\overmap\ships\computers\engine_control.dm"
+#include "code\modules\overmap\ships\computers\helm.dm"
+#include "code\modules\overmap\ships\computers\shuttle.dm"
+#include "code\modules\overmap\ships\engines\engine.dm"
+#include "code\modules\overmap\ships\engines\thermal.dm"
 #include "code\modules\paperwork\carbonpaper.dm"
 #include "code\modules\paperwork\clipboard.dm"
 #include "code\modules\paperwork\faxmachine.dm"
@@ -1475,17 +1485,6 @@
 #include "code\WorkInProgress\Cael_Aislinn\Rust\virtual_particle_catcher.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Supermatter\LaserComputer.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Supermatter\ZeroPointLaser.dm"
-#include "code\WorkInProgress\Chinsky\ashtray.dm"
-#include "code\WorkInProgress\Chinsky\guestpass.dm"
-#include "code\WorkInProgress\Chinsky\overmap\_defines.dm"
-#include "code\WorkInProgress\Chinsky\overmap\README.dm"
-#include "code\WorkInProgress\Chinsky\overmap\sectors.dm"
-#include "code\WorkInProgress\Chinsky\overmap\ships\ship.dm"
-#include "code\WorkInProgress\Chinsky\overmap\ships\computers\engine_control.dm"
-#include "code\WorkInProgress\Chinsky\overmap\ships\computers\helm.dm"
-#include "code\WorkInProgress\Chinsky\overmap\ships\computers\shuttle.dm"
-#include "code\WorkInProgress\Chinsky\overmap\ships\engines\engine.dm"
-#include "code\WorkInProgress\Chinsky\overmap\ships\engines\thermal.dm"
 #include "code\WorkInProgress\Cib\MedicalSideEffects.dm"
 #include "code\WorkInProgress\computer3\bios.dm"
 #include "code\WorkInProgress\computer3\buildandrepair.dm"
diff --git a/code/WorkInProgress/Chinsky/guestpass.dm b/code/game/machinery/computer/guestpass.dm
similarity index 100%
rename from code/WorkInProgress/Chinsky/guestpass.dm
rename to code/game/machinery/computer/guestpass.dm
diff --git a/code/WorkInProgress/Chinsky/ashtray.dm b/code/game/objects/items/ashtray.dm
similarity index 100%
rename from code/WorkInProgress/Chinsky/ashtray.dm
rename to code/game/objects/items/ashtray.dm
diff --git a/code/WorkInProgress/Chinsky/overmap/README.dm b/code/modules/overmap/README.dm
similarity index 100%
rename from code/WorkInProgress/Chinsky/overmap/README.dm
rename to code/modules/overmap/README.dm
diff --git a/code/WorkInProgress/Chinsky/overmap/_defines.dm b/code/modules/overmap/_defines.dm
similarity index 100%
rename from code/WorkInProgress/Chinsky/overmap/_defines.dm
rename to code/modules/overmap/_defines.dm
diff --git a/code/WorkInProgress/Chinsky/overmap/sectors.dm b/code/modules/overmap/sectors.dm
similarity index 100%
rename from code/WorkInProgress/Chinsky/overmap/sectors.dm
rename to code/modules/overmap/sectors.dm
diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm b/code/modules/overmap/ships/computers/engine_control.dm
similarity index 100%
rename from code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm
rename to code/modules/overmap/ships/computers/engine_control.dm
diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm
similarity index 100%
rename from code/WorkInProgress/Chinsky/overmap/ships/computers/helm.dm
rename to code/modules/overmap/ships/computers/helm.dm
diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/shuttle.dm b/code/modules/overmap/ships/computers/shuttle.dm
similarity index 100%
rename from code/WorkInProgress/Chinsky/overmap/ships/computers/shuttle.dm
rename to code/modules/overmap/ships/computers/shuttle.dm
diff --git a/code/WorkInProgress/Chinsky/overmap/ships/engines/engine.dm b/code/modules/overmap/ships/engines/engine.dm
similarity index 100%
rename from code/WorkInProgress/Chinsky/overmap/ships/engines/engine.dm
rename to code/modules/overmap/ships/engines/engine.dm
diff --git a/code/WorkInProgress/Chinsky/overmap/ships/engines/thermal.dm b/code/modules/overmap/ships/engines/thermal.dm
similarity index 100%
rename from code/WorkInProgress/Chinsky/overmap/ships/engines/thermal.dm
rename to code/modules/overmap/ships/engines/thermal.dm
diff --git a/code/WorkInProgress/Chinsky/overmap/ships/ship.dm b/code/modules/overmap/ships/ship.dm
similarity index 100%
rename from code/WorkInProgress/Chinsky/overmap/ships/ship.dm
rename to code/modules/overmap/ships/ship.dm