diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/23_25.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Castles/Innadril.xml
similarity index 96%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/23_25.xml
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Castles/Innadril.xml
index fc1c5717ee..a1723fbc03 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/23_25.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Castles/Innadril.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="23_25">
-		<group>
-			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
-			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
-			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<group>
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/23_25.xml b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Castles/Innadril.xml
similarity index 96%
rename from L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/23_25.xml
rename to L2J_Mobius_2.5_Underground/dist/game/data/spawns/Castles/Innadril.xml
index fc1c5717ee..a1723fbc03 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/23_25.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Castles/Innadril.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="23_25">
-		<group>
-			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
-			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
-			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<group>
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/23_25.xml b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Castles/Innadril.xml
similarity index 96%
rename from L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/23_25.xml
rename to L2J_Mobius_3.0_Helios/dist/game/data/spawns/Castles/Innadril.xml
index fc1c5717ee..a1723fbc03 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/23_25.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Castles/Innadril.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="23_25">
-		<group>
-			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
-			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
-			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<group>
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/23_25.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Castles/Innadril.xml
similarity index 96%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/23_25.xml
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Castles/Innadril.xml
index fc1c5717ee..a1723fbc03 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/23_25.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Castles/Innadril.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="23_25">
-		<group>
-			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
-			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
-			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<group>
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Castles/Innadril.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Castles/Innadril.xml
new file mode 100644
index 0000000000..a1723fbc03
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Castles/Innadril.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<group>
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/old/23_25.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/old/23_25.xml
deleted file mode 100644
index fc1c5717ee..0000000000
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/old/23_25.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="23_25">
-		<group>
-			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
-			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
-			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Castles/Innadril.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Castles/Innadril.xml
new file mode 100644
index 0000000000..a1723fbc03
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Castles/Innadril.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<group>
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/old/23_25.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/old/23_25.xml
deleted file mode 100644
index fc1c5717ee..0000000000
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/old/23_25.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="23_25">
-		<group>
-			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
-			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
-			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Castles/Innadril.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Castles/Innadril.xml
new file mode 100644
index 0000000000..a1723fbc03
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Castles/Innadril.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<group>
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/old/23_25.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/old/23_25.xml
deleted file mode 100644
index fc1c5717ee..0000000000
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/old/23_25.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="23_25">
-		<group>
-			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
-			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
-			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Castles/Innadril.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Castles/Innadril.xml
new file mode 100644
index 0000000000..a1723fbc03
--- /dev/null
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Castles/Innadril.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<group>
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/old/23_25.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/old/23_25.xml
deleted file mode 100644
index fc1c5717ee..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/old/23_25.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="23_25">
-		<group>
-			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
-			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
-			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Castles/Innadril.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Castles/Innadril.xml
new file mode 100644
index 0000000000..a1723fbc03
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Castles/Innadril.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<group>
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/old/23_25.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/old/23_25.xml
deleted file mode 100644
index fc1c5717ee..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/old/23_25.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="23_25">
-		<group>
-			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
-			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
-			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Castles/Innadril.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Castles/Innadril.xml
new file mode 100644
index 0000000000..a1723fbc03
--- /dev/null
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Castles/Innadril.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<group>
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/old/23_25.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/old/23_25.xml
deleted file mode 100644
index fc1c5717ee..0000000000
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/old/23_25.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="23_25">
-		<group>
-			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
-			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
-			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Castles/Innadril.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Castles/Innadril.xml
new file mode 100644
index 0000000000..a1723fbc03
--- /dev/null
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Castles/Innadril.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<group>
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/old/23_25.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/old/23_25.xml
deleted file mode 100644
index fc1c5717ee..0000000000
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/old/23_25.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="23_25">
-		<group>
-			<npc id="35312" x="116363" y="245268" z="-1056" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35312" x="116417" y="245616" z="-1056" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35313" x="116190" y="247827" z="-752" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35313" x="116256" y="248182" z="-800" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35320" x="117136" y="241763" z="-1288" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
-			<npc id="35311" x="114443" y="249142" z="-88" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-784" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-			<npc id="35315" x="116015" y="248558" z="-944" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35314" x="115649" y="249072" z="-944" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35317" x="115863" y="250387" z="-320" respawnTime="60sec" /> <!-- Tate -->
-			<npc id="35653" x="116253" y="249588" z="-784" heading="41905" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36408" x="116041" y="249446" z="-944" heading="47953" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/Castles/Innadril.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/Castles/Innadril.xml
new file mode 100644
index 0000000000..8a943713d4
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/Castles/Innadril.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<npc id="35279" x="116024" y="250557" z="-798" heading="-16384" respawnDelay="60" />
+		<npc id="35311" x="114443" y="249142" z="-74" heading="0" respawnDelay="60" />
+		<npc id="35312" x="116363" y="245268" z="-1040" heading="49152" respawnDelay="10800" />
+		<npc id="35312" x="116417" y="245616" z="-1040" heading="0" respawnDelay="10800" />
+		<npc id="35313" x="116190" y="247827" z="-750" heading="49152" respawnDelay="10800" />
+		<npc id="35313" x="116256" y="248182" z="-790" heading="0" respawnDelay="10800" />
+		<npc id="35314" x="115649" y="249072" z="-973" heading="868" respawnDelay="60" />
+		<npc id="35315" x="116015" y="248558" z="-946" heading="18052" respawnDelay="60" />
+		<npc id="35316" x="116123" y="249702" z="-762" heading="49152" respawnDelay="60" />
+		<npc id="35317" x="115863" y="250387" z="-322" heading="0" respawnDelay="60" />
+		<npc id="35318" x="115787" y="249585" z="-775" heading="49152" respawnDelay="60" />
+		<npc id="35320" x="117136" y="241763" z="-1280" heading="49152" respawnDelay="60" />
+		<npc id="35653" x="116253" y="249588" z="-786" heading="41905" respawnDelay="60" />
+		<npc id="36408" x="116041" y="249446" z="-947" heading="47953" respawnDelay="60" />
+	</spawn>
+</list>
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/EpilogueSpawns.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/EpilogueSpawns.xml
index 6513788aa2..1131b6e8a2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/EpilogueSpawns.xml
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/EpilogueSpawns.xml
@@ -21888,7 +21888,6 @@
 		<npc id="21066" x="114427" y="15881" z="7001" heading="39813" respawnDelay="230" />
 		<npc id="31681" x="114432" y="-18272" z="-1840" heading="2000" respawnDelay="60" />
 		<npc id="21148" x="114432" y="177950" z="-5432" heading="0" respawnDelay="60" />
