diff --git a/L2J_Mobius_Underground/dist/game/data/instances/BaylorWarzone.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/BaylorWarzone.xml
similarity index 98%
rename from L2J_Mobius_Underground/dist/game/data/instances/BaylorWarzone.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/BaylorWarzone.xml
index 6a72d0ccc9..709d364230 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/BaylorWarzone.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/BaylorWarzone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Baylor Warzone -->
-<instance id="166" maxWorlds="80" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="166" maxWorlds="80" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="60" empty="3" />
 	<removeBuffs type="ALL" />
 	<locations>
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/CavernOfThePirateCaptainWorldDay60.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/CavernOfThePirateCaptainWorldDay60.xml
similarity index 94%
rename from L2J_Mobius_Underground/dist/game/data/instances/CavernOfThePirateCaptainWorldDay60.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/CavernOfThePirateCaptainWorldDay60.xml
index 07f541ca3e..eb71e39881 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/CavernOfThePirateCaptainWorldDay60.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/CavernOfThePirateCaptainWorldDay60.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Cavern of the Pirate Captain (Daydream-61) -->
-<instance id="133" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="133" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="60" empty="10" />
 	<removeBuffs type="ALL" />
 	<locations>
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/CavernOfThePirateCaptainWorldDay83.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/CavernOfThePirateCaptainWorldDay83.xml
similarity index 94%
rename from L2J_Mobius_Underground/dist/game/data/instances/CavernOfThePirateCaptainWorldDay83.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/CavernOfThePirateCaptainWorldDay83.xml
index bba61462c3..91841dba12 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/CavernOfThePirateCaptainWorldDay83.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/CavernOfThePirateCaptainWorldDay83.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Cavern of the Pirate Captain (Daydream-83) -->
-<instance id="135" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="135" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="60" empty="10" />
 	<locations>
 		<enter type="RANDOM">
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/IceQueensCastle.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/IceQueensCastle.xml
similarity index 95%
rename from L2J_Mobius_Underground/dist/game/data/instances/IceQueensCastle.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/IceQueensCastle.xml
index eb1cdf7c6f..e78ef0a0ae 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/IceQueensCastle.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/IceQueensCastle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Ice Queen's Castle -->
-<instance id="137" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="137" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="20" empty="0" />
 	<locations>
 		<enter type="FIXED">
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/IceQueensCastleBattleEasy.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/IceQueensCastleBattleEasy.xml
similarity index 94%
rename from L2J_Mobius_Underground/dist/game/data/instances/IceQueensCastleBattleEasy.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/IceQueensCastleBattleEasy.xml
index 489cce42ea..905d1725bc 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/IceQueensCastleBattleEasy.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/IceQueensCastleBattleEasy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Ice Queen's Castle -->
-<instance id="139" maxWorlds="80" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="139" maxWorlds="80" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="120" empty="0" />
 	<removeBuffs type="ALL" />
 	<locations>
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/IceQueensCastleBattleHardcore.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/IceQueensCastleBattleHardcore.xml
similarity index 94%
rename from L2J_Mobius_Underground/dist/game/data/instances/IceQueensCastleBattleHardcore.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/IceQueensCastleBattleHardcore.xml
index 34cebd5322..de7a4f960a 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/IceQueensCastleBattleHardcore.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/IceQueensCastleBattleHardcore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Ice Queen's Castle (Epic) -->
-<instance id="144" maxWorlds="80" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="144" maxWorlds="80" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="120" empty="0" />
 	<removeBuffs type="ALL" />
 	<locations>
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/IstinaCavernCommon.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/IstinaCavernCommon.xml
similarity index 94%
rename from L2J_Mobius_Underground/dist/game/data/instances/IstinaCavernCommon.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/IstinaCavernCommon.xml
index d896f53703..b859d89f17 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/IstinaCavernCommon.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/IstinaCavernCommon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Istina Cavern -->
-<instance id="169" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="169" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="60" empty="5" />
 	<removeBuffs type="ALL" />
 	<locations>
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/IstinaCavernExtreme.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/IstinaCavernExtreme.xml
similarity index 94%
rename from L2J_Mobius_Underground/dist/game/data/instances/IstinaCavernExtreme.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/IstinaCavernExtreme.xml
index b0c7c04202..591e27ae6c 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/IstinaCavernExtreme.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/IstinaCavernExtreme.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Istina Cavern -->
-<instance id="170" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="170" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="60" empty="5" />
 	<removeBuffs type="ALL" />
 	<locations>
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/KimerianCommon.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/KimerianCommon.xml
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/instances/KimerianCommon.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/KimerianCommon.xml
index c46aa6cfe2..cad0f519e4 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/KimerianCommon.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/KimerianCommon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kimerian (Common) -->
-<instance id="161" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="161" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="30" empty="0" />
 	<locations>
 		<enter type="FIXED">
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/LastImperialTomb.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/LastImperialTomb.xml
similarity index 97%
rename from L2J_Mobius_Underground/dist/game/data/instances/LastImperialTomb.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/LastImperialTomb.xml
index 8add710d0d..55c98708c1 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/LastImperialTomb.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/LastImperialTomb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Last Imperial Tomb -->
-<instance id="136" maxWorlds="5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="136" maxWorlds="5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="120" empty="30" />
 	<locations>
 		<enter type="FIXED">
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/OctavisWarzoneCommon.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/OctavisWarzoneCommon.xml
similarity index 98%
rename from L2J_Mobius_Underground/dist/game/data/instances/OctavisWarzoneCommon.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/OctavisWarzoneCommon.xml
index 0b0a3c597f..b330784685 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/OctavisWarzoneCommon.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/OctavisWarzoneCommon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Octavis Warzone -->
-<instance id="180" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="180" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="120" empty="5" /> <!-- TODO: Confir me -->
 	<removeBuffs type="ALL" />
 	<locations>
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/OctavisWarzoneExtreme.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/OctavisWarzoneExtreme.xml
similarity index 98%
rename from L2J_Mobius_Underground/dist/game/data/instances/OctavisWarzoneExtreme.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/OctavisWarzoneExtreme.xml
index 0eb58f40bd..3e99128fe2 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/OctavisWarzoneExtreme.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/OctavisWarzoneExtreme.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Octavis Warzone Extreme -->
-<instance id="181" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="181" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="120" empty="5" />
 	<removeBuffs type="ALL" />
 	<locations>
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/SeedOfDestructionStage1.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/SeedOfDestructionStage1.xml
similarity index 95%
rename from L2J_Mobius_Underground/dist/game/data/instances/SeedOfDestructionStage1.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/SeedOfDestructionStage1.xml
index 30c350add6..2b4899ffbd 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/SeedOfDestructionStage1.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/SeedOfDestructionStage1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Seed of Destruction -->
-<instance id="110" maxWorlds="3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="110" maxWorlds="3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="130" empty="120" />
 	<locations>
 		<enter type="FIXED">
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/TautiWarzoneCommon.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/TautiWarzoneCommon.xml
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/instances/TautiWarzoneCommon.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/TautiWarzoneCommon.xml
index 121f225f77..784d2031df 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/TautiWarzoneCommon.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/TautiWarzoneCommon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Tauti Warzone -->
-<instance id="218" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="218" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="120" empty="5" /><!-- TODO: Confirm me -->
 	<removeBuffs type="ALL" />
 	<locations>
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/TautiWarzoneExtreme.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/TautiWarzoneExtreme.xml
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/instances/TautiWarzoneExtreme.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/TautiWarzoneExtreme.xml
index ad4cd1724a..0015bf7d9c 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/TautiWarzoneExtreme.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/TautiWarzoneExtreme.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Tauti Warzone Extreme -->
-<instance id="129" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="129" maxWorlds="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="120" empty="5" />
 	<removeBuffs type="ALL" />
 	<locations>
