Decouples NPCService and NPCController from Lineage2Client class

l2jserver2-gameserver/data/template/npc/warehouse/30005-Wilford.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30005" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30054-Rant.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30054" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30055-Rolfe.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30055" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30057-Aldo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30057" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30058-Holvas.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30058" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30079-Barder.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30079" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30083-Pochi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30083" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30086-Taurin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30086" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30092-Collob.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30092" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30095-Randolf.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30095" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30103-Valkon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30103" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30104-Parman.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30104" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30139-Dorankus.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30139" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30140-Erviante.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30140" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30151-Chad.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30151" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30152-Julia.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30152" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30153-Markius.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30153" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30169-Marty.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30169" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30170-Radic.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30170" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30182-Cliff.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30182" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30183-Hagger.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30183" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30210-Norman.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30210" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30232-Sorint.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30232" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30255-Haprock.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30255" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30316-Raut.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30316" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30322-Ballin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30322" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30350-Carlon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30350" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30521-Murdoc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30521" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30522-Airy.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30522" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30562-Grookin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30562" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30563-Imantu.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30563" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30686-Silva.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30686" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30843-Romp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30843" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30844-Walderal.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30844" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30895-Kluck.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30895" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/30896-Mia.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="30896" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31225-ArenaManager.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31225" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31267-Lietta.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31267" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31268-Hakon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31268" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31270-Stefano.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31270" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31311-Hugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31311" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31312-Durin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31312" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31313-Lunin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31313" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31315-Daisy.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31315" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31374-Jaff.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31374" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31381-Hagos.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31381" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31773-Sonin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31773" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31956-Rydel.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31956" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31957-Cherbal.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31957" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/31959-Axel.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="31959" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/32170-Benis.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="32170" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/warehouse/32172-Saylem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController"
     id="32172" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">