-		<npc id="35311" x="114443" y="249142" z="-74" heading="0" respawnDelay="60" />
 		<npc id="20831" x="114460" y="13756" z="5991" heading="60699" respawnDelay="250" />
 		<npc id="20824" x="114462" y="15112" z="932" heading="0" respawnDelay="190" />
 		<npc id="20830" x="114464" y="15546" z="2996" heading="0" respawnDelay="249" />
@@ -22200,7 +22199,6 @@
 		<npc id="21368" x="115647" y="-41002" z="-2548" heading="7030" respawnDelay="109" />
 		<npc id="30685" x="115647" y="77114" z="-2649" heading="40960" respawnDelay="60" />
 		<npc id="22025" x="115649" y="-144210" z="-3150" heading="39642" respawnDelay="60" />
-		<npc id="35314" x="115649" y="249072" z="-973" heading="868" respawnDelay="60" />
 		<npc id="21061" x="115655" y="18301" z="932" heading="48419" respawnDelay="190" />
 		<npc id="32478" x="115656" y="76620" z="-2664" heading="60000" respawnDelay="60" />
 		<npc id="20956" x="115661" y="2710" z="-3689" heading="17194" respawnDelay="37" />
@@ -22241,7 +22239,6 @@
 		<npc id="20822" x="115781" y="17184" z="-2123" heading="50619" respawnDelay="180" />
 		<npc id="21067" x="115785" y="15117" z="7001" heading="62675" respawnDelay="250" />
 		<npc id="20815" x="115787" y="17917" z="-3605" heading="58977" respawnDelay="165" />
