diff --git a/modular_citadel/code/game/gamemodes/gangs/dominator.dm b/code/game/gamemodes/gangs/dominator.dm
similarity index 100%
rename from modular_citadel/code/game/gamemodes/gangs/dominator.dm
rename to code/game/gamemodes/gangs/dominator.dm
diff --git a/modular_citadel/code/game/gamemodes/gangs/dominator_countdown.dm b/code/game/gamemodes/gangs/dominator_countdown.dm
similarity index 100%
rename from modular_citadel/code/game/gamemodes/gangs/dominator_countdown.dm
rename to code/game/gamemodes/gangs/dominator_countdown.dm
diff --git a/modular_citadel/code/game/gamemodes/gangs/gang.dm b/code/game/gamemodes/gangs/gang.dm
similarity index 100%
rename from modular_citadel/code/game/gamemodes/gangs/gang.dm
rename to code/game/gamemodes/gangs/gang.dm
diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_datums.dm b/code/game/gamemodes/gangs/gang_datums.dm
similarity index 100%
rename from modular_citadel/code/game/gamemodes/gangs/gang_datums.dm
rename to code/game/gamemodes/gangs/gang_datums.dm
diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_decals.dm b/code/game/gamemodes/gangs/gang_decals.dm
similarity index 100%
rename from modular_citadel/code/game/gamemodes/gangs/gang_decals.dm
rename to code/game/gamemodes/gangs/gang_decals.dm
diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_hud.dm b/code/game/gamemodes/gangs/gang_hud.dm
similarity index 100%
rename from modular_citadel/code/game/gamemodes/gangs/gang_hud.dm
rename to code/game/gamemodes/gangs/gang_hud.dm
diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_items.dm b/code/game/gamemodes/gangs/gang_items.dm
similarity index 100%
rename from modular_citadel/code/game/gamemodes/gangs/gang_items.dm
rename to code/game/gamemodes/gangs/gang_items.dm
diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_pen.dm b/code/game/gamemodes/gangs/gang_pen.dm
similarity index 100%
rename from modular_citadel/code/game/gamemodes/gangs/gang_pen.dm
rename to code/game/gamemodes/gangs/gang_pen.dm
diff --git a/modular_citadel/code/game/gamemodes/gangs/gangs.dm b/code/game/gamemodes/gangs/gangs.dm
similarity index 100%
rename from modular_citadel/code/game/gamemodes/gangs/gangs.dm
rename to code/game/gamemodes/gangs/gangs.dm
diff --git a/modular_citadel/code/game/gamemodes/gangs/gangtool.dm b/code/game/gamemodes/gangs/gangtool.dm
similarity index 100%
rename from modular_citadel/code/game/gamemodes/gangs/gangtool.dm
rename to code/game/gamemodes/gangs/gangtool.dm
diff --git a/modular_citadel/code/game/gamemodes/gangs/implant_gang.dm b/code/game/gamemodes/gangs/implant_gang.dm
similarity index 100%
rename from modular_citadel/code/game/gamemodes/gangs/implant_gang.dm
rename to code/game/gamemodes/gangs/implant_gang.dm
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 8459819b5b..74554ac9f8 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -14,8 +14,8 @@
 	false_report_weight = 10
 	restricted_jobs = list("AI", "Cyborg")
 	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
-	required_players = 30
-	required_enemies = 2
+	required_players = 20
+	required_enemies = 1
 	recommended_enemies = 3
 	enemy_minimum_age = 14
 
diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm
index e086485a49..8e385f6674 100644
--- a/code/modules/antagonists/swarmer/swarmer_event.dm
+++ b/code/modules/antagonists/swarmer/swarmer_event.dm
@@ -1,8 +1,8 @@
 /datum/round_event_control/spawn_swarmer
 	name = "Spawn Swarmer Shell"
 	typepath = /datum/round_event/spawn_swarmer
-	weight = 7
-	max_occurrences = 1 //Only once okay fam
+	weight = 0
+	max_occurrences = 0
 	earliest_start = 30 MINUTES
 	min_players = 15
 
diff --git a/modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm b/modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm
deleted file mode 100644
index 5dfe1dfcbd..0000000000
--- a/modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm
+++ /dev/null
@@ -1,3 +0,0 @@
-/datum/round_event_control/spawn_swarmer
-	weight = 0
-	max_occurrences = 0
\ No newline at end of file
diff --git a/modular_citadel/code/game/gamemodes/revolution/revolution.dm b/modular_citadel/code/game/gamemodes/revolution/revolution.dm
deleted file mode 100644
index b377fc9fbd..0000000000
--- a/modular_citadel/code/game/gamemodes/revolution/revolution.dm
+++ /dev/null
@@ -1,5 +0,0 @@
-/datum/game_mode/revolution
-	restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
-	false_report_weight = 10
-	required_players = 20
-	required_enemies = 1
diff --git a/tgstation.dme b/tgstation.dme
index 12dcd71113..3e23660aac 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -573,6 +573,17 @@
 #include "code\game\gamemodes\dynamic\dynamic_rulesets_midround.dm"
 #include "code\game\gamemodes\dynamic\dynamic_rulesets_roundstart.dm"
 #include "code\game\gamemodes\extended\extended.dm"
+#include "code\game\gamemodes\gangs\dominator.dm"
+#include "code\game\gamemodes\gangs\dominator_countdown.dm"
+#include "code\game\gamemodes\gangs\gang.dm"
+#include "code\game\gamemodes\gangs\gang_datums.dm"
+#include "code\game\gamemodes\gangs\gang_decals.dm"
+#include "code\game\gamemodes\gangs\gang_hud.dm"
+#include "code\game\gamemodes\gangs\gang_items.dm"
+#include "code\game\gamemodes\gangs\gang_pen.dm"
+#include "code\game\gamemodes\gangs\gangs.dm"
+#include "code\game\gamemodes\gangs\gangtool.dm"
+#include "code\game\gamemodes\gangs\implant_gang.dm"
 #include "code\game\gamemodes\meteor\meteor.dm"
 #include "code\game\gamemodes\meteor\meteors.dm"
 #include "code\game\gamemodes\monkey\monkey.dm"
@@ -2989,19 +3000,6 @@
 #include "modular_citadel\code\datums\status_effects\chems.dm"
 #include "modular_citadel\code\datums\status_effects\debuffs.dm"
 #include "modular_citadel\code\datums\wires\autoylathe.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\dominator.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\dominator_countdown.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang_datums.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang_decals.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang_hud.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang_items.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang_pen.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gangs.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gangtool.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\implant_gang.dm"
-#include "modular_citadel\code\game\gamemodes\miniantags\bot_swarm\swarmer_event.dm"
-#include "modular_citadel\code\game\gamemodes\revolution\revolution.dm"
 #include "modular_citadel\code\game\machinery\displaycases.dm"
 #include "modular_citadel\code\game\machinery\firealarm.dm"
 #include "modular_citadel\code\game\machinery\Sleeper.dm"