diff --git a/_maps/shuttles/arrival_birdshot.dmm b/_maps/shuttles/arrival/arrival_birdshot.dmm
similarity index 100%
rename from _maps/shuttles/arrival_birdshot.dmm
rename to _maps/shuttles/arrival/arrival_birdshot.dmm
diff --git a/_maps/shuttles/arrival_box.dmm b/_maps/shuttles/arrival/arrival_box.dmm
similarity index 100%
rename from _maps/shuttles/arrival_box.dmm
rename to _maps/shuttles/arrival/arrival_box.dmm
diff --git a/_maps/shuttles/arrival_catwalk.dmm b/_maps/shuttles/arrival/arrival_catwalk.dmm
similarity index 100%
rename from _maps/shuttles/arrival_catwalk.dmm
rename to _maps/shuttles/arrival/arrival_catwalk.dmm
diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival/arrival_delta.dmm
similarity index 100%
rename from _maps/shuttles/arrival_delta.dmm
rename to _maps/shuttles/arrival/arrival_delta.dmm
diff --git a/_maps/shuttles/arrival_donut.dmm b/_maps/shuttles/arrival/arrival_donut.dmm
similarity index 100%
rename from _maps/shuttles/arrival_donut.dmm
rename to _maps/shuttles/arrival/arrival_donut.dmm
diff --git a/_maps/shuttles/arrival_kilo.dmm b/_maps/shuttles/arrival/arrival_kilo.dmm
similarity index 100%
rename from _maps/shuttles/arrival_kilo.dmm
rename to _maps/shuttles/arrival/arrival_kilo.dmm
diff --git a/_maps/shuttles/arrival_nebula.dmm b/_maps/shuttles/arrival/arrival_nebula.dmm
similarity index 100%
rename from _maps/shuttles/arrival_nebula.dmm
rename to _maps/shuttles/arrival/arrival_nebula.dmm
diff --git a/_maps/shuttles/arrival_northstar.dmm b/_maps/shuttles/arrival/arrival_northstar.dmm
similarity index 100%
rename from _maps/shuttles/arrival_northstar.dmm
rename to _maps/shuttles/arrival/arrival_northstar.dmm
diff --git a/_maps/shuttles/arrival_pubby.dmm b/_maps/shuttles/arrival/arrival_pubby.dmm
similarity index 100%
rename from _maps/shuttles/arrival_pubby.dmm
rename to _maps/shuttles/arrival/arrival_pubby.dmm
diff --git a/_maps/shuttles/aux_base_default.dmm b/_maps/shuttles/aux_base/aux_base_default.dmm
similarity index 100%
rename from _maps/shuttles/aux_base_default.dmm
rename to _maps/shuttles/aux_base/aux_base_default.dmm
diff --git a/_maps/shuttles/aux_base_small.dmm b/_maps/shuttles/aux_base/aux_base_small.dmm
similarity index 100%
rename from _maps/shuttles/aux_base_small.dmm
rename to _maps/shuttles/aux_base/aux_base_small.dmm
diff --git a/_maps/shuttles/cargo_birdboat.dmm b/_maps/shuttles/cargo/cargo_birdboat.dmm
similarity index 100%
rename from _maps/shuttles/cargo_birdboat.dmm
rename to _maps/shuttles/cargo/cargo_birdboat.dmm
diff --git a/_maps/shuttles/cargo_birdshot.dmm b/_maps/shuttles/cargo/cargo_birdshot.dmm
similarity index 100%
rename from _maps/shuttles/cargo_birdshot.dmm
rename to _maps/shuttles/cargo/cargo_birdshot.dmm
diff --git a/_maps/shuttles/cargo_box.dmm b/_maps/shuttles/cargo/cargo_box.dmm
similarity index 100%
rename from _maps/shuttles/cargo_box.dmm
rename to _maps/shuttles/cargo/cargo_box.dmm
diff --git a/_maps/shuttles/cargo_catwalk.dmm b/_maps/shuttles/cargo/cargo_catwalk.dmm
similarity index 100%
rename from _maps/shuttles/cargo_catwalk.dmm
rename to _maps/shuttles/cargo/cargo_catwalk.dmm
diff --git a/_maps/shuttles/cargo_delta.dmm b/_maps/shuttles/cargo/cargo_delta.dmm
similarity index 100%
rename from _maps/shuttles/cargo_delta.dmm
rename to _maps/shuttles/cargo/cargo_delta.dmm
diff --git a/_maps/shuttles/cargo_kilo.dmm b/_maps/shuttles/cargo/cargo_kilo.dmm
similarity index 100%
rename from _maps/shuttles/cargo_kilo.dmm
rename to _maps/shuttles/cargo/cargo_kilo.dmm
diff --git a/_maps/shuttles/cargo_mini.dmm b/_maps/shuttles/cargo/cargo_mini.dmm
similarity index 100%
rename from _maps/shuttles/cargo_mini.dmm
rename to _maps/shuttles/cargo/cargo_mini.dmm
diff --git a/_maps/shuttles/cargo_nebula.dmm b/_maps/shuttles/cargo/cargo_nebula.dmm
similarity index 100%
rename from _maps/shuttles/cargo_nebula.dmm
rename to _maps/shuttles/cargo/cargo_nebula.dmm
diff --git a/_maps/shuttles/cargo_northstar.dmm b/_maps/shuttles/cargo/cargo_northstar.dmm
similarity index 100%
rename from _maps/shuttles/cargo_northstar.dmm
rename to _maps/shuttles/cargo/cargo_northstar.dmm
diff --git a/_maps/shuttles/cargo_pubby.dmm b/_maps/shuttles/cargo/cargo_pubby.dmm
similarity index 100%
rename from _maps/shuttles/cargo_pubby.dmm
rename to _maps/shuttles/cargo/cargo_pubby.dmm
diff --git a/_maps/shuttles/emergency_arena.dmm b/_maps/shuttles/emergency/emergency_arena.dmm
similarity index 100%
rename from _maps/shuttles/emergency_arena.dmm
rename to _maps/shuttles/emergency/emergency_arena.dmm
diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency/emergency_asteroid.dmm
similarity index 100%
rename from _maps/shuttles/emergency_asteroid.dmm
rename to _maps/shuttles/emergency/emergency_asteroid.dmm
diff --git a/_maps/shuttles/emergency_backup.dmm b/_maps/shuttles/emergency/emergency_backup.dmm
similarity index 100%
rename from _maps/shuttles/emergency_backup.dmm
rename to _maps/shuttles/emergency/emergency_backup.dmm
diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm
similarity index 100%
rename from _maps/shuttles/emergency_bar.dmm
rename to _maps/shuttles/emergency/emergency_bar.dmm
diff --git a/_maps/shuttles/emergency_bballhooper.dmm b/_maps/shuttles/emergency/emergency_bballhooper.dmm
similarity index 100%
rename from _maps/shuttles/emergency_bballhooper.dmm
rename to _maps/shuttles/emergency/emergency_bballhooper.dmm
diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency/emergency_birdboat.dmm
similarity index 100%
rename from _maps/shuttles/emergency_birdboat.dmm
rename to _maps/shuttles/emergency/emergency_birdboat.dmm
diff --git a/_maps/shuttles/emergency_birdshot.dmm b/_maps/shuttles/emergency/emergency_birdshot.dmm
similarity index 100%
rename from _maps/shuttles/emergency_birdshot.dmm
rename to _maps/shuttles/emergency/emergency_birdshot.dmm
diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency/emergency_box.dmm
similarity index 100%
rename from _maps/shuttles/emergency_box.dmm
rename to _maps/shuttles/emergency/emergency_box.dmm
diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency/emergency_casino.dmm
similarity index 100%
rename from _maps/shuttles/emergency_casino.dmm
rename to _maps/shuttles/emergency/emergency_casino.dmm
diff --git a/_maps/shuttles/emergency_catwalk.dmm b/_maps/shuttles/emergency/emergency_catwalk.dmm
similarity index 100%
rename from _maps/shuttles/emergency_catwalk.dmm
rename to _maps/shuttles/emergency/emergency_catwalk.dmm
diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency/emergency_cere.dmm
similarity index 100%
rename from _maps/shuttles/emergency_cere.dmm
rename to _maps/shuttles/emergency/emergency_cere.dmm
diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency/emergency_clown.dmm
similarity index 100%
rename from _maps/shuttles/emergency_clown.dmm
rename to _maps/shuttles/emergency/emergency_clown.dmm
diff --git a/_maps/shuttles/emergency_construction.dmm b/_maps/shuttles/emergency/emergency_construction.dmm
similarity index 100%
rename from _maps/shuttles/emergency_construction.dmm
rename to _maps/shuttles/emergency/emergency_construction.dmm
diff --git a/_maps/shuttles/emergency_constructionbig.dmm b/_maps/shuttles/emergency/emergency_constructionbig.dmm
similarity index 100%
rename from _maps/shuttles/emergency_constructionbig.dmm
rename to _maps/shuttles/emergency/emergency_constructionbig.dmm
diff --git a/_maps/shuttles/emergency_cramped.dmm b/_maps/shuttles/emergency/emergency_cramped.dmm
similarity index 100%
rename from _maps/shuttles/emergency_cramped.dmm
rename to _maps/shuttles/emergency/emergency_cramped.dmm
diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency/emergency_cruise.dmm
similarity index 100%
rename from _maps/shuttles/emergency_cruise.dmm
rename to _maps/shuttles/emergency/emergency_cruise.dmm
diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm
similarity index 100%
rename from _maps/shuttles/emergency_delta.dmm
rename to _maps/shuttles/emergency/emergency_delta.dmm
diff --git a/_maps/shuttles/emergency_discoinferno.dmm b/_maps/shuttles/emergency/emergency_discoinferno.dmm
similarity index 100%
rename from _maps/shuttles/emergency_discoinferno.dmm
rename to _maps/shuttles/emergency/emergency_discoinferno.dmm
diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency/emergency_donut.dmm
similarity index 100%
rename from _maps/shuttles/emergency_donut.dmm
rename to _maps/shuttles/emergency/emergency_donut.dmm
diff --git a/_maps/shuttles/emergency_fame.dmm b/_maps/shuttles/emergency/emergency_fame.dmm
similarity index 100%
rename from _maps/shuttles/emergency_fame.dmm
rename to _maps/shuttles/emergency/emergency_fame.dmm
diff --git a/_maps/shuttles/emergency_fish.dmm b/_maps/shuttles/emergency/emergency_fish.dmm
similarity index 100%
rename from _maps/shuttles/emergency_fish.dmm
rename to _maps/shuttles/emergency/emergency_fish.dmm
diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency/emergency_goon.dmm
similarity index 100%
rename from _maps/shuttles/emergency_goon.dmm
rename to _maps/shuttles/emergency/emergency_goon.dmm
diff --git a/_maps/shuttles/emergency_hugcage.dmm b/_maps/shuttles/emergency/emergency_hugcage.dmm
similarity index 100%
rename from _maps/shuttles/emergency_hugcage.dmm
rename to _maps/shuttles/emergency/emergency_hugcage.dmm
diff --git a/_maps/shuttles/emergency_humpback.dmm b/_maps/shuttles/emergency/emergency_humpback.dmm
similarity index 100%
rename from _maps/shuttles/emergency_humpback.dmm
rename to _maps/shuttles/emergency/emergency_humpback.dmm
diff --git a/_maps/shuttles/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm
similarity index 100%
rename from _maps/shuttles/emergency_imfedupwiththisworld.dmm
rename to _maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm
diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency/emergency_kilo.dmm
similarity index 100%
rename from _maps/shuttles/emergency_kilo.dmm
rename to _maps/shuttles/emergency/emergency_kilo.dmm
diff --git a/_maps/shuttles/emergency_lance.dmm b/_maps/shuttles/emergency/emergency_lance.dmm
similarity index 100%
rename from _maps/shuttles/emergency_lance.dmm
rename to _maps/shuttles/emergency/emergency_lance.dmm
diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency/emergency_luxury.dmm
similarity index 100%
rename from _maps/shuttles/emergency_luxury.dmm
rename to _maps/shuttles/emergency/emergency_luxury.dmm
diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency/emergency_medisim.dmm
similarity index 100%
rename from _maps/shuttles/emergency_medisim.dmm
rename to _maps/shuttles/emergency/emergency_medisim.dmm
diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm
similarity index 100%
rename from _maps/shuttles/emergency_meta.dmm
rename to _maps/shuttles/emergency/emergency_meta.dmm
diff --git a/_maps/shuttles/emergency_meteor.dmm b/_maps/shuttles/emergency/emergency_meteor.dmm
similarity index 100%
rename from _maps/shuttles/emergency_meteor.dmm
rename to _maps/shuttles/emergency/emergency_meteor.dmm
diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency/emergency_mini.dmm
similarity index 100%
rename from _maps/shuttles/emergency_mini.dmm
rename to _maps/shuttles/emergency/emergency_mini.dmm
diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency/emergency_monastery.dmm
similarity index 100%
rename from _maps/shuttles/emergency_monastery.dmm
rename to _maps/shuttles/emergency/emergency_monastery.dmm
diff --git a/_maps/shuttles/emergency_narnar.dmm b/_maps/shuttles/emergency/emergency_narnar.dmm
similarity index 100%
rename from _maps/shuttles/emergency_narnar.dmm
rename to _maps/shuttles/emergency/emergency_narnar.dmm
diff --git a/_maps/shuttles/emergency_nature.dmm b/_maps/shuttles/emergency/emergency_nature.dmm
similarity index 100%
rename from _maps/shuttles/emergency_nature.dmm
rename to _maps/shuttles/emergency/emergency_nature.dmm
diff --git a/_maps/shuttles/emergency_nebula.dmm b/_maps/shuttles/emergency/emergency_nebula.dmm
similarity index 100%
rename from _maps/shuttles/emergency_nebula.dmm
rename to _maps/shuttles/emergency/emergency_nebula.dmm
diff --git a/_maps/shuttles/emergency_northstar.dmm b/_maps/shuttles/emergency/emergency_northstar.dmm
similarity index 100%
rename from _maps/shuttles/emergency_northstar.dmm
rename to _maps/shuttles/emergency/emergency_northstar.dmm
diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency/emergency_omega.dmm
similarity index 100%
rename from _maps/shuttles/emergency_omega.dmm
rename to _maps/shuttles/emergency/emergency_omega.dmm
diff --git a/_maps/shuttles/emergency_pod.dmm b/_maps/shuttles/emergency/emergency_pod.dmm
similarity index 100%
rename from _maps/shuttles/emergency_pod.dmm
rename to _maps/shuttles/emergency/emergency_pod.dmm
diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency/emergency_pubby.dmm
similarity index 100%
rename from _maps/shuttles/emergency_pubby.dmm
rename to _maps/shuttles/emergency/emergency_pubby.dmm
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency/emergency_raven.dmm
similarity index 100%
rename from _maps/shuttles/emergency_raven.dmm
rename to _maps/shuttles/emergency/emergency_raven.dmm
diff --git a/_maps/shuttles/emergency_rollerdome.dmm b/_maps/shuttles/emergency/emergency_rollerdome.dmm
similarity index 100%
rename from _maps/shuttles/emergency_rollerdome.dmm
rename to _maps/shuttles/emergency/emergency_rollerdome.dmm
diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency/emergency_russiafightpit.dmm
similarity index 100%
rename from _maps/shuttles/emergency_russiafightpit.dmm
rename to _maps/shuttles/emergency/emergency_russiafightpit.dmm
diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency/emergency_scrapheap.dmm
similarity index 100%
rename from _maps/shuttles/emergency_scrapheap.dmm
rename to _maps/shuttles/emergency/emergency_scrapheap.dmm
diff --git a/_maps/shuttles/emergency_scrapheap/classic1.dmm b/_maps/shuttles/emergency/emergency_scrapheap/classic1.dmm
similarity index 100%
rename from _maps/shuttles/emergency_scrapheap/classic1.dmm
rename to _maps/shuttles/emergency/emergency_scrapheap/classic1.dmm
diff --git a/_maps/shuttles/emergency_scrapheap/classic2.dmm b/_maps/shuttles/emergency/emergency_scrapheap/classic2.dmm
similarity index 100%
rename from _maps/shuttles/emergency_scrapheap/classic2.dmm
rename to _maps/shuttles/emergency/emergency_scrapheap/classic2.dmm
diff --git a/_maps/shuttles/emergency_scrapheap/classic_aft1.dmm b/_maps/shuttles/emergency/emergency_scrapheap/classic_aft1.dmm
similarity index 100%
rename from _maps/shuttles/emergency_scrapheap/classic_aft1.dmm
rename to _maps/shuttles/emergency/emergency_scrapheap/classic_aft1.dmm
diff --git a/_maps/shuttles/emergency_scrapheap/classic_aft2.dmm b/_maps/shuttles/emergency/emergency_scrapheap/classic_aft2.dmm
similarity index 100%
rename from _maps/shuttles/emergency_scrapheap/classic_aft2.dmm
rename to _maps/shuttles/emergency/emergency_scrapheap/classic_aft2.dmm
diff --git a/_maps/shuttles/emergency_scrapheap/classic_aft3.dmm b/_maps/shuttles/emergency/emergency_scrapheap/classic_aft3.dmm
similarity index 100%
rename from _maps/shuttles/emergency_scrapheap/classic_aft3.dmm
rename to _maps/shuttles/emergency/emergency_scrapheap/classic_aft3.dmm
diff --git a/_maps/shuttles/emergency_scrapheap/classic_fore1.dmm b/_maps/shuttles/emergency/emergency_scrapheap/classic_fore1.dmm
similarity index 100%
rename from _maps/shuttles/emergency_scrapheap/classic_fore1.dmm
rename to _maps/shuttles/emergency/emergency_scrapheap/classic_fore1.dmm
diff --git a/_maps/shuttles/emergency_scrapheap/classic_fore2.dmm b/_maps/shuttles/emergency/emergency_scrapheap/classic_fore2.dmm
similarity index 100%
rename from _maps/shuttles/emergency_scrapheap/classic_fore2.dmm
rename to _maps/shuttles/emergency/emergency_scrapheap/classic_fore2.dmm
diff --git a/_maps/shuttles/emergency_scrapheap/classic_fore3.dmm b/_maps/shuttles/emergency/emergency_scrapheap/classic_fore3.dmm
similarity index 100%
rename from _maps/shuttles/emergency_scrapheap/classic_fore3.dmm
rename to _maps/shuttles/emergency/emergency_scrapheap/classic_fore3.dmm
diff --git a/_maps/shuttles/emergency_scrapheap/classic_starboard1.dmm b/_maps/shuttles/emergency/emergency_scrapheap/classic_starboard1.dmm
similarity index 100%
rename from _maps/shuttles/emergency_scrapheap/classic_starboard1.dmm
rename to _maps/shuttles/emergency/emergency_scrapheap/classic_starboard1.dmm
diff --git a/_maps/shuttles/emergency_scrapheap/classic_starboard2.dmm b/_maps/shuttles/emergency/emergency_scrapheap/classic_starboard2.dmm
similarity index 100%
rename from _maps/shuttles/emergency_scrapheap/classic_starboard2.dmm
rename to _maps/shuttles/emergency/emergency_scrapheap/classic_starboard2.dmm
diff --git a/_maps/shuttles/emergency_shadow.dmm b/_maps/shuttles/emergency/emergency_shadow.dmm
similarity index 100%
rename from _maps/shuttles/emergency_shadow.dmm
rename to _maps/shuttles/emergency/emergency_shadow.dmm
diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency/emergency_supermatter.dmm
similarity index 100%
rename from _maps/shuttles/emergency_supermatter.dmm
rename to _maps/shuttles/emergency/emergency_supermatter.dmm
diff --git a/_maps/shuttles/emergency_tram.dmm b/_maps/shuttles/emergency/emergency_tram.dmm
similarity index 100%
rename from _maps/shuttles/emergency_tram.dmm
rename to _maps/shuttles/emergency/emergency_tram.dmm
diff --git a/_maps/shuttles/emergency_tranquility.dmm b/_maps/shuttles/emergency/emergency_tranquility.dmm
similarity index 100%
rename from _maps/shuttles/emergency_tranquility.dmm
rename to _maps/shuttles/emergency/emergency_tranquility.dmm
diff --git a/_maps/shuttles/emergency_venture.dmm b/_maps/shuttles/emergency/emergency_venture.dmm
similarity index 100%
rename from _maps/shuttles/emergency_venture.dmm
rename to _maps/shuttles/emergency/emergency_venture.dmm
diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency/emergency_wabbajack.dmm
similarity index 100%
rename from _maps/shuttles/emergency_wabbajack.dmm
rename to _maps/shuttles/emergency/emergency_wabbajack.dmm
diff --git a/_maps/shuttles/emergency_wawa.dmm b/_maps/shuttles/emergency/emergency_wawa.dmm
similarity index 100%
rename from _maps/shuttles/emergency_wawa.dmm
rename to _maps/shuttles/emergency/emergency_wawa.dmm
diff --git a/_maps/shuttles/emergency_zeta.dmm b/_maps/shuttles/emergency/emergency_zeta.dmm
similarity index 100%
rename from _maps/shuttles/emergency_zeta.dmm
rename to _maps/shuttles/emergency/emergency_zeta.dmm
diff --git a/_maps/shuttles/escape_pod_cramped.dmm b/_maps/shuttles/escape_pod/escape_pod_cramped.dmm
similarity index 100%
rename from _maps/shuttles/escape_pod_cramped.dmm
rename to _maps/shuttles/escape_pod/escape_pod_cramped.dmm
diff --git a/_maps/shuttles/escape_pod_default.dmm b/_maps/shuttles/escape_pod/escape_pod_default.dmm
similarity index 100%
rename from _maps/shuttles/escape_pod_default.dmm
rename to _maps/shuttles/escape_pod/escape_pod_default.dmm
diff --git a/_maps/shuttles/escape_pod_large.dmm b/_maps/shuttles/escape_pod/escape_pod_large.dmm
similarity index 100%
rename from _maps/shuttles/escape_pod_large.dmm
rename to _maps/shuttles/escape_pod/escape_pod_large.dmm
diff --git a/_maps/shuttles/escape_pod_luxury.dmm b/_maps/shuttles/escape_pod/escape_pod_luxury.dmm
similarity index 100%
rename from _maps/shuttles/escape_pod_luxury.dmm
rename to _maps/shuttles/escape_pod/escape_pod_luxury.dmm
diff --git a/_maps/shuttles/ferry_base.dmm b/_maps/shuttles/ferry/ferry_base.dmm
similarity index 100%
rename from _maps/shuttles/ferry_base.dmm
rename to _maps/shuttles/ferry/ferry_base.dmm
diff --git a/_maps/shuttles/ferry_fancy.dmm b/_maps/shuttles/ferry/ferry_fancy.dmm
similarity index 100%
rename from _maps/shuttles/ferry_fancy.dmm
rename to _maps/shuttles/ferry/ferry_fancy.dmm
diff --git a/_maps/shuttles/ferry_kilo.dmm b/_maps/shuttles/ferry/ferry_kilo.dmm
similarity index 100%
rename from _maps/shuttles/ferry_kilo.dmm
rename to _maps/shuttles/ferry/ferry_kilo.dmm
diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry/ferry_lighthouse.dmm
similarity index 100%
rename from _maps/shuttles/ferry_lighthouse.dmm
rename to _maps/shuttles/ferry/ferry_lighthouse.dmm
diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry/ferry_meat.dmm
similarity index 100%
rename from _maps/shuttles/ferry_meat.dmm
rename to _maps/shuttles/ferry/ferry_meat.dmm
diff --git a/_maps/shuttles/ferry_nebula.dmm b/_maps/shuttles/ferry/ferry_nebula.dmm
similarity index 100%
rename from _maps/shuttles/ferry_nebula.dmm
rename to _maps/shuttles/ferry/ferry_nebula.dmm
diff --git a/_maps/shuttles/hunter_bounty.dmm b/_maps/shuttles/hunter/hunter_bounty.dmm
similarity index 100%
rename from _maps/shuttles/hunter_bounty.dmm
rename to _maps/shuttles/hunter/hunter_bounty.dmm
diff --git a/_maps/shuttles/hunter_mi13_foodtruck.dmm b/_maps/shuttles/hunter/hunter_mi13_foodtruck.dmm
similarity index 100%
rename from _maps/shuttles/hunter_mi13_foodtruck.dmm
rename to _maps/shuttles/hunter/hunter_mi13_foodtruck.dmm
diff --git a/_maps/shuttles/hunter_psyker.dmm b/_maps/shuttles/hunter/hunter_psyker.dmm
similarity index 100%
rename from _maps/shuttles/hunter_psyker.dmm
rename to _maps/shuttles/hunter/hunter_psyker.dmm
diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter/hunter_russian.dmm
similarity index 100%
rename from _maps/shuttles/hunter_russian.dmm
rename to _maps/shuttles/hunter/hunter_russian.dmm
diff --git a/_maps/shuttles/hunter_space_cop.dmm b/_maps/shuttles/hunter/hunter_space_cop.dmm
similarity index 100%
rename from _maps/shuttles/hunter_space_cop.dmm
rename to _maps/shuttles/hunter/hunter_space_cop.dmm
diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm
similarity index 100%
rename from _maps/shuttles/infiltrator_advanced.dmm
rename to _maps/shuttles/infiltrator/infiltrator_advanced.dmm
diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator/infiltrator_basic.dmm
similarity index 100%
rename from _maps/shuttles/infiltrator_basic.dmm
rename to _maps/shuttles/infiltrator/infiltrator_basic.dmm
diff --git a/_maps/shuttles/infiltrator_clown.dmm b/_maps/shuttles/infiltrator/infiltrator_clown.dmm
similarity index 100%
rename from _maps/shuttles/infiltrator_clown.dmm
rename to _maps/shuttles/infiltrator/infiltrator_clown.dmm
diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour/labour_box.dmm
similarity index 100%
rename from _maps/shuttles/labour_box.dmm
rename to _maps/shuttles/labour/labour_box.dmm
diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour/labour_delta.dmm
similarity index 100%
rename from _maps/shuttles/labour_delta.dmm
rename to _maps/shuttles/labour/labour_delta.dmm
diff --git a/_maps/shuttles/labour_generic.dmm b/_maps/shuttles/labour/labour_generic.dmm
similarity index 100%
rename from _maps/shuttles/labour_generic.dmm
rename to _maps/shuttles/labour/labour_generic.dmm
diff --git a/_maps/shuttles/labour_kilo.dmm b/_maps/shuttles/labour/labour_kilo.dmm
similarity index 100%
rename from _maps/shuttles/labour_kilo.dmm
rename to _maps/shuttles/labour/labour_kilo.dmm
diff --git a/_maps/shuttles/labour_nebula.dmm b/_maps/shuttles/labour/labour_nebula.dmm
similarity index 100%
rename from _maps/shuttles/labour_nebula.dmm
rename to _maps/shuttles/labour/labour_nebula.dmm
diff --git a/_maps/shuttles/mining_box.dmm b/_maps/shuttles/mining/mining_box.dmm
similarity index 100%
rename from _maps/shuttles/mining_box.dmm
rename to _maps/shuttles/mining/mining_box.dmm
diff --git a/_maps/shuttles/mining_common_kilo.dmm b/_maps/shuttles/mining/mining_common_kilo.dmm
similarity index 100%
rename from _maps/shuttles/mining_common_kilo.dmm
rename to _maps/shuttles/mining/mining_common_kilo.dmm
diff --git a/_maps/shuttles/mining_common_meta.dmm b/_maps/shuttles/mining/mining_common_meta.dmm
similarity index 100%
rename from _maps/shuttles/mining_common_meta.dmm
rename to _maps/shuttles/mining/mining_common_meta.dmm
diff --git a/_maps/shuttles/mining_common_northstar.dmm b/_maps/shuttles/mining/mining_common_northstar.dmm
similarity index 100%
rename from _maps/shuttles/mining_common_northstar.dmm
rename to _maps/shuttles/mining/mining_common_northstar.dmm
diff --git a/_maps/shuttles/mining_delta.dmm b/_maps/shuttles/mining/mining_delta.dmm
similarity index 100%
rename from _maps/shuttles/mining_delta.dmm
rename to _maps/shuttles/mining/mining_delta.dmm
diff --git a/_maps/shuttles/mining_freight.dmm b/_maps/shuttles/mining/mining_freight.dmm
similarity index 100%
rename from _maps/shuttles/mining_freight.dmm
rename to _maps/shuttles/mining/mining_freight.dmm
diff --git a/_maps/shuttles/mining_kilo.dmm b/_maps/shuttles/mining/mining_kilo.dmm
similarity index 100%
rename from _maps/shuttles/mining_kilo.dmm
rename to _maps/shuttles/mining/mining_kilo.dmm
diff --git a/_maps/shuttles/mining_large.dmm b/_maps/shuttles/mining/mining_large.dmm
similarity index 100%
rename from _maps/shuttles/mining_large.dmm
rename to _maps/shuttles/mining/mining_large.dmm
diff --git a/_maps/shuttles/mining_nebula.dmm b/_maps/shuttles/mining/mining_nebula.dmm
similarity index 100%
rename from _maps/shuttles/mining_nebula.dmm
rename to _maps/shuttles/mining/mining_nebula.dmm
diff --git a/_maps/shuttles/mining_northstar.dmm b/_maps/shuttles/mining/mining_northstar.dmm
similarity index 100%
rename from _maps/shuttles/mining_northstar.dmm
rename to _maps/shuttles/mining/mining_northstar.dmm
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate/pirate_default.dmm
similarity index 100%
rename from _maps/shuttles/pirate_default.dmm
rename to _maps/shuttles/pirate/pirate_default.dmm
diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate/pirate_dutchman.dmm
similarity index 100%
rename from _maps/shuttles/pirate_dutchman.dmm
rename to _maps/shuttles/pirate/pirate_dutchman.dmm
diff --git a/_maps/shuttles/pirate_ex_interdyne.dmm b/_maps/shuttles/pirate/pirate_ex_interdyne.dmm
similarity index 100%
rename from _maps/shuttles/pirate_ex_interdyne.dmm
rename to _maps/shuttles/pirate/pirate_ex_interdyne.dmm
diff --git a/_maps/shuttles/pirate_geode.dmm b/_maps/shuttles/pirate/pirate_geode.dmm
similarity index 100%
rename from _maps/shuttles/pirate_geode.dmm
rename to _maps/shuttles/pirate/pirate_geode.dmm
diff --git a/_maps/shuttles/pirate_grey.dmm b/_maps/shuttles/pirate/pirate_grey.dmm
similarity index 100%
rename from _maps/shuttles/pirate_grey.dmm
rename to _maps/shuttles/pirate/pirate_grey.dmm
diff --git a/_maps/shuttles/pirate_irs.dmm b/_maps/shuttles/pirate/pirate_irs.dmm
similarity index 100%
rename from _maps/shuttles/pirate_irs.dmm
rename to _maps/shuttles/pirate/pirate_irs.dmm
diff --git a/_maps/shuttles/pirate_medieval.dmm b/_maps/shuttles/pirate/pirate_medieval.dmm
similarity index 100%
rename from _maps/shuttles/pirate_medieval.dmm
rename to _maps/shuttles/pirate/pirate_medieval.dmm
diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate/pirate_silverscale.dmm
similarity index 100%
rename from _maps/shuttles/pirate_silverscale.dmm
rename to _maps/shuttles/pirate/pirate_silverscale.dmm
diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin/ruin_caravan_victim.dmm
similarity index 100%
rename from _maps/shuttles/ruin_caravan_victim.dmm
rename to _maps/shuttles/ruin/ruin_caravan_victim.dmm
diff --git a/_maps/shuttles/ruin_cyborg_mothership.dmm b/_maps/shuttles/ruin/ruin_cyborg_mothership.dmm
similarity index 100%
rename from _maps/shuttles/ruin_cyborg_mothership.dmm
rename to _maps/shuttles/ruin/ruin_cyborg_mothership.dmm
diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin/ruin_pirate_cutter.dmm
similarity index 100%
rename from _maps/shuttles/ruin_pirate_cutter.dmm
rename to _maps/shuttles/ruin/ruin_pirate_cutter.dmm
diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin/ruin_syndicate_dropship.dmm
similarity index 100%
rename from _maps/shuttles/ruin_syndicate_dropship.dmm
rename to _maps/shuttles/ruin/ruin_syndicate_dropship.dmm
diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin/ruin_syndicate_fighter_shiv.dmm
similarity index 100%
rename from _maps/shuttles/ruin_syndicate_fighter_shiv.dmm
rename to _maps/shuttles/ruin/ruin_syndicate_fighter_shiv.dmm
diff --git a/_maps/shuttles/starfury_corvette.dmm b/_maps/shuttles/starfury/starfury_corvette.dmm
similarity index 100%
rename from _maps/shuttles/starfury_corvette.dmm
rename to _maps/shuttles/starfury/starfury_corvette.dmm
diff --git a/_maps/shuttles/starfury_fighter1.dmm b/_maps/shuttles/starfury/starfury_fighter1.dmm
similarity index 100%
rename from _maps/shuttles/starfury_fighter1.dmm
rename to _maps/shuttles/starfury/starfury_fighter1.dmm
diff --git a/_maps/shuttles/starfury_fighter2.dmm b/_maps/shuttles/starfury/starfury_fighter2.dmm
similarity index 100%
rename from _maps/shuttles/starfury_fighter2.dmm
rename to _maps/shuttles/starfury/starfury_fighter2.dmm
diff --git a/_maps/shuttles/starfury_fighter3.dmm b/_maps/shuttles/starfury/starfury_fighter3.dmm
similarity index 100%
rename from _maps/shuttles/starfury_fighter3.dmm
rename to _maps/shuttles/starfury/starfury_fighter3.dmm
diff --git a/_maps/shuttles/whiteship_birdshot.dmm b/_maps/shuttles/whiteship/whiteship_birdshot.dmm
similarity index 100%
rename from _maps/shuttles/whiteship_birdshot.dmm
rename to _maps/shuttles/whiteship/whiteship_birdshot.dmm
diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship/whiteship_box.dmm
similarity index 100%
rename from _maps/shuttles/whiteship_box.dmm
rename to _maps/shuttles/whiteship/whiteship_box.dmm
diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship/whiteship_cere.dmm
similarity index 100%
rename from _maps/shuttles/whiteship_cere.dmm
rename to _maps/shuttles/whiteship/whiteship_cere.dmm
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship/whiteship_delta.dmm
similarity index 100%
rename from _maps/shuttles/whiteship_delta.dmm
rename to _maps/shuttles/whiteship/whiteship_delta.dmm
diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship/whiteship_donut.dmm
similarity index 100%
rename from _maps/shuttles/whiteship_donut.dmm
rename to _maps/shuttles/whiteship/whiteship_donut.dmm
diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship/whiteship_kilo.dmm
similarity index 100%
rename from _maps/shuttles/whiteship_kilo.dmm
rename to _maps/shuttles/whiteship/whiteship_kilo.dmm
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship/whiteship_meta.dmm
similarity index 100%
rename from _maps/shuttles/whiteship_meta.dmm
rename to _maps/shuttles/whiteship/whiteship_meta.dmm
diff --git a/_maps/shuttles/whiteship_obelisk.dmm b/_maps/shuttles/whiteship/whiteship_obelisk.dmm
similarity index 100%
rename from _maps/shuttles/whiteship_obelisk.dmm
rename to _maps/shuttles/whiteship/whiteship_obelisk.dmm
diff --git a/_maps/shuttles/whiteship_personalshuttle.dmm b/_maps/shuttles/whiteship/whiteship_personalshuttle.dmm
similarity index 100%
rename from _maps/shuttles/whiteship_personalshuttle.dmm
rename to _maps/shuttles/whiteship/whiteship_personalshuttle.dmm
diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship/whiteship_pubby.dmm
similarity index 100%
rename from _maps/shuttles/whiteship_pubby.dmm
rename to _maps/shuttles/whiteship/whiteship_pubby.dmm
diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship/whiteship_tram.dmm
similarity index 100%
rename from _maps/shuttles/whiteship_tram.dmm
rename to _maps/shuttles/whiteship/whiteship_tram.dmm
diff --git a/code/datums/shuttles/arrival.dm b/code/datums/shuttles/arrival.dm
index 38cb67fa1d7..b020295b5fb 100644
--- a/code/datums/shuttles/arrival.dm
+++ b/code/datums/shuttles/arrival.dm
@@ -1,5 +1,6 @@
 /datum/map_template/shuttle/arrival
 	port_id = "arrival"
