diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3adae3a9ab8e8..1c5f9e4eb6f8b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
     strategy:
       fail-fast: false # Let all map tests run to completion
       matrix:
-        maptype: ['/datum/map/cyberiad', '/datum/map/delta', '/datum/map/metastation', '/datum/map/cerestation']
+        maptype: ['/datum/map/boxstation', '/datum/map/deltastation', '/datum/map/metastation', '/datum/map/cerestation']
         byondtype: ['STABLE']
     services:
       mariadb:
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/stations/boxstation.dmm
similarity index 100%
rename from _maps/map_files/cyberiad/cyberiad.dmm
rename to _maps/map_files/stations/boxstation.dmm
diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
similarity index 100%
rename from _maps/map_files/cerestation/cerestation.dmm
rename to _maps/map_files/stations/cerestation.dmm
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/stations/deltastation.dmm
similarity index 100%
rename from _maps/map_files/Delta/delta.dmm
rename to _maps/map_files/stations/deltastation.dmm
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/stations/metastation.dmm
similarity index 100%
rename from _maps/map_files/MetaStation/MetaStation.dmm
rename to _maps/map_files/stations/metastation.dmm
diff --git a/code/controllers/subsystem/non_firing/SSmapping.dm b/code/controllers/subsystem/non_firing/SSmapping.dm
index 58aa4771dc0ba..6b33a817f4a53 100644
--- a/code/controllers/subsystem/non_firing/SSmapping.dm
+++ b/code/controllers/subsystem/non_firing/SSmapping.dm
@@ -29,10 +29,10 @@ SUBSYSTEM_DEF(mapping)
 			map_datum = text2path(lines[1])
 			map_datum = new map_datum
 		catch
-			map_datum = new /datum/map/cyberiad // Assume cyberiad if non-existent
+			map_datum = new /datum/map/boxstation // Assume cyberiad if non-existent
 		fdel("data/next_map.txt") // Remove to avoid the same map existing forever
 	else
-		map_datum = new /datum/map/cyberiad // Assume cyberiad if non-existent
+		map_datum = new /datum/map/boxstation // Assume cyberiad if non-existent
 
 /datum/controller/subsystem/mapping/Shutdown()
 	if(next_map) // Save map for next round