diff --git a/L2J_Mobius_Underground/dist/game/data/instances/TeredorWarzone.xml b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/TeredorWarzone.xml
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/instances/TeredorWarzone.xml
rename to L2J_Mobius_Underground/dist/game/data/instances/Bosses/TeredorWarzone.xml
index 6b092b5240..b97cff650a 100644
--- a/L2J_Mobius_Underground/dist/game/data/instances/TeredorWarzone.xml
+++ b/L2J_Mobius_Underground/dist/game/data/instances/Bosses/TeredorWarzone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Teredor Warzone -->
-<instance id="160" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="160" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="60" empty="3" />
 	<locations>
 		<enter type="FIXED">
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lindvior.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
similarity index 97%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lindvior.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index 4b01a71f3b..3b677a5988 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lindvior.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -33,7 +33,7 @@ import ai.AbstractNpcAI;
  * Lindvior Scene AI.
  * @author nonom
  */
-public final class Lindvior extends AbstractNpcAI
+public final class LindviorScene extends AbstractNpcAI
 {
 	private static final int LINDVIOR_CAMERA = 18669;
 	private static final int TOMARIS = 32552;
@@ -51,7 +51,7 @@ public final class Lindvior extends AbstractNpcAI
 	private L2Npc _tomaris = null;
 	private L2Npc _artius = null;
 	
-	public Lindvior()
+	public LindviorScene()
 	{
 		scheduleNextLindviorVisit();
 	}
@@ -135,6 +135,6 @@ public final class Lindvior extends AbstractNpcAI
 	
 	public static void main(String[] args)
 	{
-		new Lindvior();
+		new LindviorScene();
 	}
 }
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/MonasteryOfSilence/Anais.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Anais/Anais.java
similarity index 96%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/MonasteryOfSilence/Anais.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index b6af978b02..ff5cbd1f36 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/MonasteryOfSilence/Anais.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.MonasteryOfSilence;
+package ai.bosses.Anais;
 
 import java.util.ArrayList;
 