+	prefix = "_maps/shuttles/arrival/"
 	who_can_purchase = null
 
 /datum/map_template/shuttle/arrival/box
diff --git a/code/datums/shuttles/aux_base.dm b/code/datums/shuttles/aux_base.dm
index c377e278b90..1f6600456bd 100644
--- a/code/datums/shuttles/aux_base.dm
+++ b/code/datums/shuttles/aux_base.dm
@@ -1,5 +1,6 @@
 /datum/map_template/shuttle/aux_base
 	port_id = "aux_base"
+	prefix = "_maps/shuttles/aux_base/"
 	who_can_purchase = null
 
 /datum/map_template/shuttle/aux_base/default
diff --git a/code/datums/shuttles/cargo.dm b/code/datums/shuttles/cargo.dm
index b3fadeaaa75..ba0e1bfd223 100644
--- a/code/datums/shuttles/cargo.dm
+++ b/code/datums/shuttles/cargo.dm
@@ -1,5 +1,6 @@
 /datum/map_template/shuttle/cargo
 	port_id = "cargo"
+	prefix = "_maps/shuttles/cargo/"
 	name = "Base Shuttle Template (Cargo)"
 	who_can_purchase = null
 
diff --git a/code/datums/shuttles/emergency.dm b/code/datums/shuttles/emergency.dm
index 6197afc9a3f..aeb896e54de 100644
--- a/code/datums/shuttles/emergency.dm
+++ b/code/datums/shuttles/emergency.dm
@@ -3,6 +3,7 @@
 /datum/map_template/shuttle/emergency
 	port_id = "emergency"
 	name = "Base Shuttle Template (Emergency)"
