Decouples NPCService and NPCController from Lineage2Client class

l2jserver2-gameserver/data/template/npc/teleporter/29055-TeleportationCubic.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="29055" 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/teleporter/29061-TeleportationCubic.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="29061" 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/teleporter/30006-Roxxy.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30006" 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/teleporter/30059-Trisha.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30059" 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/teleporter/30080-Clarissa.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30080" 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/teleporter/30134-Jasmine.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30134" 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/teleporter/30146-Mirabel.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30146" 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/teleporter/30162-Karin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30162" 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/teleporter/30177-Valentina.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30177" 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/teleporter/30233-Esmeralda.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30233" 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/teleporter/30256-Bella.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30256" 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/teleporter/30320-Richlin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30320" 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/teleporter/30427-Siff.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30427" 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/teleporter/30429-Tiramisa.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30429" 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/teleporter/30483-Mozella.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30483" 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/teleporter/30484-Ponti.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30484" 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/teleporter/30485-Capella.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30485" 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/teleporter/30486-Hanna.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30486" 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/teleporter/30487-Penelope.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30487" 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/teleporter/30540-Wirphy.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30540" 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/teleporter/30576-Tamil.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30576" 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/teleporter/30716-Cecile.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30716" 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/teleporter/30719-Mariell.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30719" 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/teleporter/30722-Merian.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30722" 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/teleporter/30727-Verona.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30727" 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/teleporter/30836-Minerva.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30836" 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/teleporter/30848-Elisa.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30848" 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/teleporter/30878-Angelina.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30878" 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/teleporter/30899-Flauen.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="30899" 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/teleporter/31147-Sobling.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31147" 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/teleporter/31211-RaceTrackGuide.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31211" 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/teleporter/31212-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31212" 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/teleporter/31213-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31213" 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/teleporter/31214-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31214" 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/teleporter/31215-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31215" 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/teleporter/31216-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31216" 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/teleporter/31217-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31217" 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/teleporter/31218-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31218" 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/teleporter/31219-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31219" 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/teleporter/31220-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31220" 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/teleporter/31221-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31221" 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/teleporter/31222-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31222" 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/teleporter/31223-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31223" 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/teleporter/31224-EventGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31224" 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/teleporter/31275-Tatiana.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31275" 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/teleporter/31320-Ilyana.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31320" 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/teleporter/31376-Kurfa.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31376" 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/teleporter/31383-TeranuMardui.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31383" 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/teleporter/31698-Arisha.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31698" 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/teleporter/31699-Stanislava.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31699" 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/teleporter/31842-TeleportationCubic.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31842" 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/teleporter/31843-TeleportationCubic.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31843" 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/teleporter/31861-Gatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31861" 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/teleporter/31964-Bilia.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="31964" 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/teleporter/32034-TempleGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32034" 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/teleporter/32035-TempleGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32035" 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/teleporter/32036-TempleGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32036" 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/teleporter/32037-TempleGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32037" 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/teleporter/32039-TriolSMirror.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32039" 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/teleporter/32040-TriolSMirror.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32040" 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/teleporter/32163-Ragara.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32163" 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/teleporter/32181-Mellon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32181" 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/teleporter/32184-Yinir.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32184" 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/teleporter/32186-Yung.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32186" 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/teleporter/32189-Largo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32189" 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/teleporter/32239-MotherNornil.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32239" 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/teleporter/32351-EnceinteInsurgent.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32351" 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/teleporter/32377-Kuram.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32377" 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/teleporter/32378-FantasyIslePaddies.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32378" 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/teleporter/32534-Jaedin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32534" 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/teleporter/32539-GatekeeperOfAbyss.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32539" 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/teleporter/32613-Handy.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32613" 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/teleporter/32614-Lamcedas.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32614" 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/teleporter/32645-Chandra.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32645" 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/teleporter/32648-NewsInformer.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32648" 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/teleporter/32649-Dwyph.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32649" 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/teleporter/32652-TeleportCrystal.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32652" 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/teleporter/32653-Krun.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32653" 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/teleporter/32654-Tarun.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32654" 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/teleporter/32711-Droph.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32711" 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/teleporter/32712-Somulitan.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32712" 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/teleporter/32714-Asher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32714" 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/teleporter/32734-Klemis.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32734" 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/teleporter/32774-Elmina.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32774" 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/teleporter/32782-Lionel.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="32782" 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/teleporter/35560-MassGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="35560" 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/teleporter/35561-MassGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="35561" 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/teleporter/35562-MassGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="35562" 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/teleporter/35563-MassGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="35563" 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/teleporter/35564-MassGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="35564" 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/teleporter/35565-MassGatekeeper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="35565" 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/teleporter/36570-EmeryCompressor.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.TeleporterController"
+    controller="com.l2jserver.model.world.npc.controller.impl.TeleporterController"
     id="36570" 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">