DataPack part for IXmlReader refactoring.

L2J_DataPack/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java

@@ -23,7 +23,7 @@ import java.util.logging.Level;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.GeoData;
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;

L2J_DataPack/dist/game/data/scripts/ai/group_template/RangeGuard.java

@@ -20,7 +20,7 @@ package ai.group_template;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_DataPack/dist/game/data/scripts/ai/individual/Beleth.java

@@ -27,8 +27,8 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.cache.HtmCache;
-import com.l2jserver.gameserver.datatables.DoorTable;
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Object;
@@ -109,7 +109,7 @@ public final class Beleth extends AbstractNpcAI
 		{
 			GrandBossManager.getInstance().setBossStatus(29118, 0);
 		}
-		DoorTable.getInstance().getDoor(20240001).openMe();
+		DoorData.getInstance().getDoor(20240001).openMe();
 	}
 	
 	protected static L2Npc spawn(int npcId, Location loc)
@@ -143,7 +143,7 @@ public final class Beleth extends AbstractNpcAI
 		public void run()
 		{
 			GrandBossManager.getInstance().setBossStatus(29118, 0);
-			DoorTable.getInstance().getDoor(20240001).openMe();
+			DoorData.getInstance().getDoor(20240001).openMe();
 		}
 	}
 	
@@ -221,7 +221,7 @@ public final class Beleth extends AbstractNpcAI
 						ThreadPoolManager.getInstance().scheduleGeneral(new Spawn(6), 2500);
 						break;
 					case 6:
-						L2DoorInstance door = DoorTable.getInstance().getDoor(20240001);
+						L2DoorInstance door = DoorData.getInstance().getDoor(20240001);
 						door.closeMe();
 						ZONE.broadcastPacket(new StaticObject(door, false));
 						ZONE.broadcastPacket(new DoorStatusUpdate(door));
@@ -368,11 +368,11 @@ public final class Beleth extends AbstractNpcAI
 					case 32:
 						ZONE.broadcastPacket(new SpecialCamera(CAMERA2, 800, 180, 0, 0, 4000, 0, 10, 1, 0, 0));
 						ZONE.broadcastPacket(new SpecialCamera(CAMERA2, 800, 180, 0, 0, 4000, 0, 10, 1, 0, 0));
-						L2DoorInstance door2 = DoorTable.getInstance().getDoor(20240002);
+						L2DoorInstance door2 = DoorData.getInstance().getDoor(20240002);
 						door2.openMe();
 						ZONE.broadcastPacket(new StaticObject(door2, false));
 						ZONE.broadcastPacket(new DoorStatusUpdate(door2));
-						DoorTable.getInstance().getDoor(20240003).openMe();
+						DoorData.getInstance().getDoor(20240003).openMe();
 						ThreadPoolManager.getInstance().scheduleGeneral(new Spawn(33), 4000);
 						break;
 					case 33:

L2J_DataPack/dist/game/data/scripts/ai/individual/DarkWaterDragon.java

@@ -26,7 +26,7 @@ import javolution.util.FastSet;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;

L2J_DataPack/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java

@@ -23,9 +23,9 @@ import java.util.List;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.MultisellData;
+import com.l2jserver.gameserver.data.xml.impl.MultisellData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jserver.gameserver.datatables.SkillData;
-import com.l2jserver.gameserver.datatables.SkillTreesData;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.actor.L2Npc;

L2J_DataPack/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java

@@ -31,7 +31,7 @@ import org.w3c.dom.Node;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.data.xml.IXmlReader;
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2Territory;
 import com.l2jserver.gameserver.model.Location;

L2J_DataPack/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java

@@ -24,7 +24,7 @@ import java.util.StringTokenizer;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.MultisellData;
+import com.l2jserver.gameserver.data.xml.impl.MultisellData;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.Territory;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.TerritoryNPCSpawn;

L2J_DataPack/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java

@@ -23,7 +23,7 @@ import java.util.Map;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.ClassListData;
+import com.l2jserver.gameserver.data.xml.impl.ClassListData;
 import com.l2jserver.gameserver.enums.CategoryType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_DataPack/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java

@@ -22,7 +22,7 @@ import ai.individual.Valakas;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.DoorTable;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.Location;
@@ -151,17 +151,17 @@ public final class GrandBossTeleporters extends AbstractNpcAI
 			}
 			case 31384:
 			{
-				DoorTable.getInstance().getDoor(24210004).openMe();
+				DoorData.getInstance().getDoor(24210004).openMe();
 				break;
 			}
 			case 31686:
 			{
-				DoorTable.getInstance().getDoor(24210006).openMe();
+				DoorData.getInstance().getDoor(24210006).openMe();
 				break;
 			}
 			case 31687:
 			{
-				DoorTable.getInstance().getDoor(24210005).openMe();
+				DoorData.getInstance().getDoor(24210005).openMe();
 				break;
 			}
 			case 31540:

L2J_DataPack/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java

@@ -20,7 +20,7 @@ package ai.npc.TerritoryManagers;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.MultisellData;
+import com.l2jserver.gameserver.data.xml.impl.MultisellData;
 import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.QuestManager;

L2J_DataPack/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java

@@ -23,8 +23,8 @@ import java.util.Collection;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jserver.gameserver.datatables.SkillData;
-import com.l2jserver.gameserver.datatables.SkillTreesData;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_DataPack/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java