+	prefix = "_maps/shuttles/emergency/"
 	///assoc list of shuttle events to add to this shuttle on spawn (typepath = weight)
 	var/list/events
 	///pick all events instead of random
diff --git a/code/datums/shuttles/escape_pod.dm b/code/datums/shuttles/escape_pod.dm
index 0b2f35dd9dd..250e0841540 100644
--- a/code/datums/shuttles/escape_pod.dm
+++ b/code/datums/shuttles/escape_pod.dm
@@ -1,5 +1,6 @@
 /datum/map_template/shuttle/escape_pod
 	port_id = "escape_pod"
+	prefix = "_maps/shuttles/escape_pod/"
 	who_can_purchase = null
 
 /datum/map_template/shuttle/escape_pod/default
diff --git a/code/datums/shuttles/ferry.dm b/code/datums/shuttles/ferry.dm
index f9c5841abf3..aa874f1b19b 100644
--- a/code/datums/shuttles/ferry.dm
+++ b/code/datums/shuttles/ferry.dm
@@ -1,5 +1,6 @@
 /datum/map_template/shuttle/ferry
 	port_id = "ferry"
+	prefix = "_maps/shuttles/ferry/"
 	name = "Base Shuttle Template (Ferry)"
 
 /datum/map_template/shuttle/ferry/base
