diff --git a/baystation12.dme b/baystation12.dme
index a9fd6e90b58..7ab54db66b9 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -213,6 +213,28 @@
 #include "code\game\smoothwall.dm"
 #include "code\game\sound.dm"
 #include "code\game\supplyshuttle.dm"
+#include "code\game\antagonist\antagonist.dm"
+#include "code\game\antagonist\antagonist_build.dm"
+#include "code\game\antagonist\antagonist_globals.dm"
+#include "code\game\antagonist\antagonist_helpers.dm"
+#include "code\game\antagonist\antagonist_objectives.dm"
+#include "code\game\antagonist\antagonist_spawn.dm"
+#include "code\game\antagonist\alien\borer.dm"
+#include "code\game\antagonist\alien\xenomorph.dm"
+#include "code\game\antagonist\outsider\commando.dm"
+#include "code\game\antagonist\outsider\deathsquad.dm"
+#include "code\game\antagonist\outsider\ert.dm"
+#include "code\game\antagonist\outsider\mercenary.dm"
+#include "code\game\antagonist\outsider\ninja.dm"
+#include "code\game\antagonist\outsider\raider.dm"
+#include "code\game\antagonist\outsider\wizard.dm"
+#include "code\game\antagonist\station\changeling.dm"
+#include "code\game\antagonist\station\cultist.dm"
+#include "code\game\antagonist\station\highlander.dm"
+#include "code\game\antagonist\station\renegade.dm"
+#include "code\game\antagonist\station\revolutionary.dm"
+#include "code\game\antagonist\station\rogue_ai.dm"
+#include "code\game\antagonist\station\traitor.dm"
 #include "code\game\area\ai_monitored.dm"
 #include "code\game\area\areas.dm"
 #include "code\game\area\asteroid_areas.dm"
@@ -231,28 +253,6 @@
 #include "code\game\gamemodes\intercept_report.dm"
 #include "code\game\gamemodes\objective.dm"
 #include "code\game\gamemodes\setupgame.dm"
-#include "code\game\gamemodes\antagonist\antagonist.dm"
-#include "code\game\gamemodes\antagonist\antagonist_build.dm"
-#include "code\game\gamemodes\antagonist\antagonist_globals.dm"
-#include "code\game\gamemodes\antagonist\antagonist_helpers.dm"
-#include "code\game\gamemodes\antagonist\antagonist_objectives.dm"
-#include "code\game\gamemodes\antagonist\antagonist_spawn.dm"
-#include "code\game\gamemodes\antagonist\alien\borer.dm"
-#include "code\game\gamemodes\antagonist\alien\xenomorph.dm"
-#include "code\game\gamemodes\antagonist\outsider\commando.dm"
-#include "code\game\gamemodes\antagonist\outsider\deathsquad.dm"
-#include "code\game\gamemodes\antagonist\outsider\ert.dm"
-#include "code\game\gamemodes\antagonist\outsider\mercenary.dm"
-#include "code\game\gamemodes\antagonist\outsider\ninja.dm"
-#include "code\game\gamemodes\antagonist\outsider\raider.dm"
-#include "code\game\gamemodes\antagonist\outsider\wizard.dm"
-#include "code\game\gamemodes\antagonist\station\changeling.dm"
-#include "code\game\gamemodes\antagonist\station\cultist.dm"
-#include "code\game\gamemodes\antagonist\station\highlander.dm"
-#include "code\game\gamemodes\antagonist\station\renegade.dm"
-#include "code\game\gamemodes\antagonist\station\revolutionary.dm"
-#include "code\game\gamemodes\antagonist\station\rogue_ai.dm"
-#include "code\game\gamemodes\antagonist\station\traitor.dm"
 #include "code\game\gamemodes\blob\blob.dm"
 #include "code\game\gamemodes\blob\theblob.dm"
 #include "code\game\gamemodes\blob\blobs\core.dm"
