From 3c486e6993b658fb4f7199994e2a01df38e343ef Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 28 Apr 2016 19:47:59 +0000
Subject: [PATCH] Moved AbstractNpcAI at ai scripts base folder.
---
trunk/dist/game/data/scripts/ai/{npc => }/AbstractNpcAI.java | 2 +-
.../scripts/ai/group_template/AdenReconstructorManager.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java | 2 +-
.../dist/game/data/scripts/ai/group_template/DragonValley.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/FairyTrees.java | 2 +-
.../game/data/scripts/ai/group_template/FeedableBeasts.java | 2 +-
.../dist/game/data/scripts/ai/group_template/FleeMonsters.java | 2 +-
.../game/data/scripts/ai/group_template/FrozenLabyrinth.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/HotSprings.java | 2 +-
.../dist/game/data/scripts/ai/group_template/IsleOfPrayer.java | 2 +-
.../game/data/scripts/ai/group_template/LairOfAntharas.java | 2 +-
.../game/data/scripts/ai/group_template/MinionSpawnManager.java | 2 +-
.../game/data/scripts/ai/group_template/MonasteryOfSilence.java | 2 +-
.../game/data/scripts/ai/group_template/NonLethalableNpcs.java | 2 +-
.../game/data/scripts/ai/group_template/NonRandomWalkNpcs.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/PaganKey.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/PaganTemple.java | 2 +-
.../dist/game/data/scripts/ai/group_template/PavelArchaic.java | 2 +-
.../dist/game/data/scripts/ai/group_template/PlainsOfDion.java | 2 +-
.../game/data/scripts/ai/group_template/PlainsOfLizardman.java | 2 +-
.../game/data/scripts/ai/group_template/PolymorphingAngel.java | 2 +-
.../data/scripts/ai/group_template/PolymorphingOnAttack.java | 2 +-
.../dist/game/data/scripts/ai/group_template/PrimevalIsle.java | 2 +-
.../dist/game/data/scripts/ai/group_template/PrisonGuards.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/RandomSpawn.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/Remnants.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/Sandstorms.java | 2 +-
.../data/scripts/ai/group_template/SeeThroughSilentMove.java | 2 +-
.../dist/game/data/scripts/ai/group_template/SelMahumDrill.java | 2 +-
.../dist/game/data/scripts/ai/group_template/SelMahumSquad.java | 2 +-
.../dist/game/data/scripts/ai/group_template/SilentValley.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/SummonPc.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/TurekOrcs.java | 2 +-
.../data/scripts/ai/group_template/WarriorFishingBlock.java | 2 +-
trunk/dist/game/data/scripts/ai/group_template/Wasteland.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Anais.java | 2 +-
.../dist/game/data/scripts/ai/individual/Antharas/Antharas.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Ballista.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Beleth.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Core.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/DivineBeast.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Epidos.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/EvasGiftBox.java | 2 +-
.../game/data/scripts/ai/individual/FrightenedRagnaOrc.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Gordon.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/GraveRobbers.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Lailly.java | 2 +-
.../game/data/scripts/ai/individual/LeopardDragonHachling.java | 2 +-
.../dist/game/data/scripts/ai/individual/MercenaryCaptain.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Namo.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Orfen.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/QueenAnt.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java | 2 +-
.../dist/game/data/scripts/ai/individual/RagnaOrcCommander.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/RagnaOrcHero.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Rakun.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java | 2 +-
.../dist/game/data/scripts/ai/individual/ScarletVanHalisha.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/SinEater.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/SinWardens.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Valakas.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java | 2 +-
trunk/dist/game/data/scripts/ai/individual/WindVortex.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Acateo/Acateo.java | 2 +-
.../data/scripts/ai/npc/AdventurersGuide/AdventurersGuide.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java | 2 +-
.../data/scripts/ai/npc/AlchemistManager/AlchemistManager.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java | 2 +-
.../game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java | 2 +-
.../game/data/scripts/ai/npc/ArenaManager/ArenaManager.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java | 2 +-
.../ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java | 2 +-
.../data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java | 2 +-
.../data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java | 2 +-
.../scripts/ai/npc/CastleChamberlain/CastleChamberlain.java | 2 +-
.../scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java | 2 +-
.../ai/npc/CastleMercenaryManager/CastleMercenaryManager.java | 2 +-
.../scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java | 2 +-
.../data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java | 2 +-
.../data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java | 2 +-
.../scripts/ai/npc/DimensionalManager/DimensionalManager.java | 2 +-
.../game/data/scripts/ai/npc/DragonVortex/DragonVortex.java | 2 +-
.../dist/game/data/scripts/ai/npc/FameManager/FameManager.java | 2 +-
.../game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java | 2 +-
.../ai/npc/FortressArcherCaptain/FortressArcherCaptain.java | 2 +-
.../ai/npc/FortressSiegeManager/FortressSiegeManager.java | 2 +-
.../game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Jinia/Jinia.java | 2 +-
.../game/data/scripts/ai/npc/KainVanHalter/KainVanHalter.java | 2 +-
.../data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java | 2 +-
.../dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java | 2 +-
.../game/data/scripts/ai/npc/ManorManager/ManorManager.java | 2 +-
.../dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Merlot/Merlot.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java | 2 +-
.../data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Nomi/Nomi.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Proclaimer/Proclaimer.java | 2 +-
.../data/scripts/ai/npc/RemembranceTower/RemembranceTower.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Rignos/Rignos.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java | 2 +-
.../data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java | 2 +-
.../scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java | 2 +-
.../dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java | 2 +-
.../data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java | 2 +-
.../game/data/scripts/ai/npc/Teleports/DarkOmens/DarkOmens.java | 2 +-
.../ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java | 2 +-
.../DimensionalWarpTeleport/DimensionalWarpTeleport.java | 2 +-
.../ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java | 2 +-
.../GainakUndergroundEntrance/GainakUndergroundEntrance.java | 2 +-
.../ai/npc/Teleports/GardenOfSpirits/GardenOfSpirits.java | 2 +-
.../scripts/ai/npc/Teleports/GiantServant/GiantServant.java | 2 +-
.../Teleports/GrandBossTeleporters/GrandBossTeleporters.java | 2 +-
.../scripts/ai/npc/Teleports/KargosTeleport/KargosTeleport.java | 2 +-
.../dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java | 2 +-
.../MithrilMinesTeleporter/MithrilMinesTeleporter.java | 2 +-
.../ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java | 2 +-
.../ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java | 2 +-
.../ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java | 2 +-
.../scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java | 2 +-
.../Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java | 2 +-
.../Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java | 2 +-
.../Teleports/StrongholdsTeleports/StrongholdsTeleports.java | 2 +-
.../game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java | 2 +-
.../ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java | 2 +-
.../npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java | 2 +-
.../TeleportToUndergroundColiseum.java | 2 +-
.../ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java | 2 +-
.../game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java | 2 +-
.../game/data/scripts/ai/npc/Teleports/Warpgate/Warpgate.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java | 2 +-
.../scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Trandon/Trandon.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java | 2 +-
.../scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java | 2 +-
.../FirstClassTransferTalk/FirstClassTransferTalk.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java | 2 +-
.../game/data/scripts/ai/npc/WyvernManager/WyvernManager.java | 2 +-
trunk/dist/game/data/scripts/ai/npc/Zenya/Zenya.java | 2 +-
.../ai/zones/AteliaFortress/AteliaManager/AteliaManager.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/FantasyIsle/Parade.java | 2 +-
.../dist/game/data/scripts/ai/zones/FantasyIsle/TalentShow.java | 2 +-
.../data/scripts/ai/zones/Magmeld/AnghelWaterfallPortal.java | 2 +-
.../game/data/scripts/ai/zones/Magmeld/OrbisTempleStatues.java | 2 +-
.../data/scripts/ai/zones/Magmeld/OrbisTempleTeleports.java | 2 +-
.../scripts/ai/zones/TalkingIsland/Apprentice/Apprentice.java | 2 +-
.../ai/zones/TalkingIsland/AwakeningMaster/AwakeningMaster.java | 2 +-
.../dist/game/data/scripts/ai/zones/TalkingIsland/Banette.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Bink.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Devno.java | 2 +-
.../game/data/scripts/ai/zones/TalkingIsland/DrillSergeant.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Eleve.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Gagabu.java | 2 +-
.../game/data/scripts/ai/zones/TalkingIsland/Handermonkey.java | 2 +-
.../game/data/scripts/ai/zones/TalkingIsland/Hardin/Hardin.java | 2 +-
.../TalkingIsland/HarnakUnderground/HarnakUnderground.java | 2 +-
.../dist/game/data/scripts/ai/zones/TalkingIsland/Heymond.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Karonf.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Lumi.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mahram.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mai.java | 2 +-
.../game/data/scripts/ai/zones/TalkingIsland/MarinSmith.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Milia.java | 2 +-
.../scripts/ai/zones/TalkingIsland/MonkOfChaos/MonkOfChaos.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Oris.java | 2 +-
.../data/scripts/ai/zones/TalkingIsland/Pantheon/Pantheon.java | 2 +-
.../game/data/scripts/ai/zones/TalkingIsland/Raina/Raina.java | 2 +-
.../dist/game/data/scripts/ai/zones/TalkingIsland/Shannon.java | 2 +-
trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Sodian.java | 2 +-
.../dist/game/data/scripts/ai/zones/TalkingIsland/Stiller.java | 2 +-
.../dist/game/data/scripts/ai/zones/TalkingIsland/Theodore.java | 2 +-
.../game/data/scripts/ai/zones/TalkingIsland/TrainingGolem.java | 2 +-
.../data/scripts/ai/zones/TalkingIsland/TrainningSoldier.java | 2 +-
.../data/scripts/ai/zones/TalkingIsland/YeSagiraGuards.java | 2 +-
.../TalkingIsland/YeSagiraTeleporter/YeSagiraTeleporter.java | 2 +-
.../game/data/scripts/custom/FactionManager/FactionManager.java | 2 +-
.../data/scripts/custom/events/TvT/TvTManager/TvTManager.java | 2 +-
trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java | 2 +-
trunk/dist/game/data/scripts/custom/listeners/ListenerTest.java | 2 +-
trunk/dist/game/data/scripts/custom/package-info.java | 2 +-
.../game/data/scripts/features/SkillTransfer/SkillTransfer.java | 2 +-
trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java | 2 +-
trunk/dist/game/data/scripts/gracia/AI/Lindvior.java | 2 +-
trunk/dist/game/data/scripts/gracia/AI/Maguen.java | 2 +-
.../scripts/gracia/AI/NPC/FortuneTelling/FortuneTelling.java | 2 +-
.../data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java | 2 +-
trunk/dist/game/data/scripts/gracia/AI/NPC/Lekon/Lekon.java | 2 +-
trunk/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java | 2 +-
.../game/data/scripts/gracia/AI/NPC/Nottingale/Nottingale.java | 2 +-
trunk/dist/game/data/scripts/gracia/AI/NPC/Seyo/Seyo.java | 2 +-
.../scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java | 2 +-
.../gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java | 2 +-
trunk/dist/game/data/scripts/gracia/AI/StarStones.java | 2 +-
.../SeedOfInfinity/HallOfSuffering/HallOfSuffering.java | 2 +-
trunk/dist/game/data/scripts/instances/AbstractInstance.java | 2 +-
.../instances/MonasteryOfSilence2/MonasteryOfSilence2.java | 2 +-
.../scripts/village_master/ProofOfCourage/ProofOfCourage.java | 2 +-
.../scripts/village_master/ProofOfJustice/ProofOfJustice.java | 2 +-
212 files changed, 212 insertions(+), 212 deletions(-)
rename trunk/dist/game/data/scripts/ai/{npc => }/AbstractNpcAI.java (96%)
diff --git a/trunk/dist/game/data/scripts/ai/npc/AbstractNpcAI.java b/trunk/dist/game/data/scripts/ai/AbstractNpcAI.java
similarity index 96%
rename from trunk/dist/game/data/scripts/ai/npc/AbstractNpcAI.java
rename to trunk/dist/game/data/scripts/ai/AbstractNpcAI.java
index 21edc8bb6f..6854a1c634 100644
--- a/trunk/dist/game/data/scripts/ai/npc/AbstractNpcAI.java
+++ b/trunk/dist/game/data/scripts/ai/AbstractNpcAI.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.npc;
+package ai;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
diff --git a/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java b/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java
index 3c1cdc4aab..9372c9d4d3 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Aden Reconstructor Manager AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java b/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java
index 7927a47ed0..be1c917e27 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
/**
diff --git a/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java b/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java
index 80233f9278..c9c399b573 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java
@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dummy AI for spawns/respawns only for testing.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java b/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java
index 14daa7107f..fddfadbcac 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java
@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dragon Valley AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/FairyTrees.java b/trunk/dist/game/data/scripts/ai/group_template/FairyTrees.java
index 2bf23b7e01..03017e3877 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/FairyTrees.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/FairyTrees.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Playable;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Fairy Trees AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java b/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
index 40221f68cb..662d128987 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
import quests.Q00655_AGrandPlanForTamingWildBeasts.Q00655_AGrandPlanForTamingWildBeasts;
diff --git a/trunk/dist/game/data/scripts/ai/group_template/FleeMonsters.java b/trunk/dist/game/data/scripts/ai/group_template/FleeMonsters.java
index e6d5f0bb32..51d2511e18 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/FleeMonsters.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/FleeMonsters.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.interfaces.ILocational;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Flee Monsters AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java b/trunk/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java
index a918a2b66f..5fd6cbbe49 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Frozen Labyrinth AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java b/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java
index 9e53f28eb9..575374ddcf 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Giant's Cave AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java b/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java
index 04e8f19113..139fe2e7cc 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Hills of Gold AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/HotSprings.java b/trunk/dist/game/data/scripts/ai/group_template/HotSprings.java
index b51312eae0..8be2512d9d 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/HotSprings.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/HotSprings.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.BuffInfo;
import com.l2jmobius.gameserver.model.skills.Skill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Hot Springs AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java b/trunk/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java
index 12e0373091..65691a3e3b 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Isle of Prayer AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java b/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java
index 157ce5c0eb..0303a264f7 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Lair of Antharas AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java b/trunk/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java
index 6c1912f5af..463fe03491 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.MinionHolder;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Minion Spawn Manager.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java b/trunk/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java
index 725dd33f91..d43eb71f1c 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java
@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Monastery of Silence AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java b/trunk/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java
index 346bff4038..2ba4b6dc9a 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java
@@ -18,7 +18,7 @@ package ai.group_template;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* @author UnAfraid
diff --git a/trunk/dist/game/data/scripts/ai/group_template/NonRandomWalkNpcs.java b/trunk/dist/game/data/scripts/ai/group_template/NonRandomWalkNpcs.java
index 87784b512e..a60fadf4f3 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/NonRandomWalkNpcs.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/NonRandomWalkNpcs.java
@@ -18,7 +18,7 @@ package ai.group_template;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Non Random Walk Npcs AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/PaganKey.java b/trunk/dist/game/data/scripts/ai/group_template/PaganKey.java
index 2a75094d29..2ec50ec077 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/PaganKey.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/PaganKey.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Pagan Key AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/PaganTemple.java b/trunk/dist/game/data/scripts/ai/group_template/PaganTemple.java
index ab9d5b9c7b..18e2c6663d 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/PaganTemple.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/PaganTemple.java
@@ -19,7 +19,7 @@ package ai.group_template;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Pagan Temple AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/PavelArchaic.java b/trunk/dist/game/data/scripts/ai/group_template/PavelArchaic.java
index 2489424fb5..0593fa9740 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/PavelArchaic.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/PavelArchaic.java
@@ -19,7 +19,7 @@ package ai.group_template;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Pavel Archaic AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/PlainsOfDion.java b/trunk/dist/game/data/scripts/ai/group_template/PlainsOfDion.java
index 59f4ed4fb8..d31f60c429 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/PlainsOfDion.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/PlainsOfDion.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* AI for mobs in Plains of Dion (near Floran Village).
diff --git a/trunk/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java b/trunk/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
index 5eb7a3305d..d92567e872 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.L2Playable;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Plains of Lizardmen AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java b/trunk/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java
index c33abaf604..afa1f353a9 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Angel spawns...when one of the angels in the keys dies, the other angel will spawn.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java b/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
index 6d7f24a39b..9ded18e94d 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Polymorphing on attack monsters AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java b/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java
index 2f6d7ec1aa..0782f300c3 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Primeval Isle AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java b/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java
index b3b1ee2a86..992af9f5da 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Prison Guards AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/RandomSpawn.java b/trunk/dist/game/data/scripts/ai/group_template/RandomSpawn.java
index 8236d2dfbc..aee3fff336 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/RandomSpawn.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/RandomSpawn.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Manages spawn of NPCs having several random spawn points.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/Remnants.java b/trunk/dist/game/data/scripts/ai/group_template/Remnants.java
index bcaa786f1c..97e7aa9fbf 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/Remnants.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/Remnants.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Remnants AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/Sandstorms.java b/trunk/dist/game/data/scripts/ai/group_template/Sandstorms.java
index fcbbbcd8ba..f0c01c5666 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/Sandstorms.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/Sandstorms.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Sandstorms AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java b/trunk/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java
index eebdc0958d..fd08d9d2e3 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java
@@ -19,7 +19,7 @@ package ai.group_template;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* See Through Silent Move AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java b/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java
index ae6003792c..4b227f7596 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java
@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Sel Mahum Training Ground AI for drill groups.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/SelMahumSquad.java b/trunk/dist/game/data/scripts/ai/group_template/SelMahumSquad.java
index 336abb2ee9..06ad18ac32 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/SelMahumSquad.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/SelMahumSquad.java
@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Sel Mahum Training Ground AI for squads and chefs.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java b/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java
index 91f1c92054..1ff8236bfe 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Silent Valley AI
diff --git a/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java b/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java
index 6e15a6a588..b4bd247756 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java
@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.util.Broadcast;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Stakato Nest AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/SummonPc.java b/trunk/dist/game/data/scripts/ai/group_template/SummonPc.java
index 6a6e102aa2..06820e0139 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/SummonPc.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/SummonPc.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.skills.Skill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Summon Pc AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/TurekOrcs.java b/trunk/dist/game/data/scripts/ai/group_template/TurekOrcs.java
index 09a3e86244..8a3daa07c6 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/TurekOrcs.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/TurekOrcs.java
@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Turek Orcs AI - flee and return with assistance
diff --git a/trunk/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java b/trunk/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java
index aa859fe328..c69933850c 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Warrior Fishing Block AI.
diff --git a/trunk/dist/game/data/scripts/ai/group_template/Wasteland.java b/trunk/dist/game/data/scripts/ai/group_template/Wasteland.java
index c65b4a9fc1..f21aabbe97 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/Wasteland.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/Wasteland.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Wasteland AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Anais.java b/trunk/dist/game/data/scripts/ai/individual/Anais.java
index db8ac43456..5564c5d938 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Anais.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Anais.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Anais AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java b/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java
index d8031e21c5..40d3029d8c 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java
@@ -45,7 +45,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SpecialCamera;
import com.l2jmobius.gameserver.util.Broadcast;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Antharas AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java b/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java
index 4ab924ffa4..54fe9cb60d 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Baium AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Ballista.java b/trunk/dist/game/data/scripts/ai/individual/Ballista.java
index d490fb03da..a7a2457350 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Ballista.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Ballista.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Ballista AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Beleth.java b/trunk/dist/game/data/scripts/ai/individual/Beleth.java
index f8400c12f7..3c4f49eb13 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Beleth.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Beleth.java
@@ -48,7 +48,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SpecialCamera;
import com.l2jmobius.gameserver.network.serverpackets.StaticObject;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Beleth's AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Core.java b/trunk/dist/game/data/scripts/ai/individual/Core.java
index b7df69ddaf..bba0f2bf90 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Core.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Core.java
@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.PlaySound;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Core AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java b/trunk/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java
index 42707fa93c..9704fbf6f3 100644
--- a/trunk/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java
+++ b/trunk/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* AI for Kamaloka (33) - Crimson Hatu Otis
diff --git a/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java b/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
index 06e13730d7..1175520fee 100644
--- a/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
+++ b/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dark Water Dragon's AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/DivineBeast.java b/trunk/dist/game/data/scripts/ai/individual/DivineBeast.java
index cc29404880..adee65fe3c 100644
--- a/trunk/dist/game/data/scripts/ai/individual/DivineBeast.java
+++ b/trunk/dist/game/data/scripts/ai/individual/DivineBeast.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Simple AI that manages special conditions for Divine Beast summon.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Epidos.java b/trunk/dist/game/data/scripts/ai/individual/Epidos.java
index 8c768d85ba..08c5432c90 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Epidos.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Epidos.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.util.MinionList;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Manages minion's spawn, idle despawn and Teleportation Cube spawn.
diff --git a/trunk/dist/game/data/scripts/ai/individual/EvasGiftBox.java b/trunk/dist/game/data/scripts/ai/individual/EvasGiftBox.java
index 82dc61c632..63915b53fb 100644
--- a/trunk/dist/game/data/scripts/ai/individual/EvasGiftBox.java
+++ b/trunk/dist/game/data/scripts/ai/individual/EvasGiftBox.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.ItemHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Eva's Gift Box AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java b/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java
index a940e335e8..c3f0d12cbb 100644
--- a/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java
+++ b/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Frightened Ragna Orc AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Gordon.java b/trunk/dist/game/data/scripts/ai/individual/Gordon.java
index 50cbbc7f39..9e40acb688 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Gordon.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Gordon.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Gordon AI
diff --git a/trunk/dist/game/data/scripts/ai/individual/GraveRobbers.java b/trunk/dist/game/data/scripts/ai/individual/GraveRobbers.java
index 44057120b6..40f234b33d 100644
--- a/trunk/dist/game/data/scripts/ai/individual/GraveRobbers.java
+++ b/trunk/dist/game/data/scripts/ai/individual/GraveRobbers.java
@@ -18,7 +18,7 @@ package ai.individual;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Grove Robber's AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Lailly.java b/trunk/dist/game/data/scripts/ai/individual/Lailly.java
index 3a67acc4e6..131afa3563 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Lailly.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Lailly.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Lailly AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/LeopardDragonHachling.java b/trunk/dist/game/data/scripts/ai/individual/LeopardDragonHachling.java
index 35039edce9..fd6cc1cd20 100644
--- a/trunk/dist/game/data/scripts/ai/individual/LeopardDragonHachling.java
+++ b/trunk/dist/game/data/scripts/ai/individual/LeopardDragonHachling.java
@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.util.Rnd;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Leopard Dragon Hachling AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java b/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java
index 4e79d131b3..23927b242b 100644
--- a/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java
+++ b/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Mercenary Captain AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Namo.java b/trunk/dist/game/data/scripts/ai/individual/Namo.java
index 4a5358f972..529ba2cc7b 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Namo.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Namo.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Namo AI
diff --git a/trunk/dist/game/data/scripts/ai/individual/Orfen.java b/trunk/dist/game/data/scripts/ai/individual/Orfen.java
index e110201afd..48e961b979 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Orfen.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Orfen.java
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.PlaySound;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Orfen's AI
diff --git a/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java b/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java
index 1e4a102e21..e902fd1736 100644
--- a/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java
+++ b/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.zone.type.L2BossZone;
import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.PlaySound;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Queen Ant's AI
diff --git a/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java b/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java
index 2726045525..f84755747c 100644
--- a/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java
+++ b/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.zone.type.L2EffectZone;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Queen Shyeed AI
diff --git a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcCommander.java b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcCommander.java
index 1256d4bb1c..eef0382439 100644
--- a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcCommander.java
+++ b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcCommander.java
@@ -18,7 +18,7 @@ package ai.individual;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Ragna Orc Commander AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcHero.java b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcHero.java
index f18e7d9235..c492f4db9c 100644
--- a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcHero.java
+++ b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcHero.java
@@ -18,7 +18,7 @@ package ai.individual;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Ragna Orc Hero AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java
index 86b9f437dc..4d2f8e4547 100644
--- a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java
+++ b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java
@@ -18,7 +18,7 @@ package ai.individual;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Ragna Orc Seer AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Rakun.java b/trunk/dist/game/data/scripts/ai/individual/Rakun.java
index dddd0ce3e0..8d2a8f8fc0 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Rakun.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Rakun.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Rakun AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java b/trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java
index 9f08d5dc78..c0cddf82b9 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java
@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.zone.type.L2NoRestartZone;
import com.l2jmobius.gameserver.network.serverpackets.SpecialCamera;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Sailren AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java b/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java
index b299349b09..5bba0393bf 100644
--- a/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java
+++ b/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.util.Util;
import com.l2jmobius.util.Rnd;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* @author Micr0, Zerox
diff --git a/trunk/dist/game/data/scripts/ai/individual/SinEater.java b/trunk/dist/game/data/scripts/ai/individual/SinEater.java
index 5e5a46b282..9d41e75bd9 100644
--- a/trunk/dist/game/data/scripts/ai/individual/SinEater.java
+++ b/trunk/dist/game/data/scripts/ai/individual/SinEater.java
@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKill;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Sin Eater AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/SinWardens.java b/trunk/dist/game/data/scripts/ai/individual/SinWardens.java
index 6be9d4a1d7..206f82ff0a 100644
--- a/trunk/dist/game/data/scripts/ai/individual/SinWardens.java
+++ b/trunk/dist/game/data/scripts/ai/individual/SinWardens.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Manages Sin Wardens disappearing and chat.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Valakas.java b/trunk/dist/game/data/scripts/ai/individual/Valakas.java
index 1634a949ff..ca5f310ca6 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Valakas.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Valakas.java
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
import com.l2jmobius.gameserver.network.serverpackets.SpecialCamera;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Valakas' AI.
diff --git a/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java b/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java
index 3672583f29..3969a87c23 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Venom AI on Rune Castle.
diff --git a/trunk/dist/game/data/scripts/ai/individual/WindVortex.java b/trunk/dist/game/data/scripts/ai/individual/WindVortex.java
index 8793a2e499..16fd4cdb9d 100644
--- a/trunk/dist/game/data/scripts/ai/individual/WindVortex.java
+++ b/trunk/dist/game/data/scripts/ai/individual/WindVortex.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* @author Stayway
diff --git a/trunk/dist/game/data/scripts/ai/npc/Acateo/Acateo.java b/trunk/dist/game/data/scripts/ai/npc/Acateo/Acateo.java
index 9f216001fe..0d621e2c2d 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Acateo/Acateo.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Acateo/Acateo.java
@@ -19,7 +19,7 @@ package ai.npc.Acateo;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Acateo AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/AdventurersGuide/AdventurersGuide.java b/trunk/dist/game/data/scripts/ai/npc/AdventurersGuide/AdventurersGuide.java
index a91445f590..996acc06e8 100644
--- a/trunk/dist/game/data/scripts/ai/npc/AdventurersGuide/AdventurersGuide.java
+++ b/trunk/dist/game/data/scripts/ai/npc/AdventurersGuide/AdventurersGuide.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.skills.Skill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Adventurers Guide AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java b/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java
index 416a9cdd06..5c4e1c7357 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00184_ArtOfPersuasion.Q00184_ArtOfPersuasion;
import quests.Q00185_NikolasCooperation.Q00185_NikolasCooperation;
diff --git a/trunk/dist/game/data/scripts/ai/npc/AlchemistManager/AlchemistManager.java b/trunk/dist/game/data/scripts/ai/npc/AlchemistManager/AlchemistManager.java
index 9d1e680e7b..1f582b17d0 100644
--- a/trunk/dist/game/data/scripts/ai/npc/AlchemistManager/AlchemistManager.java
+++ b/trunk/dist/game/data/scripts/ai/npc/AlchemistManager/AlchemistManager.java
@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass;
import com.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Alchemist Manager AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java b/trunk/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java
index 7f88626f63..388bcc5ed6 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.ItemHolder;
import com.l2jmobius.gameserver.model.holders.QuestItemHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Alexandria (Armor Merchant) AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java b/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java
index 0822a2f628..e3e0f20d0f 100644
--- a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java
+++ b/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java
@@ -19,7 +19,7 @@ package ai.npc.AltarOfSouls;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Altar of Souls AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java b/trunk/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java
index e1f267517c..3de3164036 100644
--- a/trunk/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java
+++ b/trunk/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.network.SystemMessageId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Arena Manager AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java b/trunk/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
index 1f01437ff0..b2ddcfc46a 100644
--- a/trunk/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
+++ b/trunk/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.network.clientpackets.RequestAcquireSkill;
import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Avant-Garde AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java b/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java
index 5fe6d7dcf7..0e35dd8dd8 100644
--- a/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java
+++ b/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Black Judge AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 926b6cae62..b520771634 100644
--- a/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Black Marketeer of Mammon AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java b/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java
index 6188fd97e1..605ed2b646 100644
--- a/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java
+++ b/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.entity.Castle;
import com.l2jmobius.gameserver.model.entity.Fort;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Castle Ambassador AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java b/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java
index 8927132bb4..7a4b858ded 100644
--- a/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java
+++ b/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Castle Blacksmith AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java b/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
index 86df3014f8..10c454f618 100644
--- a/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
+++ b/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
@@ -57,7 +57,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowSeedSetting;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Castle Chamberlain AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java b/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java
index 422eddbc86..8554f5172c 100644
--- a/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java
+++ b/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.network.clientpackets.RequestAcquireSkill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import handlers.effecthandlers.CallPc;
/**
diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java b/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
index cebc68ce5c..fc2fa05db9 100644
--- a/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Castle;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Castle Mercenary Manager AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java b/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java
index 6b815c411c..2ecf19e347 100644
--- a/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java
+++ b/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java
@@ -19,7 +19,7 @@ package ai.npc.CastleSiegeManager;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Castle Siege Manager AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java b/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java
index 0af8f806e3..a71ba448cc 100644
--- a/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java
+++ b/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.entity.Siege;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Castle Teleporter AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java b/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java
index a29d8a28d9..46e3ed03e0 100644
--- a/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java
+++ b/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java
@@ -19,7 +19,7 @@ package ai.npc.CastleWarehouse;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Castle Warehouse Keeper AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java b/trunk/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java
index 1060f277e0..b15d05ba73 100644
--- a/trunk/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java
+++ b/trunk/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Clan Trader AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/DimensionalManager/DimensionalManager.java b/trunk/dist/game/data/scripts/ai/npc/DimensionalManager/DimensionalManager.java
index edaf1c604e..7f55e6123c 100644
--- a/trunk/dist/game/data/scripts/ai/npc/DimensionalManager/DimensionalManager.java
+++ b/trunk/dist/game/data/scripts/ai/npc/DimensionalManager/DimensionalManager.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.network.SystemMessageId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dimensional Manager AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java b/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java
index 9cf432bf54..c4170cfd3e 100644
--- a/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java
+++ b/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.L2Spawn;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dragon Vortex AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/FameManager/FameManager.java b/trunk/dist/game/data/scripts/ai/npc/FameManager/FameManager.java
index b16e651c3f..7df56771e9 100644
--- a/trunk/dist/game/data/scripts/ai/npc/FameManager/FameManager.java
+++ b/trunk/dist/game/data/scripts/ai/npc/FameManager/FameManager.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Fame Manager AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
index 9cf96bfa4e..f96cb5913b 100644
--- a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
@@ -19,7 +19,7 @@ package ai.npc.ForgeOfTheGods;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Forge of the Gods AI
diff --git a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java
index 45a4c142e1..27004dcba1 100644
--- a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java
+++ b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Rooney AI
diff --git a/trunk/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java b/trunk/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
index c52233cb41..ef8d33afa8 100644
--- a/trunk/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
+++ b/trunk/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
@@ -19,7 +19,7 @@ package ai.npc.FortressArcherCaptain;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Fortress Archer Captain AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java b/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java
index c6cb175546..967f42c88f 100644
--- a/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java
+++ b/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java
@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Fortress Siege Manager AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java b/trunk/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java
index 3583cb747b..1e2ab9607c 100644
--- a/trunk/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java
+++ b/trunk/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Freya's Steward AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Jinia/Jinia.java b/trunk/dist/game/data/scripts/ai/npc/Jinia/Jinia.java
index 31ee3f1fc5..aed481a656 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Jinia/Jinia.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Jinia/Jinia.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.QuestState;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q10286_ReunionWithSirra.Q10286_ReunionWithSirra;
/**
diff --git a/trunk/dist/game/data/scripts/ai/npc/KainVanHalter/KainVanHalter.java b/trunk/dist/game/data/scripts/ai/npc/KainVanHalter/KainVanHalter.java
index 31fc433e9f..3d8093c242 100644
--- a/trunk/dist/game/data/scripts/ai/npc/KainVanHalter/KainVanHalter.java
+++ b/trunk/dist/game/data/scripts/ai/npc/KainVanHalter/KainVanHalter.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2QuestGuardInstance;
import com.l2jmobius.gameserver.model.quest.QuestState;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q10791_TheManOfMystery.Q10791_TheManOfMystery;
/**
diff --git a/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java b/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java
index 61e9aafae1..71db1a413a 100644
--- a/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java
+++ b/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Ketra Orc Support AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java b/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java
index 823421b027..1ef7a092a7 100644
--- a/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java
+++ b/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExResponseBeautyList;
import com.l2jmobius.gameserver.network.serverpackets.ExResponseResetList;
import com.l2jmobius.gameserver.network.serverpackets.ExShowBeautyMenu;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* La Vie En Rose AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java b/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java
index 56d9507fed..7a69f2890e 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java
@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.util.Broadcast;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Mammons AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java b/trunk/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java
index 2407cea93b..589704cff0 100644
--- a/trunk/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java
+++ b/trunk/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowSeedInfo;
import com.l2jmobius.gameserver.network.serverpackets.ExShowSellCropList;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Manor manager AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java b/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java
index 4ccf1ec51a..edfddeb571 100644
--- a/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java
+++ b/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java
@@ -53,7 +53,7 @@ import com.l2jmobius.gameserver.network.serverpackets.mentoring.ExMentorList;
import com.l2jmobius.gameserver.util.Util;
import com.l2jmobius.util.data.xml.IXmlReader;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Mentor Guide.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Merlot/Merlot.java b/trunk/dist/game/data/scripts/ai/npc/Merlot/Merlot.java
index dd18853696..9e46789dcb 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Merlot/Merlot.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Merlot/Merlot.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Merlot AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java b/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java
index 810e607ad5..d01abf2100 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Monastery Minigame AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java b/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
index 88182f9c06..8318e9d786 100644
--- a/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Monument of Heroes AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Nomi/Nomi.java b/trunk/dist/game/data/scripts/ai/npc/Nomi/Nomi.java
index 2e436f5788..aab8d51684 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Nomi/Nomi.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Nomi/Nomi.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.skills.Skill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Nomi AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java
index 6cba764dd1..347a06e9b6 100644
--- a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java
+++ b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* @author UnAfraid
diff --git a/trunk/dist/game/data/scripts/ai/npc/Proclaimer/Proclaimer.java b/trunk/dist/game/data/scripts/ai/npc/Proclaimer/Proclaimer.java
index 1d9d153b9d..3ad8d61739 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Proclaimer/Proclaimer.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Proclaimer/Proclaimer.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Proclaimer AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/RemembranceTower/RemembranceTower.java b/trunk/dist/game/data/scripts/ai/npc/RemembranceTower/RemembranceTower.java
index d53f1a3fc4..98f4cf16a7 100644
--- a/trunk/dist/game/data/scripts/ai/npc/RemembranceTower/RemembranceTower.java
+++ b/trunk/dist/game/data/scripts/ai/npc/RemembranceTower/RemembranceTower.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.serverpackets.OnEventTrigger;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Remembrance Tower AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Rignos/Rignos.java b/trunk/dist/game/data/scripts/ai/npc/Rignos/Rignos.java
index 42bbf1662f..f7875bf759 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Rignos/Rignos.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Rignos/Rignos.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Rignos AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java b/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java
index 4826abb5fa..db30dcd110 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java
@@ -18,7 +18,7 @@ package ai.npc.Scarecrow;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Scarecrow AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java b/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java
index 71889970d0..a68f7b658d 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.instancezone.InstanceWorld;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Sirra AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java b/trunk/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java
index e3f669b50d..1fd438bdf8 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java
@@ -18,7 +18,7 @@ package ai.npc.Summons.MerchantGolem;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Golem Trader AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java b/trunk/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
index ad7ccc25a3..21fa97d27e 100644
--- a/trunk/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/trunk/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.clientpackets.RequestAcquireSkill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Support Unit Captain AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java b/trunk/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java
index a4de8d6516..bc1622710f 100644
--- a/trunk/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java
+++ b/trunk/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.serverpackets.HennaEquipList;
import com.l2jmobius.gameserver.network.serverpackets.HennaRemoveList;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Symbol Maker AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java
index 75e6240989..c8422ec1a9 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Cruma Tower teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/DarkOmens/DarkOmens.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/DarkOmens/DarkOmens.java
index 58cbd0c289..7e28985ecb 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/DarkOmens/DarkOmens.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/DarkOmens/DarkOmens.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dark Omens teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
index ebc5ab8865..8cd67d4a77 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.zone.type.L2TownZone;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Chambers of Delusion teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/DimensionalWarpTeleport/DimensionalWarpTeleport.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/DimensionalWarpTeleport/DimensionalWarpTeleport.java
index 77e822c3fa..41e2569a5b 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/DimensionalWarpTeleport/DimensionalWarpTeleport.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/DimensionalWarpTeleport/DimensionalWarpTeleport.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* @author hlwrave
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
index bd77c6bd38..f4ef63dcbc 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Elroki teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java
index 5deb0fd428..5fef13822d 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Gainak Underground Entrance teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/GardenOfSpirits/GardenOfSpirits.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/GardenOfSpirits/GardenOfSpirits.java
index b8ad611c86..b25227eaf8 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/GardenOfSpirits/GardenOfSpirits.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/GardenOfSpirits/GardenOfSpirits.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Garden of Spirits teleport zones.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/GiantServant/GiantServant.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/GiantServant/GiantServant.java
index 50d1142546..eab0969827 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/GiantServant/GiantServant.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/GiantServant/GiantServant.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Hermuncus Minion AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
index 15a76b14b7..bf11c08111 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
@@ -28,8 +28,8 @@ import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.zone.type.L2BossZone;
+import ai.AbstractNpcAI;
import ai.individual.Valakas;
-import ai.npc.AbstractNpcAI;
/**
* Grand Bosses teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/KargosTeleport/KargosTeleport.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/KargosTeleport/KargosTeleport.java
index b56e3cdded..030e44844c 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/KargosTeleport/KargosTeleport.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/KargosTeleport/KargosTeleport.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* @author hlwrave
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java
index e9b717d29d..7424414928 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Klemis AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 1e7bf5476f..e3ac8d68c7 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Mithril Mines teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java
index d70512eaeb..12343fe0d0 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Newbie Travel Token AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java
index 8e71ec2b2b..2a4dd44327 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java
@@ -19,7 +19,7 @@ package ai.npc.Teleports.NoblesseTeleport;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Noblesse teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java
index 190a337270..dfe1d145e6 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Pagan Temple teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java
index a5ea4f72ff..aed3057e54 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Separated Soul teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java
index a13b991fda..61dfd07e85 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.QuestState;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00240_ImTheOnlyOneYouCanTrust.Q00240_ImTheOnlyOneYouCanTrust;
/**
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java
index 5bb49806bf..45d51b06ed 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.zone.type.L2BossZone;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Steel Citadel teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java
index f9d4d1fa82..120280f7df 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java
@@ -19,7 +19,7 @@ package ai.npc.Teleports.StrongholdsTeleports;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Strongholds teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java
index 590fe572f3..e3332b25bb 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Gracia Survivor teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
index c5ab9e3189..dfa160ded9 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Fantasy Island teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
index 185ff55812..0bdc9cb169 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Monster Derby Track teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index d73a637944..2d86ac6998 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Underground Coliseum teleport AI
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
index bfd5b057b5..d904c1516e 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Charm teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java
index 5938c5535f..57c1d83b3b 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Tower of Insolence Vortex teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/Warpgate/Warpgate.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/Warpgate/Warpgate.java
index 2779b9798d..86abb04c00 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/Warpgate/Warpgate.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/Warpgate/Warpgate.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Warpgate teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java b/trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java
index a2f6c64381..1e3d0900ac 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.instancezone.InstanceWorld;
import com.l2jmobius.gameserver.model.quest.QuestState;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q10327_IntruderWhoWantsTheBookOfGiants.Q10327_IntruderWhoWantsTheBookOfGiants;
/**
diff --git a/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java b/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java
index bab441788e..2d72c9682a 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java
@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Trainer healers AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/Trandon.java b/trunk/dist/game/data/scripts/ai/npc/Trandon/Trandon.java
index 36f706b7ed..d09264758d 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Trandon/Trandon.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Trandon/Trandon.java
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
import com.l2jmobius.gameserver.model.variables.PlayerVariables;
import com.l2jmobius.gameserver.network.clientpackets.RequestAcquireSkill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Trandon AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java b/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java
index 13ae8cf960..db0d36adba 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.QuestState;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
/**
diff --git a/trunk/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java b/trunk/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
index e9aeca1a40..81577776e5 100644
--- a/trunk/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/trunk/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Varka Silenos Support AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java b/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java
index 4f589dfa90..b77e2bd7c7 100644
--- a/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2VillageMasterFighterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2VillageMasterPriestInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* This script manages the dialogs of the headmasters of all newbie villages.
diff --git a/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java b/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java
index 7919621e34..3fc520bb63 100644
--- a/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java
+++ b/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Weaver Olf - Pins And Pouch Unseal AI.
diff --git a/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java b/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
index 684e26ad53..b732969891 100644
--- a/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
+++ b/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.entity.Fort;
import com.l2jmobius.gameserver.model.entity.clanhall.SiegableHall;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Wyvern Manager
diff --git a/trunk/dist/game/data/scripts/ai/npc/Zenya/Zenya.java b/trunk/dist/game/data/scripts/ai/npc/Zenya/Zenya.java
index f941085429..4a8118338a 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Zenya/Zenya.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Zenya/Zenya.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Zenya AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/AteliaFortress/AteliaManager/AteliaManager.java b/trunk/dist/game/data/scripts/ai/zones/AteliaFortress/AteliaManager/AteliaManager.java
index 12063a488c..cb75d0b61c 100644
--- a/trunk/dist/game/data/scripts/ai/zones/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/trunk/dist/game/data/scripts/ai/zones/AteliaFortress/AteliaManager/AteliaManager.java
@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.skills.AbnormalType;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* URL https://l2wiki.com/Atelia_Fortress
diff --git a/trunk/dist/game/data/scripts/ai/zones/FantasyIsle/Parade.java b/trunk/dist/game/data/scripts/ai/zones/FantasyIsle/Parade.java
index f3de95c2ea..6bb9b8f191 100644
--- a/trunk/dist/game/data/scripts/ai/zones/FantasyIsle/Parade.java
+++ b/trunk/dist/game/data/scripts/ai/zones/FantasyIsle/Parade.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Fantasy Isle Parade
diff --git a/trunk/dist/game/data/scripts/ai/zones/FantasyIsle/TalentShow.java b/trunk/dist/game/data/scripts/ai/zones/FantasyIsle/TalentShow.java
index cd34f598a8..df6d44caca 100644
--- a/trunk/dist/game/data/scripts/ai/zones/FantasyIsle/TalentShow.java
+++ b/trunk/dist/game/data/scripts/ai/zones/FantasyIsle/TalentShow.java
@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.PlaySound;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Talent Show AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/Magmeld/AnghelWaterfallPortal.java b/trunk/dist/game/data/scripts/ai/zones/Magmeld/AnghelWaterfallPortal.java
index 1178e5fe58..52e985eb61 100644
--- a/trunk/dist/game/data/scripts/ai/zones/Magmeld/AnghelWaterfallPortal.java
+++ b/trunk/dist/game/data/scripts/ai/zones/Magmeld/AnghelWaterfallPortal.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Anghel Waterfall Portal teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleStatues.java b/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleStatues.java
index a5159b7be7..7ae78ca0fd 100644
--- a/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleStatues.java
+++ b/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleStatues.java
@@ -19,7 +19,7 @@ package ai.zones.Magmeld;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Orbis Temple Statues AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleTeleports.java b/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleTeleports.java
index d5efe8ff83..c66b595e26 100644
--- a/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleTeleports.java
+++ b/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleTeleports.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Orbis Temple teleport AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Apprentice/Apprentice.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Apprentice/Apprentice.java
index 5ecd50911f..b2054eeeeb 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Apprentice/Apprentice.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Apprentice/Apprentice.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Apprentice AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 75a01e0ce8..e837ff30d8 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowUsm;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q10338_SeizeYourDestiny.Q10338_SeizeYourDestiny;
import quests.Q10472_WindsOfFate_EncroachingShadows.Q10472_WindsOfFate_EncroachingShadows;
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Banette.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Banette.java
index b0656fd990..d2e60ad698 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Banette.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Banette.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Banette AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Bink.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Bink.java
index 4e91bae620..f1bda9afaa 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Bink.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Bink.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Bink AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Devno.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Devno.java
index 7958c7d674..3656038a6c 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Devno.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Devno.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Devno AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/DrillSergeant.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/DrillSergeant.java
index dead3e0636..f8b0edbc7c 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/DrillSergeant.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/DrillSergeant.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Drill Sergeant AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Eleve.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Eleve.java
index 29f7432ea7..59afd3afb4 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Eleve.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Eleve.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Eleve AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Gagabu.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Gagabu.java
index 13920f83aa..6da28b92a4 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Gagabu.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Gagabu.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Gagabu AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Handermonkey.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Handermonkey.java
index 6c92e23a84..991806c383 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Handermonkey.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Handermonkey.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Handermonkey AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/Hardin.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/Hardin.java
index b738d2f66f..fca4529976 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/Hardin.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/Hardin.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Hardin AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/HarnakUnderground/HarnakUnderground.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/HarnakUnderground/HarnakUnderground.java
index 4422ca8c51..d4fa8b5f99 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/HarnakUnderground/HarnakUnderground.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/HarnakUnderground/HarnakUnderground.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* @author hlwrave
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Heymond.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Heymond.java
index 29a301c7e8..b998100e4c 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Heymond.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Heymond.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Heymond AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Karonf.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Karonf.java
index ef4eaa00f3..5e5fdaadfa 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Karonf.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Karonf.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Karonf AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Lumi.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Lumi.java
index 61199ae660..475ea66abe 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Lumi.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Lumi.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Lumi AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mahram.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mahram.java
index f2898d98f9..5833dc518e 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mahram.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mahram.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Mahram AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mai.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mai.java
index a5b0c34805..4833153c86 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mai.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mai.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Mai AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MarinSmith.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MarinSmith.java
index 55e7a1184a..adcd801362 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MarinSmith.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MarinSmith.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Marin Smith AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Milia.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Milia.java
index 5968495569..76bbb247bf 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Milia.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Milia.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Milia AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index 1ed9a2c7e0..c3f6d2810c 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Monk of Chaos AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Oris.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Oris.java
index dd1af17f73..103807c0f5 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Oris.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Oris.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Oris AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/Pantheon.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/Pantheon.java
index 4245f5195c..c88326963e 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/Pantheon.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/Pantheon.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q10320_LetsGoToTheCentralSquare.Q10320_LetsGoToTheCentralSquare;
/**
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/Raina.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/Raina.java
index 6e2db79194..8650101891 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/Raina.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/Raina.java
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.network.serverpackets.AcquireSkillList;
import com.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Raina AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Shannon.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Shannon.java
index 2fb50b5f8a..bb7deaebfb 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Shannon.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Shannon.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Shannon AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Sodian.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Sodian.java
index ccd730798b..facdad276d 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Sodian.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Sodian.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Sodian AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Stiller.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Stiller.java
index 2c2d14bf8b..8eba88ff85 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Stiller.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Stiller.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Stiller AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Theodore.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Theodore.java
index 1332f34457..7661204409 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Theodore.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Theodore.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Theodore AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainingGolem.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainingGolem.java
index f7794ba5ef..7d2a338481 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainingGolem.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainingGolem.java
@@ -18,7 +18,7 @@ package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Training Golem AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainningSoldier.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainningSoldier.java
index 4ecbf7e187..6958d9ae3d 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainningSoldier.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainningSoldier.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2QuestGuardInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Trainning Soldier AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraGuards.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraGuards.java
index 30c4b399f2..25432a31c9 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraGuards.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraGuards.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* YeSagira AI.
diff --git a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraTeleporter/YeSagiraTeleporter.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraTeleporter/YeSagiraTeleporter.java
index 2df8c4ea1b..aa4ad909bc 100644
--- a/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraTeleporter/YeSagiraTeleporter.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraTeleporter/YeSagiraTeleporter.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
import com.l2jmobius.gameserver.model.events.annotations.RegisterType;
import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerCreate;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* @author Neanrakyr
diff --git a/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java b/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java
index d2b2a7e920..f158cc71c2 100644
--- a/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java
+++ b/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* @author Mobius
diff --git a/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java b/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
index bbe663d4c0..21884695f3 100644
--- a/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
+++ b/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.entity.TvTEvent;
import com.l2jmobius.gameserver.model.olympiad.OlympiadManager;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* TvT Manager AI.
diff --git a/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java b/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java
index 60a1d64329..4b0b06341d 100644
--- a/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java
+++ b/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java
@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.util.Broadcast;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Wedding AI.
diff --git a/trunk/dist/game/data/scripts/custom/listeners/ListenerTest.java b/trunk/dist/game/data/scripts/custom/listeners/ListenerTest.java
index 40a3c7ce6f..59d1d1d31a 100644
--- a/trunk/dist/game/data/scripts/custom/listeners/ListenerTest.java
+++ b/trunk/dist/game/data/scripts/custom/listeners/ListenerTest.java
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.events.returns.TerminateReturn;
import com.l2jmobius.gameserver.model.holders.ItemHolder;
import com.l2jmobius.util.Rnd;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* An example usage of Listeners.
diff --git a/trunk/dist/game/data/scripts/custom/package-info.java b/trunk/dist/game/data/scripts/custom/package-info.java
index 5d7b0654ab..1a1a2be8da 100644
--- a/trunk/dist/game/data/scripts/custom/package-info.java
+++ b/trunk/dist/game/data/scripts/custom/package-info.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
- /**
+/**
* Scripts added in the custom folder define quests and/or AI that are not normally part of the original Lineage 2 game.
* In addition, "custom" is sometimes used as a temporary implementation of aspects of the original game that are not yet fully implementable by L2J.
* In this manner, partially accurate emulation may be offered until a better method is implemented.
diff --git a/trunk/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/trunk/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java
index ee1697568b..1965de69a6 100644
--- a/trunk/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java
+++ b/trunk/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java
@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Skill Transfer feature.
diff --git a/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java b/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java
index ff00bc53ef..2f59c798ab 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Energy Seeds AI.
diff --git a/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java b/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java
index efbe1235b8..faf14f5f47 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Lindvior Scene AI.
diff --git a/trunk/dist/game/data/scripts/gracia/AI/Maguen.java b/trunk/dist/game/data/scripts/gracia/AI/Maguen.java
index b3d6d1fb55..9c6b1bf2f4 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/Maguen.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/Maguen.java
@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.skills.BuffInfo;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import gracia.AI.NPC.Nemo.Nemo;
/**
diff --git a/trunk/dist/game/data/scripts/gracia/AI/NPC/FortuneTelling/FortuneTelling.java b/trunk/dist/game/data/scripts/gracia/AI/NPC/FortuneTelling/FortuneTelling.java
index 03c74703ca..94ed570f68 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/NPC/FortuneTelling/FortuneTelling.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/NPC/FortuneTelling/FortuneTelling.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Fortune Telling AI.
diff --git a/trunk/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java b/trunk/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java
index e27398b968..781fdb6a7a 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java
@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dilios AI
diff --git a/trunk/dist/game/data/scripts/gracia/AI/NPC/Lekon/Lekon.java b/trunk/dist/game/data/scripts/gracia/AI/NPC/Lekon/Lekon.java
index 337f840761..28cf991990 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/NPC/Lekon/Lekon.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/NPC/Lekon/Lekon.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.SystemMessageId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Lekon AI.
diff --git a/trunk/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java b/trunk/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java
index eb787d5c73..b1db9e7633 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import gracia.AI.Maguen;
/**
diff --git a/trunk/dist/game/data/scripts/gracia/AI/NPC/Nottingale/Nottingale.java b/trunk/dist/game/data/scripts/gracia/AI/NPC/Nottingale/Nottingale.java
index 259ce4db63..7a37ea1daa 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/NPC/Nottingale/Nottingale.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/NPC/Nottingale/Nottingale.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.network.serverpackets.RadarControl;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
/**
diff --git a/trunk/dist/game/data/scripts/gracia/AI/NPC/Seyo/Seyo.java b/trunk/dist/game/data/scripts/gracia/AI/NPC/Seyo/Seyo.java
index ab517cf9aa..3e8e9e5d21 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/NPC/Seyo/Seyo.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/NPC/Seyo/Seyo.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Seyo AI.
diff --git a/trunk/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java b/trunk/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
index 5aff82ccbb..26aa1c724b 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Zealot of Shilen AI.
diff --git a/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java b/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
index 3480449c5e..f0a4a631e5 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.zone.L2ZoneType;
import com.l2jmobius.gameserver.model.zone.type.L2EffectZone;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Seed Of Annihilation AI.
diff --git a/trunk/dist/game/data/scripts/gracia/AI/StarStones.java b/trunk/dist/game/data/scripts/gracia/AI/StarStones.java
index 9d06483245..d8157a645e 100644
--- a/trunk/dist/game/data/scripts/gracia/AI/StarStones.java
+++ b/trunk/dist/game/data/scripts/gracia/AI/StarStones.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Star Stones AI.
diff --git a/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java b/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java
index ecd149501a..6649be90cc 100644
--- a/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java
+++ b/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Seed of Infinity (Hall of Suffering) instance zone.
diff --git a/trunk/dist/game/data/scripts/instances/AbstractInstance.java b/trunk/dist/game/data/scripts/instances/AbstractInstance.java
index 3d291ebaf6..caf77c07db 100644
--- a/trunk/dist/game/data/scripts/instances/AbstractInstance.java
+++ b/trunk/dist/game/data/scripts/instances/AbstractInstance.java
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.skills.BuffInfo;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Abstract class for Instances.
diff --git a/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java b/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java
index 5f9f1f8820..c2079612c4 100644
--- a/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java
+++ b/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q10294_SevenSignsToTheMonasteryOfSilence.Q10294_SevenSignsToTheMonasteryOfSilence;
import quests.Q10295_SevenSignsSolinasTomb.Q10295_SevenSignsSolinasTomb;
import quests.Q10296_SevenSignsPowerOfTheSeal.Q10296_SevenSignsPowerOfTheSeal;
diff --git a/trunk/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java b/trunk/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java
index 7e489ba879..828d125910 100644
--- a/trunk/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java
+++ b/trunk/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Proof Of Courage implementation.
diff --git a/trunk/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java b/trunk/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java
index 46e265f783..afcc6f4a74 100644
--- a/trunk/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java
+++ b/trunk/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Proof Of Justice implementation.