diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java
index dedc387414..10b10ea514 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java
@@ -53,7 +53,7 @@ public class TarBeetleSpawn implements IGameXmlReader
 	@Override
 	public void load()
 	{
-		parseDatapackFile("data/spawnZones/tar_beetle.xml");
+		parseDatapackFile("data/scripts/ai/npc/ForgeOfTheGods/tar_beetle.xml");
 		if (!zones.isEmpty())
 		{
 			spawnTask = ThreadPool.scheduleAtFixedRate(() -> zones.forEach(SpawnZone::refreshSpawn), 1000, 60000);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnZones/tar_beetle.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/tar_beetle.xml
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnZones/tar_beetle.xml
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/tar_beetle.xml
index 262b4898a3..cdb0eb9a97 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnZones/tar_beetle.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/tar_beetle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/tar_beetle.xsd">
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../xsd/tar_beetle.xsd">
 	<!-- Forge of the Gods lower level - Spawn Zones -->
 	<spawnZone maxNpcCount="4">
 		<zone minZ="-5565" maxZ="-5365">
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
index d295e9c437..620e960154 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
@@ -253,7 +253,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm
 		_spawnCount = 0;
 		_spawnList.clear();
 		_spawnZoneList.clear();
-		parseDatapackFile("data/spawnZones/final_emperial_tomb.xml");
+		parseDatapackFile("data/scripts/instances/FinalEmperialTomb/final_emperial_tomb.xml");
 		_log.info("[Final Emperial Tomb] Loaded " + _spawnZoneList.size() + " spawn zones data.");
 		_log.info("[Final Emperial Tomb] Loaded " + _spawnCount + " spawns data.");
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnZones/final_emperial_tomb.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/final_emperial_tomb.xml
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnZones/final_emperial_tomb.xml
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/final_emperial_tomb.xml
index 1be7391aa7..5f29d3c077 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnZones/final_emperial_tomb.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/final_emperial_tomb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawnZones.xsd">
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/spawnZones.xsd">
 	<spawnZones>
 		<zone id="0" minZ="-9220" maxZ="-8920">
 			<point x="-87956" y="-151907" />
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/test.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/test.xml
deleted file mode 100644
index 62a55d4403..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/test.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list enabled="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawnlist.xsd">
-	<spawn zone="spawn_zone_test_01">
-		<npc id="20550" count="3" respawnDelay="15" respawnRandom="5" />
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/chapel_guards.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/chapel_guards.xml
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/chapel_guards.xml
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/chapel_guards.xml
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/random_treasurebox_spawns.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/random_treasurebox_spawns.xml
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/random_treasurebox_spawns.xml
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/random_treasurebox_spawns.xml
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/sel_mahums.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/sel_mahums.xml
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/sel_mahums.xml
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/sel_mahums.xml
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/turek_orcs_fixed_pos.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/turek_orcs_fixed_pos.xml
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/turek_orcs_fixed_pos.xml
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/turek_orcs_fixed_pos.xml
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/turek_orcs_zone_based.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/turek_orcs_zone_based.xml
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawnlist/turek_orcs_zone_based.xml
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/turek_orcs_zone_based.xml
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/npcSpawnTerritories/npc_spawn_zone_test.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/npcSpawnTerritories/npc_spawn_zone_test.xml
deleted file mode 100644
index cb1b8659d9..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/npcSpawnTerritories/npc_spawn_zone_test.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list enabled="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/zones.xsd">
-	<zone name="spawn_zone_test_01" type="NpcSpawnTerritory" shape="Cuboid" minZ="-3734" maxZ="-3689">
-		<node X="75552" Y="142899" />
-		<node X="76887" Y="144333" />
-	</zone>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/npcSpawnTerritories/random_treasurebox_zones.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/spawnZones/random_treasurebox_zones.xml
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/npcSpawnTerritories/random_treasurebox_zones.xml
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/spawnZones/random_treasurebox_zones.xml
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/npcSpawnTerritories/turek_orcs.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/spawnZones/turek_orcs.xml
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/npcSpawnTerritories/turek_orcs.xml
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/spawnZones/turek_orcs.xml
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java
index 55457c4d7a..2238e7a9c3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java
@@ -77,7 +77,7 @@ public final class SpawnTable implements IGameXmlReader
 			}
 			
 			// Load XML list
-			parseDatapackDirectory("data/spawnlist", false);
+			parseDatapackDirectory("data/spawns", false);
 			LOGGER.info(getClass().getSimpleName() + ": Loaded " + _xmlSpawnCount + " npc spawns from XML.");
 		}
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index 8290a4fe09..acb13ae331 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -378,7 +378,7 @@ public final class ZoneManager implements IGameXmlReader
 		_classZones.clear();
 		_spawnTerritories.clear();
 		parseDatapackDirectory("data/zones", false);
-		parseDatapackDirectory("data/zones/npcSpawnTerritories", false);
+		parseDatapackDirectory("data/zones/spawnZones", false);
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _classZones.size() + " zone classes and " + getSize() + " zones.");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _spawnTerritories.size() + " NPC spawn territoriers.");
 	}