@@ -159,10 +159,6 @@ public final class Anais extends AbstractNpcAI
 		return super.onAttack(npc, attacker, damage, isSummon);
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * @see com.l2jmobius.gameserver.model.quest.Quest#onSpawn(com.l2jmobius.gameserver.model.actor.L2Npc)
-	 */
 	@Override
 	public String onSpawn(L2Npc npc)
 	{
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001-01.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001-01.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001-01.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001-01.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001-02.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001-02.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001-02.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001-02.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001-03.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001-03.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001-03.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001-03.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001-04.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001-04.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001-04.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001-04.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001-05.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001-05.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001-05.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001-05.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/13001.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/13001.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/Antharas.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/Antharas.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 10e3ab4cc4..1f39611ed2 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/LairOfAntharas/Antharas/Antharas.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.LairOfAntharas.Antharas;
+package ai.bosses.Antharas;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/31862-01.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/31862-01.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/31862-01.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/31862-01.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/31862-02.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/31862-02.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/31862-02.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/31862-02.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/31862-03.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/31862-03.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/31862-03.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/31862-03.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/31862-04.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/31862-04.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/31862-04.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/31862-04.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/31862.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/31862.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/31862.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/31862.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/Baium.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/Baium.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index fbfa9fef16..a70e0d4d26 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/Baium/Baium.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.TowerOfInsolence.Baium;
+package ai.bosses.Baium;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/BaylorWarzone/BaylorWarzone.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/BaylorWarzone/BaylorWarzone.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 3fc7135fcc..3394c02a83 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/BaylorWarzone/BaylorWarzone.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.BaylorWarzone;
+package ai.bosses.Baylor;
 
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/BaylorWarzone/condNoParty.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baylor/condNoParty.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/BaylorWarzone/condNoParty.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baylor/condNoParty.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/BaylorWarzone/condNoPartyLeader.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baylor/condNoPartyLeader.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/BaylorWarzone/condNoPartyLeader.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Baylor/condNoPartyLeader.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/CrumaTower/Core.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/CrumaTower/Core.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java
index 0cf073fe1e..bd55f7825c 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/CrumaTower/Core.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.CrumaTower;
+package ai.bosses.Core;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FrostLake/FreyasSteward/32029-1.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/FreyasSteward/32029-1.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FrostLake/FreyasSteward/32029-1.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/FreyasSteward/32029-1.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FrostLake/FreyasSteward/32029.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/FreyasSteward/32029.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FrostLake/FreyasSteward/32029.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/FreyasSteward/32029.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FrostLake/FreyasSteward/FreyasSteward.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/FreyasSteward/FreyasSteward.java
similarity index 97%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FrostLake/FreyasSteward/FreyasSteward.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/FreyasSteward/FreyasSteward.java
index a9b28c35a9..8efcf1ed9f 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FrostLake/FreyasSteward/FreyasSteward.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/FreyasSteward/FreyasSteward.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.FrostLake.FreyasSteward;
+package ai.bosses.Freya.FreyasSteward;
 
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 8d1edcdf83..6d4860e00b 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.IceQueensCastle;
+package ai.bosses.Freya.IceQueensCastle;
 
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IceQueensCastleBattle/18851-01.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/18851-01.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IceQueensCastleBattle/18851-01.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/18851-01.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IceQueensCastleBattle/18851.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/18851.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IceQueensCastleBattle/18851.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/18851.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index 7615844602..4e3ab64023 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.IceQueensCastleBattle;
+package ai.bosses.Freya.IceQueensCastleBattle;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-01.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-01.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-01.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-01.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-02.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-02.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-02.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-02.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-03.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-03.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-03.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-03.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-04.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-04.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-04.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-04.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-05.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-05.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-05.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-05.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-06.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-06.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-06.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-06.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-07.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-07.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-07.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-07.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-08.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-08.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-08.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-08.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-09.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-09.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-09.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-09.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-10.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-10.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-10.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-10.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-11.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-11.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/32781-11.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/32781-11.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/Jinia.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
similarity index 98%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/Jinia.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 22bfdde5d9..adb23f31c2 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Jinia/Jinia.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.FreyasGarden.Jinia;
+package ai.bosses.Freya.Jinia;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/32762-easy.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/32762-easy.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/32762-easy.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/32762-easy.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/32762-easyfight.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/32762-easyfight.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/32762-easyfight.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/32762-easyfight.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/32762-hard.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/32762-hard.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/32762-hard.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/32762-hard.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/32762-hardfight.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/32762-hardfight.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/32762-hardfight.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/32762-hardfight.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/32762.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/32762.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/32762.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/32762.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/Sirra.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/Sirra.java
similarity index 97%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/Sirra.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/Sirra.java
index f619884177..5374031265 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/FreyasGarden/Sirra/Sirra.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Freya/Sirra/Sirra.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.FreyasGarden.Sirra;
+package ai.bosses.Freya.Sirra;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
similarity index 97%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index faaa7893d5..da34d1c897 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.LastImperialTomb;
+package ai.bosses.Frintezza;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
similarity index 96%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index b52c0680ff..bb37c2bac6 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.LastImperialTomb;
+package ai.bosses.Frintezza;
 
 import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
 import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-01.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-01.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-01.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-01.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-02.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-02.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-02.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-02.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-03.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-03.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-03.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-03.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-04.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-04.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-04.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-04.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-05.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-05.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-05.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-05.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-06.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-06.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-06.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-06.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-07.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-07.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-07.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-07.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-08.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-08.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/33293-08.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/33293-08.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/IstinaCavern.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/IstinaCavern.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index e27404b391..f2ce03efdf 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/IstinaCavern/IstinaCavern.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.IstinaCavern;
+package ai.bosses.Istina;
 
 import java.util.Comparator;
 import java.util.Map;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/33098-01.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/33098-01.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/33098-01.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/33098-01.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/33098-02.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/33098-02.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/33098-02.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/33098-02.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/33098-03.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/33098-03.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/33098-03.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/33098-03.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/33131-01.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/33131-01.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/33131-01.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/33131-01.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/KimerianCommon.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/KimerianCommon.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 884c6d4041..87ecf2699a 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.Kimerian;
+package ai.bosses.Kimerian;
 
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.ChatType;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/condParty.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/condParty.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/Kimerian/condParty.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Kimerian/condParty.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/OctavisWarzone.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/OctavisWarzone.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 5eff40f7aa..c6f024c42c 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/OctavisWarzone.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.OctavisWarzone;
+package ai.bosses.Octavis;
 
 import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.Movie;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/PartyEnterCommon.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/PartyEnterCommon.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/PartyEnterCommon.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/PartyEnterCommon.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/PartyEnterExtreme.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/PartyEnterExtreme.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/PartyEnterExtreme.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/PartyEnterExtreme.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/PartyMemberReenter.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/PartyMemberReenter.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/PartyMemberReenter.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/PartyMemberReenter.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/condBigGroup.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/condBigGroup.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/condBigGroup.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/condBigGroup.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/condNoGroup.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/condNoGroup.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/condNoGroup.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/condNoGroup.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/condNoLevelCommon.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/condNoLevelCommon.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/condNoLevelCommon.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/condNoLevelCommon.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/condNoLevelExtreme.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/condNoLevelExtreme.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/OctavisWarzone/condNoLevelExtreme.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Octavis/condNoLevelExtreme.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SeaOfSpores/Orfen.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SeaOfSpores/Orfen.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 20bc7e6d57..efc491d788 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SeaOfSpores/Orfen.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.SeaOfSpores;
+package ai.bosses.Orfen;
 
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/Wastelands/QueenAnt.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/Wastelands/QueenAnt.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index eb1fe1e89c..1deeacefa0 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/Wastelands/QueenAnt.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.Wastelands;
+package ai.bosses.QueenAnt;
 
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/StakatoNest/QueenShyeed.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/StakatoNest/QueenShyeed.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 89e3006cca..8206dcbb59 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/StakatoNest/QueenShyeed.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.StakatoNest;
+package ai.bosses.QueenShyeed;
 
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-01.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-01.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-01.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-01.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-01a.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-01a.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-01a.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-01a.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-02.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-02.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-02.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-02.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-02a.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-02a.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-02a.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-02a.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-03.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-03.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-03.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-03.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-03a.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-03a.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-03a.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-03a.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-04.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-04.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-04.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-04.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-05.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-05.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109-05.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109-05.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/32109.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/32109.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/Sailren.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/Sailren.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index bb2aee13d9..fbe2297935 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/Sailren/Sailren.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.PrimevalIsle.Sailren;
+package ai.bosses.Sailren;
 
 import com.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/Cannon/Cannon.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/Cannon/Cannon.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index a67a84928d..69df6320f6 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/Cannon/Cannon.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.PrisonOfDarkness.Cannon;
+package ai.bosses.Spezion.Cannon;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -55,7 +55,6 @@ public final class Cannon extends AbstractNpcAI
 	private static final int F_MEMORY_FRAGMENT = 17613; // Frightening Memory Fragment
 	// Misc
 	private static final Map<Integer, Integer> TRANSFORM_DATA = new HashMap<>();
-	
 	static
 	{
 		TRANSFORM_DATA.put(22965, 22979); // Novice Phantom -> Novice Escort Swordsman
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/Cannon/cannon-noItem.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/cannon-noItem.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/Cannon/cannon-noItem.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/cannon-noItem.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/Cannon/cannon-recharge.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/cannon-recharge.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/Cannon/cannon-recharge.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/cannon-recharge.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/Cannon/cannon.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/cannon.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/Cannon/cannon.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/cannon.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/PresentSpezion.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/PresentSpezion.java
similarity index 97%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/PresentSpezion.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/PresentSpezion.java
index e1c378429c..0fef270db4 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrisonOfDarkness/PresentSpezion.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Spezion/PresentSpezion.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.PrisonOfDarkness;
+package ai.bosses.Spezion;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/33675.htm b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/33675.htm
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/33678-1.htm b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/33678-1.htm
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/33678-1.htm
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/33678-1.htm
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/33678-2.htm b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/33678-2.htm
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/33678-2.htm
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/33678-2.htm
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/33678-3.htm b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/33678-3.htm
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/33678-3.htm
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/33678-3.htm
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/PartyEnterCommon.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/PartyEnterCommon.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/PartyEnterCommon.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/PartyEnterCommon.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/PartyEnterExtreme.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/PartyEnterExtreme.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/PartyEnterExtreme.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/PartyEnterExtreme.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/PartyMemberReenter.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/PartyMemberReenter.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/PartyMemberReenter.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/PartyMemberReenter.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/TautiWarzone.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/TautiWarzone.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index 5aa1bf008f..0663b2a61a 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/TautiWarzone.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.TautiWarzone;
+package ai.bosses.Tauti;
 
 import java.util.List;
 
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/condBigGroup.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/condBigGroup.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/condBigGroup.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/condBigGroup.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/condNoGroup.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/condNoGroup.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/condNoGroup.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/condNoGroup.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/condNoLevelCommon.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/condNoLevelCommon.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/condNoLevelCommon.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/condNoLevelCommon.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/condNoLevelExtreme.html b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/condNoLevelExtreme.html
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TautiWarzone/condNoLevelExtreme.html
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tauti/condNoLevelExtreme.html
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TeredorWarzone/TeredorWarzone.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/TeredorWarzone/TeredorWarzone.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index dc5e28d9e0..fe5488c8aa 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/TeredorWarzone/TeredorWarzone.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.TeredorWarzone;
+package ai.bosses.Teredor;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/SeedOfDestruction/SeedOfDestruction.xml b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tiat/SeedOfDestruction.xml
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/SeedOfDestruction/SeedOfDestruction.xml
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tiat/SeedOfDestruction.xml
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/SeedOfDestruction/SeedOfDestruction.xsd b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tiat/SeedOfDestruction.xsd
similarity index 100%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/SeedOfDestruction/SeedOfDestruction.xsd
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tiat/SeedOfDestruction.xsd
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 3e42c3774e..11ed766aa7 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.SeedOfDestruction;
+package ai.bosses.Tiat;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -206,7 +206,7 @@ public final class Stage1 extends AbstractInstance implements IGameXmlReader
 	@Override
 	public void load()
 	{
-		parseDatapackFile("data/scripts/instances/SeedOfDestruction/SeedOfDestruction.xml");
+		parseDatapackFile("data/scripts/ai/bosses/Tiat/SeedOfDestruction.xml");
 		_log.info("[Seed of Destruction] Loaded " + _spawnZoneList.size() + " spawn zones data.");
 	}
 	
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Valakas.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Valakas.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 290a4370ba..2603aacb81 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Valakas.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.areas.ForgeOfTheGods;
+package ai.bosses.Valakas;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
similarity index 99%
rename from L2J_Mobius_Underground/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
rename to L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index 67a0ab8b4d..3d161460ad 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package instances.CavernOfThePirateCaptain;
+package ai.bosses.Zaken;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/package-info.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/package-info.java
new file mode 100644
index 0000000000..7fc7403d60
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+/**
+ * @author Mobius
+ */
+package ai.bosses;
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/others/GrandBossTeleporters/GrandBossTeleporters.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/others/GrandBossTeleporters/GrandBossTeleporters.java
index 7f8952e3aa..ecfccfd502 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/others/GrandBossTeleporters/GrandBossTeleporters.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/others/GrandBossTeleporters/GrandBossTeleporters.java
@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.quest.QuestState;
 
 import ai.AbstractNpcAI;
-import ai.areas.ForgeOfTheGods.Valakas;
+import ai.bosses.Valakas.Valakas;
 
 /**
  * Grand Bosses teleport AI.<br>
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 71cb3293b7..899eec2024 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -31,8 +31,8 @@ import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.zone.type.L2NoRestartZone;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 
-import ai.areas.LairOfAntharas.Antharas.Antharas;
-import ai.areas.TowerOfInsolence.Baium.Baium;
+import ai.bosses.Antharas.Antharas;
+import ai.bosses.Baium.Baium;
 
 /**
  * @author St3eT