diff --git a/code/datums/shuttles/hunter.dm b/code/datums/shuttles/hunter.dm
index ade978c937e..140388398ea 100644
--- a/code/datums/shuttles/hunter.dm
+++ b/code/datums/shuttles/hunter.dm
@@ -1,5 +1,6 @@
 /datum/map_template/shuttle/hunter
 	port_id = "hunter"
+	prefix = "_maps/shuttles/hunter/"
 	who_can_purchase = null
 
 /datum/map_template/shuttle/hunter/space_cop
diff --git a/code/datums/shuttles/infiltrator.dm b/code/datums/shuttles/infiltrator.dm
index 414dcb5129f..a892736048b 100644
--- a/code/datums/shuttles/infiltrator.dm
+++ b/code/datums/shuttles/infiltrator.dm
@@ -1,5 +1,6 @@
 /datum/map_template/shuttle/infiltrator
 	port_id = "infiltrator"
+	prefix = "_maps/shuttles/infiltrator/"
 	who_can_purchase = null
 
 /datum/map_template/shuttle/infiltrator/basic
diff --git a/code/datums/shuttles/labour.dm b/code/datums/shuttles/labour.dm
new file mode 100644
index 00000000000..e8bbdecaeba
--- /dev/null
+++ b/code/datums/shuttles/labour.dm
@@ -0,0 +1,24 @@
+/datum/map_template/shuttle/labour
+	port_id = "labour"
+	prefix = "_maps/shuttles/labour/"
+	who_can_purchase = null
+
+/datum/map_template/shuttle/labour/box
+	suffix = "box"
+	name = "labour shuttle (Box)"
+
+/datum/map_template/shuttle/labour/generic
+	suffix = "generic"
+	name = "labour shuttle (Generic)"
+
+/datum/map_template/shuttle/labour/delta
+	suffix = "delta"
+	name = "labour shuttle (Delta)"
+
+/datum/map_template/shuttle/labour/kilo
+	suffix = "kilo"
+	name = "labour shuttle (Kilo)"
+
+/datum/map_template/shuttle/labour/nebula
+	suffix = "nebula"
+	name = "labour shuttle (Nebula)"
diff --git a/code/datums/shuttles/mining.dm b/code/datums/shuttles/mining.dm
index 21747a488e3..276797b5f52 100644
--- a/code/datums/shuttles/mining.dm
+++ b/code/datums/shuttles/mining.dm
@@ -1,31 +1,7 @@
-// LABOUR SHUTTLES
-/datum/map_template/shuttle/labour
-	port_id = "labour"
-	who_can_purchase = null
-
-/datum/map_template/shuttle/labour/box
-	suffix = "box"
-	name = "labour shuttle (Box)"
-
-/datum/map_template/shuttle/labour/generic
-	suffix = "generic"
-	name = "labour shuttle (Generic)"
-
-/datum/map_template/shuttle/labour/delta
-	suffix = "delta"
-	name = "labour shuttle (Delta)"
-
-/datum/map_template/shuttle/labour/kilo
-	suffix = "kilo"
-	name = "labour shuttle (Kilo)"
-
-/datum/map_template/shuttle/labour/nebula
-	suffix = "nebula"
-	name = "labour shuttle (Nebula)"
-
 // MINING SHUTTLES
 /datum/map_template/shuttle/mining
 	port_id = "mining"
