diff --git a/Distribution/Data/Spawns/Bastion_Cemetery.json b/Distribution/Data/Spawns/Overworld/Bastion_Cemetery.json
similarity index 100%
rename from Distribution/Data/Spawns/Bastion_Cemetery.json
rename to Distribution/Data/Spawns/Overworld/Bastion_Cemetery.json
diff --git a/Distribution/Data/Spawns/Bastion_NPCs.json b/Distribution/Data/Spawns/Overworld/Bastion_NPCs.json
similarity index 100%
rename from Distribution/Data/Spawns/Bastion_NPCs.json
rename to Distribution/Data/Spawns/Overworld/Bastion_NPCs.json
diff --git a/Distribution/Data/Spawns/Bastion_TownCritters.json b/Distribution/Data/Spawns/Overworld/Bastion_TownCritters.json
similarity index 100%
rename from Distribution/Data/Spawns/Bastion_TownCritters.json
rename to Distribution/Data/Spawns/Overworld/Bastion_TownCritters.json
diff --git a/Distribution/Data/Spawns/Brigand_Camp.json b/Distribution/Data/Spawns/Overworld/Brigand_Camp.json
similarity index 100%
rename from Distribution/Data/Spawns/Brigand_Camp.json
rename to Distribution/Data/Spawns/Overworld/Brigand_Camp.json
diff --git a/Distribution/Data/Spawns/Coldbarrow_NPCs.json b/Distribution/Data/Spawns/Overworld/Coldbarrow_NPCs.json
similarity index 100%
rename from Distribution/Data/Spawns/Coldbarrow_NPCs.json
rename to Distribution/Data/Spawns/Overworld/Coldbarrow_NPCs.json
diff --git a/Distribution/Data/Spawns/Coldbarrow_TownCritters.json b/Distribution/Data/Spawns/Overworld/Coldbarrow_TownCritters.json
similarity index 100%
rename from Distribution/Data/Spawns/Coldbarrow_TownCritters.json
rename to Distribution/Data/Spawns/Overworld/Coldbarrow_TownCritters.json
diff --git a/Distribution/Data/Spawns/Cresthaven_NPCs.json b/Distribution/Data/Spawns/Overworld/Cresthaven_NPCs.json
similarity index 100%
rename from Distribution/Data/Spawns/Cresthaven_NPCs.json
rename to Distribution/Data/Spawns/Overworld/Cresthaven_NPCs.json
diff --git a/Distribution/Data/Spawns/Cresthaven_TownCritters.json b/Distribution/Data/Spawns/Overworld/Cresthaven_TownCritters.json
similarity index 100%
rename from Distribution/Data/Spawns/Cresthaven_TownCritters.json
rename to Distribution/Data/Spawns/Overworld/Cresthaven_TownCritters.json
diff --git a/Distribution/Data/Spawns/EastRivermouth_NPCs.json b/Distribution/Data/Spawns/Overworld/EastRivermouth_NPCs.json
similarity index 100%
rename from Distribution/Data/Spawns/EastRivermouth_NPCs.json
rename to Distribution/Data/Spawns/Overworld/EastRivermouth_NPCs.json
diff --git a/Distribution/Data/Spawns/EastRivermouth_TownCritters.json b/Distribution/Data/Spawns/Overworld/EastRivermouth_TownCritters.json
similarity index 100%
rename from Distribution/Data/Spawns/EastRivermouth_TownCritters.json
rename to Distribution/Data/Spawns/Overworld/EastRivermouth_TownCritters.json
diff --git a/Distribution/Data/Spawns/EvilMage_Fortress.json b/Distribution/Data/Spawns/Overworld/EvilMage_Fortress.json
similarity index 100%
rename from Distribution/Data/Spawns/EvilMage_Fortress.json
rename to Distribution/Data/Spawns/Overworld/EvilMage_Fortress.json
diff --git a/Distribution/Data/Spawns/Mireport_Cemetery.json b/Distribution/Data/Spawns/Overworld/Mireport_Cemetery.json
similarity index 100%
rename from Distribution/Data/Spawns/Mireport_Cemetery.json
rename to Distribution/Data/Spawns/Overworld/Mireport_Cemetery.json
diff --git a/Distribution/Data/Spawns/Mireport_NPCS.json b/Distribution/Data/Spawns/Overworld/Mireport_NPCS.json
similarity index 100%
rename from Distribution/Data/Spawns/Mireport_NPCS.json
rename to Distribution/Data/Spawns/Overworld/Mireport_NPCS.json
diff --git a/Distribution/Data/Spawns/Mireport_TownCritters.json b/Distribution/Data/Spawns/Overworld/Mireport_TownCritters.json
similarity index 100%
rename from Distribution/Data/Spawns/Mireport_TownCritters.json
rename to Distribution/Data/Spawns/Overworld/Mireport_TownCritters.json
diff --git a/Distribution/Data/Spawns/Myrish_Cemetery.json b/Distribution/Data/Spawns/Overworld/Myrish_Cemetery.json
similarity index 100%
rename from Distribution/Data/Spawns/Myrish_Cemetery.json
rename to Distribution/Data/Spawns/Overworld/Myrish_Cemetery.json
diff --git a/Distribution/Data/Spawns/Myrish_NPCs.json b/Distribution/Data/Spawns/Overworld/Myrish_NPCs.json
similarity index 100%
rename from Distribution/Data/Spawns/Myrish_NPCs.json
rename to Distribution/Data/Spawns/Overworld/Myrish_NPCs.json
diff --git a/Distribution/Data/Spawns/Myrish_TownCritters.json b/Distribution/Data/Spawns/Overworld/Myrish_TownCritters.json
similarity index 100%
rename from Distribution/Data/Spawns/Myrish_TownCritters.json
rename to Distribution/Data/Spawns/Overworld/Myrish_TownCritters.json
diff --git a/Distribution/Data/Spawns/Orc_Fort.json b/Distribution/Data/Spawns/Overworld/Orc_Fort.json
similarity index 100%
rename from Distribution/Data/Spawns/Orc_Fort.json
rename to Distribution/Data/Spawns/Overworld/Orc_Fort.json
diff --git a/Distribution/Data/Spawns/Overworld_Animals.json b/Distribution/Data/Spawns/Overworld/Overworld_Animals.json
similarity index 100%
rename from Distribution/Data/Spawns/Overworld_Animals.json
rename to Distribution/Data/Spawns/Overworld/Overworld_Animals.json
diff --git a/Distribution/Data/Spawns/Overworld_Monsters.json b/Distribution/Data/Spawns/Overworld/Overworld_Monsters.json
similarity index 100%
rename from Distribution/Data/Spawns/Overworld_Monsters.json
rename to Distribution/Data/Spawns/Overworld/Overworld_Monsters.json
diff --git a/Distribution/Data/Spawns/Ratman_Fort.json b/Distribution/Data/Spawns/Overworld/Ratman_Fort.json
similarity index 100%
rename from Distribution/Data/Spawns/Ratman_Fort.json
rename to Distribution/Data/Spawns/Overworld/Ratman_Fort.json
diff --git a/Distribution/Data/Spawns/Rivermouth_Cemetery.json b/Distribution/Data/Spawns/Overworld/Rivermouth_Cemetery.json
similarity index 100%
rename from Distribution/Data/Spawns/Rivermouth_Cemetery.json
rename to Distribution/Data/Spawns/Overworld/Rivermouth_Cemetery.json
diff --git a/Distribution/Data/Spawns/Ruined_Farm.json b/Distribution/Data/Spawns/Overworld/Ruined_Farm.json
similarity index 100%
rename from Distribution/Data/Spawns/Ruined_Farm.json
rename to Distribution/Data/Spawns/Overworld/Ruined_Farm.json
diff --git a/Distribution/Data/Spawns/Savage_Camp.json b/Distribution/Data/Spawns/Overworld/Savage_Camp.json
similarity index 100%
rename from Distribution/Data/Spawns/Savage_Camp.json
rename to Distribution/Data/Spawns/Overworld/Savage_Camp.json
diff --git a/Distribution/Data/Spawns/Stonehollow_NPCs.json b/Distribution/Data/Spawns/Overworld/Stonehollow_NPCs.json
similarity index 100%
rename from Distribution/Data/Spawns/Stonehollow_NPCs.json
rename to Distribution/Data/Spawns/Overworld/Stonehollow_NPCs.json
diff --git a/Distribution/Data/Spawns/Stonehollow_TownCritters.json b/Distribution/Data/Spawns/Overworld/Stonehollow_TownCritters.json
similarity index 100%
rename from Distribution/Data/Spawns/Stonehollow_TownCritters.json
rename to Distribution/Data/Spawns/Overworld/Stonehollow_TownCritters.json
diff --git a/Distribution/Data/Spawns/Teareek_NPCs.json b/Distribution/Data/Spawns/Overworld/Teareek_NPCs.json
similarity index 100%
rename from Distribution/Data/Spawns/Teareek_NPCs.json
rename to Distribution/Data/Spawns/Overworld/Teareek_NPCs.json
diff --git a/Distribution/Data/Spawns/Teareek_TownCritters.json b/Distribution/Data/Spawns/Overworld/Teareek_TownCritters.json
similarity index 100%
rename from Distribution/Data/Spawns/Teareek_TownCritters.json
rename to Distribution/Data/Spawns/Overworld/Teareek_TownCritters.json
diff --git a/Distribution/Data/Spawns/Tower_Of_Liches.json b/Distribution/Data/Spawns/Overworld/Tower_Of_Liches.json
similarity index 100%
rename from Distribution/Data/Spawns/Tower_Of_Liches.json
rename to Distribution/Data/Spawns/Overworld/Tower_Of_Liches.json
diff --git a/Distribution/Data/Spawns/WestRivermouth_NPCs.json b/Distribution/Data/Spawns/Overworld/WestRivermouth_NPCs.json
similarity index 100%
rename from Distribution/Data/Spawns/WestRivermouth_NPCs.json
rename to Distribution/Data/Spawns/Overworld/WestRivermouth_NPCs.json
diff --git a/Distribution/Data/Spawns/WestRivermouth_TownCritters.json b/Distribution/Data/Spawns/Overworld/WestRivermouth_TownCritters.json
similarity index 100%
rename from Distribution/Data/Spawns/WestRivermouth_TownCritters.json
rename to Distribution/Data/Spawns/Overworld/WestRivermouth_TownCritters.json
diff --git a/Distribution/Data/Spawns/WharfsEnd_NPCs.json b/Distribution/Data/Spawns/Overworld/WharfsEnd_NPCs.json
similarity index 100%
rename from Distribution/Data/Spawns/WharfsEnd_NPCs.json
rename to Distribution/Data/Spawns/Overworld/WharfsEnd_NPCs.json
diff --git a/Distribution/Data/Spawns/WharfsEnd_TownCritters.json b/Distribution/Data/Spawns/Overworld/WharfsEnd_TownCritters.json
similarity index 100%
rename from Distribution/Data/Spawns/WharfsEnd_TownCritters.json
rename to Distribution/Data/Spawns/Overworld/WharfsEnd_TownCritters.json
diff --git a/Distribution/Data/Spawns/Shame_Level_1.json b/Distribution/Data/Spawns/Underworld/Shame_Level_1.json
similarity index 100%
rename from Distribution/Data/Spawns/Shame_Level_1.json
rename to Distribution/Data/Spawns/Underworld/Shame_Level_1.json
diff --git a/Distribution/Data/Spawns/Shame_Level_2.json b/Distribution/Data/Spawns/Underworld/Shame_Level_2.json
similarity index 100%
rename from Distribution/Data/Spawns/Shame_Level_2.json
rename to Distribution/Data/Spawns/Underworld/Shame_Level_2.json
diff --git a/Distribution/Data/Spawns/Shame_Level_3.json b/Distribution/Data/Spawns/Underworld/Shame_Level_3.json
similarity index 100%
rename from Distribution/Data/Spawns/Shame_Level_3.json
rename to Distribution/Data/Spawns/Underworld/Shame_Level_3.json
diff --git a/Distribution/Data/Spawns/Shame_Level_4.json b/Distribution/Data/Spawns/Underworld/Shame_Level_4.json
similarity index 100%
rename from Distribution/Data/Spawns/Shame_Level_4.json
rename to Distribution/Data/Spawns/Underworld/Shame_Level_4.json
diff --git a/Distribution/Data/Spawns/Shame_Level_5.json b/Distribution/Data/Spawns/Underworld/Shame_Level_5.json
similarity index 100%
rename from Distribution/Data/Spawns/Shame_Level_5.json
rename to Distribution/Data/Spawns/Underworld/Shame_Level_5.json