diff --git a/code/game/gamemodes/antagonist/alien/borer.dm b/code/game/antagonist/alien/borer.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/alien/borer.dm
rename to code/game/antagonist/alien/borer.dm
diff --git a/code/game/gamemodes/antagonist/alien/xenomorph.dm b/code/game/antagonist/alien/xenomorph.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/alien/xenomorph.dm
rename to code/game/antagonist/alien/xenomorph.dm
diff --git a/code/game/gamemodes/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/antagonist.dm
rename to code/game/antagonist/antagonist.dm
diff --git a/code/game/gamemodes/antagonist/antagonist_build.dm b/code/game/antagonist/antagonist_build.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/antagonist_build.dm
rename to code/game/antagonist/antagonist_build.dm
diff --git a/code/game/gamemodes/antagonist/antagonist_globals.dm b/code/game/antagonist/antagonist_globals.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/antagonist_globals.dm
rename to code/game/antagonist/antagonist_globals.dm
diff --git a/code/game/gamemodes/antagonist/antagonist_helpers.dm b/code/game/antagonist/antagonist_helpers.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/antagonist_helpers.dm
rename to code/game/antagonist/antagonist_helpers.dm
diff --git a/code/game/gamemodes/antagonist/antagonist_objectives.dm b/code/game/antagonist/antagonist_objectives.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/antagonist_objectives.dm
rename to code/game/antagonist/antagonist_objectives.dm
diff --git a/code/game/gamemodes/antagonist/antagonist_spawn.dm b/code/game/antagonist/antagonist_spawn.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/antagonist_spawn.dm
rename to code/game/antagonist/antagonist_spawn.dm
diff --git a/code/game/gamemodes/antagonist/mutiny/loyalist.dm b/code/game/antagonist/mutiny/loyalist.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/mutiny/loyalist.dm
rename to code/game/antagonist/mutiny/loyalist.dm
diff --git a/code/game/gamemodes/antagonist/mutiny/mutineer.dm b/code/game/antagonist/mutiny/mutineer.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/mutiny/mutineer.dm
rename to code/game/antagonist/mutiny/mutineer.dm
diff --git a/code/game/gamemodes/antagonist/outsider/commando.dm b/code/game/antagonist/outsider/commando.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/outsider/commando.dm
rename to code/game/antagonist/outsider/commando.dm
diff --git a/code/game/gamemodes/antagonist/outsider/deathsquad.dm b/code/game/antagonist/outsider/deathsquad.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/outsider/deathsquad.dm
rename to code/game/antagonist/outsider/deathsquad.dm
diff --git a/code/game/gamemodes/antagonist/outsider/ert.dm b/code/game/antagonist/outsider/ert.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/outsider/ert.dm
rename to code/game/antagonist/outsider/ert.dm
diff --git a/code/game/gamemodes/antagonist/outsider/mercenary.dm b/code/game/antagonist/outsider/mercenary.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/outsider/mercenary.dm
rename to code/game/antagonist/outsider/mercenary.dm
diff --git a/code/game/gamemodes/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/outsider/ninja.dm
rename to code/game/antagonist/outsider/ninja.dm
diff --git a/code/game/gamemodes/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/outsider/raider.dm
rename to code/game/antagonist/outsider/raider.dm
diff --git a/code/game/gamemodes/antagonist/outsider/wizard.dm b/code/game/antagonist/outsider/wizard.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/outsider/wizard.dm
rename to code/game/antagonist/outsider/wizard.dm
diff --git a/code/game/gamemodes/antagonist/station/changeling.dm b/code/game/antagonist/station/changeling.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/station/changeling.dm
rename to code/game/antagonist/station/changeling.dm
diff --git a/code/game/gamemodes/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/station/cultist.dm
rename to code/game/antagonist/station/cultist.dm
diff --git a/code/game/gamemodes/antagonist/station/highlander.dm b/code/game/antagonist/station/highlander.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/station/highlander.dm
rename to code/game/antagonist/station/highlander.dm
diff --git a/code/game/gamemodes/antagonist/station/monkey.dm b/code/game/antagonist/station/monkey.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/station/monkey.dm
rename to code/game/antagonist/station/monkey.dm
diff --git a/code/game/gamemodes/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/station/renegade.dm
rename to code/game/antagonist/station/renegade.dm
diff --git a/code/game/gamemodes/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/station/revolutionary.dm
rename to code/game/antagonist/station/revolutionary.dm
diff --git a/code/game/gamemodes/antagonist/station/rogue_ai.dm b/code/game/antagonist/station/rogue_ai.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/station/rogue_ai.dm
rename to code/game/antagonist/station/rogue_ai.dm
diff --git a/code/game/gamemodes/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm
similarity index 100%
rename from code/game/gamemodes/antagonist/station/traitor.dm
rename to code/game/antagonist/station/traitor.dm