diff --git a/code/modules/mapping/cerestation.dm b/code/modules/mapping/cerestation.dm
deleted file mode 100644
index 20c533338da2c..0000000000000
--- a/code/modules/mapping/cerestation.dm
+++ /dev/null
@@ -1,6 +0,0 @@
-/datum/map/cerestation
-	fluff_name = "NSS Farragus"
-	technical_name = "CereStation"
-	map_path = "_maps/map_files/cerestation/cerestation.dmm"
-	webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/cerestation/"
-	min_players_random = 60
diff --git a/code/modules/mapping/cyberiad.dm b/code/modules/mapping/cyberiad.dm
deleted file mode 100644
index bc6496192d87a..0000000000000
--- a/code/modules/mapping/cyberiad.dm
+++ /dev/null
@@ -1,5 +0,0 @@
-/datum/map/cyberiad
-	fluff_name = "NSS Cyberiad"
-	technical_name = "Cyberiad"
-	map_path = "_maps/map_files/cyberiad/cyberiad.dmm"
-	webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/cyberiad/"
diff --git a/code/modules/mapping/delta.dm b/code/modules/mapping/delta.dm
deleted file mode 100644
index ed0d91dc0baed..0000000000000
--- a/code/modules/mapping/delta.dm
+++ /dev/null
@@ -1,5 +0,0 @@
-/datum/map/delta
-	fluff_name = "NSS Kerberos"
-	technical_name = "Delta"
-	map_path = "_maps/map_files/Delta/delta.dmm"
-	webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/deltastation/"
diff --git a/code/modules/mapping/metastation.dm b/code/modules/mapping/metastation.dm
deleted file mode 100644
index d1a486bfc666e..0000000000000
--- a/code/modules/mapping/metastation.dm
+++ /dev/null
@@ -1,5 +0,0 @@
-/datum/map/metastation
-	fluff_name = "NSS Cerebron"
-	technical_name = "MetaStation"
-	map_path = "_maps/map_files/MetaStation/MetaStation.dmm"
-	webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/metastation/"
diff --git a/code/modules/mapping/station_datums.dm b/code/modules/mapping/station_datums.dm
new file mode 100644
index 0000000000000..1f0356abc464c
--- /dev/null
+++ b/code/modules/mapping/station_datums.dm
@@ -0,0 +1,30 @@
+/datum/map/boxstation
+	fluff_name = "NSS Cyberiad"
+	technical_name = "Cyberiad"
+	map_path = "_maps/map_files/stations/boxstation.dmm"
+	webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/cyberiad/"
+
+/datum/map/metastation
+	fluff_name = "NSS Cerebron"
+	technical_name = "MetaStation"
+	map_path = "_maps/map_files/stations/metastation.dmm"
+	webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/metastation/"
+
+/datum/map/deltastation
+	fluff_name = "NSS Kerberos"
+	technical_name = "Delta"
+	map_path = "_maps/map_files/stations/deltastation.dmm"
+	webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/deltastation/"
+
+/datum/map/cerestation
+	fluff_name = "NSS Farragus"
+	technical_name = "CereStation"
+	map_path = "_maps/map_files/stations/cerestation.dmm"
+	webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/cerestation/"
+	min_players_random = 60
+
+/datum/map/test_tiny
+	fluff_name = "test_tiny"
+	technical_name = "test_tiny"
+	map_path = "_maps/map_files/test_tiny/test_tiny.dmm"
+	voteable = FALSE
diff --git a/code/modules/mapping/test_tiny.dm b/code/modules/mapping/test_tiny.dm
deleted file mode 100644
index 0c6294c15d0f6..0000000000000
--- a/code/modules/mapping/test_tiny.dm
+++ /dev/null
@@ -1,5 +0,0 @@
-/datum/map/test_tiny
-	fluff_name = "test_tiny"
-	technical_name = "test_tiny"
-	map_path = "_maps/map_files/test_tiny/test_tiny.dmm"
-	voteable = FALSE
diff --git a/paradise.dme b/paradise.dme
index 842679f672c63..404e0e040a33c 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1962,13 +1962,9 @@
 #include "code\modules\lighting\lighting_turf.dm"
 #include "code\modules\mapping\access_helpers.dm"
 #include "code\modules\mapping\base_map_datum.dm"
-#include "code\modules\mapping\cerestation.dm"
-#include "code\modules\mapping\cyberiad.dm"
-#include "code\modules\mapping\delta.dm"
 #include "code\modules\mapping\mapping_helpers.dm"
 #include "code\modules\mapping\merge_conflicts.dm"
-#include "code\modules\mapping\metastation.dm"
-#include "code\modules\mapping\test_tiny.dm"
+#include "code\modules\mapping\station_datums.dm"
 #include "code\modules\mapping\windoor_access_helpers.dm"
 #include "code\modules\maptext_alerts\location_blurbs.dm"
 #include "code\modules\maptext_alerts\text_blurbs.dm"
diff --git a/tools/github-actions/nanomap-renderer-invoker.sh b/tools/github-actions/nanomap-renderer-invoker.sh
index f46dac10d5c36..14f0e810b1857 100755
--- a/tools/github-actions/nanomap-renderer-invoker.sh
+++ b/tools/github-actions/nanomap-renderer-invoker.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 set -e
 # Generate maps
-tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/cyberiad/cyberiad.dmm"
-tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/Delta/delta.dmm"
-tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/MetaStation/MetaStation.dmm"
-tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/cerestation/cerestation.dmm"
+tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/boxstation.dmm"
+tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/deltastation.dmm"
+tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/metastation.dmm"
+tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/cerestation.dmm"
 # Move and rename files so the game understands them
 cd "data/nanomaps"
-mv "cyberiad_nanomap_z1.png" "Cyberiad_nanomap_z1.png"
-mv "delta_nanomap_z1.png" "Delta_nanomap_z1.png"
-#mv "MetaStation_nanomap_z1.png" "MetaStation_nanomap_z1.png" # What's even the point of this?
+mv "boxstation_nanomap_z1.png" "Cyberiad_nanomap_z1.png"
+mv "deltastation_nanomap_z1.png" "Delta_nanomap_z1.png"
+mv "metastation_nanomap_z1.png" "MetaStation_nanomap_z1.png"
 mv "cerestation_nanomap_z1.png" "CereStation_nanomap_z1.png"
 cd "../../"
 cp "data/nanomaps/Cyberiad_nanomap_z1.png" "icons/_nanomaps"