@@ -23,8 +23,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.datatables.ClanTable;
-import com.l2jserver.gameserver.datatables.NpcData;
 import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.L2Npc;

L2J_DataPack/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java

@@ -23,8 +23,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.datatables.ClanTable;
-import com.l2jserver.gameserver.datatables.NpcData;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.Location;

L2J_DataPack/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java

@@ -34,8 +34,8 @@ import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.datatables.ClanTable;
-import com.l2jserver.gameserver.datatables.NpcData;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;

L2J_DataPack/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java

@@ -31,8 +31,8 @@ import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.L2SpecialSiegeGuardAI;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.datatables.ClanTable;
-import com.l2jserver.gameserver.datatables.NpcData;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2SiegeClan;

L2J_DataPack/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java

@@ -18,7 +18,7 @@
  */
 package custom.NewbieCoupons;
 
-import com.l2jserver.gameserver.datatables.MultisellData;
+import com.l2jserver.gameserver.data.xml.impl.MultisellData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;

L2J_DataPack/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java

@@ -21,7 +21,7 @@ package custom.RaidbossInfo;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.Location;

L2J_DataPack/dist/game/data/scripts/custom/Validators/SubClassSkills.java

@@ -23,7 +23,7 @@ import java.util.Arrays;
 import javolution.util.FastList;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.ClassListData;
+import com.l2jserver.gameserver.data.xml.impl.ClassListData;
 import com.l2jserver.gameserver.enums.IllegalActionPunishmentType;
 import com.l2jserver.gameserver.model.PcCondOverride;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_DataPack/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java

@@ -21,8 +21,8 @@ package features.SkillTransfer;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.ClassListData;
-import com.l2jserver.gameserver.datatables.SkillTreesData;
+import com.l2jserver.gameserver.data.xml.impl.ClassListData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jserver.gameserver.enums.IllegalActionPunishmentType;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.PcCondOverride;

L2J_DataPack/dist/game/data/scripts/gracia/AI/EnergySeeds.java