-		<npc id="35318" x="115787" y="249585" z="-775" heading="49152" respawnDelay="60" />
 		<npc id="30655" x="115791" y="75867" z="-2714" heading="3000" respawnDelay="60" />
 		<npc id="20956" x="115795" y="118" z="-3526" heading="46279" respawnDelay="37" />
 		<npc id="21368" x="115796" y="-50219" z="-2633" heading="60657" respawnDelay="109" />
@@ -22262,7 +22259,6 @@
 		<npc id="20821" x="115851" y="16009" z="-641" heading="32950" respawnDelay="165" />
 		<npc id="20822" x="115855" y="17438" z="-2123" heading="14583" respawnDelay="180" />
 		<npc id="21363" x="115862" y="-55665" z="-2544" heading="0" respawnDelay="109" />
-		<npc id="35317" x="115863" y="250387" z="-322" heading="0" respawnDelay="60" />
 		<npc id="20822" x="115871" y="14784" z="-2123" heading="24987" respawnDelay="180" />
 		<npc id="21069" x="115874" y="14099" z="5991" heading="36316" respawnDelay="230" />
 		<npc id="20589" x="115886" y="62493" z="-4550" heading="24150" respawnDelay="80" />
@@ -22302,15 +22298,12 @@
 		<npc id="20590" x="116010" y="36192" z="-4612" heading="0" respawnDelay="80" />
 		<npc id="20592" x="116010" y="36548" z="-4612" heading="0" respawnDelay="80" />
 		<npc id="20322" x="116011" y="-195715" z="-3248" heading="15909" respawnDelay="20" />
-		<npc id="35315" x="116015" y="248558" z="-946" heading="18052" respawnDelay="60" />
 		<npc id="30533" x="116016" y="-178615" z="-944" heading="8192" respawnDelay="60" />
 		<npc id="21066" x="116021" y="16229" z="4981" heading="5917" respawnDelay="230" />
-		<npc id="35279" x="116024" y="250557" z="-798" heading="-16384" respawnDelay="60" />
 		<npc id="31031" x="116036" y="76319" z="-2703" heading="16384" respawnDelay="5" />
 		<npc id="20816" x="116038" y="15026" z="-2123" heading="2540" respawnDelay="180" />
 		<npc id="20809" x="116039" y="17196" z="-5096" heading="54114" respawnDelay="148" />
 		<npc id="21355" x="116041" y="-43293" z="-3650" heading="46118" respawnDelay="109" />
-		<npc id="36408" x="116041" y="249446" z="-947" heading="47953" respawnDelay="60" />
 		<npc id="20807" x="116045" y="173247" z="-3751" heading="14460" respawnDelay="60" />
 		<npc id="31576" x="116048" y="74716" z="-2582" heading="7000" respawnDelay="60" />
 		<npc id="22025" x="116058" y="-142322" z="-3096" heading="38763" respawnDelay="60" />
@@ -22329,7 +22322,6 @@
 		<npc id="30535" x="116103" y="-178407" z="-944" heading="49152" respawnDelay="60" />
 		<npc id="30231" x="116109" y="75022" z="-2583" heading="57344" respawnDelay="60" />
 		<npc id="20817" x="116111" y="14755" z="-2123" heading="18976" respawnDelay="180" />
-		<npc id="35316" x="116123" y="249702" z="-762" heading="49152" respawnDelay="60" />
 		<npc id="21065" x="116133" y="15057" z="3971" heading="0" respawnDelay="230" />
 		<npc id="21064" x="116134" y="15769" z="3971" heading="0" respawnDelay="230" />
 		<npc id="20816" x="116135" y="15240" z="-2123" heading="9786" respawnDelay="180" />
@@ -22354,7 +22346,6 @@
 		<npc id="22085" x="116188" y="-112950" z="-1195" heading="50191" respawnDelay="60" />
 		<npc id="30534" x="116190" y="-178615" z="-944" heading="24576" respawnDelay="60" />
 		<npc id="30532" x="116190" y="-178441" z="-944" heading="40960" respawnDelay="60" />
-		<npc id="35313" x="116190" y="247827" z="-750" heading="49152" respawnDelay="10800" />
 		<npc id="30517" x="116192" y="-181072" z="-1336" heading="40960" respawnDelay="60" />
 		<npc id="21061" x="116193" y="17838" z="932" heading="0" respawnDelay="190" />
 		<npc id="20825" x="116194" y="14339" z="932" heading="8042" respawnDelay="190" />
