diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
index b6f7e1afabd1e01e17655619ed458ca3ff010277..813c803a9c7e2c92765dcde858d11d73b44b8c27 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
@@ -17,7 +17,6 @@ package ai.individual;
 import java.util.List;
 
 import javolution.util.FastList;
-
 import ai.group_template.L2AttackableAIScript;
 
 import com.l2jserver.Config;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
index 86e29f0820b6a8dc49c7628aa550739a6fc06c7a..158b789c08e9a5626bd50649b2ccd6f3a7b812ae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
@@ -34,9 +34,9 @@ import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
-import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
index 0493f4951f457d81421f1505556c90e403a8fdb1..9d2d98d72e7b0785a22b5c6ec729c011d74ddbba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
@@ -22,12 +22,12 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java
index 8303d0b94fa4b5c50c3929284131c4f7e7044bb4..a21718a4cf223f07570255cb37b1471fb32ac510 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java
@@ -22,11 +22,11 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java
index 379e9ee28123f8ddb9af1ba5f7f276cad7c3fb57..2ef433549fab561736918b77a1dbd2bdd4a36746 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java
@@ -22,13 +22,13 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java
index 019696d928ae086d75ddc089b581cee3f921e091..05b218730fa127c361f8f73666576191f13c6ba1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java
@@ -22,9 +22,9 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
index 76e43cbe890ca17a3bd96bea20d1f6306d7df88a..c6e861f410ae7c447fff5b183b5c7434ff5e8abf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
@@ -22,12 +22,12 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java
index bcbf972bdf0be2525d8d26e900d2cba1529cbe23..76ead841f7faa51808063c8964e8e739a9792c1c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java
@@ -22,13 +22,13 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java
index c390986b2616cb356b29e8115a93ff27a59311cd..2882f1c16cbbec7c8a100f29c9a799af56bd950f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java
@@ -24,12 +24,12 @@ import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java
index de8869c127a47b93934bc1294411b3b794028057..41cbadeff286a5694120771777b2b2c844e14bdc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java
@@ -22,9 +22,9 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java
index cecfb2da0865691102be3203a77c90adeed0cd2a..be67deb6a67d71279707d8d8180625f17c9f73b5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java
@@ -22,12 +22,12 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java
index c6c076b2058b6d150d3b89d479a9ccf3bf70e0dc..332490d76517bbd0eddfd925044ca4fbc66aa330 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java
@@ -24,13 +24,13 @@ import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
index eb607864328b88cbe80b69364e2fde235f6f622e..d299e45b2403f3f2f2800d6ec7cc3eb4d0ffdb3c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
@@ -22,12 +22,12 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePet.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePet.java
index 7325bd6e2b91799994a8b12465dd4bf53c8a5ecd..1fc798b4684a3ad9c60e6a1c5b495d8b70ae15a3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePet.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePet.java
@@ -17,9 +17,9 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
index 00246065afc69ea9c34489024a3e1dc17677655a..728dfc662873540d600cc8a10f345ed6645b67a2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
@@ -21,13 +21,13 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetEnemySummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetEnemySummon.java
index 69b4d3876683c69d2d154635c42047b156e40495..7b51940c63a1994e0d14bfd89c52f7df30414ec3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetEnemySummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetEnemySummon.java
@@ -17,10 +17,10 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java
index 14a9177caddaeeca3e93e14f2d2e187cc6dd547f..6a1ab31670f36143b767fd2d0373dd34eaa4fe84 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java
@@ -17,8 +17,8 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
index eb337a17b99e071a19538de0dbc0e04c30304e98..7e1f6ae13f561232042b56bcf20e38d28a880274 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
@@ -22,12 +22,12 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java
index 443358bb13d9ea80ab0ec5c341eecaff152264e6..a38d0147133d1596b82bc3411b95f12d3326b187 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java
@@ -22,13 +22,13 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetGround.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetGround.java
index 9b5246e5c3f2769237aad20ec58e46e2d7f7f56c..d708c42aa219f5f0f4682b59c5cd994359c29e4d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetGround.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetGround.java
@@ -17,8 +17,8 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetHoly.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetHoly.java
index f7994db1f2f4cab7f4591bbe54d749cb01fc5f7c..a33300ca71a0eb8da6db5f41ca49d5ab2b60900c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetHoly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetHoly.java
@@ -17,10 +17,10 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2ArtefactInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java
index 7d2c5ec487e0b48314216fe6b1a3d4459c9d2e01..3064f734ea4937c681bd438c0846305840b90402 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java
@@ -17,10 +17,10 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOwnerPet.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOwnerPet.java
index 760e3e8a8dc50923fa1fc28cf7976267f92386d5..f3e7cebc9d89a21d2e13d6fa7e97dd66f59b5bf0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOwnerPet.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOwnerPet.java
@@ -17,9 +17,9 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java
index 8b0c6bfbae0feeef842dcbb6f892d5ae7088bc7d..f48b0da0c69b27c937a3b14def331eb536564ffd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java
@@ -21,10 +21,10 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java
index 5883021c68e6e72518a5f1432349d54a01b8b606..93fd6ad05e48d0f00059fdf4f60bd4118415b880 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java
@@ -22,10 +22,10 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
index cf009a725f9ef7b160b1108375ea4b2042568229..d80062c9ca4b9f57a6308b66658a2c486b8179c2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
@@ -17,12 +17,12 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java
index 03282004887ad149e56afa2361b1f76ce1aecc5a..813ee6066aeabbfdc3a847f5a6bb23dbc53b91cc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java
@@ -21,10 +21,10 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
index bf2d09a7ab347efbc4e5fd2522169689a599f64f..61f9b13c2b5882b1ca3cb75b992cfe23049c1095 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
@@ -17,11 +17,11 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPet.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPet.java
index 2e52703941e10f644b3312532d4295c14a179f13..c931699d3d149f3ee08ae6ef203cad0107490085 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPet.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPet.java
@@ -17,8 +17,8 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSelf.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSelf.java
index fa9e862da9c52f63728f8f06260561e553d8e1c4..783f5727dfeadd5b41d204b8a9d56348226ca895 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSelf.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSelf.java
@@ -17,8 +17,8 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSummon.java
index e53a59814ebb95b7934cbf8c8d1c2f818372a819..66572db7f29d28d75323ee537cee0e16a790d7de 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSummon.java
@@ -17,9 +17,9 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
index 70390912d8b52e076de4b7e63b81f1ae1c309e73..0083ebcaca311eb95bef522540c024e615caa15d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
@@ -21,10 +21,10 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2ChestInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToFantasy/TeleportToFantasy.java b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToFantasy/TeleportToFantasy.java
index 04b195fea5886e152c404db5a1a77dfed222e33d..249c2eed125309af4f0643c57fa847113261e9a8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToFantasy/TeleportToFantasy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToFantasy/TeleportToFantasy.java
@@ -15,6 +15,7 @@
 package teleports.TeleportToFantasy;
 
 import java.util.Map;
+
 import javolution.util.FastMap;
 
 import com.l2jserver.gameserver.model.actor.L2Npc;