diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
index acd5640c2f1a7afc0be4d5af080af74a497c9f42..d82c73c0e1d6154ef465e5a9fe99b8f94abe56f5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
@@ -23,17 +23,17 @@ import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2TamedBeastInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
 import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.skills.SkillHolder;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chests.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chests.java
index 8bf1513a2e0195fb8fac8eaf473a22f5002d7d47..12e459102c5ae5c12af40069882aba24725a0ab7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chests.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chests.java
@@ -16,11 +16,11 @@ package ai.group_template;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2ChestInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chimeras.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chimeras.java
index 6d41971a11b0fa068729c78da8b0d779c69507f6..2acd2bc7b32cd1a1c6d53c3a1fd43557b372bedc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chimeras.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chimeras.java
@@ -17,11 +17,11 @@ package ai.group_template;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.instancemanager.HellboundManager;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.util.Rnd;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DenOfEvil.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DenOfEvil.java
index 920c53de18573b43d9268651ddcf46761b6b7e0e..b6beb8220839ec1f057d7ed85cc921553102baeb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DenOfEvil.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DenOfEvil.java
@@ -17,12 +17,12 @@ package ai.group_template;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.Location;
 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.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.type.L2EffectZone;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java
index 90e6971dc530fdc3d54483905bc96b6c1dbc1753..6416f3400d63eaf356c846ea32db2cb9e4a6a8b4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java
@@ -27,18 +27,18 @@ import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.GraciaSeedsManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java
index ed2c8d6ef6eb9e0519e275fef98e31991a982b1b..4801c7b4aa80ff6dc04ff36e538c24742026ba3d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java
@@ -16,11 +16,11 @@ package ai.group_template;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
index 68bd0cb5d8fd3d3986dc91ac6a3b133ed2508161..89e757a39f4940eda57d73b8750f9b29a33abad3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
@@ -22,14 +22,14 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2TamedBeastInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java
index e18e4b031dbe1dbede060bf8981adedcc1f6f9e8..b75a86df018885345ce3e803574539daeaa29b3d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java
@@ -24,16 +24,16 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.instancemanager.DimensionalRiftManager;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 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.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2RiftInvaderInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.jython.QuestJython;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Monastery.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Monastery.java
index e22a219cc06a943afb5d51458f501f8954443c43..1b404dae1b475dd2f8d87099e6547e07d30aaebf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Monastery.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Monastery.java
@@ -21,7 +21,6 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -29,9 +28,10 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
index 57b5fd3728d408e0bacbe9c7558ba21ba059fc77..b7a86aefa264461c9d8815c477b8a23cd1b294c2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
@@ -19,12 +19,12 @@ import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.L2CharPosition;
-import com.l2jserver.gameserver.model.L2Skill;
 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.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrisonGuards.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrisonGuards.java
index 9ebdb546e07c973e1371b697243f9303041f58bb..dde597bd73f38295ac18f2023c9698ca9a8387cd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrisonGuards.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrisonGuards.java
@@ -21,11 +21,11 @@ import javolution.util.FastMap;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 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.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
 import com.l2jserver.util.Rnd;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Remnants.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Remnants.java
index 13d6ccc45e142d6c10aee947afca200872e44fd6..98d8fe3e42d95a89ad1b11e8461aa6163b163d22 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Remnants.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Remnants.java
@@ -15,9 +15,9 @@
 package ai.group_template;
 
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
  * @author DS
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StakatoNest.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StakatoNest.java
index 36f3d41fb6ae7a48e2114cbe602d4365c539402c..361a7e5abec9e951c4b9550237821565dae43c8c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StakatoNest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StakatoNest.java
@@ -19,11 +19,11 @@ import java.util.List;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.util.Broadcast;
 import com.l2jserver.gameserver.util.Util;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StarStones.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StarStones.java
index cc6b176b5210896bd1dbd67e18474ef2207e8294..54b2bbc8f84141685880b2c46e368e575b974499 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StarStones.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StarStones.java
@@ -15,9 +15,9 @@
 package ai.group_template;
 
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Amaskari.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Amaskari.java
index c95c656cd6ae57ab62f2f1e0a6236fd6ad06d500..7a4262a34f85d9eb992ffbb7266183ac5338156f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Amaskari.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Amaskari.java
@@ -18,15 +18,15 @@ import ai.group_template.L2AttackableAIScript;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.instancemanager.HellboundManager;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.skills.SkillHolder;
 import com.l2jserver.util.Rnd;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java
index b808ac4c46e074e47ab9cf59f0b983778dca2292..5bb8b2caed39bc43e96f690a2c2d419e258fec0f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java
@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.model.L2CharPosition;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.StatsSet;
@@ -40,12 +39,13 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.serverpackets.Earthquake;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java
index 4eb25603f75d4fc7c1fe3046dde4a5d47ae47d7d..2e8964e9f5f057282345340ba3d19fcd894e192c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java
@@ -30,9 +30,7 @@ import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Character;
@@ -41,7 +39,9 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2DecoyInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.quest.QuestTimer;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.serverpackets.Earthquake;
 import com.l2jserver.gameserver.network.serverpackets.MoveToPawn;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
index 1d3c868b43350cacd307ec5c922dd289ae0fd5f2..32c3e2ec3a583a367fc18931fdfe696041708c16 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.StatsSet;
@@ -38,6 +37,9 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
 import com.l2jserver.gameserver.network.serverpackets.DoorStatusUpdate;
@@ -45,8 +47,6 @@ import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.SocialAction;
 import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
 import com.l2jserver.gameserver.network.serverpackets.StaticObject;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DemonPrince.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DemonPrince.java