@@ -22374,8 +22365,6 @@
 		<npc id="20592" x="116240" y="35860" z="-3712" heading="56346" respawnDelay="80" />
 		<npc id="20816" x="116242" y="15321" z="-2123" heading="28805" respawnDelay="180" />
 		<npc id="20805" x="116244" y="185137" z="-3538" heading="468" respawnDelay="60" />
-		<npc id="35653" x="116253" y="249588" z="-786" heading="41905" respawnDelay="60" />
-		<npc id="35313" x="116256" y="248182" z="-790" heading="0" respawnDelay="10800" />
 		<npc id="20812" x="116259" y="15098" z="-3605" heading="0" respawnDelay="165" />
 		<npc id="20815" x="116262" y="14822" z="-3605" heading="0" respawnDelay="165" />
 		<npc id="20820" x="116264" y="17421" z="-2123" heading="54682" respawnDelay="180" />
@@ -22401,7 +22390,6 @@
 		<npc id="20804" x="116348" y="179626" z="-3757" heading="46058" respawnDelay="60" />
 		<npc id="20809" x="116359" y="14440" z="-5096" heading="65151" respawnDelay="148" />
 		<npc id="21218" x="116361" y="174021" z="-5432" heading="0" respawnDelay="60" />
-		<npc id="35312" x="116363" y="245268" z="-1040" heading="49152" respawnDelay="10800" />
 		<npc id="20818" x="116365" y="14963" z="-641" heading="41442" respawnDelay="165" />
 		<npc id="20810" x="116373" y="17144" z="-5096" heading="53466" respawnDelay="148" />
 		<npc id="21064" x="116378" y="16479" z="3971" heading="0" respawnDelay="230" />
@@ -22413,7 +22401,6 @@
 		<npc id="20809" x="116412" y="15328" z="-5096" heading="10606" respawnDelay="148" />
 		<npc id="21354" x="116417" y="-42898" z="-3692" heading="5019" respawnDelay="109" />
 		<npc id="20819" x="116417" y="15390" z="-641" heading="2374" respawnDelay="165" />
-		<npc id="35312" x="116417" y="245616" z="-1040" heading="0" respawnDelay="10800" />
 		<npc id="20153" x="116428" y="-208623" z="-3624" heading="18815" respawnDelay="20" />
 		<npc id="20597" x="116435" y="44601" z="-3618" heading="20960" respawnDelay="80" />
 		<npc id="22020" x="116444" y="-157039" z="-1721" heading="5014" respawnDelay="60" />
@@ -22516,7 +22503,6 @@
 		<npc id="21353" x="117117" y="-41945" z="-3800" heading="0" respawnDelay="109" />
 		<npc id="30233" x="117129" y="76917" z="-2689" heading="34000" respawnDelay="60" />
 		<npc id="20322" x="117135" y="-197510" z="-3680" heading="13027" respawnDelay="20" />
