Template concept changes

Signed-off-by: Rogiel <rogiel@rogiel.com>

data/script/template/script/template/actor/character/AbstractCharacterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.l2jserver.model.id.template.CharacterTemplateID;
 import com.l2jserver.model.template.CharacterTemplate;

data/script/template/script/template/actor/character/AbstractDarkElfCharacterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.l2jserver.model.id.template.CharacterTemplateID;
 import com.l2jserver.model.world.L2Character;

data/script/template/script/template/actor/character/AbstractDwarfCharacterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.l2jserver.model.id.template.CharacterTemplateID;
 import com.l2jserver.model.world.L2Character;

data/script/template/script/template/actor/character/AbstractElfCharacterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.l2jserver.model.id.template.CharacterTemplateID;
 import com.l2jserver.model.world.L2Character;

data/script/template/script/template/actor/character/AbstractHumanCharacterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.l2jserver.model.id.template.CharacterTemplateID;
 import com.l2jserver.model.world.L2Character;

data/script/template/script/template/actor/character/AbstractKamaelCharacterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.l2jserver.model.id.template.CharacterTemplateID;
 import com.l2jserver.model.world.L2Character;

data/script/template/script/template/actor/character/AbstractOrcCharacterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.l2jserver.model.id.template.CharacterTemplateID;
 import com.l2jserver.model.world.L2Character;

data/script/template/script/template/actor/character/AbyssWalkerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/AdventurerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;
@@ -10,8 +10,8 @@ import com.l2jserver.util.dimensional.Point;
 public class AdventurerTemplate extends TreasureHunterTemplate {
 	@Inject
 	public AdventurerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.adventurer.id),