index 3d302557b4069466d9f08caf445ce291e8bf08e0..375b3281ded29cb0e2720b4fe2efa3c4b33e67d8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DemonPrince.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DemonPrince.java
@@ -19,10 +19,10 @@ import java.util.Map;
 import javolution.util.FastMap;
 import ai.group_template.L2AttackableAIScript;
 
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.skills.SkillHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.util.Rnd;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/HellboundCore.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/HellboundCore.java
index 17c8f54f77c8908a452b630250160d38b18fd414..77d18ad45db5ec9b7b4848495840cf97ef0a7163 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/HellboundCore.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/HellboundCore.java
@@ -19,8 +19,8 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.skills.SkillHolder;
 
 /**
  * Manages Naia's cast on the Hellbound Core
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
index 3b2b4a440f15d57a471ad462c158b0e0e8ba1cd3..352089b625008a82dfc9cc02d895722286c8ce94 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
@@ -30,13 +30,13 @@ import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java
index 8c6c1a9991ee49eaf03466ea2cb0e0c773152828..3bae92b951abb5cf4b9433680999f994bf150d00 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.StatsSet;
@@ -33,6 +32,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
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 76bc50b3016fe7eb313bb2550ffcc3dc56720469..ac71c45832785ed99b2b30e171c3e2463834317b 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
@@ -23,7 +23,6 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -31,10 +30,11 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.PlaySound;
-import com.l2jserver.gameserver.skills.SkillHolder;
 import com.l2jserver.util.Rnd;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ranku.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ranku.java
index d61c2437f06289681c00b4f7c8ef75a690b4bfc2..3ad720dfa6fe2d13e201f390ae90c3437f21e930 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ranku.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ranku.java
@@ -17,10 +17,10 @@ package ai.individual;
 import gnu.trove.set.hash.TIntHashSet;
 import ai.group_template.L2AttackableAIScript;
 
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Typhoon.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Typhoon.java
index 34d6ac53dbba19f36b694b6bf6601a22f1a31e23..fd11db2b94295696ff0f8d29746a1ac38d6449b0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Typhoon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Typhoon.java
@@ -20,7 +20,7 @@ import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
-import com.l2jserver.gameserver.skills.SkillHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
 
 /**
  * @author GKR
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java
index cea5e43c81164bcf24ff7aadc385f2d3cfabd634..836007e246e0c75a4ae38cd78c17d8f95f0703e8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java
@@ -26,9 +26,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -36,7 +34,9 @@ import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2DecoyInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.quest.QuestTimer;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 import com.l2jserver.gameserver.network.serverpackets.SocialAction;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java
index 9abbbe355649781419b76bb519885d20cc7b700e..2299262387e18ea576490bb685d37a0e76b9e5ef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java
@@ -25,15 +25,15 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.DoorTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.StatsSet;
 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.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 import com.l2jserver.util.Rnd;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index 30c750dce0f7a03e7ceaceecb2b35d39244c617b..1d38b42e9a7adef4811788192100c2a5c970b0bf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -40,18 +40,18 @@ import com.l2jserver.gameserver.instancemanager.MapRegionManager.TeleportWhereTy
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegeStatus;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
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 c17deb95de0d137391dfc0f41c660a830503ac42..a997967c4470dbc0050da4f75f9e6a3ce17224f1 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
@@ -40,13 +40,13 @@ import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.clanhall.ClanHallSiegeEngine;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegeStatus;
 import com.l2jserver.gameserver.model.zone.type.L2ResidenceHallTeleportZone;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 
 /**
  * @author BiggBoss
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/IOPRace/IOPRace.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/IOPRace/IOPRace.java
index 83e16b8e17555f09b0af4d33951987f76f8a8891..0947915e378228892f9bc89ea96d8d90522b3911 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/IOPRace/IOPRace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/IOPRace/IOPRace.java
@@ -15,11 +15,11 @@
 package custom.IOPRace;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 public class IOPRace extends Quest
 {
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java
index 3ebaf080be2e6c8bae8ca38c8bf70635a10d2ac7..ebd2f8f3d4a4576ede06ac3dfd530abac954f6bb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java
@@ -17,12 +17,12 @@ package custom.KetraOrcSupport;
 import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.WareHouseWithdrawalList;
 import com.l2jserver.gameserver.util.Util;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
index d550ffa8b980004b4d0ec6ac9433ff852429853f..0df8f71824fe5d60aa98f1393d0c7e2cb235444d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
@@ -24,9 +24,9 @@ import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SkillTransferValidator.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SkillTransferValidator.java
index 27c382a2bc4be4dcfe45346a02996aeb33005efe..26b266227e75a0eee947a5b2ed7c45e555e6e6ce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SkillTransferValidator.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SkillTransferValidator.java
@@ -16,12 +16,12 @@ package custom.Validators;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
-import com.l2jserver.gameserver.model.ItemHolder;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java
index 039c1e96f21d3461488da2b0eae5c84bb2f2ae3c..2bbc917fb4e73c21bf129dc44688c4c85b57325b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java
@@ -19,11 +19,11 @@ import java.util.Arrays;
 import javolution.util.FastList;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java
index 1de9a780b75ca9c9a3d24a92497d0d4824e11243..edb1adee201bb68bf10df52e55b9dc6fde0a5006 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -17,12 +17,12 @@ package custom.VarkaSilenosSupport;
 import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.WareHouseWithdrawalList;
 import com.l2jserver.gameserver.util.Util;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index 54b7f4592ae18b359d9d1a3f518f543c7ea4beb6..04db567ca78480d266308342af8804ebbfeb3cae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -15,7 +15,6 @@
 package events.FreyaCelebration;
 
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -23,6 +22,7 @@ import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index 90eda514999cd5e03544142b4c6ec4364b6e68d8..6d0635a7f9c25a1d4c3e8f039f1f8ef726c16a77 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -18,7 +18,7 @@ import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
@@ -139,7 +139,7 @@ public class GiftOfVitality extends Quest
 			{
 				htmltext = "4306-nolevel.htm";
 			}
-			else if ((player.getPet() == null) || !(player.getPet() instanceof L2SummonInstance))
+			else if ((player.getPet() == null) || !(player.getPet() instanceof L2ServitorInstance))
 			{
 				htmltext = "4306-nosummon.htm";
 			}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java
index f914b7c7fef0f0eb82e1c14b9a55b429cf9c1578..2448edf8ea8202e79e4c2719d1f687e13ca8ed23 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java
@@ -20,7 +20,7 @@ import com.l2jserver.gameserver.instancemanager.MercTicketManager;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
 public class L2ItemInstanceAction implements IActionHandler
 {
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
index 8c3562146e1ca97a649d8994148c3afc8257c73b..204b2e95bc446379d27ee7ca54d4d7348c2fdd38 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
@@ -18,7 +18,7 @@ import com.l2jserver.gameserver.handler.IActionHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.util.StringUtil;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
index 6d302751618b91b2ea28014bcfa49b4c216eef72..40ba05547a3f7e35b5903f3b4c3e3315aa0da94c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
@@ -27,12 +27,12 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Item;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.skills.BaseStats;
-import com.l2jserver.gameserver.skills.Stats;
 import com.l2jserver.util.StringUtil;
 
 public class L2NpcActionShift implements IActionHandler
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index a2679bdf97770d45fe7c7dfceffc7574cda45348..1442f608499479c565a6b81f2475407c8b9b1b4b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -19,10 +19,10 @@ import java.util.StringTokenizer;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.GMSkillTable;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java
index dfd97681bdbe92a0b712d48089d2a296edc24184..393825f611069f95860358adb8aa92122c0c304f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java
@@ -20,7 +20,7 @@ import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Item;
+import com.l2jserver.gameserver.model.items.L2Item;
 
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditNpc.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditNpc.java
index f57309751abe7bc66e2b59563e092c7fc696c676..f8ed3e420c05c3c61ee9c2130dfd007508bfb465 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditNpc.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditNpc.java
@@ -37,17 +37,17 @@ import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2DropCategory;
 import com.l2jserver.gameserver.model.L2DropData;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2TradeList;
 import com.l2jserver.gameserver.model.L2TradeList.L2TradeItem;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Item;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.util.StringUtil;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index b78c73bb583dbf97969552d9e831ec8534382a70..7e7e9e95c44dbcc3ea9fea70a37abb7988cd6bcf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -22,12 +22,13 @@ import com.l2jserver.gameserver.communitybbs.Manager.RegionBBSManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2ChestInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.AbnormalEffect;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.CharInfo;
 import com.l2jserver.gameserver.network.serverpackets.Earthquake;
@@ -42,7 +43,6 @@ import com.l2jserver.gameserver.network.serverpackets.SunRise;
 import com.l2jserver.gameserver.network.serverpackets.SunSet;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
-import com.l2jserver.gameserver.skills.AbnormalEffect;
 import com.l2jserver.gameserver.util.Broadcast;
 
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
index b6f9033b0dc283a080c219be01749dc421438f73..0c8623d5df98b6e74229d46082c017caf89d261f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
@@ -22,8 +22,8 @@ import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.Elementals;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
index b6ea7041bc6dfbd8a5869b43aee8dc9de6643fb1..9dd41244349ca368053c89c880e92704892bdae0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
@@ -20,8 +20,8 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.CharInfo;
 import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 0649605138b96eab61237de7c8bacc8494180516..f6856bf46cdb2866815843ec7070316ba313ee3d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -23,10 +23,10 @@ import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.util.StringUtil;
 
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
index a0823ba857b553514d490b1fa94a9700d4c3577e..b2a912c70310f413ef8619d51555c674fce28a4d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
@@ -21,10 +21,10 @@ import com.l2jserver.gameserver.model.MobGroup;
 import com.l2jserver.gameserver.model.MobGroupTable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Broadcast;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index f380adc0192662ca23ec05d09da4088eca263387..5dd745e65bb0492eaaa45368d23e3494a3552aa2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -23,8 +23,8 @@ import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.PledgeSkillList;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index e8aee04a0356dc881b46a01e89c80e755c051f32..9960b443ecbfafe407402b9a2f8200475479ca1c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -39,11 +39,11 @@ import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Broadcast;
 import com.l2jserver.util.StringUtil;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index 9be417e20798b82a549ca5f102903b1cc8e87adc..2c3760f141df0615b597ae76268b49491bca827e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -37,9 +37,9 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.util.StringUtil;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java
index b2b576bf926c7e5b7041ff7b7ea5206f8de7d384..4201bd31cda5630ab77fd92cd1b23f1863294a77 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java
@@ -22,9 +22,9 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ArenaBuff.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ArenaBuff.java
index dcbb1cd02270b80978a16a090a0074342c40189c..edb6172e728f13c786f6341e36549659b1130fbc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ArenaBuff.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ArenaBuff.java
@@ -19,10 +19,10 @@ import java.util.logging.Level;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IBypassHandler;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
  * @author Xaras2
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
index 662fecb5afd22c1ee9a5a5a6c542715670353399..ade8113b1c2381be2a69fbf6bee78bc4feb27ab7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2FestivalGuideInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java
index 4a549e1e6c7f67c9061dc7608af38b0b43651da5..ab9acf0116f6dba6f72a6236a72f278be19f8920 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java
@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.instancemanager.games.Lottery;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
index 06ae43313bc6629d9709c10167c73c5286cf5e10..1dfbc87c833e92b6f2bcd3edf7fca9a9f3fe6dba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
@@ -23,16 +23,16 @@ import com.l2jserver.gameserver.datatables.MultiSell;
 import com.l2jserver.gameserver.datatables.NpcBufferTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IBypassHandler;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2OlympiadManagerInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.olympiad.CompetitionType;
 import com.l2jserver.gameserver.model.olympiad.Olympiad;
 import com.l2jserver.gameserver.model.olympiad.OlympiadManager;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExHeroList;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveHennaList.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveHennaList.java
index 9c3795d74b95bfca30a3f5d00eaf106d747aac7f..b2931f492a734b7f8e19cee304bf6ecf55d8e02f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveHennaList.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveHennaList.java
@@ -18,7 +18,7 @@ import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SymbolMakerInstance;
-import com.l2jserver.gameserver.model.item.instance.L2HennaInstance;
+import com.l2jserver.gameserver.model.items.instance.L2HennaInstance;
 import com.l2jserver.gameserver.network.serverpackets.HennaRemoveList;
 
 public class RemoveHennaList implements IBypassHandler
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportBlessing.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportBlessing.java
index d5b85ca70b6e14e37a92e64438bc08baf5f1efd1..a2d8a09105323f8684251b847b30b0611c632bef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportBlessing.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportBlessing.java
@@ -16,10 +16,10 @@ package handlers.bypasshandlers;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IBypassHandler;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 
 public class SupportBlessing implements IBypassHandler
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java
index e76ee262cb6088ebbbab067b98eb9d26b44622a4..3dd50c2cf918c54e9f03ad99a739a0d0d1936761 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java
@@ -18,12 +18,12 @@ import com.l2jserver.gameserver.datatables.HelperBuffTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.L2HelperBuff;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 public class SupportMagic implements IBypassHandler
 {
@@ -87,7 +87,7 @@ public class SupportMagic implements IBypassHandler
 		
 		if (isSummon)
 		{
-			if ((player.getPet() == null) || !(player.getPet() instanceof L2SummonInstance))
+			if ((player.getPet() == null) || !(player.getPet() instanceof L2ServitorInstance))
 			{
 				String content = "<html><body>Only servitors can receive this Support Magic. If you do not have a servitor, you cannot access these spells.</body></html>";
 				npc.insertObjectIdAndShowChatWindow(player, content);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AbortCast.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AbortCast.java
index 7dd740d7d267f23ba64e408b890e549f6c629dd2..3951c00dff948b1e7582add60fe77ee45d0ce4ae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AbortCast.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AbortCast.java
@@ -14,10 +14,10 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 public class AbortCast extends L2Effect
 {
@@ -28,7 +28,7 @@ public class AbortCast extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -38,7 +38,7 @@ public class AbortCast extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -55,7 +55,7 @@ public class AbortCast extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Betray.java
index f735a7dc5ac232b92a611932746087cd61859e59..d89249914ea4b3c895f6d469615cc5b0f30bf759 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Betray.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Betray.java
@@ -16,12 +16,12 @@ package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author decad
@@ -36,7 +36,7 @@ public class Betray extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -46,7 +46,7 @@ public class Betray extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -63,7 +63,7 @@ public class Betray extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -73,7 +73,7 @@ public class Betray extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BigHead.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BigHead.java
index 57bfe7eb26bc47a860af42e90c6047de08dd47a2..6fa93dc3a12d4fdae37354c1ee1398bf3516a536 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BigHead.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BigHead.java
@@ -14,11 +14,11 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.AbnormalEffect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.AbnormalEffect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * 
@@ -33,7 +33,7 @@ public class BigHead extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -43,7 +43,7 @@ public class BigHead extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -54,7 +54,7 @@ public class BigHead extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -64,7 +64,7 @@ public class BigHead extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java
index bc1ec54c90bc49e386e2014b5d2e4f9e221ba656..c87c97f27c04b164270b422cdda0e9a940513f0d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author UnAfraid
@@ -33,7 +33,7 @@ public class BlockResurrection extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -43,7 +43,7 @@ public class BlockResurrection extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java
index dc4fd97d3f385bdc0eee19cb2807eb0b0dd01411..b703745df4ac753bbae0227e9e7337a2fa73a3be 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java
@@ -14,15 +14,15 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.serverpackets.StartRotation;
 import com.l2jserver.gameserver.network.serverpackets.StopRotation;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author decad
@@ -38,7 +38,7 @@ public class Bluff extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -48,7 +48,7 @@ public class Bluff extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -70,7 +70,7 @@ public class Bluff extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Buff.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Buff.java
index b065a0b509b33fcd047b389ff39635e7ddac875f..7e0ad0d5c2d0b57881836dd81c4a6d50d93e2b39 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Buff.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Buff.java
@@ -14,10 +14,10 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author mkizub
@@ -37,7 +37,7 @@ public class Buff extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#effectCanBeStolen()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#effectCanBeStolen()
 	 */
 	@Override
 	protected boolean effectCanBeStolen()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Cancel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Cancel.java
index b2a6245e8a9c36df0db39c67db2ebe8c0f93d672..a8ef14d2646472b32bcb9a55a0034687d9d33587 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Cancel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Cancel.java
@@ -17,13 +17,13 @@ package handlers.effecthandlers;
 import java.util.logging.Logger;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.util.Rnd;
 import com.l2jserver.util.StringUtil;
 
@@ -43,7 +43,7 @@ public class Cancel extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -53,7 +53,7 @@ public class Cancel extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -63,7 +63,7 @@ public class Cancel extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CancelAll.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CancelAll.java
index b286fa1522cf79f08b43e48fc12db73094fa57fc..f51476931524f291197e3a703847e57ea7888e68 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CancelAll.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CancelAll.java
@@ -14,10 +14,10 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CancelDebuff.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CancelDebuff.java
index 56b90710fa817f4e294ca394ab452b6bf6ee63d1..301c08b02ea8475a04a461dfa37140ba27833b95 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CancelDebuff.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CancelDebuff.java
@@ -14,13 +14,13 @@
  */
 package handlers.effecthandlers;
  
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.util.Rnd;
  
 /**
@@ -37,7 +37,7 @@ public class CancelDebuff extends L2Effect
    
     /**
      *
-     * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+     * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
      */
     @Override
     public L2EffectType getEffectType()