-		<npc id="35320" x="117136" y="241763" z="-1280" heading="49152" respawnDelay="60" />
 		<npc id="22022" x="117137" y="-156339" z="-1956" heading="37045" respawnDelay="60" />
 		<npc id="20819" x="117139" y="15977" z="-641" heading="6021" respawnDelay="165" />
 		<npc id="30990" x="117148" y="76865" z="-2688" heading="34000" respawnDelay="5" />
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/Castles/Innadril.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/Castles/Innadril.xml
new file mode 100644
index 0000000000..8a943713d4
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/Castles/Innadril.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="InnadrilCastle">
+		<npc id="35279" x="116024" y="250557" z="-798" heading="-16384" respawnDelay="60" />
+		<npc id="35311" x="114443" y="249142" z="-74" heading="0" respawnDelay="60" />
+		<npc id="35312" x="116363" y="245268" z="-1040" heading="49152" respawnDelay="10800" />
+		<npc id="35312" x="116417" y="245616" z="-1040" heading="0" respawnDelay="10800" />
+		<npc id="35313" x="116190" y="247827" z="-750" heading="49152" respawnDelay="10800" />
+		<npc id="35313" x="116256" y="248182" z="-790" heading="0" respawnDelay="10800" />
+		<npc id="35314" x="115649" y="249072" z="-973" heading="868" respawnDelay="60" />
+		<npc id="35315" x="116015" y="248558" z="-946" heading="18052" respawnDelay="60" />
+		<npc id="35316" x="116123" y="249702" z="-762" heading="49152" respawnDelay="60" />
+		<npc id="35317" x="115863" y="250387" z="-322" heading="0" respawnDelay="60" />
+		<npc id="35318" x="115787" y="249585" z="-775" heading="49152" respawnDelay="60" />
+		<npc id="35320" x="117136" y="241763" z="-1280" heading="49152" respawnDelay="60" />
+		<npc id="35653" x="116253" y="249588" z="-786" heading="41905" respawnDelay="60" />
+		<npc id="36408" x="116041" y="249446" z="-947" heading="47953" respawnDelay="60" />
+	</spawn>
+</list>
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml
index c60bb5b567..4645246313 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml
@@ -24300,7 +24300,6 @@
 		<npc id="22824" x="114428" y="112744" z="-3056" heading="9335" respawnDelay="60" />
 		<npc id="31681" x="114432" y="-18272" z="-1840" heading="2000" respawnDelay="60" />
 		<npc id="21148" x="114432" y="177950" z="-5432" heading="0" respawnDelay="60" />
-		<npc id="35311" x="114443" y="249142" z="-74" heading="0" respawnDelay="60" />
 		<npc id="22824" x="114450" y="112856" z="-3040" heading="20901" respawnDelay="60" />
 		<npc id="20831" x="114460" y="13756" z="5991" heading="60699" respawnDelay="250" />
 		<npc id="20824" x="114462" y="15112" z="932" heading="0" respawnDelay="190" />
@@ -24675,7 +24674,6 @@
 		<npc id="21368" x="115647" y="-41002" z="-2548" heading="7030" respawnDelay="109" />
 		<npc id="30685" x="115647" y="77114" z="-2649" heading="40960" respawnDelay="60" />
 		<npc id="22025" x="115649" y="-144210" z="-3150" heading="39642" respawnDelay="60" />
-		<npc id="35314" x="115649" y="249072" z="-973" heading="868" respawnDelay="60" />
 		<npc id="21061" x="115655" y="18301" z="932" heading="48419" respawnDelay="190" />
 		<npc id="32478" x="115656" y="76620" z="-2664" heading="60000" respawnDelay="60" />
 		<npc id="22797" x="115659" y="-80131" z="-2240" heading="50485" respawnDelay="60" />
@@ -24720,7 +24718,6 @@
 		<npc id="20822" x="115781" y="17184" z="-2123" heading="50619" respawnDelay="180" />
 		<npc id="21067" x="115785" y="15117" z="7001" heading="62675" respawnDelay="250" />
 		<npc id="20815" x="115787" y="17917" z="-3605" heading="58977" respawnDelay="165" />
-		<npc id="35318" x="115787" y="249585" z="-775" heading="49152" respawnDelay="60" />
 		<npc id="30655" x="115791" y="75867" z="-2714" heading="3000" respawnDelay="60" />
 		<npc id="20956" x="115795" y="118" z="-3526" heading="46279" respawnDelay="37" />
 		<npc id="22798" x="115796" y="-77190" z="-72" heading="56752" respawnDelay="60" />
@@ -24748,7 +24745,6 @@
 		<npc id="22790" x="115853" y="-84773" z="-3392" heading="49384" respawnDelay="60" />
 		<npc id="20822" x="115855" y="17438" z="-2123" heading="14583" respawnDelay="180" />
 		<npc id="21363" x="115862" y="-55665" z="-2544" heading="0" respawnDelay="109" />
-		<npc id="35317" x="115863" y="250387" z="-322" heading="0" respawnDelay="60" />
 		<npc id="22793" x="115867" y="-84992" z="-3392" heading="0" respawnDelay="60" />
 		<npc id="22789" x="115871" y="-81348" z="-3392" heading="0" respawnDelay="60" />
 		<npc id="20822" x="115871" y="14784" z="-2123" heading="24987" respawnDelay="180" />