+		super(factory.createID(CharacterClass.ADVENTURER.id),
-				CharacterClass.adventurer,
+				CharacterClass.ADVENTURER,
 				// ATTRIBUTES
 				21,// INT
 				40,// STR

data/script/template/script/template/actor/character/ArbalesterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ArcanaLordTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ArchmageTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ArtisanTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/AssassinTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/BersekerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/BishopTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/BladedancerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/BountyHunterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/CardinalTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ClericTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/DarkAvengerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/DarkFighterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/DarkMysticTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/DarkWizardTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/DestroyerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/DominatorTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/DoombringerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/DoomcryerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/DreadnoughtTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/DuelistTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/DwarvenFighterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ElderTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ElementalMasterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ElementalSummonerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ElvenFighterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ElvenKnightTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ElvenMysticTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ElvenScoutTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ElvenWizardTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/EvaSaintTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/EvaTemplarTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/FemaleSoldierTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/FemaleSoulbreakerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/FemaleSouldhoundTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/FortuneSeekerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/GhostHunterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;
@@ -7,11 +7,11 @@ import com.l2jserver.model.world.L2Character;
 import com.l2jserver.model.world.character.CharacterClass;
 import com.l2jserver.util.dimensional.Point;
 
-public class GhosthunterTemplate extends AbyssWalkerTemplate {
+public class GhostHunterTemplate extends AbyssWalkerTemplate {
 	@Inject
-	public GhosthunterTemplate(CharacterTemplateIDFactory factory) {
+	public GhostHunterTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ghostHunter.id),
+		super(factory.createID(CharacterClass.GHOST_HUNTER.id),
-				CharacterClass.ghostHunter,
+				CharacterClass.GHOST_HUNTER,
 				// ATTRIBUTES
 				25,// INT
 				41,// STR
@@ -35,7 +35,7 @@ public class GhosthunterTemplate extends AbyssWalkerTemplate {
 		);
 	}
 
-	protected GhosthunterTemplate(CharacterTemplateID id,
+	protected GhostHunterTemplate(CharacterTemplateID id,
 			CharacterClass characterClass, int intelligence, int strength,
 			int concentration, int mentality, int dexterity, int witness,
 			int physicalAttack, int magicalAttack, int physicalDefense,

data/script/template/script/template/actor/character/GhostSentinelTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;
@@ -7,11 +7,11 @@ import com.l2jserver.model.world.L2Character;
 import com.l2jserver.model.world.character.CharacterClass;
 import com.l2jserver.util.dimensional.Point;
 
-public class GhostsentinelTemplate extends PhantomRangerTemplate {
+public class GhostSentinelTemplate extends PhantomRangerTemplate {
 	@Inject
-	public GhostsentinelTemplate(CharacterTemplateIDFactory factory) {
+	public GhostSentinelTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ghostSentinel.id),
+		super(factory.createID(CharacterClass.GHOST_SENTINEL.id),
-				CharacterClass.ghostSentinel,
+				CharacterClass.GHOST_SENTINEL,
 				// ATTRIBUTES
 				25,// INT
 				41,// STR
@@ -35,7 +35,7 @@ public class GhostsentinelTemplate extends PhantomRangerTemplate {
 		);
 	}
 
-	protected GhostsentinelTemplate(CharacterTemplateID id,
+	protected GhostSentinelTemplate(CharacterTemplateID id,
 			CharacterClass characterClass, int intelligence, int strength,
 			int concentration, int mentality, int dexterity, int witness,
 			int physicalAttack, int magicalAttack, int physicalDefense,

data/script/template/script/template/actor/character/GladiatorTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/GrandKhauatariTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/HawkeyeTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/HellKnightTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;
@@ -7,11 +7,11 @@ import com.l2jserver.model.world.L2Character;
 import com.l2jserver.model.world.character.CharacterClass;
 import com.l2jserver.util.dimensional.Point;
 
-public class HellknightTemplate extends DarkAvengerTemplate {
+public class HellKnightTemplate extends DarkAvengerTemplate {
 	@Inject
-	public HellknightTemplate(CharacterTemplateIDFactory factory) {
+	public HellKnightTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.hellKnight.id),
+		super(factory.createID(CharacterClass.HELL_KNIGHT.id),
-				CharacterClass.hellKnight,
+				CharacterClass.HELL_KNIGHT,
 				// ATTRIBUTES
 				21,// INT
 				40,// STR
@@ -35,7 +35,7 @@ public class HellknightTemplate extends DarkAvengerTemplate {
 		);
 	}
 
-	protected HellknightTemplate(CharacterTemplateID id,
+	protected HellKnightTemplate(CharacterTemplateID id,
 			CharacterClass characterClass, int intelligence, int strength,
 			int concentration, int mentality, int dexterity, int witness,
 			int physicalAttack, int magicalAttack, int physicalDefense,

data/script/template/script/template/actor/character/HierophantTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/HumanFighterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/HumanMysticTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/InspectorTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/JudicatorTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/KnightTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/MaestroTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/MaleSoldierTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/MaleSoulbreakerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/MaleSouldhoundTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/MoonlightSentinelTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/MysticMuseTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/NecromancerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/OracleTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/OrcFighterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/OrcMonkTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/OrcMysticTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/OrcRaiderTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/OrcShamanTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/OverlordTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/PaladinTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/PalusKnightTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/PhantomRangerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/PhantomSummonerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/PhoenixKnightTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;
@@ -7,11 +7,11 @@ import com.l2jserver.model.world.L2Character;
 import com.l2jserver.model.world.character.CharacterClass;
 import com.l2jserver.util.dimensional.Point;
 
-public class PhoenixknightTemplate extends PaladinTemplate {
+public class PhoenixKnightTemplate extends PaladinTemplate {
 	@Inject
-	public PhoenixknightTemplate(CharacterTemplateIDFactory factory) {
+	public PhoenixKnightTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.phoenixKnight.id),
+		super(factory.createID(CharacterClass.PHOENIX_KNIGHT.id),
-				CharacterClass.phoenixKnight,
+				CharacterClass.PHOENIX_KNIGHT,
 				// ATTRIBUTES
 				21,// INT
 				40,// STR
@@ -35,7 +35,7 @@ public class PhoenixknightTemplate extends PaladinTemplate {
 		);
 	}
 
-	protected PhoenixknightTemplate(CharacterTemplateID id,
+	protected PhoenixKnightTemplate(CharacterTemplateID id,
 			CharacterClass characterClass, int intelligence, int strength,
 			int concentration, int mentality, int dexterity, int witness,
 			int physicalAttack, int magicalAttack, int physicalDefense,

data/script/template/script/template/actor/character/PlainsWalkerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ProphetTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/RogueTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/SagittariusTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;
@@ -10,8 +10,8 @@ import com.l2jserver.util.dimensional.Point;
 public class SagittariusTemplate extends HawkeyeTemplate {
 	@Inject
 	public SagittariusTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.sagittarius.id),
+		super(factory.createID(CharacterClass.SAGITTARIUS.id),
-				CharacterClass.sagittarius,
+				CharacterClass.SAGITTARIUS,
 				// ATTRIBUTES
 				21,// INT
 				40,// STR

data/script/template/script/template/actor/character/ScavengerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ShillieanSaintTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ShillienElderTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ShillienKnightTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ShillienOracleTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/ShillienTemplarTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/SilverRangerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/SorcerorTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/SoultakerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/SpectralMasterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/SpectraldancerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/SpellhowlerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/SpellsingerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/StormScreamerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/SwordMuseTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/SwordSingerTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/TempleKnightTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/TitanTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/TreasureHunterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;

data/script/template/script/template/actor/character/TricksterTemplate.java

@@ -1,4 +1,4 @@
-package script.template.character;
+package script.template.actor.character;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.id.template.CharacterTemplateID;