+	prefix = "_maps/shuttles/mining/"
 	who_can_purchase = null
 
 /datum/map_template/shuttle/mining/box
@@ -55,6 +31,7 @@
 // MINING COMMON SHUTTLES
 /datum/map_template/shuttle/mining_common
 	port_id = "mining_common"
+	prefix = "_maps/shuttles/mining/"
 	who_can_purchase = null
 
 /datum/map_template/shuttle/mining_common/meta
diff --git a/code/datums/shuttles/pirate.dm b/code/datums/shuttles/pirate.dm
index 99f866d23fc..62c6e97f37a 100644
--- a/code/datums/shuttles/pirate.dm
+++ b/code/datums/shuttles/pirate.dm
@@ -1,5 +1,6 @@
 /datum/map_template/shuttle/pirate
 	port_id = "pirate"
+	prefix = "_maps/shuttles/pirate/"
 	who_can_purchase = null
 
 /datum/map_template/shuttle/pirate/default
diff --git a/code/datums/shuttles/ruin.dm b/code/datums/shuttles/ruin.dm
index 511e2d6ecdc..1163909458d 100644
--- a/code/datums/shuttles/ruin.dm
+++ b/code/datums/shuttles/ruin.dm
@@ -1,5 +1,6 @@
 /datum/map_template/shuttle/ruin
 	port_id = "ruin"