@@ -24807,16 +24803,13 @@
 		<npc id="20590" x="116010" y="36192" z="-4612" heading="0" respawnDelay="80" />
 		<npc id="20592" x="116010" y="36548" z="-4612" heading="0" respawnDelay="80" />
 		<npc id="20322" x="116011" y="-195715" z="-3248" heading="15909" respawnDelay="20" />
-		<npc id="35315" x="116015" y="248558" z="-946" heading="18052" respawnDelay="60" />
 		<npc id="30533" x="116016" y="-178615" z="-944" heading="8192" respawnDelay="60" />
 		<npc id="21066" x="116021" y="16229" z="4981" heading="5917" respawnDelay="230" />
-		<npc id="35279" x="116024" y="250557" z="-798" heading="-16384" respawnDelay="60" />
 		<npc id="31031" x="116036" y="76319" z="-2703" heading="16384" respawnDelay="5" />
 		<npc id="20816" x="116038" y="15026" z="-2123" heading="2540" respawnDelay="180" />
 		<npc id="22823" x="116038" y="110008" z="-3032" heading="39284" respawnDelay="60" />
 		<npc id="20809" x="116039" y="17196" z="-5096" heading="54114" respawnDelay="148" />
 		<npc id="21355" x="116041" y="-43293" z="-3650" heading="46118" respawnDelay="109" />
-		<npc id="36408" x="116041" y="249446" z="-947" heading="47953" respawnDelay="60" />
 		<npc id="20807" x="116045" y="173247" z="-3751" heading="14460" respawnDelay="60" />
 		<npc id="31576" x="116048" y="74716" z="-2582" heading="7000" respawnDelay="60" />
 		<npc id="22025" x="116058" y="-142322" z="-3096" heading="38763" respawnDelay="60" />
@@ -24840,7 +24833,6 @@
 		<npc id="30535" x="116103" y="-178407" z="-944" heading="49152" respawnDelay="60" />
 		<npc id="30231" x="116109" y="75022" z="-2583" heading="57344" respawnDelay="60" />
 		<npc id="20817" x="116111" y="14755" z="-2123" heading="18976" respawnDelay="180" />
-		<npc id="35316" x="116123" y="249702" z="-762" heading="49152" respawnDelay="60" />
 		<npc id="22791" x="116130" y="-84021" z="-3392" heading="61159" respawnDelay="60" />
 		<npc id="21065" x="116133" y="15057" z="3971" heading="0" respawnDelay="230" />
 		<npc id="21064" x="116134" y="15769" z="3971" heading="0" respawnDelay="230" />
@@ -24871,7 +24863,6 @@
 		<npc id="22085" x="116188" y="-112950" z="-1195" heading="50191" respawnDelay="60" />
 		<npc id="30534" x="116190" y="-178615" z="-944" heading="24576" respawnDelay="60" />
 		<npc id="30532" x="116190" y="-178441" z="-944" heading="40960" respawnDelay="60" />
-		<npc id="35313" x="116190" y="247827" z="-750" heading="49152" respawnDelay="10800" />
 		<npc id="30517" x="116192" y="-181072" z="-1336" heading="40960" respawnDelay="60" />
 		<npc id="21061" x="116193" y="17838" z="932" heading="0" respawnDelay="190" />
 		<npc id="20825" x="116194" y="14339" z="932" heading="8042" respawnDelay="190" />
@@ -24894,8 +24885,6 @@
 		<npc id="20592" x="116240" y="35860" z="-3712" heading="56346" respawnDelay="80" />
 		<npc id="20816" x="116242" y="15321" z="-2123" heading="28805" respawnDelay="180" />
 		<npc id="20805" x="116244" y="185137" z="-3538" heading="468" respawnDelay="60" />
-		<npc id="35653" x="116253" y="249588" z="-786" heading="41905" respawnDelay="60" />
-		<npc id="35313" x="116256" y="248182" z="-790" heading="0" respawnDelay="10800" />
 		<npc id="20812" x="116259" y="15098" z="-3605" heading="0" respawnDelay="165" />
 		<npc id="20815" x="116262" y="14822" z="-3605" heading="0" respawnDelay="165" />
 		<npc id="20820" x="116264" y="17421" z="-2123" heading="54682" respawnDelay="180" />
