Decouples NPCService and NPCController from Lineage2Client class

l2jserver2-gameserver/data/template/npc/merchant/30001-Lector.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="30001" 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/merchant/30002-Jackson.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="30002" 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/merchant/30003-Silvia.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="30003" 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/merchant/30004-Katerina.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="30004" 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/merchant/30047-Firon.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="30047" 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/merchant/30060-Sabrin.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="30060" 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/merchant/30061-Casey.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="30061" 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/merchant/30062-Sonia.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="30062" 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/merchant/30063-Lara.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="30063" 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/merchant/30078-Pano.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="30078" 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/merchant/30081-Helvetia.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="30081" 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/merchant/30082-Denkus.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="30082" 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/merchant/30084-Graham.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="30084" 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/merchant/30085-Stanford.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="30085" 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/merchant/30087-Peta.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="30087" 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/merchant/30088-Radia.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="30088" 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/merchant/30090-Sandra.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="30090" 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/merchant/30091-Ellie.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="30091" 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/merchant/30093-Groot.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="30093" 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/merchant/30094-Gentler.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="30094" 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/merchant/30097-Galladucci.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="30097" 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/merchant/30098-Alexandria.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="30098" 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/merchant/30135-Iria.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="30135" 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/merchant/30136-Payne.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="30136" 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/merchant/30137-Vollodos.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="30137" 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/merchant/30138-Minaless.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="30138" 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/merchant/30147-Unoren.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="30147" 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/merchant/30148-Ariel.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="30148" 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/merchant/30149-Creamees.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="30149" 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/merchant/30150-Herbiel.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="30150" 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/merchant/30163-Rex.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="30163" 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/merchant/30164-Ian.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="30164" 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/merchant/30165-Ralford.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="30165" 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/merchant/30166-Wesley.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="30166" 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/merchant/30178-Zenkin.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="30178" 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/merchant/30179-Raudia.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="30179" 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/merchant/30180-Sara.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="30180" 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/merchant/30181-Galibredo.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="30181" 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/merchant/30207-Arodin.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="30207" 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/merchant/30208-Damion.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="30208" 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/merchant/30209-Colleen.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="30209" 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/merchant/30230-Edroc.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="30230" 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/merchant/30231-Garette.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="30231" 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/merchant/30253-Simplon.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="30253" 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/merchant/30254-Harmony.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="30254" 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/merchant/30294-Varan.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="30294" 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/merchant/30301-Hally.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="30301" 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/merchant/30313-Asha.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="30313" 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/merchant/30314-Nestle.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="30314" 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/merchant/30315-Poesia.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="30315" 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/merchant/30321-Sydnia.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="30321" 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/merchant/30387-Clancy.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="30387" 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/merchant/30420-Tyra.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="30420" 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/merchant/30436-Sarien.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="30436" 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/merchant/30437-Rolento.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="30437" 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/merchant/30516-Reep.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="30516" 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/merchant/30517-Shari.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="30517" 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/merchant/30518-Garita.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="30518" 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/merchant/30519-Mion.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="30519" 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/merchant/30558-Jakal.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="30558" 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/merchant/30559-Kunai.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="30559" 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/merchant/30560-Uska.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="30560" 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/merchant/30561-Papuma.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="30561" 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/merchant/30684-Viktor.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="30684" 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/merchant/30834-Cema.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="30834" 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/merchant/30837-Woodrow.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="30837" 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/merchant/30838-Woodley.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="30838" 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/merchant/30839-Holly.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="30839" 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/merchant/30840-Lorenzo.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="30840" 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/merchant/30841-Carson.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="30841" 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/merchant/30842-Alexis.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="30842" 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/merchant/30879-Felton.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="30879" 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/merchant/30890-Espen.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="30890" 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/merchant/30891-Verona.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="30891" 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/merchant/30892-Enverun.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="30892" 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/merchant/30893-Payel.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="30893" 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/merchant/30924-Nedy.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="30924" 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/merchant/31044-Galman.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="31044" 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/merchant/31045-Kitzka.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="31045" 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/merchant/31256-Leon.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="31256" 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/merchant/31257-Veronica.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="31257" 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/merchant/31258-Helmut.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="31258" 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/merchant/31259-Janne.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="31259" 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/merchant/31260-Judith.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="31260" 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/merchant/31261-Renee.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="31261" 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/merchant/31262-Rupert.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="31262" 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/merchant/31263-Liesel.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="31263" 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/merchant/31273-Borodin.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="31273" 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/merchant/31274-Fundin.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="31274" 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/merchant/31291-Terava.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="31291" 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/merchant/31300-Drumond.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="31300" 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/merchant/31301-Nils.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="31301" 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/merchant/31302-Vladimir.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="31302" 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/merchant/31303-Alisha.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="31303" 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/merchant/31304-Astrid.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="31304" 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/merchant/31305-Candice.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="31305" 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/merchant/31306-Natasha.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="31306" 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/merchant/31307-Weber.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="31307" 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/merchant/31318-Greta.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="31318" 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/merchant/31319-Hans.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="31319" 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">