+	prefix = "_maps/shuttles/ruin/"
 	who_can_purchase = null
 
 /datum/map_template/shuttle/ruin/cyborg_mothership
diff --git a/code/datums/shuttles/starfury.dm b/code/datums/shuttles/starfury.dm
index 510033d6436..85bf00b97c9 100644
--- a/code/datums/shuttles/starfury.dm
+++ b/code/datums/shuttles/starfury.dm
@@ -1,5 +1,6 @@
 /datum/map_template/shuttle/starfury
 	port_id = "starfury"
+	prefix = "_maps/shuttles/starfury/"
 	who_can_purchase = null
 
 /datum/map_template/shuttle/starfury/fighter_one
diff --git a/code/datums/shuttles/whiteship.dm b/code/datums/shuttles/whiteship.dm
index b8dbcfd4bd7..86743a25afc 100644
--- a/code/datums/shuttles/whiteship.dm
+++ b/code/datums/shuttles/whiteship.dm
@@ -1,5 +1,6 @@
 /datum/map_template/shuttle/whiteship
 	port_id = "whiteship"
+	prefix = "_maps/shuttles/whiteship/"
 
 /datum/map_template/shuttle/whiteship/box
 	suffix = "box"
diff --git a/strings/modular_maps/emergency_scrapheap.toml b/strings/modular_maps/emergency_scrapheap.toml
index 6372704b704..e6c56d82ffc 100644
--- a/strings/modular_maps/emergency_scrapheap.toml
+++ b/strings/modular_maps/emergency_scrapheap.toml
@@ -1,4 +1,4 @@
-directory = "_maps/shuttles/emergency_scrapheap/"
+directory = "_maps/shuttles/emergency/emergency_scrapheap/"
 
 [rooms.shuttle]
 modules = ["classic1.dmm", "classic2.dmm"]
diff --git a/tgstation.dme b/tgstation.dme
index e17c81ab8be..68072b4f464 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2038,6 +2038,7 @@
 #include "code\datums\shuttles\ferry.dm"
 #include "code\datums\shuttles\hunter.dm"
 #include "code\datums\shuttles\infiltrator.dm"
+#include "code\datums\shuttles\labour.dm"
 #include "code\datums\shuttles\mining.dm"
 #include "code\datums\shuttles\pirate.dm"
 #include "code\datums\shuttles\ruin.dm"
diff --git a/tools/maplint/lints/area_noop.yml b/tools/maplint/lints/area_noop.yml
index c751e85381b..fedfffd5040 100644
--- a/tools/maplint/lints/area_noop.yml
+++ b/tools/maplint/lints/area_noop.yml
@@ -9,7 +9,7 @@
   skip_files:
     - _maps/map_files/tramstation/maintenance_modules
     - _maps/modular_generic
-    - _maps/shuttles/emergency_scrapheap
+    - _maps/shuttles/emergency/emergency_scrapheap
     - _maps/templates
     - _maps/minigame/deathmatch/OSHA_Violator.dmm
     - _maps/minigame/deathmatch/maint_mania.dmm