@@ -24929,7 +24918,6 @@
 		<npc id="20804" x="116348" y="179626" z="-3757" heading="46058" respawnDelay="60" />
 		<npc id="20809" x="116359" y="14440" z="-5096" heading="65151" respawnDelay="148" />
 		<npc id="21218" x="116361" y="174021" z="-5432" heading="0" respawnDelay="60" />
-		<npc id="35312" x="116363" y="245268" z="-1040" heading="49152" respawnDelay="10800" />
 		<npc id="22799" x="116365" y="-77781" z="-40" heading="17774" respawnDelay="60" />
 		<npc id="20818" x="116365" y="14963" z="-641" heading="41442" respawnDelay="165" />
 		<npc id="20810" x="116373" y="17144" z="-5096" heading="53466" respawnDelay="148" />
@@ -24944,7 +24932,6 @@
 		<npc id="20809" x="116412" y="15328" z="-5096" heading="10606" respawnDelay="148" />
 		<npc id="21354" x="116417" y="-42898" z="-3692" heading="5019" respawnDelay="109" />
 		<npc id="20819" x="116417" y="15390" z="-641" heading="2374" respawnDelay="165" />
-		<npc id="35312" x="116417" y="245616" z="-1040" heading="0" respawnDelay="10800" />
 		<npc id="20153" x="116428" y="-208623" z="-3624" heading="18815" respawnDelay="20" />
 		<npc id="20597" x="116435" y="44601" z="-3618" heading="20960" respawnDelay="80" />
 		<npc id="22020" x="116444" y="-157039" z="-1721" heading="5014" respawnDelay="60" />
@@ -25083,7 +25070,6 @@
 		<npc id="21353" x="117117" y="-41945" z="-3800" heading="0" respawnDelay="109" />
 		<npc id="30233" x="117129" y="76917" z="-2689" heading="34000" respawnDelay="60" />
 		<npc id="20322" x="117135" y="-197510" z="-3680" heading="13027" respawnDelay="20" />
-		<npc id="35320" x="117136" y="241763" z="-1280" heading="49152" respawnDelay="60" />
 		<npc id="22022" x="117137" y="-156339" z="-1956" heading="37045" respawnDelay="60" />
 		<npc id="20819" x="117139" y="15977" z="-641" heading="6021" respawnDelay="165" />
 		<npc id="22789" x="117144" y="-77639" z="-3392" heading="53826" respawnDelay="60" />
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Interlude/Interlude_23_25.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Castles/Innadril.xml
similarity index 89%
rename from L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Interlude/Interlude_23_25.xml
rename to L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Castles/Innadril.xml
index 2313249471..b5308bd5b4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Interlude/Interlude_23_25.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Castles/Innadril.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="Interlude_23_25">
+	<spawn name="InnadrilCastle">
 		<group>
-			<npc id="35320" x="117136" y="241763" z="-1280" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
+			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
+			<npc id="35311" x="114443" y="249142" z="-74" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="35312" x="116363" y="245268" z="-1040" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
 			<npc id="35312" x="116417" y="245616" z="-1040" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
 			<npc id="35313" x="116190" y="247827" z="-750" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
 			<npc id="35313" x="116256" y="248182" z="-790" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35311" x="114443" y="249142" z="-74" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35318" x="115787" y="249585" z="-775" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
 			<npc id="35314" x="115649" y="249072" z="-973" heading="868" respawnTime="60sec" /> <!-- Blacksmith -->
 			<npc id="35315" x="116015" y="248558" z="-946" heading="18052" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="35317" x="115863" y="250387" z="-322" respawnTime="60sec" /> <!-- Tate -->
+			<npc id="35318" x="115787" y="249585" z="-775" heading="49152" respawnTime="60sec" /> <!-- Solinus -->
+			<npc id="35320" x="117136" y="241763" z="-1280" heading="49152" respawnTime="60sec" /> <!-- Raybell -->
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Innadril/Innadril.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Innadril/Innadril.xml
deleted file mode 100644
index e182c86ee2..0000000000
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Innadril/Innadril.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="Goddard">
-		<group>
-			<npc id="35279" x="116024" y="250557" z="-768" respawnTime="60sec" /> <!-- Innadril Holy Artifact -->
-		</group>
-	</spawn>
-</list>