BETA: Classes rearranging:

	* Moving char/npc templates to model/actor/templates.
	* Moving skill related classes to model/skills/.
	* Moving effect related classes to model/effects/.
	* Moving some other related classes to model/items or model/skills.
	* Moving conditions to model/conditions (they're not for skills only).
	* Moving DocumentBase, DocumentItem, DocumentSkill to engines/.
	* Renaming SkillEngine to DocumentEngine (it's not for skills only).
	* Renaming L2SummonInstance to L2ServitorInstance, summons are all "summoned" NPCs such as pets and servitors, servitors are those summoned by class skills.
	* Added L2SkillOpType enum, contains current operative types and new ones.
	* Added EffectState enum.
	
'''Note:''' Empty folders and minor fixes will be done in following commits, due Trac's limitations.

L2J_Server_BETA/java/com/l2jserver/gameserver/ItemsAutoDestroy.java

@@ -22,8 +22,8 @@ import javolution.util.FastList;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
 import com.l2jserver.gameserver.model.L2World;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.item.type.L2EtcItemType;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
 
 public class ItemsAutoDestroy
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/MonsterRace.java

@@ -21,7 +21,7 @@ import java.util.logging.Logger;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
 
 

L2J_Server_BETA/java/com/l2jserver/gameserver/RecipeController.java

@@ -39,13 +39,14 @@ import com.l2jserver.gameserver.model.L2ManufactureItem;
 import com.l2jserver.gameserver.model.L2RecipeInstance;
 import com.l2jserver.gameserver.model.L2RecipeList;
 import com.l2jserver.gameserver.model.L2RecipeStatInstance;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.TempItem;
 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.itemcontainer.Inventory;
+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.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ItemList;
@@ -56,7 +57,6 @@ import com.l2jserver.gameserver.network.serverpackets.RecipeShopItemInfo;
 import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Stats;
 import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -50,14 +50,14 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2FestivalMonsterInstance;
 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.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/AbstractAI.java

@@ -26,10 +26,10 @@ import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.model.L2CharPosition;
 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.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.AutoAttackStart;
 import com.l2jserver.gameserver.network.serverpackets.AutoAttackStop;

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -34,7 +34,6 @@ import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.instancemanager.DimensionalRiftManager;
 import com.l2jserver.gameserver.model.L2CharPosition;
 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;
@@ -49,12 +48,13 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2RiftInvaderInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate.AIType;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate.AIType;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
-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;
 import com.l2jserver.util.Rnd;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

@@ -32,26 +32,26 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.instancemanager.WalkingManager;
 import com.l2jserver.gameserver.model.L2CharPosition;
-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.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 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.instance.L2ItemInstance.ItemLocation;
-import com.l2jserver.gameserver.model.item.type.L2WeaponType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
+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.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.AutoAttackStop;
 import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.util.Rnd;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java

@@ -25,7 +25,6 @@ import java.util.logging.Logger;
 import javolution.util.FastList;
 
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.MobGroup;
 import com.l2jserver.gameserver.model.MobGroupTable;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -37,6 +36,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2ControllableMobInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 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;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2DoorAI.java

@@ -17,10 +17,10 @@ package com.l2jserver.gameserver.ai;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.model.L2CharPosition;
 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.L2DefenderInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
  * @author mkizub

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java

@@ -25,9 +25,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ThreadPoolManager;
-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;
@@ -39,7 +37,9 @@ import com.l2jserver.gameserver.model.actor.instance.L2FortBallistaInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
 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;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2PlayableAI.java

@@ -15,10 +15,10 @@
 package com.l2jserver.gameserver.ai;
 
 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.L2Character.AIAccessor;
 import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -97,7 +97,7 @@ public abstract class L2PlayableAI extends L2CharacterAI
 	}
 	
 	/**
-	 * @see com.l2jserver.gameserver.ai.L2CharacterAI#onIntentionCast(com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object)
+	 * @see com.l2jserver.gameserver.ai.L2CharacterAI#onIntentionCast(com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object)
 	 */
 	@Override
 	protected void onIntentionCast(L2Skill skill, L2Object target)

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2PlayerAI.java

@@ -25,12 +25,12 @@ import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_REST;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.L2CharPosition;
 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.L2Character.AIAccessor;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 public class L2PlayerAI extends L2PlayableAI
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java

@@ -24,9 +24,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ThreadPoolManager;
-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;
@@ -36,7 +34,9 @@ import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
 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;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2SummonAI.java

@@ -24,10 +24,10 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ThreadPoolManager;
 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.L2Character.AIAccessor;
 import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.util.Rnd;
 
 public class L2SummonAI extends L2PlayableAI implements Runnable

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2VehicleAI.java

@@ -15,9 +15,9 @@
 package com.l2jserver.gameserver.ai;
 
 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.L2Vehicle;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
  * @author DS

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/AugmentationData.java

@@ -32,10 +32,10 @@ import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.L2Augmentation;
-import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.item.L2Item;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.clientpackets.AbstractRefinePacket;
-import com.l2jserver.gameserver.skills.Stats;
 import com.l2jserver.util.Rnd;
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharSummonTable.java

@@ -30,12 +30,12 @@ import com.l2jserver.gameserver.model.L2SummonItem;
 import com.l2jserver.gameserver.model.actor.instance.L2MerchantSummonInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
-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.skills.l2skills.L2SkillSummon;
 import com.l2jserver.gameserver.network.serverpackets.PetItemList;
-import com.l2jserver.gameserver.skills.l2skills.L2SkillSummon;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 
 /**
  * @author Nyaran
@@ -135,7 +135,7 @@ public class CharSummonTable
 		return _pets;
 	}
 	
-	public void saveSummon(L2SummonInstance summon)
+	public void saveSummon(L2ServitorInstance summon)
 	{
 		if (summon == null || summon.getTimeRemaining() <= 0)
 			return;
@@ -181,7 +181,7 @@ public class CharSummonTable
 			ResultSet rset = statement.executeQuery();
 			
 			L2NpcTemplate summonTemplate;
-			L2SummonInstance summon;
+			L2ServitorInstance summon;
 			L2SkillSummon skill;
 			
 			while (rset.next())
@@ -212,11 +212,11 @@ public class CharSummonTable
 				else if (summonTemplate.isType("L2MerchantSummon"))
 				{
 					// TODO: Confirm L2Merchant summon = new L2MerchantSummonInstance(id, summonTemplate, activeChar, skill);
-					summon = new L2SummonInstance(id, summonTemplate, activeChar, skill);
+					summon = new L2ServitorInstance(id, summonTemplate, activeChar, skill);
 				}
 				else
 				{
-					summon = new L2SummonInstance(id, summonTemplate, activeChar, skill);
+					summon = new L2ServitorInstance(id, summonTemplate, activeChar, skill);
 				}
 				
 				summon.setName(summonTemplate.getName());

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharTemplateTable.java

@@ -23,8 +23,8 @@ import java.util.logging.Logger;
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate;
 import com.l2jserver.gameserver.model.base.ClassId;
-import com.l2jserver.gameserver.templates.chars.L2PcTemplate;
 
 /**
  * 

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/DoorTable.java

@@ -34,10 +34,10 @@ import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
 import com.l2jserver.gameserver.model.entity.ClanHall;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
 import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
-import com.l2jserver.gameserver.templates.chars.L2CharTemplate;
 
 public class DoorTable
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantGroupsTable.java

@@ -26,8 +26,8 @@ import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillDetail;
 import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
  * This class ...

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantHPBonusData.java

@@ -29,11 +29,11 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.skills.funcs.FuncTemplate;
-import com.l2jserver.gameserver.skills.funcs.LambdaConst;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.funcs.FuncTemplate;
+import com.l2jserver.gameserver.model.skills.funcs.LambdaConst;
+import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author  MrPoke

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantItemTable.java

@@ -32,8 +32,8 @@ import org.w3c.dom.Node;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.EnchantItem;
 import com.l2jserver.gameserver.model.EnchantScroll;
-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;
 
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/GMSkillTable.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-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.util.Util;
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HennaTable.java

@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.item.L2Henna;
+import com.l2jserver.gameserver.model.items.L2Henna;
 
 /**
  * This class ...

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HennaTreeTable.java

@@ -27,8 +27,8 @@ import javolution.util.FastMap;
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.model.base.ClassId;
-import com.l2jserver.gameserver.model.item.L2Henna;
-import com.l2jserver.gameserver.model.item.instance.L2HennaInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+import com.l2jserver.gameserver.model.items.instance.L2HennaInstance;
 
 /**
  * This class ...

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HeroSkillTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import com.l2jserver.gameserver.model.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
  *

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -29,23 +29,23 @@ import javolution.util.FastMap;
 
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
-import com.l2jserver.gameserver.Item;
 import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.engines.DocumentEngine;
+import com.l2jserver.gameserver.engines.items.Item;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.instance.L2EventMonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.L2Armor;
-import com.l2jserver.gameserver.model.item.L2EtcItem;
-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.instance.L2ItemInstance.ItemLocation;
-import com.l2jserver.gameserver.model.item.type.L2ArmorType;
-import com.l2jserver.gameserver.model.item.type.L2WeaponType;
-import com.l2jserver.gameserver.skills.SkillsEngine;
+import com.l2jserver.gameserver.model.items.L2Armor;
+import com.l2jserver.gameserver.model.items.L2EtcItem;
+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.instance.L2ItemInstance.ItemLocation;
+import com.l2jserver.gameserver.model.items.type.L2ArmorType;
+import com.l2jserver.gameserver.model.items.type.L2WeaponType;
 import com.l2jserver.gameserver.util.GMAudit;
 
 /**
@@ -195,7 +195,7 @@ public class ItemTable
 		_armors.clear();
 		_etcItems.clear();
 		_weapons.clear();
-		for (L2Item item :  SkillsEngine.getInstance().loadItems())
+		for (L2Item item :  DocumentEngine.getInstance().loadItems())
 		{
 			if (highest < item.getItemId())
 				highest = item.getItemId();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NobleSkillTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import com.l2jserver.gameserver.model.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
  *

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcTable.java

@@ -36,13 +36,13 @@ import com.l2jserver.gameserver.model.L2DropCategory;
 import com.l2jserver.gameserver.model.L2DropData;
 import com.l2jserver.gameserver.model.L2MinionData;
 import com.l2jserver.gameserver.model.L2NpcAIData;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
-import com.l2jserver.gameserver.skills.BaseStats;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
 
 public class NpcTable
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/PetDataTable.java

@@ -30,8 +30,8 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.L2PetData;
 import com.l2jserver.gameserver.model.L2PetLevelData;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.type.L2EtcItemType;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
 
 public class PetDataTable
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTable.java

@@ -18,8 +18,8 @@ import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.logging.Logger;
 
-import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.skills.SkillsEngine;
+import com.l2jserver.gameserver.engines.DocumentEngine;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
  * 
@@ -55,7 +55,7 @@ public class SkillTable
 	private void load()
 	{
 		_skills.clear();
-		SkillsEngine.getInstance().loadAllSkills(_skills);
+		DocumentEngine.getInstance().loadAllSkills(_skills);
 		
 		_skillMaxLevel.clear();
 		for (final L2Skill skill : _skills.values(new L2Skill[0]))

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTreesData.java

@@ -32,13 +32,13 @@ import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.L2Clan;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.base.Race;
 import com.l2jserver.gameserver.model.base.SubClass;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.file.filter.XMLFilter;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SpawnTable.java

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.instancemanager.DayNightSpawnManager;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 
 /**
  * This class ...

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/StaticObjects.java

@@ -29,7 +29,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
-import com.l2jserver.gameserver.templates.chars.L2CharTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
 
 public class StaticObjects
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SummonEffectsTable.java

@@ -18,8 +18,8 @@ import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.List;
 
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
  * @author Nyaran

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/hitConditionBonus.java → L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/hitConditionBonus.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.gameserver.skills;
+package com.l2jserver.gameserver.datatables;
 
 import java.io.File;
 import java.util.logging.Level;
@@ -44,7 +44,7 @@ public class hitConditionBonus
 	private static int darkBonus = 0;
 	//private static int rainBonus = 0;
 	
-	protected static double getConditionBonus(L2Character attacker, L2Character target)
+	public static double getConditionBonus(L2Character attacker, L2Character target)
 	{
 		double mod = 100;
 		// Get high or low bonus

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/DocumentBase.java → L2J_Server_BETA/java/com/l2jserver/gameserver/engines/DocumentBase.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.gameserver.skills;
+package com.l2jserver.gameserver.engines;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -35,104 +35,107 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.model.ChanceCondition;
 import com.l2jserver.gameserver.model.L2Object.InstanceType;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.base.PlayerState;
 import com.l2jserver.gameserver.model.base.Race;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.type.L2ArmorType;
-import com.l2jserver.gameserver.model.item.type.L2WeaponType;
-import com.l2jserver.gameserver.skills.conditions.Condition;
-import com.l2jserver.gameserver.skills.conditions.ConditionChangeWeapon;
-import com.l2jserver.gameserver.skills.conditions.ConditionForceBuff;
-import com.l2jserver.gameserver.skills.conditions.ConditionGameChance;
-import com.l2jserver.gameserver.skills.conditions.ConditionGameTime;
-import com.l2jserver.gameserver.skills.conditions.ConditionGameTime.CheckGameTime;
-import com.l2jserver.gameserver.skills.conditions.ConditionLogicAnd;
-import com.l2jserver.gameserver.skills.conditions.ConditionLogicNot;
-import com.l2jserver.gameserver.skills.conditions.ConditionLogicOr;
-import com.l2jserver.gameserver.skills.conditions.ConditionMinDistance;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerActiveEffectId;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerActiveSkillId;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerAgathionId;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerCanSweep;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerCharges;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerClassIdRestriction;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerCloakStatus;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerCp;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerFlyMounted;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerGrade;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerHasCastle;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerHasClanHall;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerHasFort;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerHasPet;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerHp;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerInsideZoneId;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerInstanceId;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerInvSize;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerIsClanLeader;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerIsHero;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerLandingZone;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerLevel;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerLevelRange;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerMp;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerPkCount;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerPledgeClass;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerRace;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerRangeFromNpc;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerServitorNpcId;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerSex;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerSiegeSide;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerSouls;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerState;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerSubclass;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerTransformationId;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerTvTEvent;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerVehicleMounted;
-import com.l2jserver.gameserver.skills.conditions.ConditionPlayerWeight;
-import com.l2jserver.gameserver.skills.conditions.ConditionSiegeZone;
-import com.l2jserver.gameserver.skills.conditions.ConditionSkillStats;
-import com.l2jserver.gameserver.skills.conditions.ConditionSlotItemId;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetAbnormal;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetActiveEffectId;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetActiveSkillId;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetAggro;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetClassIdRestriction;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetLevel;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetNpcId;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetNpcType;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetPlayable;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetRace;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetRaceId;
-import com.l2jserver.gameserver.skills.conditions.ConditionTargetUsesWeaponKind;
-import com.l2jserver.gameserver.skills.conditions.ConditionUsingItemType;
-import com.l2jserver.gameserver.skills.conditions.ConditionUsingSkill;
-import com.l2jserver.gameserver.skills.conditions.ConditionWithSkill;
-import com.l2jserver.gameserver.skills.funcs.FuncTemplate;
-import com.l2jserver.gameserver.skills.funcs.Lambda;
-import com.l2jserver.gameserver.skills.funcs.LambdaCalc;
-import com.l2jserver.gameserver.skills.funcs.LambdaConst;
-import com.l2jserver.gameserver.skills.funcs.LambdaStats;
-import com.l2jserver.gameserver.templates.effects.EffectTemplate;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.conditions.ConditionChangeWeapon;
+import com.l2jserver.gameserver.model.conditions.ConditionForceBuff;
+import com.l2jserver.gameserver.model.conditions.ConditionGameChance;
+import com.l2jserver.gameserver.model.conditions.ConditionGameTime;
+import com.l2jserver.gameserver.model.conditions.ConditionGameTime.CheckGameTime;
+import com.l2jserver.gameserver.model.conditions.ConditionLogicAnd;
+import com.l2jserver.gameserver.model.conditions.ConditionLogicNot;
+import com.l2jserver.gameserver.model.conditions.ConditionLogicOr;
+import com.l2jserver.gameserver.model.conditions.ConditionMinDistance;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerActiveEffectId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerActiveSkillId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerAgathionId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanSweep;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCharges;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerClassIdRestriction;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCloakStatus;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCp;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerFlyMounted;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerGrade;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasCastle;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasClanHall;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasFort;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasPet;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHp;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerInsideZoneId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerInstanceId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerInvSize;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerIsClanLeader;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerIsHero;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerLandingZone;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerLevel;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerLevelRange;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerMp;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerPkCount;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerPledgeClass;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerRace;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerRangeFromNpc;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerServitorNpcId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerSex;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerSiegeSide;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerSouls;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerState;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerSubclass;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerTransformationId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerTvTEvent;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerVehicleMounted;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerWeight;
+import com.l2jserver.gameserver.model.conditions.ConditionSiegeZone;
+import com.l2jserver.gameserver.model.conditions.ConditionSkillStats;
+import com.l2jserver.gameserver.model.conditions.ConditionSlotItemId;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetAbnormal;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetActiveEffectId;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetActiveSkillId;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetAggro;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetClassIdRestriction;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetLevel;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetNpcId;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetNpcType;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetPlayable;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetRace;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetRaceId;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetUsesWeaponKind;
+import com.l2jserver.gameserver.model.conditions.ConditionUsingItemType;
+import com.l2jserver.gameserver.model.conditions.ConditionUsingSkill;
+import com.l2jserver.gameserver.model.conditions.ConditionWithSkill;
+import com.l2jserver.gameserver.model.effects.AbnormalEffect;
+import com.l2jserver.gameserver.model.effects.EffectTemplate;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.type.L2ArmorType;
+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.skills.funcs.FuncTemplate;
+import com.l2jserver.gameserver.model.skills.funcs.Lambda;
+import com.l2jserver.gameserver.model.skills.funcs.LambdaCalc;
+import com.l2jserver.gameserver.model.skills.funcs.LambdaConst;
+import com.l2jserver.gameserver.model.skills.funcs.LambdaStats;
+import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author mkizub
  */
-abstract class DocumentBase
+public abstract class DocumentBase
 {
-	static Logger _log = Logger.getLogger(DocumentBase.class.getName());
+	protected static Logger _log = Logger.getLogger(DocumentBase.class.getName());
 	
 	private final File _file;
 	protected Map<String, String[]> _tables;
 	
-	DocumentBase(File pFile)
+	protected DocumentBase(File pFile)
 	{
 		_file = pFile;
 		_tables = new FastMap<String, String[]>();
 	}
 	
-	Document parse()
+	public Document parse()
 	{
 		Document doc;
 		try

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/SkillsEngine.java → L2J_Server_BETA/java/com/l2jserver/gameserver/engines/DocumentEngine.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.gameserver.skills;
+package com.l2jserver.gameserver.engines;
 
 import gnu.trove.map.hash.TIntObjectHashMap;
 
@@ -24,26 +24,28 @@ import javolution.util.FastList;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.item.L2Item;
+import com.l2jserver.gameserver.engines.items.DocumentItem;
+import com.l2jserver.gameserver.engines.skills.DocumentSkill;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.util.file.filter.XMLFilter;
 
 /**
  * @author mkizub
  */
-public class SkillsEngine
+public class DocumentEngine
 {
-	private static final Logger _log = Logger.getLogger(SkillsEngine.class.getName());
+	private static final Logger _log = Logger.getLogger(DocumentEngine.class.getName());
 	
 	private final List<File> _itemFiles = new FastList<File>();
 	private final List<File> _skillFiles = new FastList<File>();
 	
-	public static SkillsEngine getInstance()
+	public static DocumentEngine getInstance()
 	{
 		return SingletonHolder._instance;
 	}
 	
-	private SkillsEngine()
+	private DocumentEngine()
 	{
 		hashFiles("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
@@ -118,6 +120,6 @@ public class SkillsEngine
 	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
-		protected static final SkillsEngine _instance = new SkillsEngine();
+		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/DocumentItem.java → L2J_Server_BETA/java/com/l2jserver/gameserver/engines/items/DocumentItem.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.gameserver.skills;
+package com.l2jserver.gameserver.engines.items;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
@@ -25,15 +25,15 @@ import javolution.util.FastList;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.Item;
+import com.l2jserver.gameserver.engines.DocumentBase;
 import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.skills.conditions.Condition;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.items.L2Item;
 
 /**
  * @author mkizub, JIV
  */
-final class DocumentItem extends DocumentBase
+public final class DocumentItem extends DocumentBase
 {
 	private Item _currentItem = null;
 	private List<L2Item> _itemsInFile = new FastList<L2Item>();

L2J_Server_BETA/java/com/l2jserver/gameserver/Item.java → L2J_Server_BETA/java/com/l2jserver/gameserver/engines/items/Item.java

@@ -12,10 +12,10 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.gameserver;
+package com.l2jserver.gameserver.engines.items;
 
 import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.item.L2Item;
+import com.l2jserver.gameserver.model.items.L2Item;
 
 /**
  * This class ...

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/DocumentSkill.java → L2J_Server_BETA/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.gameserver.skills;
+package com.l2jserver.gameserver.engines.skills;
 
 import java.io.File;
 import java.util.List;
@@ -25,15 +25,16 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.gameserver.datatables.EnchantGroupsTable;
-import com.l2jserver.gameserver.model.L2Skill;
+import com.l2jserver.gameserver.engines.DocumentBase;
 import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.skills.conditions.Condition;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 /**
  * @author mkizub
  */
-class DocumentSkill extends DocumentBase
+public class DocumentSkill extends DocumentBase
 {
 	public static class Skill
 	{
@@ -56,7 +57,7 @@ class DocumentSkill extends DocumentBase
 	private Skill _currentSkill;
 	private List<L2Skill> _skillsInFile  = new FastList<L2Skill>();
 	
-	DocumentSkill(File file)
+	public DocumentSkill(File file)
 	{
 		super(file);
 	}
@@ -72,7 +73,7 @@ class DocumentSkill extends DocumentBase
 		return _currentSkill.sets[_currentSkill.currentLevel];
 	}
 	
-	protected List<L2Skill> getSkills()
+	public List<L2Skill> getSkills()
 	{
 		return _skillsInFile;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/EffectHandler.java

@@ -20,7 +20,7 @@ import java.util.logging.Logger;
 
 import javolution.util.FastMap;
 
-import com.l2jserver.gameserver.model.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.scripting.L2ScriptEngineManager;
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/IItemHandler.java

@@ -17,7 +17,7 @@ package com.l2jserver.gameserver.handler;
 import java.util.logging.Logger;
 
 import com.l2jserver.gameserver.model.actor.L2Playable;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ISkillHandler.java

@@ -17,9 +17,9 @@ package com.l2jserver.gameserver.handler;
 import java.util.logging.Logger;
 
 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;
 
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ITargetTypeHandler.java

@@ -15,9 +15,9 @@
 package com.l2jserver.gameserver.handler;
 
 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

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ItemHandler.java

@@ -16,7 +16,7 @@ package com.l2jserver.gameserver.handler;
 
 import gnu.trove.map.hash.TIntObjectHashMap;
 
-import com.l2jserver.gameserver.model.item.L2EtcItem;
+import com.l2jserver.gameserver.model.items.L2EtcItem;
 
 /**
  * This class manages handlers of items

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/SkillHandler.java

@@ -16,7 +16,7 @@ package com.l2jserver.gameserver.handler;
 
 import gnu.trove.map.hash.TIntObjectHashMap;
 
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
 
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/TargetHandler.java

@@ -18,7 +18,7 @@ import java.util.Map;
 
 import javolution.util.FastMap;
 
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
  * @author UnAfraid

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java

@@ -30,8 +30,8 @@ import com.l2jserver.gameserver.model.VehiclePathPoint;
 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.actor.templates.L2CharTemplate;
 import com.l2jserver.gameserver.network.serverpackets.ExAirShipTeleportList;
-import com.l2jserver.gameserver.templates.chars.L2CharTemplate;
 
 
 public class AirShipManager

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/BoatManager.java

@@ -27,8 +27,8 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.VehiclePathPoint;
 import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
-import com.l2jserver.gameserver.templates.chars.L2CharTemplate;
 
 public class BoatManager
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CastleManager.java

@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2Object;
 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;
 
 public class CastleManager implements InstanceListManager
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java

@@ -46,7 +46,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2GuardInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2RiftInvaderInstance;
-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;
 import com.l2jserver.gameserver.util.Broadcast;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java

@@ -41,11 +41,11 @@ import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.model.L2Spawn;
 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.DimensionalRift;
-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.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DuelManager.java

@@ -18,8 +18,8 @@ import java.util.logging.Logger;
 
 import javolution.util.FastList;
 
-import com.l2jserver.gameserver.model.L2Effect;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.entity.Duel;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortSiegeGuardManager.java

@@ -27,8 +27,8 @@ import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.instance.L2FortBallistaInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.Fort;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 
 public class FortSiegeGuardManager
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java

@@ -40,7 +40,7 @@ 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.model.entity.FortSiege;
-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;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java

@@ -42,12 +42,12 @@ import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SepulcherMonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SepulcherNpcInstance;
-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.quest.QuestState;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/HellboundManager.java

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ItemsOnGroundManager.java

@@ -29,8 +29,8 @@ import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.ItemsAutoDestroy;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.model.L2World;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.item.type.L2EtcItemType;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
 
 /**
  * This class manage all items on ground.

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java

@@ -31,9 +31,9 @@ import com.l2jserver.gameserver.model.AutoChatHandler;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.Castle;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
 /**
  * @author yellowperil & Fulminus

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java

@@ -34,7 +34,7 @@ import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java

@@ -27,8 +27,8 @@ import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.Castle;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 
 public class SiegeGuardManager
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java

@@ -35,12 +35,12 @@ import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.L2Clan;
 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.entity.Castle;
 import com.l2jserver.gameserver.model.entity.Siege;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 
 public class SiegeManager
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java

@@ -41,7 +41,6 @@ import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2SiegeClan;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
@@ -51,14 +50,15 @@ 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.instance.L2SiegeFlagInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.model.entity.Fort;
 import com.l2jserver.gameserver.model.entity.Siegable;
 import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.L2Properties;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java

@@ -40,7 +40,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.zone.L2ZoneRespawn;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.model.zone.form.ZoneCuboid;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java

@@ -26,7 +26,7 @@ import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.Announcements;
 import com.l2jserver.gameserver.ThreadPoolManager;
-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;
 import com.l2jserver.util.Rnd;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java

@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/ChanceCondition.java

@@ -18,6 +18,7 @@ import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.util.Rnd;
 
 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/ChanceSkillList.java

@@ -24,10 +24,12 @@ import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
+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.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillLaunched;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * CT2.3: Added support for allowing effect as a chance skill trigger (DrHouse)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/CharEffectList.java

@@ -30,15 +30,17 @@ 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.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager;
 import com.l2jserver.gameserver.model.olympiad.OlympiadGameTask;
+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.AbnormalStatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.ExOlympiadSpelledInfo;
 import com.l2jserver.gameserver.network.serverpackets.PartySpelled;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 public class CharEffectList
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/ClanWarehouse.java

@@ -16,8 +16,8 @@ package com.l2jserver.gameserver.model;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.model.itemcontainer.Warehouse;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 
 public final class ClanWarehouse extends Warehouse
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/CombatFlag.java

@@ -17,7 +17,7 @@ package com.l2jserver.gameserver.model;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.ItemTable;
 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.InventoryUpdate;
 import com.l2jserver.gameserver.network.serverpackets.ItemList;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/CursedWeapon.java

@@ -31,8 +31,9 @@ import com.l2jserver.gameserver.model.L2Party.messageType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 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.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.Earthquake;
 import com.l2jserver.gameserver.network.serverpackets.ExRedSky;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/Elementals.java

@@ -18,9 +18,9 @@ import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.skills.funcs.FuncAdd;
-import com.l2jserver.gameserver.skills.funcs.LambdaConst;
+import com.l2jserver.gameserver.model.skills.funcs.FuncAdd;
+import com.l2jserver.gameserver.model.skills.funcs.LambdaConst;
+import com.l2jserver.gameserver.model.stats.Stats;
 
 public final class Elementals
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/EnchantItem.java

@@ -16,8 +16,8 @@ package com.l2jserver.gameserver.model;
 
 import java.util.Arrays;
 
-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;
 
 /**
  * @author UnAfraid

L2J_Server_BETA/java/com/l2jserver/gameserver/model/EnchantScroll.java

@@ -15,8 +15,8 @@
 package com.l2jserver.gameserver.model;
 
 import com.l2jserver.Config;
-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;
 
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/FusionSkill.java

@@ -22,6 +22,8 @@ import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.util.Util;
 
 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/ItemInfo.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver.model;
 
-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;
 
 /**
  * Get all information from L2ItemInstance to generate ItemInfo.<BR><BR>

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2ArmorSet.java

@@ -14,8 +14,8 @@
 package com.l2jserver.gameserver.model;
 
 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;
 
 /**
  * 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Augmentation.java

@@ -21,10 +21,11 @@ import com.l2jserver.gameserver.datatables.AugmentationData;
 import com.l2jserver.gameserver.datatables.SkillTable;
 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.funcs.FuncAdd;
+import com.l2jserver.gameserver.model.skills.funcs.LambdaConst;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.skills.funcs.FuncAdd;
-import com.l2jserver.gameserver.skills.funcs.LambdaConst;
 
 /**
  * Used to store an augmentation and its boni

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -43,6 +43,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance.TimeStamp;
 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.communityserver.CommunityServerThread;
 import com.l2jserver.gameserver.network.communityserver.writepackets.WorldInfo;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Fishing.java

@@ -20,12 +20,12 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PenaltyMonsterInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExFishingHpRegen;
 import com.l2jserver.gameserver.network.serverpackets.ExFishingStartCombat;
 import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
 
 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2GroupSpawn.java

@@ -21,7 +21,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.Territory;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
 
 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Manor.java

@@ -27,7 +27,7 @@ import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.ItemTable;
-import com.l2jserver.gameserver.model.item.L2Item;
+import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2NpcAIData.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model;
 
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate.AIType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate.AIType;
 
 /**
  * This Data is for NPC Attributes and AI related stuffs.<br>

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Object.java

@@ -83,9 +83,9 @@ public abstract class L2Object
 		L2TerrainObjectInstance(L2Npc),
 		L2EffectPointInstance(L2Npc),
 		// Summons, Pets, Decoys and Traps
-		L2SummonInstance(L2Summon),
-		L2SiegeSummonInstance(L2SummonInstance),
-		L2MerchantSummonInstance(L2SummonInstance),
+		L2ServitorInstance(L2Summon),
+		L2SiegeSummonInstance(L2ServitorInstance),
+		L2MerchantSummonInstance(L2ServitorInstance),
 		L2PetInstance(L2Summon),
 		L2BabyPetInstance(L2PetInstance),
 		L2DecoyInstance(L2Decoy),

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Party.java

@@ -35,10 +35,12 @@ 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.actor.instance.L2SummonInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
 import com.l2jserver.gameserver.model.entity.DimensionalRift;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
 import com.l2jserver.gameserver.network.serverpackets.ExAskModifyPartyLooting;
@@ -54,7 +56,6 @@ import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowAll;
 import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowDelete;
 import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowDeleteAll;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Stats;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
@@ -736,7 +737,7 @@ public class L2Party
 	 * Distribute Experience and SP rewards to L2PcInstance Party members in the known area of the last attacker.<BR><BR>
 	 *
 	 * <B><U> Actions</U> :</B><BR><BR>
-	 * <li>Get the L2PcInstance owner of the L2SummonInstance (if necessary) </li>
+	 * <li>Get the L2PcInstance owner of the L2ServitorInstance (if necessary) </li>
 	 * <li>Calculate the Experience and SP reward distribution rate </li>
 	 * <li>Add Experience and SP to the L2PcInstance </li><BR><BR>
 	 *
@@ -752,7 +753,7 @@ public class L2Party
 	 */
 	public void distributeXpAndSp(long xpReward, int spReward, List<L2Playable> rewardedMembers, int topLvl, int partyDmg, L2Attackable target)
 	{
-		L2SummonInstance summon = null;
+		L2ServitorInstance summon = null;
 		List<L2Playable> validMembers = getValidMembers(rewardedMembers, topLvl);
 		
 		float penalty;
@@ -769,7 +770,7 @@ public class L2Party
 		final float vitalityPoints = target.getVitalityPoints(partyDmg) * Config.RATE_PARTY_XP / validMembers.size();
 		final boolean useVitalityRate = target.useVitalityRate();
 		
-		// Go through the L2PcInstances and L2PetInstances (not L2SummonInstances) that must be rewarded
+		// Go through the L2PcInstances and L2PetInstances (not L2ServitorInstances) that must be rewarded
 		synchronized(rewardedMembers)
 		{
 			for (L2Character member : rewardedMembers)
@@ -778,10 +779,10 @@ public class L2Party
 				
 				penalty = 0;
 				
-				// The L2SummonInstance penalty
-				if (member.getPet() instanceof L2SummonInstance)
+				// The L2ServitorInstance penalty
+				if (member.getPet() instanceof L2ServitorInstance)
 				{
-					summon     = (L2SummonInstance)member.getPet();
+					summon     = (L2ServitorInstance)member.getPet();
 					penalty    = summon.getExpPenalty();
 				}
 				// Pets that leech xp from the owner (like babypets) do not get rewarded directly

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Spawn.java

@@ -30,7 +30,7 @@ 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.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
 
 /**
@@ -159,7 +159,7 @@ public class L2Spawn
 			return;
 		
 		// Create the generic constructor of L2NpcInstance managed by this L2Spawn
-		Class<?>[] parameters = {int.class, Class.forName("com.l2jserver.gameserver.templates.chars.L2NpcTemplate")};
+		Class<?>[] parameters = {int.class, Class.forName("com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate")};
 		_constructor = Class.forName("com.l2jserver.gameserver.model.actor.instance." + _template.getType() + "Instance").getConstructor(parameters);
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2TradeList.java

@@ -30,7 +30,7 @@ import javolution.util.FastMap;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.ItemTable;
-import com.l2jserver.gameserver.model.item.L2Item;
+import com.l2jserver.gameserver.model.items.L2Item;
 
 /**
  * This class ...

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2WorldRegion.java

@@ -32,6 +32,7 @@ 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.L2Vehicle;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.model.zone.type.L2PeaceZone;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/MobGroup.java

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2ControllableMobInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/ShortCuts.java

@@ -24,8 +24,8 @@ import java.util.logging.Logger;
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.item.type.L2EtcItemType;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
 import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot;
 import com.l2jserver.gameserver.network.serverpackets.ShortCutInit;
 import com.l2jserver.gameserver.network.serverpackets.ShortCutRegister;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/TempItem.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model;
 
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
 /**
  * Class explanation:<br>

L2J_Server_BETA/java/com/l2jserver/gameserver/model/TerritoryWard.java

@@ -19,7 +19,7 @@ import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 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.InventoryUpdate;
 import com.l2jserver.gameserver.network.serverpackets.ItemList;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/TradeItem.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver.model;
 
-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;
 
 public class TradeItem
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/TradeList.java

@@ -25,9 +25,9 @@ import javolution.util.FastSet;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.ItemTable;
 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.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jserver.gameserver.network.serverpackets.ItemList;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

@@ -43,26 +43,26 @@ import com.l2jserver.gameserver.model.L2DropData;
 import com.l2jserver.gameserver.model.L2Manor;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Party;
-import com.l2jserver.gameserver.model.L2Skill;
 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.instance.L2PetInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
 import com.l2jserver.gameserver.model.actor.knownlist.AttackableKnownList;
 import com.l2jserver.gameserver.model.actor.status.AttackableStatus;
-import com.l2jserver.gameserver.model.item.L2Item;
-import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.item.type.L2EtcItemType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
 import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.skills.Stats;
 import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
@@ -581,7 +581,7 @@ public class L2Attackable extends L2Npc
 	 * Distribute Exp and SP rewards to L2PcInstance (including Summon owner) that hit the L2Attackable and to their Party members.
 	 *
 	 * Actions:
-	 * Get the L2PcInstance owner of the L2SummonInstance (if necessary) and L2Party in progress
+	 * Get the L2PcInstance owner of the L2ServitorInstance (if necessary) and L2Party in progress
 	 * Calculate the Experience and SP rewards in function of the level difference
 	 * Add Exp and SP rewards to L2PcInstance (including Summon penalty) and to Party members in the known area of the last attacker
 	 *
@@ -622,7 +622,7 @@ public class L2Attackable extends L2Npc
 				// Prevent unwanted behavior
 				if (damage > 1)
 				{
-					if ((attacker instanceof L2SummonInstance) || ((attacker instanceof L2PetInstance) && ((L2PetInstance) attacker).getPetLevelData().getOwnerExpTaken() > 0))
+					if ((attacker instanceof L2ServitorInstance) || ((attacker instanceof L2PetInstance) && ((L2PetInstance) attacker).getPetLevelData().getOwnerExpTaken() > 0))
 						ddealer = ((L2Summon) attacker).getOwner();
 					else
 						ddealer = info.getAttacker();
@@ -694,9 +694,9 @@ public class L2Attackable extends L2Npc
 					else
 						return;
 					
-					// If this attacker is a L2PcInstance with a summoned L2SummonInstance, get Exp Penalty applied for the current summoned L2SummonInstance
-					if (attacker instanceof L2PcInstance && ((L2PcInstance) attacker).getPet() instanceof L2SummonInstance)
-						penalty = ((L2SummonInstance) ((L2PcInstance) attacker).getPet()).getExpPenalty();
+					// If this attacker is a L2PcInstance with a summoned L2ServitorInstance, get Exp Penalty applied for the current summoned L2SummonInstance
+					if (attacker instanceof L2PcInstance && ((L2PcInstance) attacker).getPet() instanceof L2ServitorInstance)
+						penalty = ((L2ServitorInstance) ((L2PcInstance) attacker).getPet()).getExpPenalty();
 					
 					// We must avoid "over damage", if any
 					if (damage > getMaxHp())
@@ -708,7 +708,7 @@ public class L2Attackable extends L2Npc
 						// Calculate Exp and SP rewards
 						if (attacker.getKnownList().knowsObject(this))
 						{
-							// Calculate the difference of level between this attacker (L2PcInstance or L2SummonInstance owner) and the L2Attackable
+							// Calculate the difference of level between this attacker (L2PcInstance or L2ServitorInstance owner) and the L2Attackable
 							// mob = 24, atk = 10, diff = -14 (full xp)
 							// mob = 24, atk = 28, diff = 4 (some xp)
 							// mob = 24, atk = 50, diff = 26 (no xp)
@@ -2058,10 +2058,10 @@ public class L2Attackable extends L2Npc
 	}
 	
 	/**
-	 * Calculate the Experience and SP to distribute to attacker (L2PcInstance, L2SummonInstance or L2Party) of the L2Attackable.
+	 * Calculate the Experience and SP to distribute to attacker (L2PcInstance, L2ServitorInstance or L2Party) of the L2Attackable.
 	 *
-	 * @param diff The difference of level between attacker (L2PcInstance, L2SummonInstance or L2Party) and the L2Attackable
-	 * @param damage The damages given by the attacker (L2PcInstance, L2SummonInstance or L2Party)
+	 * @param diff The difference of level between attacker (L2PcInstance, L2ServitorInstance or L2Party) and the L2Attackable
+	 * @param damage The damages given by the attacker (L2PcInstance, L2ServitorInstance or L2Party)
 	 * @return 
 	 */
 	private int[] calculateExpAndSp(int diff, int damage)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -52,10 +52,8 @@ import com.l2jserver.gameserver.model.CharEffectList;
 import com.l2jserver.gameserver.model.FusionSkill;
 import com.l2jserver.gameserver.model.IChanceSkillTrigger;
 import com.l2jserver.gameserver.model.L2CharPosition;
-import com.l2jserver.gameserver.model.L2Effect;
 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.L2WorldRegion;
 import com.l2jserver.gameserver.model.Location;
@@ -69,13 +67,29 @@ import com.l2jserver.gameserver.model.actor.knownlist.CharKnownList;
 import com.l2jserver.gameserver.model.actor.position.CharPosition;
 import com.l2jserver.gameserver.model.actor.stat.CharStat;
 import com.l2jserver.gameserver.model.actor.status.CharStatus;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.effects.AbnormalEffect;
+import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.entity.Instance;
-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.holders.SkillHolder;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+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.model.quest.Quest;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.L2SkillType;
+import com.l2jserver.gameserver.model.skills.funcs.Func;
+import com.l2jserver.gameserver.model.skills.l2skills.L2SkillAgathion;
+import com.l2jserver.gameserver.model.skills.l2skills.L2SkillMount;
+import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSummon;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.stats.Calculator;
+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.AbstractNpcInfo;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
@@ -99,21 +113,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.TeleportToLocation;
 import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
 import com.l2jserver.gameserver.pathfinding.PathFinding;
-import com.l2jserver.gameserver.skills.AbnormalEffect;
-import com.l2jserver.gameserver.skills.Calculator;
-import com.l2jserver.gameserver.skills.Formulas;
-import com.l2jserver.gameserver.skills.SkillHolder;
-import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.skills.funcs.Func;
-import com.l2jserver.gameserver.skills.l2skills.L2SkillAgathion;
-import com.l2jserver.gameserver.skills.l2skills.L2SkillMount;
-import com.l2jserver.gameserver.skills.l2skills.L2SkillSummon;
 import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
-import com.l2jserver.gameserver.templates.chars.L2CharTemplate;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
-import com.l2jserver.gameserver.templates.skills.L2EffectType;
-import com.l2jserver.gameserver.templates.skills.L2SkillType;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
 import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.gameserver.util.Util;
@@ -7434,7 +7434,7 @@ public abstract class L2Character extends L2Object
 	 *
 	 * <B><U> Overridden in </U> :</B><BR><BR>
 	 * <li> L2PcInstance
-	 * <li> L2SummonInstance
+	 * <li> L2ServitorInstance
 	 * <li> L2PetInstance</li><BR><BR>
 	 * @param target 
 	 * @param damage 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Decoy.java

@@ -18,14 +18,14 @@ package com.l2jserver.gameserver.model.actor;
 import java.util.Collection;
 
 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.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+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.CharInfo;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
-import com.l2jserver.gameserver.templates.chars.L2CharTemplate;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 
 
 public abstract class L2Decoy extends L2Character

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -36,7 +36,6 @@ import com.l2jserver.gameserver.instancemanager.TownManager;
 import com.l2jserver.gameserver.instancemanager.WalkingManager;
 import com.l2jserver.gameserver.model.L2NpcAIData;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
@@ -54,14 +53,18 @@ import com.l2jserver.gameserver.model.actor.instance.L2WarehouseInstance;
 import com.l2jserver.gameserver.model.actor.knownlist.NpcKnownList;
 import com.l2jserver.gameserver.model.actor.stat.NpcStat;
 import com.l2jserver.gameserver.model.actor.status.NpcStatus;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate.AIType;
 import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.model.entity.Fort;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
-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.olympiad.Olympiad;
 import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.type.L2TownZone;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
@@ -72,9 +75,6 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.ServerObjectInfo;
 import com.l2jserver.gameserver.network.serverpackets.SocialAction;
 import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
-import com.l2jserver.gameserver.templates.chars.L2NpcTemplate.AIType;
-import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Broadcast;
 import com.l2jserver.util.Rnd;
 import com.l2jserver.util.StringUtil;