From 9cb504363234c3a64a3240f4ec077ab69eff953f Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 28 Oct 2016 09:02:19 +0000
Subject: [PATCH] Moved AbstractNpcAi class to ai.
---
.../dist/game/data/scripts/ai/{npc => }/AbstractNpcAI.java | 2 +-
.../dist/game/data/scripts/ai/fantasy_isle/Parade.java | 2 +-
.../dist/game/data/scripts/ai/fantasy_isle/TalentShow.java | 2 +-
.../game/data/scripts/ai/group_template/AltarsOfSacrifice.java | 2 +-
.../dist/game/data/scripts/ai/group_template/BeastFarm.java | 2 +-
.../dist/game/data/scripts/ai/group_template/DenOfEvil.java | 2 +-
.../dist/game/data/scripts/ai/group_template/DragonValley.java | 2 +-
.../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 +-
.../dist/game/data/scripts/ai/group_template/GiantsCave.java | 2 +-
.../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/NonTalkingNpcs.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 +-
.../dist/game/data/scripts/ai/group_template/RandomSpawn.java | 2 +-
.../dist/game/data/scripts/ai/group_template/RangeGuard.java | 2 +-
.../dist/game/data/scripts/ai/group_template/Remnants.java | 2 +-
.../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 +-
.../dist/game/data/scripts/ai/group_template/StakatoNest.java | 2 +-
.../dist/game/data/scripts/ai/group_template/SummonPc.java | 2 +-
.../dist/game/data/scripts/ai/group_template/TurekOrcs.java | 2 +-
.../dist/game/data/scripts/ai/group_template/VarkaKetra.java | 2 +-
.../data/scripts/ai/group_template/WarriorFishingBlock.java | 2 +-
.../dist/game/data/scripts/ai/individual/Anais.java | 2 +-
.../dist/game/data/scripts/ai/individual/Antharas/Antharas.java | 2 +-
.../dist/game/data/scripts/ai/individual/Baium/Baium.java | 2 +-
.../dist/game/data/scripts/ai/individual/Ballista.java | 2 +-
.../dist/game/data/scripts/ai/individual/Beleth.java | 2 +-
.../dist/game/data/scripts/ai/individual/Core.java | 2 +-
.../dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java | 2 +-
.../dist/game/data/scripts/ai/individual/DarkWaterDragon.java | 2 +-
.../dist/game/data/scripts/ai/individual/DivineBeast.java | 2 +-
.../dist/game/data/scripts/ai/individual/DrChaos.java | 2 +-
.../dist/game/data/scripts/ai/individual/Epidos.java | 2 +-
.../dist/game/data/scripts/ai/individual/EvasGiftBox.java | 2 +-
.../game/data/scripts/ai/individual/FrightenedRagnaOrc.java | 2 +-
.../dist/game/data/scripts/ai/individual/Gordon.java | 2 +-
.../dist/game/data/scripts/ai/individual/GraveRobbers.java | 2 +-
.../dist/game/data/scripts/ai/individual/Orfen.java | 2 +-
.../dist/game/data/scripts/ai/individual/QueenAnt.java | 2 +-
.../dist/game/data/scripts/ai/individual/QueenShyeed.java | 2 +-
.../dist/game/data/scripts/ai/individual/RagnaOrcCommander.java | 2 +-
.../dist/game/data/scripts/ai/individual/RagnaOrcHero.java | 2 +-
.../dist/game/data/scripts/ai/individual/RagnaOrcSeer.java | 2 +-
.../dist/game/data/scripts/ai/individual/Sailren/Sailren.java | 2 +-
.../dist/game/data/scripts/ai/individual/ScarletVanHalisha.java | 2 +-
.../dist/game/data/scripts/ai/individual/SinEater.java | 2 +-
.../dist/game/data/scripts/ai/individual/SinWardens.java | 2 +-
.../dist/game/data/scripts/ai/individual/Valakas.java | 2 +-
.../dist/game/data/scripts/ai/individual/Venom/Venom.java | 2 +-
.../dist/game/data/scripts/ai/npc/Abercrombie/Abercrombie.java | 2 +-
.../dist/game/data/scripts/ai/npc/Alarm/Alarm.java | 2 +-
.../dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java | 2 +-
.../game/data/scripts/ai/npc/ArenaManager/ArenaManager.java | 2 +-
.../dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java | 2 +-
.../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 +-
.../dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java | 2 +-
.../dist/game/data/scripts/ai/npc/Dorian/Dorian.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 +-
.../dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java | 2 +-
.../dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetle.java | 2 +-
.../ai/npc/FortressArcherCaptain/FortressArcherCaptain.java | 2 +-
.../ai/npc/FortressSiegeManager/FortressSiegeManager.java | 2 +-
.../game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java | 2 +-
.../dist/game/data/scripts/ai/npc/Jinia/Jinia.java | 2 +-
.../dist/game/data/scripts/ai/npc/Katenar/Katenar.java | 2 +-
.../data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java | 2 +-
.../game/data/scripts/ai/npc/ManorManager/ManorManager.java | 2 +-
.../data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java | 2 +-
.../dist/game/data/scripts/ai/npc/Minigame/Minigame.java | 2 +-
.../data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java | 2 +-
.../dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java | 2 +-
.../game/data/scripts/ai/npc/NpcBuffers/impl/CabaleBuffer.java | 2 +-
.../data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java | 2 +-
.../dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java | 2 +-
.../dist/game/data/scripts/ai/npc/Rignos/Rignos.java | 2 +-
.../dist/game/data/scripts/ai/npc/Selina/Selina.java | 2 +-
.../dist/game/data/scripts/ai/npc/Sirra/Sirra.java | 2 +-
.../ai/npc/SubclassCertification/SubclassCertification.java | 2 +-
.../data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java | 2 +-
.../game/data/scripts/ai/npc/Summons/Servitors/Servitors.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 +-
.../ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java | 2 +-
.../ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java | 2 +-
.../ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java | 2 +-
.../Teleports/GrandBossTeleporters/GrandBossTeleporters.java | 2 +-
.../HuntingGroundsTeleport/HuntingGroundsTeleport.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 +-
.../scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.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 +-
.../scripts/ai/npc/TerritoryManagers/TerritoryManagers.java | 2 +-
.../dist/game/data/scripts/ai/npc/TownPets/TownPets.java | 2 +-
.../scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java | 2 +-
.../dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java | 2 +-
.../scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java | 2 +-
.../FirstClassTransferTalk/FirstClassTransferTalk.java | 2 +-
.../dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java | 2 +-
.../game/data/scripts/ai/npc/WyvernManager/WyvernManager.java | 2 +-
.../data/scripts/custom/events/TvT/TvTManager/TvTManager.java | 2 +-
.../dist/game/data/scripts/custom/events/Wedding/Wedding.java | 2 +-
.../dist/game/data/scripts/custom/listeners/ListenerTest.java | 2 +-
.../game/data/scripts/features/SkillTransfer/SkillTransfer.java | 2 +-
.../dist/game/data/scripts/gracia/AI/EnergySeeds.java | 2 +-
.../dist/game/data/scripts/gracia/AI/Lindvior.java | 2 +-
.../dist/game/data/scripts/gracia/AI/Maguen.java | 2 +-
.../game/data/scripts/gracia/AI/NPC/AbyssGaze/AbyssGaze.java | 2 +-
.../data/scripts/gracia/AI/NPC/EkimusMouth/EkimusMouth.java | 2 +-
.../scripts/gracia/AI/NPC/FortuneTelling/FortuneTelling.java | 2 +-
.../data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java | 2 +-
.../dist/game/data/scripts/gracia/AI/NPC/Lekon/Lekon.java | 2 +-
.../dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java | 2 +-
.../game/data/scripts/gracia/AI/NPC/Nottingale/Nottingale.java | 2 +-
.../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 +-
.../dist/game/data/scripts/gracia/AI/StarStones.java | 2 +-
.../instances/HallOfErosionAttack/HallOfErosionAttack.java | 2 +-
.../instances/HallOfErosionDefence/HallOfErosionDefence.java | 2 +-
.../instances/HallOfSufferingAttack/HallOfSufferingAttack.java | 2 +-
.../HallOfSufferingDefence/HallOfSufferingDefence.java | 2 +-
.../gracia/instances/SeedOfDestruction/SeedOfDestruction.java | 2 +-
.../data/scripts/handlers/admincommandhandlers/AdminZones.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/Amaskari.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/Chimeras.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/DemonPrince.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/HellboundCore.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/Keltas.java | 2 +-
.../game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java | 2 +-
.../game/data/scripts/hellbound/AI/NPC/Budenka/Budenka.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/NPC/Buron/Buron.java | 2 +-
.../game/data/scripts/hellbound/AI/NPC/Deltuva/Deltuva.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/NPC/Falk/Falk.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/NPC/Hude/Hude.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/NPC/Jude/Jude.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/NPC/Kanaf/Kanaf.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/NPC/Kief/Kief.java | 2 +-
.../game/data/scripts/hellbound/AI/NPC/Natives/Natives.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/NPC/Quarry/Quarry.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/NPC/Shadai/Shadai.java | 2 +-
.../game/data/scripts/hellbound/AI/NPC/Solomon/Solomon.java | 2 +-
.../game/data/scripts/hellbound/AI/NPC/Warpgate/Warpgate.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/NaiaLock.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/OutpostCaptain.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/Ranku.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/Slaves.java | 2 +-
.../dist/game/data/scripts/hellbound/AI/Typhoon.java | 2 +-
.../scripts/hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java | 2 +-
.../data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java | 2 +-
.../hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java | 2 +-
.../scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java | 2 +-
.../scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java | 2 +-
.../dist/game/data/scripts/hellbound/HellboundEngine.java | 2 +-
.../dist/game/data/scripts/instances/AbstractInstance.java | 2 +-
.../instances/MonasteryOfSilence2/MonasteryOfSilence2.java | 2 +-
.../game/data/scripts/instances/RimKamaloka/RimKamaloka.java | 2 +-
.../DwarfBlacksmithChange1/DwarfBlacksmithChange1.java | 2 +-
.../DwarfBlacksmithChange2/DwarfBlacksmithChange2.java | 2 +-
.../DwarfWarehouseChange1/DwarfWarehouseChange1.java | 2 +-
.../DwarfWarehouseChange2/DwarfWarehouseChange2.java | 2 +-
.../ElfHumanClericChange2/ElfHumanClericChange2.java | 2 +-
.../ElfHumanFighterChange1/ElfHumanFighterChange1.java | 2 +-
.../ElfHumanFighterChange2/ElfHumanFighterChange2.java | 2 +-
.../ElfHumanWizardChange1/ElfHumanWizardChange1.java | 2 +-
.../ElfHumanWizardChange2/ElfHumanWizardChange2.java | 2 +-
.../scripts/village_master/KamaelChange1/KamaelChange1.java | 2 +-
.../scripts/village_master/KamaelChange2/KamaelChange2.java | 2 +-
.../game/data/scripts/village_master/OrcChange1/OrcChange1.java | 2 +-
.../game/data/scripts/village_master/OrcChange2/OrcChange2.java | 2 +-
210 files changed, 210 insertions(+), 210 deletions(-)
rename L2J_Mobius_HighFive/dist/game/data/scripts/ai/{npc => }/AbstractNpcAI.java (95%)
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/AbstractNpcAI.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/AbstractNpcAI.java
similarity index 95%
rename from L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/AbstractNpcAI.java
rename to L2J_Mobius_HighFive/dist/game/data/scripts/ai/AbstractNpcAI.java
index f933d01b35..d6115f1c99 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/AbstractNpcAI.java
+++ b/L2J_Mobius_HighFive/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.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/fantasy_isle/Parade.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/fantasy_isle/Parade.java
index 09fb9623b0..85ba2dc7e3 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/fantasy_isle/Parade.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/fantasy_isle/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/fantasy_isle/TalentShow.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/fantasy_isle/TalentShow.java
index 34fd300636..55c0a0540e 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/fantasy_isle/TalentShow.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/fantasy_isle/TalentShow.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.PlaySound;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Talent Show AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java
index 7015e6ab98..2713f3fc88 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.interfaces.ILocational;
import com.l2jmobius.util.Rnd;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* @author HorridoJoho, janiko, FinalDestination, lion
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/BeastFarm.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/BeastFarm.java
index 9cf6a52306..5e58f880a6 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/BeastFarm.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/BeastFarm.java
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/DenOfEvil.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/DenOfEvil.java
index fb95e4bde6..36e2a545b3 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/DenOfEvil.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/DenOfEvil.java
@@ -29,7 +29,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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/DragonValley.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/DragonValley.java
index 0242b5f9f3..63b3d091ba 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/DragonValley.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FairyTrees.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FairyTrees.java
index b6efd5cfb1..ddf2c64316 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FairyTrees.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FeedableBeasts.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
index 525d045162..340c90bac4 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
@@ -32,7 +32,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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FleeMonsters.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FleeMonsters.java
index 51c5345d74..db196f4749 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FleeMonsters.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java
index 78e4bffd23..5fea8dd3a3 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/GiantsCave.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/GiantsCave.java
index b3e44ff1f7..c2438018a6 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/GiantsCave.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/HotSprings.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/HotSprings.java
index 74c0e7a31b..e3c51a551c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/HotSprings.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java
index 1bac998744..6dfd6fe218 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/LairOfAntharas.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/LairOfAntharas.java
index 264e4eb30c..0bc83fcdb0 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/LairOfAntharas.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java
index 61e61dea24..05e95e8456 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java
index 8711ae5b5c..e85ce63f31 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java
@@ -28,7 +28,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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java
index 65b328b545..bd32d85ce9 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/NonTalkingNpcs.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/NonTalkingNpcs.java
index d64f0720f7..662c5198fc 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/NonTalkingNpcs.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/NonTalkingNpcs.java
@@ -18,7 +18,7 @@ package ai.group_template;
import com.l2jmobius.gameserver.model.actor.L2Npc;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* AI for handle Non-Talking NPCs.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PavelArchaic.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PavelArchaic.java
index bb1ff0a619..cef6ca41f7 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PavelArchaic.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfDion.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfDion.java
index 24f5876d5f..2f3d7c6c99 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfDion.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
index c3ae875d4b..eb4edb8bb9 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java
index 6780eade14..d771b62c7d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
index 84f4400bbc..dabfdae374 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
@@ -30,7 +30,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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java
index e51d6859ab..a456ea0032 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PrisonGuards.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PrisonGuards.java
index 2ab5763c49..edadddc72a 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PrisonGuards.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/RandomSpawn.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/RandomSpawn.java
index 5acc8a3aea..3213b97da0 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/RandomSpawn.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/RangeGuard.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/RangeGuard.java
index 2c1bd3b6fe..790a2cfb58 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/RangeGuard.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/RangeGuard.java
@@ -26,7 +26,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;
/**
* Range Guard AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/Remnants.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/Remnants.java
index 23bbb64da2..23bd604c23 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/Remnants.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/Sandstorms.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/Sandstorms.java
index 377115010c..ae09ce4f0f 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/Sandstorms.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java
index 2051284364..87af6bb6ed 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SelMahumDrill.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SelMahumDrill.java
index 84e4d12c3f..616cd8d6fa 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SelMahumDrill.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SelMahumDrill.java
@@ -30,7 +30,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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SelMahumSquad.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SelMahumSquad.java
index 7920b0c591..ca6d776043 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SelMahumSquad.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SilentValley.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SilentValley.java
index 6ac5c00ef1..89c03f7bca 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SilentValley.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/StakatoNest.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/StakatoNest.java
index b214a7579b..e23e129fa3 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/StakatoNest.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SummonPc.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SummonPc.java
index 8a2f8fcf50..3637e4fda7 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/SummonPc.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/TurekOrcs.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/TurekOrcs.java
index 898a7c16fe..dc32b7a46f 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/TurekOrcs.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/TurekOrcs.java
@@ -26,7 +26,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;
/**
* Turek Orcs AI - flee and return with assistance
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/VarkaKetra.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/VarkaKetra.java
index dbbd8c9bdc..7b9872e949 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/VarkaKetra.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/VarkaKetra.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00605_AllianceWithKetraOrcs.Q00605_AllianceWithKetraOrcs;
import quests.Q00606_BattleAgainstVarkaSilenos.Q00606_BattleAgainstVarkaSilenos;
import quests.Q00607_ProveYourCourageKetra.Q00607_ProveYourCourageKetra;
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java
index 6ba27af094..daba7f9601 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java
@@ -24,7 +24,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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Anais.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Anais.java
index b1f0d64258..8bff3655d2 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Anais.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Anais.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.holders.SkillHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Anais AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Antharas/Antharas.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Antharas/Antharas.java
index 62b540b84d..29dba844cc 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Antharas/Antharas.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Baium/Baium.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Baium/Baium.java
index 21a1500f09..35398ec228 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Baium/Baium.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Ballista.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Ballista.java
index d4bf15c407..32dc686ff3 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Ballista.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Beleth.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Beleth.java
index b6bfe6b27f..24c4d363d9 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Beleth.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Core.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Core.java
index 640668b955..2c2e884f2c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Core.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java
index be20285492..4051d6046b 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/DarkWaterDragon.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
index 8e3575e552..75235177d8 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
@@ -27,7 +27,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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/DivineBeast.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/DivineBeast.java
index 3b36dfc24d..0d5f19c7ea 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/DivineBeast.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java
index 21cae3083f..1f10a1f860 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java
@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
import com.l2jmobius.gameserver.network.serverpackets.SpecialCamera;
import com.l2jmobius.util.Rnd;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dr. Chaos is a boss @ Pavel's Ruins. Some things to know :
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Epidos.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Epidos.java
index 94f95598d2..53e1954497 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Epidos.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/EvasGiftBox.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/EvasGiftBox.java
index f20e972e1f..609ba9e8c1 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/EvasGiftBox.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/EvasGiftBox.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.holders.ItemHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Eva's Gift Box AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java
index c1bed5144d..33ccbdc181 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Gordon.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Gordon.java
index c3df1132cc..35c4898f16 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Gordon.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/GraveRobbers.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/GraveRobbers.java
index 88a9e75cc2..499d676c53 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/GraveRobbers.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Orfen.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Orfen.java
index 9ca39a9ad0..bf87874da2 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Orfen.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/QueenAnt.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/QueenAnt.java
index 22cc7de4fc..ecb9c227a7 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/QueenAnt.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/QueenShyeed.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/QueenShyeed.java
index fa617dd9e6..a5a2bbf16c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/QueenShyeed.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/RagnaOrcCommander.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/RagnaOrcCommander.java
index fceb577d8e..604526552b 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/RagnaOrcCommander.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/RagnaOrcHero.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/RagnaOrcHero.java
index 8877867714..ddd5bc3765 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/RagnaOrcHero.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java
index 6a36b601e1..83de01a833 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Sailren/Sailren.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Sailren/Sailren.java
index 20a49b1af0..fb5c439235 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Sailren/Sailren.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java
index 70e97bfc3d..5ab00e7baa 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/SinEater.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/SinEater.java
index 9b6b37815d..752a7afb5a 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/SinEater.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/SinWardens.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/SinWardens.java
index 615881ac35..fe48a96c56 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/SinWardens.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Valakas.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Valakas.java
index 9d82f253d8..080a737ebb 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Valakas.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Venom/Venom.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Venom/Venom.java
index 6de892d5f5..9fa1d746da 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Venom/Venom.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/Abercrombie.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/Abercrombie.java
index 0721dc7280..974ff5217a 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/Abercrombie.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/Abercrombie.java
@@ -19,7 +19,7 @@ package ai.npc.Abercrombie;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Mercenary Supplier Abercrombie AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Alarm/Alarm.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Alarm/Alarm.java
index c0884eba84..c8b5d8f4d7 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Alarm/Alarm.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java
index 0e7456c13a..ece11e8b83 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java
index 1d80da1070..385e007df1 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
index 26287fdcba..12b580d75c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.AcquireSkillList;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import custom.Validators.SubClassSkills;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java
index 0cfa32d06f..f4914e2597 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Black Judge AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index e9bd9ab532..5b91692124 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.quest.State;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Black Marketeer of Mammon - Exchange Adena for AA.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java
index 0f7cfc1711..815ff43f83 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java
index 96e6a77a4e..d93ab9502e 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
index a71d50ba41..f725123396 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
@@ -59,7 +59,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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java
index 9bff745dc9..5ca67c9ffb 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.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.clientpackets.RequestAcquireSkill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import handlers.effecthandlers.CallPc;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
index c1111e4386..06101e7424 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
@@ -27,7 +27,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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java
index 925e005046..fd323f41e6 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java
index e8711feb3b..9d96aad14c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java
index 0b064a561e..ab584ff63f 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java
index 8de30f5ab2..9f336648a5 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Dorian/Dorian.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Dorian/Dorian.java
index b993adeb0b..75e8c34abe 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Dorian/Dorian.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Dorian/Dorian.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.Q00024_InhabitantsOfTheForestOfTheDead.Q00024_InhabitantsOfTheForestOfTheDead;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java
index a11426b308..c9e3385d8b 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FameManager/FameManager.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FameManager/FameManager.java
index e046ee0b16..0290fabc8f 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FameManager/FameManager.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
index fad3142d1c..192de26d20 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
@@ -21,7 +21,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;
/**
* Forge of the Gods AI
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java
index 5653765bc5..04216bebe7 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetle.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetle.java
index 1463b16ddf..d217bfa1c3 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetle.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetle.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.skills.BuffInfo;
import com.l2jmobius.gameserver.model.skills.Skill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Tar Beetle AI
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
index 7286e73158..ca146343fc 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java
index a8938fa460..437c79562a 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java
index ef5a5d9cd9..f9e87aa81d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Jinia/Jinia.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Jinia/Jinia.java
index be7405cf7e..a95b11c450 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Jinia/Jinia.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Katenar/Katenar.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Katenar/Katenar.java
index bfb8218f5b..066dd54d1d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Katenar/Katenar.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Katenar/Katenar.java
@@ -22,7 +22,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.Q00065_CertifiedSoulBreaker.Q00065_CertifiedSoulBreaker;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java
index 944f884d03..1af408b592 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java
index ddb7be3b0d..88ab498956 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java
index 30b7fa9e15..6334212892 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java
@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.ExShowDominionRegistry;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Mercenary Captain AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Minigame/Minigame.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Minigame/Minigame.java
index 65c443b34e..2178405d67 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Minigame/Minigame.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
index 2b231cf760..937c812b52 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java
index 444bc5cc2d..b09daf8c8e 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/impl/CabaleBuffer.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/impl/CabaleBuffer.java
index e2fd347f35..4d49cf5a38 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/impl/CabaleBuffer.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/impl/CabaleBuffer.java
@@ -28,7 +28,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;
/**
* Preacher of Doom and Orator of Revelations AI
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java
index 86362ee495..453a05578b 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java
@@ -24,7 +24,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;
/**
* Priest Of Blessing AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java
index 9c8989e7a6..43ac77ef1c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java
@@ -19,7 +19,7 @@ package ai.npc.Rafforty;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Rafforty AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Rignos/Rignos.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Rignos/Rignos.java
index 5419032e2b..e2fd01216d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Rignos/Rignos.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Rignos/Rignos.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;
/**
* Rignos AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Selina/Selina.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Selina/Selina.java
index ca63798cf5..bbdfccff35 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Selina/Selina.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Selina/Selina.java
@@ -24,7 +24,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;
/**
* Mercenary Medic Selina AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Sirra/Sirra.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Sirra/Sirra.java
index b444c717ef..702687abdc 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Sirra/Sirra.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java
index bf266b072c..020ddf89d2 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java
@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.quest.State;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Subclass certification
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java
index 68da2514a0..fad38d0161 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Summons/Servitors/Servitors.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Summons/Servitors/Servitors.java
index 108f1564fb..1b92e6485f 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Summons/Servitors/Servitors.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Summons/Servitors/Servitors.java
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKill;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00230_TestOfTheSummoner.Q00230_TestOfTheSummoner;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
index fccdfce8d4..35a9910b1d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java
index 54a6a5c7fa..92a9d78e42 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java
index 16852acb77..8eb6edf1ed 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
index cb0a031121..8bff61805e 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
index d1d9bced14..4eb825aed2 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java
index 2a9e9d3862..a984d3b107 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.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;
/**
* Gatekeeper Spirit AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
index c78e7444ba..a63d826bd9 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java
index 345194e216..32f3e725b8 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.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;
/**
* Hunting Grounds teleport AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java
index 48e4e3d463..623efc7bb2 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index fbd4c6f218..fcb6d2bdb0 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java
index 17fd748495..4fc7a6bc8a 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java
index 141f52dc2f..fd7f04b321 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java
index 4dc516ddb2..fd5495ea5c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.quest.State;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Oracle teleport AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java
index 727c1a8f61..6388014616 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java
index 0df6a670ad..a0952eb6bb 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java
index 33effa6b4f..e72182bc10 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java
index 4e9e1335a2..bfe8415a55 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java
index d137e40573..a11b6277c0 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java
index 45232f51e3..aaf1faa486 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
index 13e85dec84..3e2bf0e5b6 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
index 66feb49d9b..ac9756363c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index d8ef722714..95c5cedfa4 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
index 26e04ff43a..e50fb4acd9 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java
index 4ce6d1f85b..4f0171e583 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java
index d4d8a692b1..02ad7fad67 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Retail AI for Territory Managers.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/TownPets/TownPets.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/TownPets/TownPets.java
index afccd2d91e..6a12c75d3b 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/TownPets/TownPets.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/TownPets/TownPets.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;
/**
* Town Pets AI
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java
index a5b9927ec8..1741f8cb45 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_HighFive/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.AcquireSkillList;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Trainer healers AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java
index eb7f374f76..fccd6264b2 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
index 4ee1dd9a5b..48a8b2279e 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java
index 84513206fa..1e04eefdbe 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java
index fd52ce1579..18bbf738ce 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
index af4521fb29..5b68c301c9 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
@@ -27,7 +27,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/L2J_Mobius_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java b/L2J_Mobius_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
index e244f09537..350d78d2f1 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java b/L2J_Mobius_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java
index 39d1df16ad..a0617eef05 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_HighFive/dist/game/data/scripts/custom/listeners/ListenerTest.java
index 68d07bf46c..b51b9a26db 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/custom/listeners/ListenerTest.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java
index cc2a25dee5..611bcefa02 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/EnergySeeds.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/EnergySeeds.java
index b1a9f42565..0d5891e878 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/EnergySeeds.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/EnergySeeds.java
@@ -46,7 +46,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;
import quests.Q00692_HowtoOpposeEvil.Q00692_HowtoOpposeEvil;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/Lindvior.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/Lindvior.java
index dae3cf5283..326b0c8e92 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/Lindvior.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java
index 4a4c0520a2..6e68fab2ca 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/AbyssGaze/AbyssGaze.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/AbyssGaze/AbyssGaze.java
index 93a5f6e011..e11ee35b3d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/AbyssGaze/AbyssGaze.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/AbyssGaze/AbyssGaze.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;
public class AbyssGaze extends AbstractNpcAI
{
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/EkimusMouth/EkimusMouth.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/EkimusMouth/EkimusMouth.java
index 367e0d7794..c6b9a0a626 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/EkimusMouth/EkimusMouth.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/EkimusMouth/EkimusMouth.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;
public class EkimusMouth extends AbstractNpcAI
{
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/FortuneTelling/FortuneTelling.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/FortuneTelling/FortuneTelling.java
index 03c74703ca..94ed570f68 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/FortuneTelling/FortuneTelling.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java
index f60f0f763b..2e8fc165cb 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Lekon/Lekon.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Lekon/Lekon.java
index 4aa5ec49dd..3dbc85e153 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Lekon/Lekon.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java
index eb787d5c73..b1db9e7633 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Nottingale/Nottingale.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Nottingale/Nottingale.java
index 29689a6664..9658341f95 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Nottingale/Nottingale.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Seyo/Seyo.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Seyo/Seyo.java
index 9134c1bc9e..4d43bbe68d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/Seyo/Seyo.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
index 3bbd561b57..a17cae4618 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
@@ -22,7 +22,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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
index 3327d0e475..362396e23b 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/StarStones.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/StarStones.java
index 82ccc2179e..962a3c6453 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/StarStones.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
index 9b86140561..09b8fc8a2d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
@@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.util.Util;
import com.l2jmobius.util.Rnd;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00696_ConquerTheHallOfErosion.Q00696_ConquerTheHallOfErosion;
public class HallOfErosionAttack extends AbstractNpcAI
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
index 905f272d9e..c9b6749c99 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
@@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.util.Util;
import com.l2jmobius.util.Rnd;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00697_DefendTheHallOfErosion.Q00697_DefendTheHallOfErosion;
public class HallOfErosionDefence extends AbstractNpcAI
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
index bb22d9f0c5..d25b48d33d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExSendUIEvent;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00694_BreakThroughTheHallOfSuffering.Q00694_BreakThroughTheHallOfSuffering;
public class HallOfSufferingAttack extends AbstractNpcAI
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
index 1f60d73774..dceec4436c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExSendUIEvent;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00695_DefendTheHallOfSuffering.Q00695_DefendTheHallOfSuffering;
public class HallOfSufferingDefence extends AbstractNpcAI
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java
index a44b934a8e..c285d596dc 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java
@@ -55,7 +55,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.util.Util;
import com.l2jmobius.util.Rnd;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
public class SeedOfDestruction extends AbstractNpcAI
{
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java
index c6596649e1..bd43b756ec 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java
@@ -55,7 +55,7 @@ import com.l2jmobius.gameserver.util.HtmlUtil;
import com.l2jmobius.gameserver.util.Util;
import com.l2jmobius.util.Rnd;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* @author UnAfraid
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Amaskari.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Amaskari.java
index 8090018533..8d21f0005c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Amaskari.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Amaskari.java
@@ -26,7 +26,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 hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Chimeras.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Chimeras.java
index 12ea1ff7e9..459dff2dad 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Chimeras.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Chimeras.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.skills.Skill;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/DemonPrince.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/DemonPrince.java
index 97b79eea40..93eb6f37a0 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/DemonPrince.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/DemonPrince.java
@@ -24,7 +24,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;
/**
* Demon Prince's AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/HellboundCore.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/HellboundCore.java
index df6c17d02d..7aabf7aad1 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/HellboundCore.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/HellboundCore.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.holders.SkillHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Keltas.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Keltas.java
index 45687a50bb..1b90e4e39f 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Keltas.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Keltas.java
@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Manages Darion's Enforcer's and Darion's Executioner spawn/despawn
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java
index 7f383b471f..28c9cbb8da 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java
@@ -19,7 +19,7 @@ package hellbound.AI.NPC.Bernarde;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Budenka/Budenka.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Budenka/Budenka.java
index 88b0dec624..6658216e5b 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Budenka/Budenka.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Budenka/Budenka.java
@@ -19,7 +19,7 @@ package hellbound.AI.NPC.Budenka;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Budenka AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Buron/Buron.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Buron/Buron.java
index 50664529d9..4f0d7384d9 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Buron/Buron.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Buron/Buron.java
@@ -19,7 +19,7 @@ package hellbound.AI.NPC.Buron;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Deltuva/Deltuva.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Deltuva/Deltuva.java
index 4e6b99358f..3e22fdeca9 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Deltuva/Deltuva.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Deltuva/Deltuva.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.Q00132_MatrasCuriosity.Q00132_MatrasCuriosity;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Falk/Falk.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Falk/Falk.java
index 8770486ef2..5fbf57ddb9 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Falk/Falk.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Falk/Falk.java
@@ -19,7 +19,7 @@ package hellbound.AI.NPC.Falk;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Falk AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Hude/Hude.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Hude/Hude.java
index 85d468d2eb..771eacbeea 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Hude/Hude.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Hude/Hude.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Jude/Jude.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Jude/Jude.java
index b492dafbaa..ec7db9e45d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Jude/Jude.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Jude/Jude.java
@@ -19,7 +19,7 @@ package hellbound.AI.NPC.Jude;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kanaf/Kanaf.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kanaf/Kanaf.java
index 9eca3a214f..e0ae6c33e0 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kanaf/Kanaf.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kanaf/Kanaf.java
@@ -19,7 +19,7 @@ package hellbound.AI.NPC.Kanaf;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Kanaf AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kief/Kief.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kief/Kief.java
index dfd22c9277..fbae51a01c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kief/Kief.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kief/Kief.java
@@ -19,7 +19,7 @@ package hellbound.AI.NPC.Kief;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Natives/Natives.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Natives/Natives.java
index 429f471337..05e16548c4 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Natives/Natives.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Natives/Natives.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Quarry/Quarry.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Quarry/Quarry.java
index 00f3356994..48cb83876c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Quarry/Quarry.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Quarry/Quarry.java
@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Shadai/Shadai.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Shadai/Shadai.java
index c1941cca45..cd5ee5b92b 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Shadai/Shadai.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Shadai/Shadai.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;
/**
* Shadai AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Solomon/Solomon.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Solomon/Solomon.java
index dd7859ece8..6334ffd760 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Solomon/Solomon.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Solomon/Solomon.java
@@ -19,7 +19,7 @@ package hellbound.AI.NPC.Solomon;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Warpgate/Warpgate.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Warpgate/Warpgate.java
index bf6a4f2b75..2144c92ff8 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Warpgate/Warpgate.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Warpgate/Warpgate.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
import quests.Q00130_PathToHellbound.Q00130_PathToHellbound;
import quests.Q00133_ThatsBloodyHot.Q00133_ThatsBloodyHot;
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NaiaLock.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NaiaLock.java
index 8028d62938..4519e8f755 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NaiaLock.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NaiaLock.java
@@ -20,7 +20,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Naia Lock AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/OutpostCaptain.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/OutpostCaptain.java
index f57bbbc6e1..01103b645b 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/OutpostCaptain.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/OutpostCaptain.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Ranku.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Ranku.java
index 62c858018b..985c0cf6fb 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Ranku.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Ranku.java
@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.util.MinionList;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Ranku's AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Slaves.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Slaves.java
index 6fddc9cda5..771459b6f3 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Slaves.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Slaves.java
@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.taskmanager.DecayTaskManager;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Typhoon.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Typhoon.java
index a9c464c90a..92a09153d6 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Typhoon.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Typhoon.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Typhoon's AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
index 93853f156a..f142f5b4ca 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.NpcStringId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java
index 8f4cd6a9d0..644b200248 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Base Tower.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java
index 578e5ec344..43dcd15c7e 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java
@@ -25,7 +25,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;
import hellbound.HellboundEngine;
/**
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
index 6fc92fbadf..3c959344e3 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
@@ -45,7 +45,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.util.MinionList;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Tower Of Naia.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
index cb56b651d2..8a48fc0bad 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
@@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.util.MinionList;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Tully's Workshop.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/HellboundEngine.java b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/HellboundEngine.java
index c9a120e19a..d6360e15fc 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/HellboundEngine.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/HellboundEngine.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.util.Broadcast;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Hellbound Engine.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/AbstractInstance.java
index 499a2b6613..ba9b029175 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/AbstractInstance.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/AbstractInstance.java
@@ -35,7 +35,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/L2J_Mobius_HighFive/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java
index b90c9e6216..6f24a37837 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java
+++ b/L2J_Mobius_HighFive/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/L2J_Mobius_HighFive/dist/game/data/scripts/instances/RimKamaloka/RimKamaloka.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/RimKamaloka/RimKamaloka.java
index 436ded9aff..e7fc986474 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/RimKamaloka/RimKamaloka.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/RimKamaloka/RimKamaloka.java
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.util.Rnd;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
public class RimKamaloka extends AbstractNpcAI
{
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index 428387ca8c..e18a032d1d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.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.base.ClassId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dwarf class transfer AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index 59e68552ab..a21bbd3a04 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.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.base.ClassId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dwarf class transfer AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index cfa5420142..fda2fbc865 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.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.base.ClassId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dwarf class transfer AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index cdff7e468f..19ece54dcf 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.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.base.ClassId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Dwarf class transfer AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index 8855499a8e..1574dba0e2 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.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.base.ClassId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Elf Human class transfer AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index 0b82b2620a..027eefc074 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -22,7 +22,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;
/**
* Elf Human class transfer AI
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 6084f505dc..21884f9d08 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.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.base.ClassId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Elf Human class transfer AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index 6ed2889ebe..dec7db6b92 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -22,7 +22,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;
/**
* Elf Human class transfer AI
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index b7c44ab1d6..2016154c57 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.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.base.ClassId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Elf Human class transfer AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
index 40da25b593..b292b1a899 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.model.quest.QuestState;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00062_PathOfTheTrooper.Q00062_PathOfTheTrooper;
import quests.Q00063_PathOfTheWarder.Q00063_PathOfTheWarder;
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
index 24b5f3e106..fadf41205d 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.util.Util;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
import quests.Q00064_CertifiedBerserker.Q00064_CertifiedBerserker;
import quests.Q00065_CertifiedSoulBreaker.Q00065_CertifiedSoulBreaker;
import quests.Q00066_CertifiedArbalester.Q00066_CertifiedArbalester;
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index cdaadf62eb..66d3af6188 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -22,7 +22,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;
/**
* Orc class transfer AI.
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index 6c32566f58..2a7cdf4582 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.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.base.ClassId;
-import ai.npc.AbstractNpcAI;
+import ai.AbstractNpcAI;
/**
* Orc class transfer AI.