@@ -47,7 +47,7 @@ public class CancelDebuff extends L2Effect
    
     /**
      *
-     * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+     * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
      */
     @Override
     public boolean onStart()
@@ -57,7 +57,7 @@ public class CancelDebuff extends L2Effect
    
     /**
      *
-     * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+     * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
      */
     @Override
     public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
index 373d88174809b8191853b46c7a4efcc81b447949..c0c5d1b76bd1a387047049fe1d5737ce67de67d2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
@@ -16,13 +16,13 @@ package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class ChameleonRest extends L2Effect
 {
@@ -33,7 +33,7 @@ public class ChameleonRest extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -43,7 +43,7 @@ public class ChameleonRest extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -59,7 +59,7 @@ public class ChameleonRest extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -69,7 +69,7 @@ public class ChameleonRest extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChanceSkillTrigger.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChanceSkillTrigger.java
index f8ee8a4b55e4bd056138e9e498c6a8bead654cc1..b7e364818e698a1a4bd9536ccaf960d050e3be0a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChanceSkillTrigger.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChanceSkillTrigger.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.ChanceCondition;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 public class ChanceSkillTrigger extends L2Effect
 {
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfCourage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfCourage.java
index 3e4e0311a6b6ea77c32eeaae6b7b6441ff322805..02dbd938f108406fd316e451e220743b6f921440 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfCourage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfCourage.java
@@ -15,12 +15,12 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * 
@@ -34,7 +34,7 @@ public class CharmOfCourage extends L2Effect
 	}
 	
 	/**
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -44,7 +44,7 @@ public class CharmOfCourage extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -59,7 +59,7 @@ public class CharmOfCourage extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -71,7 +71,7 @@ public class CharmOfCourage extends L2Effect
 	}
 	
 	/**
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfLuck.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfLuck.java
index bfc64e72124268151e72c30fe09256099360af94..4383718e4566adcfac8a1ce0d40fa904ede014d0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfLuck.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfLuck.java
@@ -15,11 +15,11 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Playable;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author kerberos_20
@@ -34,7 +34,7 @@ public class CharmOfLuck extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -44,7 +44,7 @@ public class CharmOfLuck extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -54,7 +54,7 @@ public class CharmOfLuck extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -64,7 +64,7 @@ public class CharmOfLuck extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java
index 82b12f2d18a87a20ae6993b637d5966d3206f000..da454e51e3163c9a4aee9b9afa13a3e4b7fe31c5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java
@@ -15,14 +15,14 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.L2Clan;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.AbnormalEffect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.AbnormalEffect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author ZaKaX (Ghost @ L2D)
@@ -36,7 +36,7 @@ public class ClanGate extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -57,7 +57,7 @@ public class ClanGate extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
@@ -67,7 +67,7 @@ public class ClanGate extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -77,7 +77,7 @@ public class ClanGate extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConfuseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConfuseMob.java
index cef229303733fa5fe3350d1361f49241bd2408bd..b82e3fb6e51d94bb268d8f53ec07559fb7d70dc3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConfuseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConfuseMob.java
@@ -21,13 +21,13 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.util.Rnd;
 
 /**
@@ -44,7 +44,7 @@ public class ConfuseMob extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -54,7 +54,7 @@ public class ConfuseMob extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -66,7 +66,7 @@ public class ConfuseMob extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -76,7 +76,7 @@ public class ConfuseMob extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confusion.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confusion.java
index 4c8ea3f20a0d3a5f6b7801ff398605bb1e7ba42b..880ff14bcfaddd32a5f10b3b84d047e156d2408a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confusion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confusion.java
@@ -21,12 +21,12 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.util.Rnd;
 
 /**
@@ -44,7 +44,7 @@ public class Confusion extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -54,7 +54,7 @@ public class Confusion extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -66,7 +66,7 @@ public class Confusion extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -76,7 +76,7 @@ public class Confusion extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
index 4dd1f8bef392e0712562c574051c0ea2b9c2ab2f..fe1aaebf13f14fe438bbf9f473bc7c5740f3ddcd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
@@ -1,10 +1,10 @@
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author Zoey76
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
index 964a5227e1ec10cbaee3cad0a5d8ee84bc6445ce..ff09c17d6dfd40556e61ba5355c5651d03095a68 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
@@ -3,15 +3,15 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java
index ebc9c2bbd82a5e4c87a37e6ebdc0dbde61d4c966..940423c051354325c03b7ea9be7b57548dadd7a5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java
@@ -14,11 +14,11 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class CpHealOverTime extends L2Effect
 {
@@ -35,7 +35,7 @@ public class CpHealOverTime extends L2Effect
 
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#effectCanBeStolen()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#effectCanBeStolen()
 	 */
 	@Override
 	protected boolean effectCanBeStolen()
@@ -45,7 +45,7 @@ public class CpHealOverTime extends L2Effect
 
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -55,7 +55,7 @@ public class CpHealOverTime extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
index 5ded149c91bbbb769bfea74705a2c8bd19bb2181..2e68c9acbc94b82874b8df348260d1428bb9e1b5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
@@ -3,15 +3,15 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
index 6dd8eeaf0c5d6b45d609ebc0338aad4bc61f5d46..0edb9e20b8524f5690a3a2f24379e1ec48dfebbd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
@@ -14,11 +14,11 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class DamOverTime extends L2Effect
 {
@@ -29,7 +29,7 @@ public class DamOverTime extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -39,7 +39,7 @@ public class DamOverTime extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Debuff.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Debuff.java
index 910a9957a77d32d082debaf8ef833c0a6cdd7010..ae4876ca28580deccac370ae0ff7cc2fa4a9a066 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Debuff.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Debuff.java
@@ -14,10 +14,10 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 public class Debuff extends L2Effect
 {
@@ -28,7 +28,7 @@ public class Debuff extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -38,7 +38,7 @@ public class Debuff extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Disarm.java
index e6642feaf776b917987d47c9f1f23a0b93839d05..e757dd843290cfb6add600b1efea5e830453c0f8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Disarm.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Disarm.java
@@ -15,11 +15,11 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * 
@@ -34,7 +34,7 @@ public class Disarm extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -44,7 +44,7 @@ public class Disarm extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -59,7 +59,7 @@ public class Disarm extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -68,7 +68,7 @@ public class Disarm extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
index 1f7522b9d8eeae9d4ad975df1a56eccafa326154..f08980eca12a01f4da5766fc0c76f52cafae538d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
@@ -14,11 +14,11 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  ** @author Gnacik
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java
index 5affe95aabe36132538a3fb0b7981d3879834ffe..17d2b3806c035cfb5de3c3bf8a5b6163fa4527bf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java
@@ -18,14 +18,14 @@ import java.util.logging.Logger;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.GeoData;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.serverpackets.FlyToLocation;
 import com.l2jserver.gameserver.network.serverpackets.FlyToLocation.FlyType;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class EnemyCharge extends L2Effect
 {
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
index 93d5d5f9b536416dcc0c1b6a91d5cf8540f25833..f20509998c58f485f8e662bcb155c20c47fef800 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
@@ -14,11 +14,11 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author mkizub
@@ -33,7 +33,7 @@ public class FakeDeath extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -43,7 +43,7 @@ public class FakeDeath extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -54,7 +54,7 @@ public class FakeDeath extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -64,7 +64,7 @@ public class FakeDeath extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fear.java
index f3e92f78a4be25886719ec8662bb9a5f3267b2de..e13936621e866a9203266e9126731e8cae91118e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fear.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fear.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.CharEffectList;
 import com.l2jserver.gameserver.model.L2CharPosition;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2FortCommanderInstance;
@@ -28,9 +27,10 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author littlecrow
@@ -51,7 +51,7 @@ public class Fear extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -61,7 +61,7 @@ public class Fear extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -114,7 +114,7 @@ public class Fear extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -124,7 +124,7 @@ public class Fear extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java
index d1b974eb8248250187fadbd2c8e43d2fd2e4d43e..fac4a8aa1e4d161e837397366766c83976a85527 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author Kerberos
@@ -37,7 +37,7 @@ public class Fusion extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
@@ -47,7 +47,7 @@ public class Fusion extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Grow.java
index df75a3137e132671f4f376fd07e53cbb2b0b0540..69dfb9bc7b92edcb30f6c8ac2a3fad39c817725a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Grow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Grow.java
@@ -14,12 +14,12 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.skills.AbnormalEffect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.AbnormalEffect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 public class Grow extends L2Effect
 {
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
index 280380cba842480a1859d27c39057eb1458d4ce1..3ed086c30fe7ad2afde7e65e26368db39c2e50cb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
@@ -14,22 +14,22 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java
index ecd3ff8b3111bb4f6d99ea8af2e8bea0d5821857..760cbaf683736e55814c6e977b0519921774eef1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java
@@ -14,13 +14,13 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.serverpackets.ExRegMax;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class HealOverTime extends L2Effect
 {
@@ -37,7 +37,7 @@ public class HealOverTime extends L2Effect
 
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#effectCanBeStolen()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#effectCanBeStolen()
 	 */
 	@Override
 	protected boolean effectCanBeStolen()
@@ -47,7 +47,7 @@ public class HealOverTime extends L2Effect
 
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -57,7 +57,7 @@ public class HealOverTime extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -68,7 +68,7 @@ public class HealOverTime extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
index aef3a35e572a4af875c152d378e6c864bc1c60e6..44ca564d675afe3b1401c49ad56d01db2f7973cc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
@@ -14,15 +14,15 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Hide.java
index 1c2794708636a6b94e3126917d5e927567dc5976..39bc7cdcd5d6ab0e35193d3bb74eaf3af69861af 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Hide.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Hide.java
@@ -15,15 +15,15 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.AbnormalEffect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.serverpackets.DeleteObject;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
-import com.l2jserver.gameserver.skills.AbnormalEffect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  *
@@ -43,7 +43,7 @@ public class Hide extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -53,7 +53,7 @@ public class Hide extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -94,7 +94,7 @@ public class Hide extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -110,7 +110,7 @@ public class Hide extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java
index d25af6601aaccf6658e7f298385d7f96b16432d9..e7540b1086032b48fa61bea1c7fa7c55c799680b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java
@@ -14,10 +14,10 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author mkizub
@@ -37,7 +37,7 @@ public class ImmobileBuff extends Buff
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -47,7 +47,7 @@ public class ImmobileBuff extends Buff
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -58,7 +58,7 @@ public class ImmobileBuff extends Buff
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -69,7 +69,7 @@ public class ImmobileBuff extends Buff
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java
index 5fd8fd2035b1a9264caf938fa8178d54af4993e9..62c6fa168bc6d069652f29e8164a82e7b963b15e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java
@@ -14,12 +14,12 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author demonia
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/IncreaseCharges.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/IncreaseCharges.java
index 1ed2e533128b9b41093b4897f31b9d60c0987904..90cd1b0c4aa2c5586d739c4790fe1bc22fc06f9d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/IncreaseCharges.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/IncreaseCharges.java
@@ -14,11 +14,11 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * 
@@ -37,7 +37,7 @@ public class IncreaseCharges extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -47,7 +47,7 @@ public class IncreaseCharges extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -64,7 +64,7 @@ public class IncreaseCharges extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Invincible.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Invincible.java
index e2cf32a5c262e57995e075b12d7e8c3b8b741f59..fc156dd362575187fc511aa5ff4affa02a0c7a30 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Invincible.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Invincible.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 public class Invincible extends L2Effect
 {
@@ -29,7 +29,7 @@ public class Invincible extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -39,7 +39,7 @@ public class Invincible extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java
index c1e1e1e1fcc486c909f958e838f72311e1e2ea2d..f236444290c769bacbb3366ed8535a91a1ec0d2a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java
@@ -14,11 +14,11 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class ManaDamOverTime extends L2Effect
 {
@@ -29,7 +29,7 @@ public class ManaDamOverTime extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -39,7 +39,7 @@ public class ManaDamOverTime extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 2cbbf1e9f03eaf8e49632615b3d3d6db868613b5..f0a0ecd0bf484907de9076c74cc91adf26801442 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -3,16 +3,16 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
index 4118c060ff6a243e6ac2518ebad6db7aa8cc8de0..66825682c007ba28f5b7125b0e446cbddaf55cbc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
@@ -14,16 +14,16 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java
index f2690ef18031b6c63a8a07c0149f8224ef8f0e19..073c20898f508a68619f1e93ab6fb43aad199a24 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java
@@ -14,11 +14,11 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class ManaHealOverTime extends L2Effect
 {
@@ -35,7 +35,7 @@ public class ManaHealOverTime extends L2Effect
 
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#effectCanBeStolen()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#effectCanBeStolen()
 	 */
 	@Override
 	protected boolean effectCanBeStolen()
@@ -45,7 +45,7 @@ public class ManaHealOverTime extends L2Effect
 
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -55,7 +55,7 @@ public class ManaHealOverTime extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
index 01421b012488fee63ade853f592a2f6cfee7f4ca..cd33d728a8c9cb3304b920a55a924cd4c890fa3a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
@@ -3,15 +3,15 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java
index 0ad6e23ad30f6e19662d8202605c7b85d1669535..c678216196b4f178e224617ef561f6e1e40b3179 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java
@@ -14,11 +14,11 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class MpConsumePerLevel extends L2Effect
 {
@@ -29,7 +29,7 @@ public class MpConsumePerLevel extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -39,7 +39,7 @@ public class MpConsumePerLevel extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Mute.java
index e63ec80088fb9797c1c0d59e063275122221ae7f..5cea70f499386c742eb1d9339fc4c115ce1e6698 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Mute.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Mute.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 public class Mute extends L2Effect
 {
@@ -29,7 +29,7 @@ public class Mute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -39,7 +39,7 @@ public class Mute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -50,7 +50,7 @@ public class Mute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
@@ -61,7 +61,7 @@ public class Mute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Negate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Negate.java
index 91f1fc80081c0517d12126ae712c129cf3d41ce3..b6db7bebf68206a5d160e1e05a7f1befed1337a8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Negate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Negate.java
@@ -14,12 +14,12 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java
index 0a7864c034f1df830750decc90f52f7fdb601bed..7233fd585258d3f67eac011eb489b2c445560064 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author earendil
@@ -39,7 +39,7 @@ public class NoblesseBless extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#effectCanBeStolen()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#effectCanBeStolen()
 	 */
 	@Override
 	protected boolean effectCanBeStolen()
@@ -49,7 +49,7 @@ public class NoblesseBless extends L2Effect
 
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -59,7 +59,7 @@ public class NoblesseBless extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -69,7 +69,7 @@ public class NoblesseBless extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -78,7 +78,7 @@ public class NoblesseBless extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java
index a239725bffa9191598040578f960b815ae3c271d..31568145cd96feb34ed61c672e87058027e21ce3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java
@@ -16,11 +16,11 @@ package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.AbnormalEffect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.AbnormalEffect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 public class Paralyze extends L2Effect
 {
@@ -37,7 +37,7 @@ public class Paralyze extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#effectCanBeStolen()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#effectCanBeStolen()
 	 */
 	@Override
 	protected boolean effectCanBeStolen()
@@ -47,7 +47,7 @@ public class Paralyze extends L2Effect
 
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -57,7 +57,7 @@ public class Paralyze extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -70,7 +70,7 @@ public class Paralyze extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -82,7 +82,7 @@ public class Paralyze extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Petrification.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Petrification.java
index cfab56c343b6aba96ed6498b6c165d961ad335ce..4949f40b8bce258bb29812af3b3d06a73da865c4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Petrification.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Petrification.java
@@ -15,11 +15,11 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.AbnormalEffect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.AbnormalEffect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 public class Petrification extends L2Effect
 {
@@ -30,7 +30,7 @@ public class Petrification extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -40,7 +40,7 @@ public class Petrification extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -52,7 +52,7 @@ public class Petrification extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -64,7 +64,7 @@ public class Petrification extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhoenixBless.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhoenixBless.java
index 2431fa233f80864d536ac72de4ce3f9efdcf918b..b76a7f23c2ccef0d9449e3c80f5cbb1d5468c608 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhoenixBless.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhoenixBless.java
@@ -15,11 +15,11 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Playable;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author Faror
@@ -33,7 +33,7 @@ public class PhoenixBless extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -43,7 +43,7 @@ public class PhoenixBless extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -53,7 +53,7 @@ public class PhoenixBless extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -64,7 +64,7 @@ public class PhoenixBless extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java
index bca10ecb6b92cc8da5ea53eee1337a5704f675ae..4b7d81dcc7b824b2c2709a1b40f176e878a71fa9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author -Rnn-
@@ -33,7 +33,7 @@ public class PhysicalAttackMute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -43,7 +43,7 @@ public class PhysicalAttackMute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -54,7 +54,7 @@ public class PhysicalAttackMute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
@@ -65,7 +65,7 @@ public class PhysicalAttackMute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java
index a40774a1fdb9664730b3999e6c12bb9103cada3d..ce8c3765645b3322166ffcf714a6b8ad09e9f884 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author -Nemesiss-
@@ -33,7 +33,7 @@ public class PhysicalMute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -43,7 +43,7 @@ public class PhysicalMute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -54,7 +54,7 @@ public class PhysicalMute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
@@ -65,7 +65,7 @@ public class PhysicalMute extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java
index 188bbf4cef08b8e6c6e28726d0edaa0b8150dc07..19f1947456e82b9fadf2b16b923aac62c62a3182 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java
@@ -15,11 +15,11 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Playable;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author kerberos_20
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
index 01b002d5dc024fa30360bcdd7b8e452cfd95f338..5385a8051760511d9cfd7624b35e0008e1e34f36 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
@@ -19,12 +19,12 @@ import java.util.List;
 
 import javolution.util.FastList;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.util.Rnd;
 
 public class RandomizeHate extends L2Effect
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Recovery.java
index 7fd9def3c6efce2b39bdb779438143de177f688e..b49b74dd8be656e801700833eb38f9064594e91a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Recovery.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Recovery.java
@@ -14,11 +14,11 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author Kerberos
@@ -33,7 +33,7 @@ public class Recovery extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -43,7 +43,7 @@ public class Recovery extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -58,7 +58,7 @@ public class Recovery extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -67,7 +67,7 @@ public class Recovery extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
index bc9e34c12661cfae005c32543d7f4fb07d2c5fb3..3a661f2e0ea4d41e05a9d413d4e68be4032c535e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
@@ -16,12 +16,12 @@ package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class Relax extends L2Effect
 {
@@ -32,7 +32,7 @@ public class Relax extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -42,7 +42,7 @@ public class Relax extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -58,7 +58,7 @@ public class Relax extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -68,7 +68,7 @@ public class Relax extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RemoveTarget.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RemoveTarget.java
index 42a71405c240bb25aeda52c193b1c2ed0f139282..64306a72e73608710fda6fd6bcb934f2dc74efa3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RemoveTarget.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RemoveTarget.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author -Nemesiss-
@@ -33,7 +33,7 @@ public class RemoveTarget extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -43,7 +43,7 @@ public class RemoveTarget extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -57,7 +57,7 @@ public class RemoveTarget extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -67,7 +67,7 @@ public class RemoveTarget extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Root.java
index 0fc7a590feeeb701e6eb658272ae9701a596e431..bbe7370f7f272d6d9dcedda03ce080bb599035b9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Root.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Root.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author mkizub
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Signet.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Signet.java
index de0f69f303e9484e3a7ce463e17c0aaabc6dc56e..02a50af1a79c480e95bb590d2ba63b5424fa3d4c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Signet.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Signet.java
@@ -17,17 +17,17 @@ package handlers.effecthandlers;
 import javolution.util.FastList;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2EffectPointInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSignet;
+import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSignetCasttime;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.l2skills.L2SkillSignet;
-import com.l2jserver.gameserver.skills.l2skills.L2SkillSignetCasttime;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @authors Forsaiken, Sami
@@ -45,7 +45,7 @@ public class Signet extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -55,7 +55,7 @@ public class Signet extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -71,7 +71,7 @@ public class Signet extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
@@ -109,7 +109,7 @@ public class Signet extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetAntiSummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetAntiSummon.java
index 3e59f385071f2ca0563920f2bf7f74b4832186c9..e4ade97c70547698d12ac90b44dd32dab7d36e71 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetAntiSummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetAntiSummon.java
@@ -15,16 +15,16 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.ai.CtrlEvent;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2EffectPointInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author Forsaiken
@@ -40,7 +40,7 @@ public class SignetAntiSummon extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -50,7 +50,7 @@ public class SignetAntiSummon extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -61,7 +61,7 @@ public class SignetAntiSummon extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
@@ -107,7 +107,7 @@ public class SignetAntiSummon extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java
index 23c781678853f2546f111f914caaf5b35aea079a..174b0aa9fe9ff4ba947d27f783a963871eb30aa0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java
@@ -23,23 +23,23 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.ai.CtrlEvent;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.idfactory.IdFactory;
-import com.l2jserver.gameserver.model.L2Effect;
 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.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2EffectPointInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSignetCasttime;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillLaunched;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.skills.l2skills.L2SkillSignetCasttime;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Point3D;
 
 public class SignetMDam extends L2Effect
@@ -53,7 +53,7 @@ public class SignetMDam extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -63,7 +63,7 @@ public class SignetMDam extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -105,7 +105,7 @@ public class SignetMDam extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
@@ -198,7 +198,7 @@ public class SignetMDam extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetNoise.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetNoise.java
index a4b94c91c8fe80ab0624a36be5ab4f50531e084f..a5902ef65a73b6132c6bc043a202b3c548d7ab02 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetNoise.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetNoise.java
@@ -15,13 +15,13 @@
 
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2EffectPointInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @authors Forsaiken, Sami
@@ -37,7 +37,7 @@ public class SignetNoise extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -47,7 +47,7 @@ public class SignetNoise extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -58,7 +58,7 @@ public class SignetNoise extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
@@ -91,7 +91,7 @@ public class SignetNoise extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java
index e0d29926ddefa21b20f1f2636dd6828bd119499e..8712e2a687cffbf9ba5d90775dd08bd367f1cd0b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java
@@ -15,12 +15,12 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class SilentMove extends L2Effect
 {
@@ -37,7 +37,7 @@ public class SilentMove extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#effectCanBeStolen()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#effectCanBeStolen()
 	 */
 	@Override
 	protected boolean effectCanBeStolen()
@@ -47,7 +47,7 @@ public class SilentMove extends L2Effect
 
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -58,7 +58,7 @@ public class SilentMove extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -68,7 +68,7 @@ public class SilentMove extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -78,7 +78,7 @@ public class SilentMove extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sleep.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sleep.java
index 10f09f0b4a8bf564e4d01667df8a168ad6fc22bc..4f58d10320b52df1cd1619f6513342d6c00b396d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sleep.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sleep.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author mkizub
@@ -33,7 +33,7 @@ public class Sleep extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -43,7 +43,7 @@ public class Sleep extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -54,7 +54,7 @@ public class Sleep extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -64,7 +64,7 @@ public class Sleep extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java
index 7e74749dff11de05dac8d339b72ad0ff152060eb..7cb90fbd286c1042f56f9116d63fe6a11b58b75c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java
@@ -15,14 +15,14 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.ai.CtrlEvent;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * 
@@ -41,7 +41,7 @@ public class Spoil extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -51,7 +51,7 @@ public class Spoil extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -94,7 +94,7 @@ public class Spoil extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Stun.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Stun.java
index b47071e86c9a6debd50eec172f5b9443800d7bb5..dd972db3d1a5e85203ab32af20c452bebfee342a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Stun.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Stun.java
@@ -15,10 +15,10 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  * @author mkizub
@@ -32,7 +32,7 @@ public class Stun extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -42,7 +42,7 @@ public class Stun extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -53,7 +53,7 @@ public class Stun extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -63,7 +63,7 @@ public class Stun extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java
index cbdf2a95b181591919efbf79caf2be82f81643af..c3877826ec996428995f2b5cab1fb95cd56abde2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java
@@ -14,15 +14,15 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * 
@@ -37,7 +37,7 @@ public class TargetMe extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -47,7 +47,7 @@ public class TargetMe extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -75,7 +75,7 @@ public class TargetMe extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
@@ -86,7 +86,7 @@ public class TargetMe extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java
index 9a8d4d1e39450a26223a6135fb0b66253aa4ec9f..e134d3190af17a10b0916eee063b43ea063bec8c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java
@@ -19,14 +19,14 @@ import java.util.logging.Logger;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.serverpackets.FlyToLocation;
 import com.l2jserver.gameserver.network.serverpackets.FlyToLocation.FlyType;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class ThrowUp extends L2Effect
 {
@@ -41,7 +41,7 @@ public class ThrowUp extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -51,7 +51,7 @@ public class ThrowUp extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -108,7 +108,7 @@ public class ThrowUp extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
@@ -118,7 +118,7 @@ public class ThrowUp extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
 	 */
 	@Override
 	public void onExit()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java
index b964c3d3d5a959703b743f7182cf4af9051c008c..4416c54fefb5bd3008870387ee5a0ada574f6e41 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java
@@ -14,12 +14,12 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 
 /**
  *
@@ -40,7 +40,7 @@ public class TransferDamage extends L2Effect
 
    /**
     *
-    * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+    * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
     */
    @Override
    public L2EffectType getEffectType()
@@ -50,7 +50,7 @@ public class TransferDamage extends L2Effect
 
    /**
     *
-    * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+    * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
     */
    @Override
    public boolean onStart()
@@ -62,7 +62,7 @@ public class TransferDamage extends L2Effect
 
    /**
     *
-    * @see com.l2jserver.gameserver.model.L2Effect#onExit()
+    * @see com.l2jserver.gameserver.model.effects.L2Effect#onExit()
     */
    @Override
    public void onExit()
@@ -73,7 +73,7 @@ public class TransferDamage extends L2Effect
 
    /**
     *
-    * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+    * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
     */
    @Override
    public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
index e522ddb66430977feef2ca0d031c38539c72d372..06980f1e12285ffa4133fc9aa2970621a6995f99 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
@@ -16,12 +16,12 @@
 package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.instancemanager.TransformationManager;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * 
@@ -42,7 +42,7 @@ public class Transformation extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -52,7 +52,7 @@ public class Transformation extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -79,7 +79,7 @@ public class Transformation extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Warp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Warp.java
index 762c977dd9c68ba4382dac539e21ffcb61e36786..6a4fa67d21d679ff634f2ac58c933a269603747f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Warp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Warp.java
@@ -17,15 +17,15 @@ package handlers.effecthandlers;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.serverpackets.FlyToLocation;
 import com.l2jserver.gameserver.network.serverpackets.FlyToLocation.FlyType;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -60,7 +60,7 @@ public class Warp extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#getEffectType()
 	 */
 	@Override
 	public L2EffectType getEffectType()
@@ -70,7 +70,7 @@ public class Warp extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onStart()
 	 */
 	@Override
 	public boolean onStart()
@@ -117,7 +117,7 @@ public class Warp extends L2Effect
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
+	 * @see com.l2jserver.gameserver.model.effects.L2Effect#onActionTime()
 	 */
 	@Override
 	public boolean onActionTime()
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
index f69ba35a55e0bbc10e31c001e3e966c3dd6b7c84..7ac392f3fd0592e3faf5b2036e0338ff022e1a88 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
@@ -19,7 +19,7 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.util.Broadcast;
@@ -33,7 +33,7 @@ public class BeastSoulShot implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
index bb7f4802516d15071ebadf2809b0a8aef1c819af..a56aad85a28f9be86fd036c7e815729d8376585c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
@@ -16,18 +16,18 @@ package handlers.itemhandlers;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IItemHandler;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2FeedableBeastInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 public class BeastSpice implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
index 158190f603fde0da3a12ddc4628fb6eafb6c0eea..faf02219a85c8b26c83b8fdf68455e760b5d871b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
@@ -19,7 +19,7 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.util.Broadcast;
@@ -33,7 +33,7 @@ public class BeastSpiritShot implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
index 5a635929af9e7645726e3ae770bc09c3ce4105d8..da30b18389c97010b458c17cceeed2a7c6117576 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
@@ -17,9 +17,9 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.L2Weapon;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.util.Broadcast;
@@ -34,7 +34,7 @@ public class BlessedSpiritShot implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public synchronized void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
index 2790e9589b05552408c5d232909a00ea4a0a72d5..a092a080542f63e54c08dde72d7ccd0ea9384c09 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
@@ -18,7 +18,7 @@ import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 
@@ -26,7 +26,7 @@ public class Book implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
index 2238db4cc756e22a46adbf026bb37c4cab1c8cfc..6b493c0d11de1147ca03c20633e32d0dfa143c20 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
@@ -20,14 +20,14 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
 public class ChristmasTree implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java
index f09875b4add8278b47a6f809aab2c94c7b74b945..82658740ea711bdec6cff25c8de7a79243f0a164 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java
@@ -18,7 +18,7 @@ import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -32,7 +32,7 @@ public class Disguise implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
index dfc770c3fe7e469e0ea986bb895c43a7e8df5bed..d4682750cc31353ca829d6b6857cf0839fb295cb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
@@ -16,14 +16,14 @@ package handlers.itemhandlers;
 
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 public class Elixir extends ItemSkills
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
index eedcb4f9ca4ae3ac36985c581c78e4a6f03567c2..26dcd6f5c62b4985bc3b058a93e991a91384aa21 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
@@ -17,7 +17,7 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExChooseInventoryAttributeItem;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
index 63b46db675b3d67a6ecdfe938b27e22a004e77b4..42019f3c55a8aac0f3913afe2c883ff25a24fbbe 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
@@ -17,7 +17,7 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ChooseInventoryItem;
 
@@ -25,7 +25,7 @@ public class EnchantScrolls implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
index c552451a5706d8a75bc38766620af032ba4cd123..6743eb4c3e9e8a5aca9827cb6e04a0b1a86cd207 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
@@ -18,7 +18,7 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2ControllableAirShipInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -27,7 +27,7 @@ public class EnergyStarStone extends ItemSkills
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
index dac536d65b6be37cd9a78e4a1b792ff8d2c0c782..37daf5910c9708df1a9a47e3fbdfe0a0bd416151 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
@@ -8,11 +8,11 @@ import java.util.logging.Logger;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
 import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager.ArenaParticipantsHolder;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2BlockInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
index 99952d1dd5b546e60b7236292270be1cc5c005a3..7dc5dad97cd90ae8967356b87a5ad0b74d84c837 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
@@ -24,8 +24,8 @@ import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.L2ExtractableProduct;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2EtcItem;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.L2EtcItem;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
index 603c349a82d072b0f7b75fd1b07d7fca67701faa..5dfb9275bffdcb43e93a121b1e78fc603dc063ba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
@@ -18,10 +18,10 @@ import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.L2Weapon;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.item.type.L2WeaponType;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.L2WeaponType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.util.Broadcast;
@@ -39,7 +39,7 @@ public class FishShots implements IItemHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
index 3089492c4b46ae142abed6f38f0323a6a98b393c..85863f9a953f717efb123c1e33b97b3ff8c670b1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
@@ -17,11 +17,11 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.instancemanager.CastleManorManager;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 
@@ -35,7 +35,7 @@ public class Harvester implements IItemHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance _item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
index b7798042952d576ca98ce69d157315ede51ff032..8fb1e62912f3f3b05f3b6f407acf292d682078c0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
@@ -16,7 +16,7 @@ package handlers.itemhandlers;
 
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index d55ef08a2ffa1a55c01160165c165162a9469537..3a0d8bd5cd05ba1af3c5e827aad573ff969e67aa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -16,21 +16,21 @@ package handlers.itemhandlers;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.handler.IItemHandler;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance.TimeStamp;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance.TimeStamp;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.item.type.L2EtcItemType;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ExUseSharedGroupItem;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.SkillHolder;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
 
 /**
@@ -157,7 +157,7 @@ public class ItemSkillsTemplate implements IItemHandler
 					{
 						playable.doSimultaneousCast(itemSkill);
 						// Summons should be affected by herbs too, self time effect is handled at L2Effect constructor
-						if (!isPet && (item.getItemType() == L2EtcItemType.HERB) && (activeChar.getPet() != null) && (activeChar.getPet() instanceof L2SummonInstance))
+						if (!isPet && (item.getItemType() == L2EtcItemType.HERB) && (activeChar.getPet() != null) && (activeChar.getPet() instanceof L2ServitorInstance))
 						{
 							activeChar.getPet().doSimultaneousCast(itemSkill);
 						}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
index 98d47eacd8be1697b9340137c6c654dc9bebc09d..b7850ceeaf915e5f6dfe70310f574edf6a59bc67 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
@@ -16,14 +16,14 @@ package handlers.itemhandlers;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.L2Playable;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 public class ManaPotion extends ItemSkills
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java
index 1be76f4f2598fed0c96fab3e010814460f857709..8cb79610d6b995f14a0901b3d82498edb70df035 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java
@@ -17,7 +17,7 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.serverpackets.ShowMiniMap;
 
 /**
@@ -31,7 +31,7 @@ public class Maps implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
index 69b46088ca7677ba65ba8018eaa841685190c3f5..0e758600e18c2fba622ff1b1b085ff80b8eb38be 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
@@ -21,7 +21,7 @@ import com.l2jserver.gameserver.instancemanager.MercTicketManager;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 public class MercTicket implements IItemHandler
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java
index f2da7e2f05cf854a09345f96caac8f45e6902871..8748cb46ef500f0b31062eb3f5107b46fc22cbc6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java
@@ -17,7 +17,7 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.serverpackets.ExRequestChangeNicknameColor;
 
 public class NicknameColor implements IItemHandler
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
index 94f38e02e96d1a6237902ab6cfe661a31e5d0f54..e00509cfd0d4d66291cf51b41332a1aef9489239 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
@@ -21,7 +21,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 
@@ -34,7 +34,7 @@ public class PaganKeys implements IItemHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
index 85416d98decd7bd7e1c17ffeaed93e94d6a773d4..25b4404b1c0ba73defa01e188d0415cde35d3d94 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
@@ -18,11 +18,11 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.PetDataTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IItemHandler;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/QuestItems.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/QuestItems.java
index c1c42edfd41f76fe301b2aaf2d26c981bdd5702f..5d440f2582d523f728e0a9b436b92141c1c51f63 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/QuestItems.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/QuestItems.java
@@ -6,8 +6,8 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
index 461d4606651f67bb924d488996cd6fb13d5896d6..b081daea0484373755133894027dd407afd9dd8a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
@@ -19,7 +19,7 @@ import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.L2RecipeList;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
index ebc7528f4f78df0d818e751d7d83cbdef4709bca..df8333c9ff1dab300c4a7a1026c8618bdb374375 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
@@ -18,7 +18,7 @@ import com.l2jserver.gameserver.handler.IItemHandler;
 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.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.Dice;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -35,7 +35,7 @@ public class RollingDice implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
index 38521a86424ed1aee7a0e2ebfc02ae25b5472381..caee52a9ae7d8769fb3780a9859a9b33c9f10e6b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
@@ -17,14 +17,14 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
-import com.l2jserver.gameserver.model.L2Skill;
 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.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -39,7 +39,7 @@ public class ScrollOfResurrection implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
index aa15a76c89e3cafee2ff1053176a58d4f52b20d3..cec25eabc79a1cef969a55cb105be52391eaaae2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
@@ -19,17 +19,17 @@ import com.l2jserver.gameserver.instancemanager.CastleManorManager;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.model.L2Manor;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 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.L2ChestInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.skills.SkillHolder;
 
 /**
  * @author  l3x
@@ -38,7 +38,7 @@ public class Seed implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java
index d78c5291da6eeab2d7143b70cac6410f7240ddd9..9744a458b4b9069dab5eb4098704b69c713d5c9c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java
@@ -17,7 +17,7 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.serverpackets.SSQStatus;
 
 /**
@@ -29,7 +29,7 @@ public class SevenSignsRecord implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java
index 81d1bd202f8e35764287d0ecb08078edce1ae83b..8809322d92077b353348f9d52a30c671d5df6af3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java
@@ -17,12 +17,12 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.L2Weapon;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.skills.Stats;
 import com.l2jserver.gameserver.util.Broadcast;
 
 public class SoulShots implements IItemHandler
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java
index 25b50fe7fbb21ca15f032deb60f1a413744de68c..a51266429fa5635ea8e9473fc3be4dd9971765ec 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java
@@ -17,7 +17,7 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.serverpackets.ShowXMasSeal;
 
 /**
@@ -28,7 +28,7 @@ public class SpecialXMas implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
index 62e75973dd4642bf17612d2a6b24fbe1d3c4be8f..e09261d3da8305687dfb653390f1583c4e4c01f9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
@@ -17,9 +17,9 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.L2Weapon;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.util.Broadcast;
@@ -34,7 +34,7 @@ public class SpiritShot implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public synchronized void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
index f086ccfa6a467e71b2005cc79fdedce3fdd8c2c3..9c96f40b68d66c3407765fddf83d5aae323589a1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
@@ -36,22 +36,22 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2XmassTreeInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillLaunched;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.PetItemList;
 import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Broadcast;
 
 public class SummonItems implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.items.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
index 55ad6091bf6d39289cecd490049d5f931d04c10c..115d960efc734700656e6c6a5985da6fac9b3c33 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
@@ -17,7 +17,7 @@ package handlers.itemhandlers;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BalanceLife.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BalanceLife.java
index 939e11a03fbbdb616be8e57935b496f12f20cd2c..7006c165e16f5e9e336c93dd9b246d4c9890f21a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BalanceLife.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BalanceLife.java
@@ -17,11 +17,11 @@ package handlers.skillhandlers;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * This class ...
@@ -40,7 +40,7 @@ public class BalanceLife implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
index b640a48ebc741d81f21efe3840f9fce30113674f..063a5c8fea39d3b9b6cae925e8c714ce9a1f9efa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
@@ -16,11 +16,11 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2FortBallistaInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.util.Rnd;
 
 public class BallistaBomb implements ISkillHandler
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java
index 261b886a9a3477e687aedada6077705d2185a0dd..c1e612fd4f93b91232974d36926f8143f7319259 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java
@@ -16,11 +16,11 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2TamedBeastInstance;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java
index 97e6c30ea35b4100d1ecdca6ad1b0144555c525a..1c4bc7a9fc4dd24af9959be7b341faa882a958de 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java
@@ -20,20 +20,20 @@ import java.util.logging.Logger;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 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.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.item.type.L2WeaponType;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.L2WeaponType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.BaseStats;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * @author  Steuf
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Cancel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Cancel.java
index bbf83d9e59c7c848c61abfc724dd0ab1a993c7a9..a1d503ef76c24b19d874feac3b9bd3aff6b1e964 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Cancel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Cancel.java
@@ -16,16 +16,16 @@ package handlers.skillhandlers;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Summon;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.util.Rnd;
 import com.l2jserver.util.StringUtil;
 
@@ -41,7 +41,7 @@ public class Cancel implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ChainHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ChainHeal.java
index 23ac8a04beed500682c668b73b01971c2c498dcf..2748896c514195952f205fcc5b9e439b2a253e3d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ChainHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ChainHeal.java
@@ -23,13 +23,13 @@ import javolution.util.FastMap;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.util.ValueSortMap;
 /**
  * 
@@ -46,7 +46,7 @@ public class ChainHeal implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java
index 72a1fe76a0c18291d59f3a247da51d2954ac595e..d09afd44a0b0b311967d2e199095919adbd06cb1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java
@@ -17,12 +17,12 @@ package handlers.skillhandlers;
 import java.util.logging.Logger;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CombatPointHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CombatPointHeal.java
index 92faad1b162419f3bc8ec40512a4e8364d4abb1c..f6dbab0137331c8f127a226535e432ae524d43c6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CombatPointHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CombatPointHeal.java
@@ -17,12 +17,12 @@ package handlers.skillhandlers;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * This class ...
@@ -39,7 +39,7 @@ public class CombatPointHeal implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character actChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
index bd329f588415eeb3cdba59134facdda68a4d597f..86d0857f410d9ef53d557d47bc9dd59568545c5c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
@@ -19,9 +19,7 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.instancemanager.DuelManager;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -29,12 +27,14 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2ClanHallManagerInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * This class ...
@@ -66,7 +66,7 @@ public class Continuous implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
@@ -221,7 +221,7 @@ public class Continuous implements ISkillHandler
 				{
 					L2Effect[] effects = skill.getEffects(activeChar, target, new Env(shld, ss, sps, bss));
 					L2Summon summon = target.getPet();
-					if (summon != null && summon != activeChar && summon instanceof L2SummonInstance && effects.length > 0)
+					if (summon != null && summon != activeChar && summon instanceof L2ServitorInstance && effects.length > 0)
 					{
 						if (effects[0].canBeStolen())
 							skill.getEffects(activeChar, target.getPet(), new Env(shld, ss, sps, bss));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java
index 3aeab9c7c17739eb889bf8fae8e564a27117c760..1f5b5eb43591d489998160011fa7604bb5e981ed 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java
@@ -16,15 +16,15 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
 
 public class CpDam implements ISkillHandler
 {
@@ -35,7 +35,7 @@ public class CpDam implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java
index 9b88c98b93116ad36fddec405418d8fd8e5dafe3..bc8ee8d1eda4989944a77ef782d5a20464bb0d34 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java
@@ -16,15 +16,15 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
 
 public class CpDamPercent implements ISkillHandler
 {
@@ -35,7 +35,7 @@ public class CpDamPercent implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
index aa14d81af7744c421643f5749af93df288ef736d..1b77cdfeb67141f740b3233142353009ec927efc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
@@ -17,11 +17,11 @@ package handlers.skillhandlers;
 import com.l2jserver.gameserver.RecipeController;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * This class ...
@@ -39,7 +39,7 @@ public class Craft implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java
index 8143c766e3ce468381de2060b118cad709406347..dd051a43b0e291a32d0976d278eac086566164e1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java
@@ -18,10 +18,10 @@ import java.util.logging.Logger;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 
 /**
@@ -39,7 +39,7 @@ public class DeluxeKey implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java
index a245f4e306384debfa5d4c014160ac1281e444ed..1bc3d077317da3897cf6a6bfe2da79d3e122d76c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java
@@ -15,13 +15,13 @@
 package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 /**
  * @author ZaKax
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
index 54ddad81b3a6996a38d4ecbc374c32ea469072ab..67b7a8be719434588bba8c03de267016012b9c7d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
@@ -22,23 +22,23 @@ import com.l2jserver.gameserver.ai.L2AttackableAI;
 import com.l2jserver.gameserver.datatables.ExperienceTable;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 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.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.util.Rnd;
 
 /**
@@ -73,7 +73,7 @@ public class Disablers implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java
index 4855caba434a5396e28734f237d3e94ef442d83a..dc271509260f0cd79792ee63a47ae093702be571 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java
@@ -18,11 +18,11 @@ import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
 import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager.ArenaParticipantsHolder;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2BlockInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 /**
  * This class ...
@@ -39,7 +39,7 @@ public class Dummy implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
index b19ac9e4542c3422ef44172c566afcf50812d3ea..e3ca3d2811df079ef6cffa9c1db6c0ad5c71ed2b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
@@ -20,11 +20,11 @@ import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2ExtractableProductItem;
 import com.l2jserver.gameserver.model.L2ExtractableSkill;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.util.Rnd;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java
index 596bb24c8b8ccf67ca363476280f8a72b796f9f0..afe07c1a26a80fac2f91f6df89165b8f30b08162 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java
@@ -19,19 +19,19 @@ import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Weapon;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.item.type.L2WeaponType;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.L2WeaponType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.model.zone.type.L2FishingZone;
 import com.l2jserver.gameserver.model.zone.type.L2WaterZone;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
index 47df4c2a95a97d7deeff2b7438ca549738d86967..656db9721ba101b211604e041b687c8a70a8fb21 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
@@ -17,14 +17,14 @@ package handlers.skillhandlers;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Fishing;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Weapon;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class FishingSkill implements ISkillHandler
 {
@@ -36,7 +36,7 @@ public class FishingSkill implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java
index 691129b6a4a20052650676818a0f8257865cdd4c..5e02106e62e84937f8956f70677ebf29096a71e1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java
@@ -16,11 +16,11 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.util.Rnd;
 
 /*
@@ -36,7 +36,7 @@ public class GetPlayer implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
index 821b77ff69b243aeb5d2d8b1280250b8c2dbe194..8a855a7be8f61074f40d256bd1b9b203b7735277 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
@@ -17,14 +17,14 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExVoteSystemInfo;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * @author Gnacik
@@ -38,7 +38,7 @@ public class GiveReco implements ISkillHandler
 
 	/**
 	 *
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java
index bd74aca95037210fb6922f581e9eaf799ac353dc..5d58a43666e955701db09dd34d8f02935044e493 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java
@@ -17,9 +17,9 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 /**
  * @author Forsaiken
@@ -34,7 +34,7 @@ public class GiveSp implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java
index e8835d3042ba4ebc12bd89a4d831c3d60bc83f2f..dc1ae67121a271d22b381e71c152a9fdf5d29143 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java
@@ -16,13 +16,13 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class GiveVitality implements ISkillHandler
 {
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
index e28dff709587ab73ed241d42640c0b2e1d665942..ce65d5ae3ef1deefb4db2f9938951e0c8138ea49 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
@@ -19,17 +19,17 @@ import java.util.logging.Logger;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jserver.gameserver.network.serverpackets.ItemList;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.util.Rnd;
 
 /**
@@ -46,7 +46,7 @@ public class Harvest implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Heal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Heal.java
index 65a8a990d76fc357a53b9b13cb6718d3ca6b88ac..1ff28d7481e01668622258d32ab655309fb2dfea 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Heal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Heal.java
@@ -17,21 +17,21 @@ package handlers.skillhandlers;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class Heal implements ISkillHandler
 {
@@ -43,7 +43,7 @@ public class Heal implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/HealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/HealPercent.java
index 25bf5cbd3590c16e38e77a050bd31d8a06d0c8b4..50edb4f72163c61e45f7ffd30ee57305cd13caf7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/HealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/HealPercent.java
@@ -17,15 +17,15 @@ package handlers.skillhandlers;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class HealPercent implements ISkillHandler
 {
@@ -41,7 +41,7 @@ public class HealPercent implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java
index 2dfa3e3fd10464c6efc60f0022d917c09be4b575..847fd5a1817137c9f9c937af0975bc896b83a1ef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java
@@ -19,17 +19,17 @@ import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.FlyToLocation;
 import com.l2jserver.gameserver.network.serverpackets.FlyToLocation.FlyType;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java
index 1430f9f2246e2727cc5fea5739a598e2258a0798..3bed7849ed0df81dfe666eeeb138164818d8fdaf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java
@@ -15,16 +15,16 @@
 package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * This class ...
@@ -43,7 +43,7 @@ public class ManaHeal implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character actChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
index b9525054f8ebf142fb863de3102f83c7d29bb362..9246b57dfa8f8f236410a6ce3b671c65abb1e288 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
@@ -15,19 +15,19 @@
 package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 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.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * Class handling the Mana damage skill
@@ -42,7 +42,7 @@ public class Manadam implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java
index a3bada56e325376ce742cf41bcad2070f43abdf6..e07a7fec5cdc80d52bf36825f71b6b4615d04404 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java
@@ -20,19 +20,19 @@ import java.util.logging.Logger;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class Mdam implements ISkillHandler
 {
@@ -47,7 +47,7 @@ public class Mdam implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
index 6e5a5d749b4d91f10c546736426d7155a78f20d9..b4f976b7f80402e8bfe79a11b681986c9d267a7c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
@@ -18,13 +18,13 @@ import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class NornilsPower implements ISkillHandler
 {
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
index c1f7432fa56b6f330d940b4b1532608952a3c548..eeb8de87758fbe2a613e77f8f573ebdf8345256e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
@@ -21,21 +21,21 @@ import java.util.logging.Logger;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.item.type.L2WeaponType;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.L2WeaponType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.BaseStats;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class Pdam implements ISkillHandler
 {
@@ -49,7 +49,7 @@ public class Pdam implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java
index 9457fed497f245c2b4c9bf66a0c32e2e07a2e17c..39f78956e0badd825d325c8c83f44a6e2b223c0b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java
@@ -16,12 +16,12 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2ControllableAirShipInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 public class RefuelAirShip implements ISkillHandler
 {
@@ -32,7 +32,7 @@ public class RefuelAirShip implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
index 277b63707a74de0e0e5fee5c9bf0220bf6e4d323..99a42cce513a9af0751d9edf07ed2d34c66adf19 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
@@ -20,14 +20,14 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 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.skills.Formulas;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 public class Resurrect implements ISkillHandler
 {
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java
index 373cd7ce3294a86e2c3ffba422bc6539c9526692..2c5388e82b848d68bb710198926b6246ff06a501 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java
@@ -16,10 +16,10 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 public class ShiftTarget implements ISkillHandler
 {
@@ -30,7 +30,7 @@ public class ShiftTarget implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java
index d6ff73edf57191e627cd82eb96dc98ef333c7704..b8169b60f7f6b9b76313014a5c60f4b4d259f8ac 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java
@@ -17,12 +17,12 @@ package handlers.skillhandlers;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * 
@@ -38,7 +38,7 @@ public class Soul implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
index dbf0328ca08697706c68e674730049aadea78e0d..7b527859a408e219763eb811b922c5f8a7e4780b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
@@ -21,15 +21,15 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Manor;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.util.Rnd;
 
 
@@ -47,7 +47,7 @@ public class Sow implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
index c66a2ffcc65d2540f586677a44a64c98363b0d4b..f826436f1bd5ea3f0d18953107ba1b542554bfea 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
@@ -17,14 +17,14 @@ package handlers.skillhandlers;
 import com.l2jserver.gameserver.ai.CtrlEvent;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * @author _drunk_
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
index 2d68ecfefd16b7dcdaa71c4b7783523b04e50290..cc69dc756a313edf038a55b22ad49e8a7b83317f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
@@ -18,19 +18,19 @@ import java.util.ArrayList;
 import java.util.logging.Level;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Env;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class StealBuffs implements ISkillHandler
 {
@@ -41,7 +41,7 @@ public class StealBuffs implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java
index cbb42aeff88534cf126d31379badf902b51ade13..d736c87db9ce7edd34afa2f13e072200dfcb610d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java
@@ -18,16 +18,16 @@ import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.FortManager;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.model.entity.Fort;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.item.type.L2WeaponType;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.L2WeaponType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.stats.Formulas;
 
 /**
  * @author _tomciaaa_
@@ -41,7 +41,7 @@ public class StrSiegeAssault implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java
index 16642ac9db4e1b2eac3fd84d5c3120d3e1b0e584..69d1adc799af4b4ef47f4e4bb6d48f21bb01e322 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java
@@ -19,13 +19,13 @@ import java.util.logging.Level;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ConfirmDlg;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java
index ddd67f9da69a038bb9435ebba69ae095620a4b24..6b14ec98c47311249d6152522aed9f67ab6d8651 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java
@@ -16,16 +16,16 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Attackable.RewardItem;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSweeper;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.l2skills.L2SkillSweeper;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * @author _drunk_, Zoey76
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
index 260522e27a68e7c8b8af33ebeb5039819f2e3445..ee7a5a4194e3df091faab520346443f74d174d1f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
@@ -17,11 +17,11 @@ package handlers.skillhandlers;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 /**
  * @author _drunk_
@@ -36,7 +36,7 @@ public class TakeCastle implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
index d4683aed2e31d9a35e2eddd917de3cc63c6c271c..86dd3a5d8d50634f039963db33ee064a7b36fb63 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
@@ -17,11 +17,11 @@ package handlers.skillhandlers;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.instancemanager.FortManager;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Fort;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 /**
  * @author _drunk_
@@ -36,7 +36,7 @@ public class TakeFort implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
index 5ebeae95e95ca7278c72c32ba8ebefc9ff78ed49..0144ce207ff5dbe9190fd25ef3f80805e04f0530 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
@@ -16,11 +16,11 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * @author Ahmed
@@ -34,7 +34,7 @@ public class TransformDispel implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
index 65aed11345ac4033156e9da9b303f4a7c145ad64..171fae54c7be5f31a0e78947b45b08dda2fe9db0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
@@ -16,14 +16,14 @@ package handlers.skillhandlers;
 
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Trap;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.Quest.TrapAction;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class Trap implements ISkillHandler
 {
@@ -35,7 +35,7 @@ public class Trap implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
index 2e45048c6eb296fb1bf47a7e525e04b83391d7bd..e27cc7402e27be1b670e624236ff770c3e407121 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
@@ -18,14 +18,14 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 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.model.entity.Instance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.util.Rnd;
 
 public class Unlock implements ISkillHandler
@@ -38,7 +38,7 @@ public class Unlock implements ISkillHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
+	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
 	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java
index 4745d0e36d0745aed5978f6f2d6ba0f8e8106348..48d341faf11f67e59bbd990450f4f3ba31b703e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java
@@ -21,12 +21,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.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.L2TargetType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
index 5b861600110d9c4e4e9a8ef83f8fee7ffb586b41..edcc32de0cd62fbeb2b29ce1a151fdb3bc2ae5f2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
@@ -21,12 +21,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.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-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/TargetAreaCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
index 9f8cce5645fed9920c45b819d876141b1746fd56..7d559e21dba5fbd4d919281bf6a8f6c2622251b2 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
@@ -21,12 +21,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.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-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 a21718a4cf223f07570255cb37b1471fb32ac510..7f0918f00e442b6fcfc141b1d6991033e5a3da23 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
@@ -21,12 +21,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.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.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -39,7 +39,7 @@ public class TargetAreaSummon implements ITargetTypeHandler
 	{
 		List<L2Character> targetList = new FastList<L2Character>();
 		target = activeChar.getPet();
-		if (target == null || !(target instanceof L2SummonInstance) || target.isDead())
+		if (target == null || !(target instanceof L2ServitorInstance) || target.isDead())
 			return _emptyTargetList;
 		
 		if (onlyFirst)
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 2ef433549fab561736918b77a1dbd2bdd4a36746..22e4b6dba7f8536bf0f4dbc68170b5df6ae344f1 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
@@ -21,14 +21,14 @@ 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.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;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.targets.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 05b218730fa127c361f8f73666576191f13c6ba1..198e5a1932eb7b0ab3e0990f78c027fea159968e 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
@@ -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.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 e13e2d1347b0fd961a9456871206775d8d4f7385..686c62d1a0a3827e0b3eb8a610e97fa9934f4d5e 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
@@ -21,12 +21,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.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-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 76ead841f7faa51808063c8964e8e739a9792c1c..15dc6cfeba4dd92a81ae2e67a6b508c6da721981 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
@@ -21,14 +21,14 @@ 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.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;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.targets.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 2882f1c16cbbec7c8a100f29c9a799af56bd950f..9c2e188e9b5faf076447227a1e7466e4aa70b6f4 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
@@ -23,13 +23,13 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 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.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.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 41cbadeff286a5694120771777b2b2c844e14bdc..f7672bb6050abe9a873ca4bc6542f3bfb6b65da7 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
@@ -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.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 be67deb6a67d71279707d8d8180625f17c9f73b5..c066d034e52fcf150bea6be9727402e3b5c61c91 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
@@ -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.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;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.targets.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 332490d76517bbd0eddfd925044ca4fbc66aa330..da629d86db642d758cfb5f953151f5779c4cac1a 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
@@ -23,14 +23,14 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 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.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.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.targets.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 7e0e55993600827b18d990ae5024c758abc62a99..660c108812c5badadc31c8993423feced0c59712 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
@@ -21,12 +21,12 @@ import javolution.util.FastList;
 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.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
@@ -37,7 +37,7 @@ public class TargetCorpseMob implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<L2Character>();
-		final boolean isSummon = target instanceof L2SummonInstance;
+		final boolean isSummon = target instanceof L2ServitorInstance;
 		if (!(isSummon || target instanceof L2Attackable) || !target.isDead())
 		{
 			activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
@@ -49,8 +49,8 @@ public class TargetCorpseMob implements ITargetTypeHandler
 		{
 			case SUMMON:
 			{
-				if (isSummon && ((L2SummonInstance)target).getOwner() != null
-						&& ((L2SummonInstance)target).getOwner().getObjectId() == activeChar.getObjectId())
+				if (isSummon && ((L2ServitorInstance)target).getOwner() != null
+						&& ((L2ServitorInstance)target).getOwner().getObjectId() == activeChar.getObjectId())
 					return _emptyTargetList;
 			}
 			case DRAIN:
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 1fc798b4684a3ad9c60e6a1c5b495d8b70ae15a3..ee97e3eb7a6b7d74e8896c86857802d2f96efcf0 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
@@ -16,10 +16,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.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 e80da167d7d7db76bf638dd1fd0b547f60eb24c9..a0f7f0c43f681616a5197e5030e97c09470c78aa 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
@@ -20,13 +20,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.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-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 7b51940c63a1994e0d14bfd89c52f7df30414ec3..6e8e58047e1384894971cc3b67f6b9867d4cfb8a 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
@@ -16,11 +16,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.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.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 6a1ab31670f36143b767fd2d0373dd34eaa4fe84..585d4e56bfc391d100b6508fdfd188ab3e91adb8 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
@@ -16,9 +16,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.model.actor.L2Character;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 fe7328d7039c0b57ecf271e99346e93556d56c36..e10bc0f5e479969e4e526ed65ae61a801bd79302 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
@@ -21,12 +21,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.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-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 a38d0147133d1596b82bc3411b95f12d3326b187..987d9dc6d72e28f170fda9215c4572b1e5657de3 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
@@ -21,14 +21,14 @@ 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.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;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.targets.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 d708c42aa219f5f0f4682b59c5cd994359c29e4d..ec0aa45a8518ca3cbdb8b87ec3fbe920ce803f8e 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
@@ -16,9 +16,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.model.actor.L2Character;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 a33300ca71a0eb8da6db5f41ca49d5ab2b60900c..7193760f421e39c10d77b938b948e310c69c4745 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
@@ -16,11 +16,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.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;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 3ede6c762551b7b801d3306f55d8000a5b17028a..6527d4f0d39a831f89e237d7bad8e1fda9d26fe2 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
@@ -16,10 +16,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.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-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 f3e7cebc9d89a21d2e13d6fa7e97dd66f59b5bf0..27255740caaf5c6210abf244b68b2afae5a11ccb 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
@@ -16,10 +16,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.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 f48b0da0c69b27c937a3b14def331eb536564ffd..05728b8dae76b7271c9a1871da2102c4c73299fa 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
@@ -20,11 +20,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.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.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 93fd6ad05e48d0f00059fdf4f60bd4118415b880..8c8d27a8359cae4942e5b3b0138e638d925a7db6 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
@@ -21,11 +21,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.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;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 26d769768de6404a095c868f746f38c00b8a94e5..ae8adc2baae9cab97ed1a17ddc51fb58cd5b2561 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
@@ -16,12 +16,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.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-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 813ee6066aeabbfdc3a847f5a6bb23dbc53b91cc..737f25931787a3f1e01bfabcd9b8a9741e670a55 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
@@ -20,11 +20,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.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.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 6740e1497df371befd5025b63fbc2e713da6fd19..0acfd93a35a5c8d7e12c87f63800454943c7de12 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
@@ -16,11 +16,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.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-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 c931699d3d149f3ee08ae6ef203cad0107490085..40cfaa9df321884655f407432e76221292c50eb1 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
@@ -16,9 +16,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.model.actor.L2Character;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 783f5727dfeadd5b41d204b8a9d56348226ca895..6cb1c1944b303959edc1b4ea233ac91bb3ef518d 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
@@ -16,9 +16,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.model.actor.L2Character;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.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 66572db7f29d28d75323ee537cee0e16a790d7de..46440930c1f1889a5d5048e1286c7933cc6c17b4 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
@@ -16,10 +16,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.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
  * @author UnAfraid
@@ -30,7 +30,7 @@ public class TargetSummon implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		target = activeChar.getPet();
-		if (target != null && !target.isDead() && target instanceof L2SummonInstance)
+		if (target != null && !target.isDead() && target instanceof L2ServitorInstance)
 			return new L2Character[] { target };
 		
 		return _emptyTargetList;
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 cacfad1c0b971eedce521183b59411cc569967c9..241ce6719c8369f662c1179c2c2e27c5da4a09d8 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
@@ -20,11 +20,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.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;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
index 2d2a1327c111d3454286d279b431517a07ad9c3d..729c81e296b12d1a8793d316e8eb4b926a0ef4fd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
@@ -45,7 +45,7 @@ import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java
index 65ee072cca062a59c6c6d57f6f3914eb04c5eb99..60eea71086e79b847672ada2f23dfeec08dc5127 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java
@@ -27,8 +27,8 @@ import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.handler.ITelnetHandler;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.CharInfo;
 import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java
index 95e6a4ac352cc65816affc8f3a5afec36bc99257..df939879a6c9ba50799dc12d63e1707e5ace7e69 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
 /**
  * @author UnAfraid
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java
index 7f4ca82dc62470080604b99a6bab5ab580d00f54..15971114f8f0d2c52af5d8220b18ff730b580e85 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java
@@ -24,9 +24,9 @@ import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IUserCommandHandler;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
index b4aff32a804927a61de8a9d9f0f5b85b4f6e18d9..83c652b7ba748e07257e00d08fee346e91359acd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
@@ -31,19 +31,19 @@ import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
 import com.l2jserver.gameserver.instancemanager.CoupleManager;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.AbnormalEffect;
 import com.l2jserver.gameserver.model.entity.L2Event;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ConfirmDlg;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.AbnormalEffect;
 import com.l2jserver.gameserver.util.Broadcast;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java
index 625765daab10c2bc2673ac964c441e99ce49021b..3c7bd0058fca81eef4c37068e59a933ff41e9d08 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java
@@ -23,13 +23,13 @@ import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.instancemanager.HellboundManager;
 import com.l2jserver.gameserver.instancemanager.WalkingManager;
 import com.l2jserver.gameserver.model.L2CharPosition;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
index 4f04ed4e9cf2f6b7ff9796ac53425b6a7840a598..ae5eee9f22299ff79a3a1fab9c0b9221342325ed 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
@@ -19,12 +19,12 @@ import java.util.Map;
 import javolution.util.FastMap;
 
 import com.l2jserver.gameserver.datatables.DoorTable;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.skills.SkillHolder;
 
 /**
  * @author GKR
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
index f6f222e3d9869937531051bddfb92a9a2dfd068e..28d2b12ce4b97ef2fd69acb4ca2c46d5fd384938 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
@@ -31,12 +31,12 @@ import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.model.zone.type.L2EffectZone;
 import com.l2jserver.gameserver.network.NpcStringId;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
index 25a38dacee3e1393bd1db65fa77f81a9285ee4b1..5f2adcdbe67e143358cfb5e5a7d4e6b796293a9e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
@@ -32,7 +32,6 @@ import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
 import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager.StatusEnum;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
@@ -40,6 +39,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.model.zone.type.L2DamageZone;
 import com.l2jserver.gameserver.network.NpcStringId;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
index 2361ab99a2791d892d62f2be53f12a17d3960a20..5bb0fa164679851bb2291cc3a4154f3630aca9ee 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld;
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -41,9 +40,11 @@ import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Instance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -56,7 +57,6 @@ import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 14284d21b7c30ce59ad309d9e320bad81d9ed1e8..014fda21cc3efcd9ecf52bee0098812a951b733e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -21,13 +21,13 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
index 45ed26fb8abb127d0ae39b13ef594dddc4359140..0d6bc69b8c04242ff498a81667e23380ae0353af 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
@@ -44,7 +44,6 @@ import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2CommandChannel;
 import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Territory;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -54,8 +53,11 @@ import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo.NpcInfo;
@@ -67,8 +69,6 @@ import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.SocialAction;
 import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.SkillHolder;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
index 7871d9f9ab2782327bddd435bacca9f68a5832e5..0294d1ded77414f0bbef5c0ad7e29f572697cd31 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
@@ -21,21 +21,21 @@ import com.l2jserver.gameserver.instancemanager.HellboundManager;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld;
 import com.l2jserver.gameserver.instancemanager.WalkingManager;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2QuestGuardInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.SkillHolder;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index bd6657bfa95c050e8c26190446ba1ea811c5db60..4c15495504e4bc97d438fa363e7acbcee82c0c3b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -25,18 +25,18 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.util.Rnd;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 1aeab6f408dde627abaaa116efd2929578b2d97e..4bc4ba8a7d4f5b8481bb5cd4a790516588baf16b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -19,18 +19,18 @@ import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
index 871137ea61a653ef99c34911930b8659877a203c..3dd5dc8d2ad88ab98a9c48439a99dee3b7d86388 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -35,6 +34,7 @@ import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
index 36d9576ea7f2c1caa5cb586db88e473f27dcbf74..f0ee4efaed07164deb695fbaea3f297bb0e748d4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
@@ -43,7 +43,6 @@ import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2CommandChannel;
 import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Territory;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -53,13 +52,14 @@ import com.l2jserver.gameserver.model.actor.L2Trap;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.SkillHolder;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
index c70b83b550c4c775490ec77bcd2ebc5749a1c0d8..e65c4aa276159bf9ed688a8aa8e8e103b926412a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
@@ -35,9 +34,10 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
index fff34cf1959fedf1554c8fec0da48259ec668835..3e44082f2392373224d58edba2f8abf255039ba0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2EventChestInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2EventMonsterInstance;
@@ -34,6 +33,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Event;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
index 45bf14c5552012060cf6d7ecda5c4b7db13e093e..4179e3d8f488b5f301486b0da1e4770ac392c36a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
@@ -24,13 +24,13 @@ import com.l2jserver.gameserver.Announcements;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
-import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.quest.Event;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.util.Rnd;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index ae2eb77abbc0e264645228c56e9d3c547f9358eb..0d243f0561139ede5e576adc5efcbe9fa698c909 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -15,12 +15,12 @@
 package quests.Q10273_GoodDayToFly;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
  * Good Day to Fly (10273).<br>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index ac24b333087f3dd3899f73347150a1872f508830..f50554e484bffa6bdc06c8ef7ed52709196d7873 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -15,12 +15,12 @@
 package quests.Q10274_CollectingInTheAir;
 
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index a938e32ea21937aad7bec61a04096c5abbfeb8c2..e81b7c0241743b9e3b5359bc572baa3a12e70cb2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -16,13 +16,13 @@ package quests.Q10275_ContainingTheAttributePower;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.Elementals;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.util.Util;
 
 /**
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
index bd0b765d48bb47b26ac6abeeb95f89924444d8d7..bd4d059ea7fa7d6b605be1cb78b730d53bf1fd6f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
@@ -29,15 +29,15 @@ import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Attackable.AbsorberInfo;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
index 8d947e67bf080dea14a72abdd6be3c852b055395..247ed06b9cb2dd088375a11f7b0c0b4dde3f2edf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
@@ -26,11 +26,11 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
 import com.l2jserver.gameserver.model.entity.Fort;
 import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.skills.SkillHolder;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
index 94c0df17e92763a8ff59257a5998d7e6152d678f..4127a733d1b4f490fc3495c19c22af45252fb1d1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
@@ -29,6 +28,7 @@ import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
 import com.l2jserver.gameserver.model.quest.jython.QuestJython;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
 import com.l2jserver.util.L2FastList;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
index bce8da66f7960c6b0ffcd08b0ccbadc03af36a26..6990366110d35e7cbf0c53534fe78b8d2ef305e4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.TerritoryNPCSpawn;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.TerritoryWard;
 import com.l2jserver.gameserver.model.actor.L2Character;
@@ -30,6 +29,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
 import com.l2jserver.gameserver.util.Util;