@@ -27,8 +27,8 @@ import ai.npc.AbstractNpcAI;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.DoorTable;
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.GraciaSeedsManager;
@@ -189,7 +189,7 @@ public class EnergySeeds extends AbstractNpcAI
 		{
 			for (int doorId : SEED_OF_DESTRUCTION_DOORS)
 			{
-				L2DoorInstance doorInstance = DoorTable.getInstance().getDoor(doorId);
+				L2DoorInstance doorInstance = DoorData.getInstance().getDoor(doorId);
 				if (doorInstance != null)
 				{
 					doorInstance.openMe();
@@ -201,7 +201,7 @@ public class EnergySeeds extends AbstractNpcAI
 		{
 			for (int doorId : SEED_OF_DESTRUCTION_DOORS)
 			{
-				L2DoorInstance doorInstance = DoorTable.getInstance().getDoor(doorId);
+				L2DoorInstance doorInstance = DoorData.getInstance().getDoor(doorId);
 				if (doorInstance != null)
 				{
 					doorInstance.closeMe();

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java

@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import javolution.text.TextBuilder;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Hero;
@@ -80,13 +80,13 @@ public class AdminAdmin implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_gmliston"))
 		{
-			AdminTable.getInstance().showGm(activeChar);
+			AdminData.getInstance().showGm(activeChar);
 			activeChar.sendMessage("Registered into gm list");
 			AdminHtml.showAdminHtml(activeChar, "gm_menu.htm");
 		}
 		else if (command.startsWith("admin_gmlistoff"))
 		{
-			AdminTable.getInstance().hideGm(activeChar);
+			AdminData.getInstance().hideGm(activeChar);
 			activeChar.sendMessage("Removed from gm list");
 			AdminHtml.showAdminHtml(activeChar, "gm_menu.htm");
 		}

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.StringTokenizer;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.SkillTreesData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Character;

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java

@@ -24,7 +24,7 @@ import java.sql.SQLException;
 
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
-import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2AccessLevel;
 import com.l2jserver.gameserver.model.L2World;
@@ -120,9 +120,9 @@ public final class AdminChangeAccessLevel implements IAdminCommandHandler
 	{
 		if (lvl >= 0)
 		{
-			if (AdminTable.getInstance().hasAccessLevel(lvl))
+			if (AdminData.getInstance().hasAccessLevel(lvl))
 			{
-				final L2AccessLevel acccessLevel = AdminTable.getInstance().getAccessLevel(lvl);
+				final L2AccessLevel acccessLevel = AdminData.getInstance().getAccessLevel(lvl);
 				player.setAccessLevel(lvl);
 				player.sendMessage("Your access level has been changed to " + acccessLevel.getName() + " (" + acccessLevel.getLevel() + ").");
 				activeChar.sendMessage(player.getName() + "'s access level has been changed to " + acccessLevel.getName() + " (" + acccessLevel.getLevel() + ").");

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java

@@ -18,7 +18,7 @@
  */
 package handlers.admincommandhandlers;
 
-import com.l2jserver.gameserver.datatables.DoorTable;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.model.L2Object;
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.model.entity.Castle;
  */
 public class AdminDoorControl implements IAdminCommandHandler
 {
-	private static DoorTable _doorTable = DoorTable.getInstance();
+	private static DoorData _doorTable = DoorData.getInstance();
 	private static final String[] ADMIN_COMMANDS =
 	{
 		"admin_open",

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java

@@ -31,8 +31,8 @@ import java.util.logging.Logger;
 
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
+import com.l2jserver.gameserver.data.xml.impl.ClassListData;
 import com.l2jserver.gameserver.datatables.CharNameTable;
-import com.l2jserver.gameserver.datatables.ClassListData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java

@@ -29,8 +29,8 @@ import java.io.PrintStream;
 import java.util.StringTokenizer;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.AdminTable;
-import com.l2jserver.gameserver.datatables.TransformData;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.data.xml.impl.TransformData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -368,7 +368,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 					int transId = transIds[Rnd.get(transIds.length)];
 					if (!TransformData.getInstance().transformPlayer(transId, player))
 					{
-						AdminTable.getInstance().broadcastMessageToGMs("EventEngine: Unknow transformation id: " + transId);
+						AdminData.getInstance().broadcastMessageToGMs("EventEngine: Unknow transformation id: " + transId);
 					}
 				}
 				showEventControl(activeChar);
@@ -428,7 +428,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 		catch (Exception e)
 		{
 			e.printStackTrace();
-			AdminTable.getInstance().broadcastMessageToGMs("EventEngine: Error! Possible blank boxes while executing a command which requires a value in the box?");
+			AdminData.getInstance().broadcastMessageToGMs("EventEngine: Error! Possible blank boxes while executing a command which requires a value in the box?");
 		}
 		return true;
 	}

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java

@@ -22,7 +22,7 @@ import java.util.StringTokenizer;
 import java.util.logging.Logger;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.ClassListData;
+import com.l2jserver.gameserver.data.xml.impl.ClassListData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java

@@ -21,7 +21,7 @@ package handlers.admincommandhandlers;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.actor.L2Character;

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java

@@ -20,7 +20,7 @@ package handlers.admincommandhandlers;
 
 import java.util.logging.Logger;
 
-import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
@@ -41,7 +41,7 @@ public class AdminGm implements IAdminCommandHandler
 	{
 		if (command.equals("admin_gm") && activeChar.isGM())
 		{
-			AdminTable.getInstance().deleteGm(activeChar);
+			AdminData.getInstance().deleteGm(activeChar);
 			activeChar.setAccessLevel(0);
 			activeChar.sendMessage("You no longer have GM status.");
 			_log.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") turned his GM status off");

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java

@@ -18,7 +18,7 @@
  */
 package handlers.admincommandhandlers;
 
-import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
@@ -116,7 +116,7 @@ public class AdminGmChat implements IAdminCommandHandler
 			}
 			text = command.substring(offset);
 			CreatureSay cs = new CreatureSay(0, Say2.ALLIANCE, activeChar.getName(), text);
-			AdminTable.getInstance().broadcastToGMs(cs);
+			AdminData.getInstance().broadcastToGMs(cs);
 		}
 		catch (StringIndexOutOfBoundsException e)
 		{

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java

@@ -20,7 +20,7 @@ package handlers.admincommandhandlers;
 
 import java.util.StringTokenizer;
 
-import com.l2jserver.gameserver.datatables.ExperienceTable;
+import com.l2jserver.gameserver.data.xml.impl.ExperienceData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Playable;
@@ -74,10 +74,10 @@ public class AdminLevel implements IAdminCommandHandler
 				L2PcInstance targetPlayer = (L2PcInstance) targetChar;
 				
 				byte lvl = Byte.parseByte(val);
-				if ((lvl >= 1) && (lvl <= ExperienceTable.getInstance().getMaxLevel()))
+				if ((lvl >= 1) && (lvl <= ExperienceData.getInstance().getMaxLevel()))
 				{
 					long pXp = targetPlayer.getExp();
-					long tXp = ExperienceTable.getInstance().getExpForLevel(lvl);
+					long tXp = ExperienceData.getInstance().getExpForLevel(lvl);
 					
 					if (pXp > tXp)
 					{
@@ -90,13 +90,13 @@ public class AdminLevel implements IAdminCommandHandler
 				}
 				else
 				{
-					activeChar.sendMessage("You must specify level between 1 and " + ExperienceTable.getInstance().getMaxLevel() + ".");
+					activeChar.sendMessage("You must specify level between 1 and " + ExperienceData.getInstance().getMaxLevel() + ".");
 					return false;
 				}
 			}
 			catch (NumberFormatException e)
 			{
-				activeChar.sendMessage("You must specify level between 1 and " + ExperienceTable.getInstance().getMaxLevel() + ".");
+				activeChar.sendMessage("You must specify level between 1 and " + ExperienceData.getInstance().getMaxLevel() + ".");
 				return false;
 			}
 		}

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java

@@ -23,7 +23,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.handler.AdminCommandHandler;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Clan;
@@ -190,7 +190,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				String subCommand = "admin_ban_char";
-				if (!AdminTable.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
+				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
 				{
 					activeChar.sendMessage("You don't have the access right to use this command!");
 					_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
@@ -207,7 +207,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				String subCommand = "admin_unban_char";
-				if (!AdminTable.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
+				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
 				{
 					activeChar.sendMessage("You don't have the access right to use this command!");
 					_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java

@@ -18,7 +18,7 @@
  */
 package handlers.admincommandhandlers;
 
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.MobGroup;

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java

@@ -18,7 +18,7 @@
  */
 package handlers.admincommandhandlers;
 
-import com.l2jserver.gameserver.datatables.TransformData;
+import com.l2jserver.gameserver.data.xml.impl.TransformData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java

@@ -25,18 +25,18 @@ import javax.script.ScriptException;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.cache.HtmCache;
-import com.l2jserver.gameserver.datatables.AdminTable;
-import com.l2jserver.gameserver.datatables.BuyListData;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.data.xml.impl.BuyListData;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemData;
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemGroupsData;
+import com.l2jserver.gameserver.data.xml.impl.MultisellData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.TransformData;
 import com.l2jserver.gameserver.datatables.CrestTable;
-import com.l2jserver.gameserver.datatables.DoorTable;
-import com.l2jserver.gameserver.datatables.EnchantItemData;
-import com.l2jserver.gameserver.datatables.EnchantItemGroupsData;
 import com.l2jserver.gameserver.datatables.ItemTable;
-import com.l2jserver.gameserver.datatables.MultisellData;
-import com.l2jserver.gameserver.datatables.NpcData;
 import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;
-import com.l2jserver.gameserver.datatables.TransformData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
@@ -78,19 +78,19 @@ public class AdminReload implements IAdminCommandHandler
 				case "config":
 				{
 					Config.load();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Configs.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Configs.");
 					break;
 				}
 				case "access":
 				{
-					AdminTable.getInstance().load();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Access.");
+					AdminData.getInstance().load();
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Access.");
 					break;
 				}
 				case "npc":
 				{
 					NpcData.getInstance().load();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Npcs.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Npcs.");
 					break;
 				}
 				case "quest":
@@ -101,20 +101,20 @@ public class AdminReload implements IAdminCommandHandler
 						if (!Util.isDigit(value))
 						{
 							QuestManager.getInstance().reload(value);
-							AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Quest Name:" + value + ".");
+							AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Quest Name:" + value + ".");
 						}
 						else
 						{
 							final int questId = Integer.parseInt(value);
 							QuestManager.getInstance().reload(questId);
-							AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Quest ID:" + questId + ".");
+							AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Quest ID:" + questId + ".");
 						}
 					}
 					else
 					{
 						QuestManager.getInstance().reloadAllScripts();
 						activeChar.sendMessage("All scripts have been reloaded.");
-						AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Quests.");
+						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Quests.");
 					}
 					break;
 				}
@@ -122,7 +122,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					WalkingManager.getInstance().load();
 					activeChar.sendMessage("All walkers have been reloaded");
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Walkers.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Walkers.");
 					break;
 				}
 				case "htm":
@@ -135,7 +135,7 @@ public class AdminReload implements IAdminCommandHandler
 						if (file.exists())
 						{
 							HtmCache.getInstance().reload(file);
-							AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Htm File:" + file.getName() + ".");
+							AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Htm File:" + file.getName() + ".");
 						}
 						else
 						{
@@ -146,62 +146,62 @@ public class AdminReload implements IAdminCommandHandler
 					{
 						HtmCache.getInstance().reload();
 						activeChar.sendMessage("Cache[HTML]: " + HtmCache.getInstance().getMemoryUsage() + " megabytes on " + HtmCache.getInstance().getLoadedFiles() + " files loaded");
-						AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Htms.");
+						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Htms.");
 					}
 					break;
 				}
 				case "multisell":
 				{
 					MultisellData.getInstance().load();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Multisells.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Multisells.");
 					break;
 				}
 				case "buylist":
 				{
 					BuyListData.getInstance().load();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Buylists.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Buylists.");
 					break;
 				}
 				case "teleport":
 				{
 					TeleportLocationTable.getInstance().reloadAll();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Teleports.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Teleports.");
 					break;
 				}
 				case "skill":
 				{
 					SkillData.getInstance().reload();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Skills.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Skills.");
 					break;
 				}
 				case "item":
 				{
 					ItemTable.getInstance().reload();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Items.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Items.");
 					break;
 				}
 				case "door":
 				{
-					DoorTable.getInstance().load();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Doors.");
+					DoorData.getInstance().load();
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Doors.");
 					break;
 				}
 				case "zone":
 				{
 					ZoneManager.getInstance().reload();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Zones.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Zones.");
 					break;
 				}
 				case "cw":
 				{
 					CursedWeaponsManager.getInstance().reload();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Cursed Weapons.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Cursed Weapons.");
 					break;
 				}
 				case "crest":
 				{
 					CrestTable.getInstance().load();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Crests.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Crests.");
 					break;
 				}
 				case "effect":
@@ -210,7 +210,7 @@ public class AdminReload implements IAdminCommandHandler
 					try
 					{
 						L2ScriptEngineManager.getInstance().executeScript(file);
-						AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Effects.");
+						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Effects.");
 					}
 					catch (ScriptException e)
 					{
@@ -225,7 +225,7 @@ public class AdminReload implements IAdminCommandHandler
 					try
 					{
 						L2ScriptEngineManager.getInstance().executeScript(file);
-						AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Handlers.");
+						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Handlers.");
 					}
 					catch (ScriptException e)
 					{
@@ -238,13 +238,13 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					EnchantItemGroupsData.getInstance().load();
 					EnchantItemData.getInstance().load();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded item enchanting data.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded item enchanting data.");
 					break;
 				}
 				case "transform":
 				{
 					TransformData.getInstance().load();
-					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded transform data.");
+					AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded transform data.");
 					break;
 				}
 				default:

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java

@@ -18,7 +18,7 @@
  */
 package handlers.admincommandhandlers;
 
-import com.l2jserver.gameserver.datatables.TransformData;
+import com.l2jserver.gameserver.data.xml.impl.TransformData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java

@@ -20,7 +20,7 @@ package handlers.admincommandhandlers;
 
 import java.util.logging.Logger;
 
-import com.l2jserver.gameserver.datatables.BuyListData;
+import com.l2jserver.gameserver.data.xml.impl.BuyListData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.buylist.L2BuyList;

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java

@@ -24,9 +24,9 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.ClassListData;
+import com.l2jserver.gameserver.data.xml.impl.ClassListData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jserver.gameserver.datatables.SkillData;
-import com.l2jserver.gameserver.datatables.SkillTreesData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2Object;

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -27,8 +27,8 @@ import java.util.regex.Pattern;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.SevenSigns;
-import com.l2jserver.gameserver.datatables.AdminTable;
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.instancemanager.DayNightSpawnManager;
@@ -220,7 +220,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			RaidBossSpawnManager.getInstance().cleanUp();
 			DayNightSpawnManager.getInstance().cleanUp();
 			L2World.getInstance().deleteVisibleNpcSpawns();
-			AdminTable.getInstance().broadcastMessageToGMs("NPC Unspawn completed!");
+			AdminData.getInstance().broadcastMessageToGMs("NPC Unspawn completed!");
 		}
 		else if (command.startsWith("admin_spawnday"))
 		{
@@ -243,7 +243,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			AutoSpawnHandler.getInstance().reload();
 			SevenSigns.getInstance().spawnSevenSignsNPC();
 			QuestManager.getInstance().reloadAllScripts();
-			AdminTable.getInstance().broadcastMessageToGMs("NPC Respawn completed!");
+			AdminData.getInstance().broadcastMessageToGMs("NPC Respawn completed!");
 		}
 		else if (command.startsWith("admin_spawn_monster") || command.startsWith("admin_spawn"))
 		{

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java

@@ -20,7 +20,7 @@ package handlers.admincommandhandlers;
 
 import java.util.logging.Logger;
 
-import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.handler.AdminCommandHandler;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -68,7 +68,7 @@ public class AdminSummon implements IAdminCommandHandler
 		if (id < 1000000)
 		{
 			subCommand = "admin_create_item";
-			if (!AdminTable.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
+			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
 			{
 				activeChar.sendMessage("You don't have the access right to use this command!");
 				_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
@@ -80,7 +80,7 @@ public class AdminSummon implements IAdminCommandHandler
 		else
 		{
 			subCommand = "admin_spawn_once";
-			if (!AdminTable.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
+			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
 			{
 				activeChar.sendMessage("You don't have the access right to use this command!");
 				_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;

L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java

@@ -20,7 +20,7 @@ package handlers.bypasshandlers;
 
 import java.util.logging.Level;
 
-import com.l2jserver.gameserver.datatables.MultisellData;
+import com.l2jserver.gameserver.data.xml.impl.MultisellData;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;

L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java

@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.logging.Level;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.MultisellData;
+import com.l2jserver.gameserver.data.xml.impl.MultisellData;
 import com.l2jserver.gameserver.datatables.NpcBufferTable;
 import com.l2jserver.gameserver.datatables.NpcBufferTable.NpcBufferData;
 import com.l2jserver.gameserver.handler.IBypassHandler;

L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.actor.L2Character;

L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java

@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.logging.Level;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.SkillTreesData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;

L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/Wear.java

@@ -22,7 +22,7 @@ import java.util.StringTokenizer;
 import java.util.logging.Level;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.BuyListData;
+import com.l2jserver.gameserver.data.xml.impl.BuyListData;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java

@@ -18,7 +18,7 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
 import com.l2jserver.gameserver.instancemanager.CastleManager;

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/OutpostCreate.java

@@ -18,7 +18,7 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.model.StatsSet;

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/Pumping.java

@@ -18,7 +18,7 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.datatables.FishingRodsData;
+import com.l2jserver.gameserver.data.xml.impl.FishingRodsData;
 import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Character;

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/Reeling.java

@@ -18,7 +18,7 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.datatables.FishingRodsData;
+import com.l2jserver.gameserver.data.xml.impl.FishingRodsData;
 import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Character;

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/Summon.java

@@ -18,8 +18,8 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.datatables.ExperienceTable;
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.ExperienceData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.StatsSet;
@@ -86,14 +86,14 @@ public final class Summon extends AbstractEffect
 		summon.setItemConsume(_consumeItem);
 		summon.setItemConsumeInterval(consumeItemInterval);
 		
-		if (summon.getLevel() >= ExperienceTable.getInstance().getMaxPetLevel())
+		if (summon.getLevel() >= ExperienceData.getInstance().getMaxPetLevel())
 		{
-			summon.getStat().setExp(ExperienceTable.getInstance().getExpForLevel(ExperienceTable.getInstance().getMaxPetLevel() - 1));
-			_log.warning(Summon.class.getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceTable.getInstance().getMaxPetLevel() + ". Please rectify.");
+			summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxPetLevel() - 1));
+			_log.warning(Summon.class.getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxPetLevel() + ". Please rectify.");
 		}
 		else
 		{
-			summon.getStat().setExp(ExperienceTable.getInstance().getExpForLevel(summon.getLevel() % ExperienceTable.getInstance().getMaxPetLevel()));
+			summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
 		}
 		
 		summon.setCurrentHp(summon.getMaxHp());

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java

@@ -18,7 +18,7 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.Location;

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java

@@ -20,8 +20,8 @@ package handlers.effecthandlers;
 
 import java.util.logging.Level;
 
-import com.l2jserver.gameserver.datatables.NpcData;
-import com.l2jserver.gameserver.datatables.PetDataTable;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
 import com.l2jserver.gameserver.model.L2PetData;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java

@@ -18,7 +18,7 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java

@@ -18,7 +18,7 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.model.StatsSet;

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/Transformation.java

@@ -18,7 +18,7 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.datatables.TransformData;
+import com.l2jserver.gameserver.data.xml.impl.TransformData;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;

L2J_DataPack/dist/game/data/scripts/handlers/itemhandlers/PetFood.java

@@ -21,7 +21,7 @@ package handlers.itemhandlers;
 import java.util.List;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.PetDataTable;
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
 import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;

L2J_DataPack/dist/game/data/scripts/handlers/itemhandlers/Recipes.java

@@ -18,7 +18,7 @@
  */
 package handlers.itemhandlers;
 
-import com.l2jserver.gameserver.datatables.RecipeData;
+import com.l2jserver.gameserver.data.xml.impl.RecipeData;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.L2RecipeList;
 import com.l2jserver.gameserver.model.actor.L2Playable;

L2J_DataPack/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java

@@ -18,7 +18,7 @@
  */
 package handlers.itemhandlers;
 
-import com.l2jserver.gameserver.datatables.PetDataTable;
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
 import com.l2jserver.gameserver.model.L2PetData;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_DataPack/dist/game/data/scripts/handlers/telnethandlers/ChatsHandler.java

@@ -22,7 +22,7 @@ import java.io.PrintWriter;
 import java.net.Socket;
 import java.util.StringTokenizer;
 
-import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.handler.ITelnetHandler;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -90,7 +90,7 @@ public class ChatsHandler implements ITelnetHandler
 			{
 				command = command.substring(7);
 				CreatureSay cs = new CreatureSay(0, Say2.ALLIANCE, "Telnet GM Broadcast from " + _cSocket.getInetAddress().getHostAddress(), command);
-				AdminTable.getInstance().broadcastToGMs(cs);
+				AdminData.getInstance().broadcastToGMs(cs);
 				_print.println("Your Message Has Been Sent To " + getOnlineGMS() + " GM(s).");
 			}
 			catch (StringIndexOutOfBoundsException e)
@@ -103,7 +103,7 @@ public class ChatsHandler implements ITelnetHandler
 	
 	private int getOnlineGMS()
 	{
-		return AdminTable.getInstance().getAllGms(true).size();
+		return AdminData.getInstance().getAllGms(true).size();
 	}
 	
 	@Override

L2J_DataPack/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java

@@ -38,7 +38,7 @@ import javolution.util.FastTable;
 import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.LoginServerThread;
 import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.handler.ITelnetHandler;
 import com.l2jserver.gameserver.model.L2Object;
@@ -464,7 +464,7 @@ public class DebugHandler implements ITelnetHandler
 	
 	private int getOnlineGMS()
 	{
-		return AdminTable.getInstance().getAllGms(true).size();
+		return AdminData.getInstance().getAllGms(true).size();
 	}
 	
 	private String getUptime(int time)

L2J_DataPack/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java

@@ -26,9 +26,9 @@ import java.util.StringTokenizer;
 import javax.script.ScriptException;
 
 import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.data.xml.impl.MultisellData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.datatables.ItemTable;
-import com.l2jserver.gameserver.datatables.MultisellData;
-import com.l2jserver.gameserver.datatables.NpcData;
 import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;

L2J_DataPack/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java

@@ -26,7 +26,7 @@ import java.util.Calendar;
 
 import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.LoginServerThread;
-import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.handler.ITelnetHandler;
 import com.l2jserver.gameserver.model.L2Object;
@@ -103,7 +103,7 @@ public class StatusHandler implements ITelnetHandler
 			int igm = 0;
 			String gmList = "";
 			
-			for (String player : AdminTable.getInstance().getAllGmNames(true))
+			for (String player : AdminData.getInstance().getAllGmNames(true))
 			{
 				gmList = gmList + ", " + player;
 				igm++;
@@ -224,7 +224,7 @@ public class StatusHandler implements ITelnetHandler
 	
 	private int getOnlineGMS()
 	{
-		return AdminTable.getInstance().getAllGms(true).size();
+		return AdminData.getInstance().getAllGms(true).size();
 	}
 	
 	private String getUptime(int time)

L2J_DataPack/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java

@@ -20,7 +20,7 @@ package handlers.voicedcommandhandlers;
 
 import java.util.StringTokenizer;
 
-import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.datatables.CharNameTable;
 import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
 import com.l2jserver.gameserver.instancemanager.PunishmentManager;
@@ -42,7 +42,7 @@ public class ChatAdmin implements IVoicedCommandHandler
 	@Override
 	public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
 	{
-		if (!AdminTable.getInstance().hasAccess(command, activeChar.getAccessLevel()))
+		if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
 		{
 			return false;
 		}
@@ -92,7 +92,7 @@ public class ChatAdmin implements IVoicedCommandHandler
 						activeChar.sendMessage("You can't ban GM !");
 						return false;
 					}
-					if (AdminTable.getInstance().hasAccess(command, player.getAccessLevel()))
+					if (AdminData.getInstance().hasAccess(command, player.getAccessLevel()))
 					{
 						activeChar.sendMessage("You can't ban moderator !");
 						return false;

L2J_DataPack/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java

@@ -18,7 +18,7 @@
  */
 package handlers.voicedcommandhandlers;
 
-import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
@@ -32,7 +32,7 @@ public class Debug implements IVoicedCommandHandler
 	@Override
 	public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
 	{
-		if (!AdminTable.getInstance().hasAccess(command, activeChar.getAccessLevel()))
+		if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
 		{
 			return false;
 		}

L2J_DataPack/dist/game/data/scripts/hellbound/AI/NPC/Hude/Hude.java

@@ -21,7 +21,7 @@ package hellbound.AI.NPC.Hude;
 import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.MultisellData;
+import com.l2jserver.gameserver.data.xml.impl.MultisellData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 

L2J_DataPack/dist/game/data/scripts/hellbound/AI/NPC/Natives/Natives.java

@@ -21,7 +21,7 @@ package hellbound.AI.NPC.Natives;
 import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.DoorTable;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -115,7 +115,7 @@ public final class Natives extends AbstractNpcAI
 					
 					for (int doorId : DOORS)
 					{
-						L2DoorInstance door = DoorTable.getInstance().getDoor(doorId);
+						L2DoorInstance door = DoorData.getInstance().getDoor(doorId);
 						if (door != null)
 						{
 							door.openMe();
@@ -138,7 +138,7 @@ public final class Natives extends AbstractNpcAI
 			{
 				for (int doorId : DOORS)
 				{
-					L2DoorInstance door = DoorTable.getInstance().getDoor(doorId);
+					L2DoorInstance door = DoorData.getInstance().getDoor(doorId);
 					if (door != null)
 					{
 						door.closeMe();

L2J_DataPack/dist/game/data/scripts/hellbound/AI/OutpostCaptain.java

@@ -21,7 +21,7 @@ package hellbound.AI;
 import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.DoorTable;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -77,7 +77,7 @@ public final class OutpostCaptain extends AbstractNpcAI
 		
 		if (npc.getId() == CAPTAIN)
 		{
-			final L2DoorInstance door = DoorTable.getInstance().getDoor(20250001);
+			final L2DoorInstance door = DoorData.getInstance().getDoor(20250001);
 			if (door != null)
 			{
 				door.closeMe();

L2J_DataPack/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import javolution.util.FastMap;
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.DoorTable;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -69,7 +69,7 @@ public final class BaseTower extends AbstractNpcAI
 	{
 		if (event.equalsIgnoreCase("CLOSE"))
 		{
-			DoorTable.getInstance().getDoor(20260004).closeMe();
+			DoorData.getInstance().getDoor(20260004).closeMe();
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -95,8 +95,8 @@ public final class BaseTower extends AbstractNpcAI
 			{
 				// Should Kendal be despawned before Guzen's spawn? Or it will be crowd of Kendal's
 				addSpawn(KENDAL, npc.getSpawn().getLocation(), false, npc.getSpawn().getRespawnDelay(), false);
-				DoorTable.getInstance().getDoor(20260003).openMe();
-				DoorTable.getInstance().getDoor(20260004).openMe();
+				DoorData.getInstance().getDoor(20260003).openMe();
+				DoorData.getInstance().getDoor(20260004).openMe();
 				startQuestTimer("CLOSE", 60000, npc, null, false);
 				break;
 			}

L2J_DataPack/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java

@@ -30,7 +30,7 @@ import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.DoorTable;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
 import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
@@ -657,7 +657,7 @@ public final class TowerOfNaia extends AbstractNpcAI
 				if (spawned.isEmpty() && DOORS.containsKey(managerId))
 				{
 					int[] doorList = DOORS.get(managerId);
-					DoorTable.getInstance().getDoor(doorList[1]).openMe();
+					DoorData.getInstance().getDoor(doorList[1]).openMe();
 					_spawns.remove(managerId);
 				}
 			}
@@ -666,7 +666,7 @@ public final class TowerOfNaia extends AbstractNpcAI
 		{
 			_challengeState = STATE_SPORE_CHALLENGE_IN_PROGRESS;
 			markElpyRespawn();
-			DoorTable.getInstance().getDoor(18250025).closeMe();
+			DoorData.getInstance().getDoor(18250025).closeMe();
 			ZoneManager.getInstance().getZoneById(200100).setEnabled(true);
 			
 			for (int i = 0; i < 10; i++)
@@ -762,7 +762,7 @@ public final class TowerOfNaia extends AbstractNpcAI
 		
 		if (npcId == MUTATED_ELPY)
 		{
-			DoorTable.getInstance().getDoor(18250025).openMe();
+			DoorData.getInstance().getDoor(18250025).openMe();
 			ZoneManager.getInstance().getZoneById(200100).setEnabled(false);
 			ZoneManager.getInstance().getZoneById(200101).setEnabled(true);
 			ZoneManager.getInstance().getZoneById(200101).setEnabled(false);
@@ -808,8 +808,8 @@ public final class TowerOfNaia extends AbstractNpcAI
 		if (DOORS.containsKey(managerId))
 		{
 			int[] doorList = DOORS.get(managerId);
-			DoorTable.getInstance().getDoor(doorList[0]).openMe();
-			DoorTable.getInstance().getDoor(doorList[1]).closeMe();
+			DoorData.getInstance().getDoor(doorList[0]).openMe();
+			DoorData.getInstance().getDoor(doorList[1]).closeMe();
 		}
 		
 		if (_spawns.containsKey(managerId) && (_spawns.get(managerId) != null))
@@ -896,7 +896,7 @@ public final class TowerOfNaia extends AbstractNpcAI
 		if (DOORS.containsKey(managerId))
 		{
 			int[] doorList = DOORS.get(managerId);
-			DoorTable.getInstance().getDoor(doorList[0]).closeMe();
+			DoorData.getInstance().getDoor(doorList[0]).closeMe();
 		}
 		
 		if (SPAWNS.containsKey(managerId))

L2J_DataPack/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java

@@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.DoorTable;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
 import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
 import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager.StatusEnum;
@@ -740,7 +740,7 @@ public final class TullyWorkshop extends AbstractNpcAI
 			final int[] doors = TULLY_DOORLIST.get(npcId);
 			for (int doorId : doors)
 			{
-				DoorTable.getInstance().getDoor(doorId).closeMe();
+				DoorData.getInstance().getDoor(doorId).closeMe();
 			}
 		}
 		
@@ -837,7 +837,7 @@ public final class TullyWorkshop extends AbstractNpcAI
 			final int[] doors = TULLY_DOORLIST.get(npcId);
 			for (int doorId : doors)
 			{
-				DoorTable.getInstance().getDoor(doorId).openMe();
+				DoorData.getInstance().getDoor(doorId).openMe();
 			}
 			
 			startQuestTimer("close", 120000, npc, null);
@@ -1205,8 +1205,8 @@ public final class TullyWorkshop extends AbstractNpcAI
 				postMortemSpawn.add(spawnedNpc);
 			}
 			
-			DoorTable.getInstance().getDoor(19260051).openMe();
-			DoorTable.getInstance().getDoor(19260052).openMe();
+			DoorData.getInstance().getDoor(19260051).openMe();
+			DoorData.getInstance().getDoor(19260052).openMe();
 			
 			countdownTime = 600000;
 			_countdown = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(() ->
@@ -1570,8 +1570,8 @@ public final class TullyWorkshop extends AbstractNpcAI
 	
 	private void handleDoorsOnDeath()
 	{
-		DoorTable.getInstance().getDoor(20250005).openMe();
-		DoorTable.getInstance().getDoor(20250004).openMe();
+		DoorData.getInstance().getDoor(20250005).openMe();
+		DoorData.getInstance().getDoor(20250004).openMe();
 		ThreadPoolManager.getInstance().scheduleGeneral(new DoorTask(new int[]
 		{
 			20250006,
@@ -1594,8 +1594,8 @@ public final class TullyWorkshop extends AbstractNpcAI
 	
 	private void handleDoorsOnRespawn()
 	{
-		DoorTable.getInstance().getDoor(20250009).closeMe();
-		DoorTable.getInstance().getDoor(20250008).closeMe();
+		DoorData.getInstance().getDoor(20250009).closeMe();
+		DoorData.getInstance().getDoor(20250008).closeMe();
 		ThreadPoolManager.getInstance().scheduleGeneral(new DoorTask(new int[]
 		{
 			20250777,
@@ -1627,7 +1627,7 @@ public final class TullyWorkshop extends AbstractNpcAI
 			L2DoorInstance door;
 			for (int doorId : _doorIds)
 			{
-				door = DoorTable.getInstance().getDoor(doorId);
+				door = DoorData.getInstance().getDoor(doorId);
 				if (door != null)
 				{
 					switch (_state)

L2J_DataPack/dist/game/data/scripts/hellbound/HellboundEngine.java

@@ -21,7 +21,7 @@ package hellbound;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.DoorTable;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
 import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -268,7 +268,7 @@ public final class HellboundEngine extends AbstractNpcAI
 		{
 			try
 			{
-				L2DoorInstance door = DoorTable.getInstance().getDoor(doorData[0]);
+				L2DoorInstance door = DoorData.getInstance().getDoor(doorData[0]);
 				if (door.getOpen())
 				{
 					if (newLevel < doorData[1])

L2J_DataPack/dist/game/data/scripts/hellbound/HellboundSpawns.java

@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.gameserver.data.xml.IXmlReader;
-import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.Location;

L2J_DataPack/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java

@@ -22,7 +22,7 @@ import quests.Q00062_PathOfTheTrooper.Q00062_PathOfTheTrooper;
 import quests.Q00063_PathOfTheWarder.Q00063_PathOfTheWarder;
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.CategoryData;
+import com.l2jserver.gameserver.data.xml.impl.CategoryData;
 import com.l2jserver.gameserver.enums.CategoryType;
 import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;

L2J_DataPack/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java

@@ -23,7 +23,7 @@ import quests.Q00065_CertifiedSoulBreaker.Q00065_CertifiedSoulBreaker;
 import quests.Q00066_CertifiedArbalester.Q00066_CertifiedArbalester;
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.CategoryData;
+import com.l2jserver.gameserver.data.xml.impl.CategoryData;
 import com.l2jserver.gameserver.enums.CategoryType;
 import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;