diff --git a/pom.xml b/pom.xml index 31137757d..3a934e8b8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,115 +1,115 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - net.citizensnpcs - citizens - 2.0 - Citizens + net.citizensnpcs + citizens + 2.0 + Citizens - - UTF-8 - 1.1-R5-SNAPSHOT - 1.1-R5-SNAPSHOT - 2.0 - Unknown - + + UTF-8 + 1.1-R5-SNAPSHOT + 1.1-R5-SNAPSHOT + 2.0 + Unknown + - - - bukkit-repo - http://repo.bukkit.org/content/groups/public/ - + + + bukkit-repo + http://repo.bukkit.org/content/groups/public/ + - - everything - http://repo.citizensnpcs.net/ - - + + everything + http://repo.citizensnpcs.net/ + + - - - org.bukkit - craftbukkit - ${craftbukkit.version} - jar - provided - - - net.citizensnpcs - citizensapi - ${citizensapi.version} - jar - compile - - - org.bukkit - bukkit - ${bukkit.version} - jar - provided - - + + + org.bukkit + craftbukkit + ${craftbukkit.version} + jar + provided + + + net.citizensnpcs + citizensapi + ${citizensapi.version} + jar + compile + + + org.bukkit + bukkit + ${bukkit.version} + jar + provided + + - http://www.citizensnpcs.net - - jenkins - http://ci.citizensnpcs.net - - - scm:git:git://github.com/CitizensDev/Citizens2.git - scm:git:git:@github.com:CitizensDev/Citizens2.git - https://github.com/CitizensDev/Citizens2/tree/master/ - - - clean package install - ${basedir}/src + http://www.citizensnpcs.net + + jenkins + http://ci.citizensnpcs.net + + + scm:git:git://github.com/CitizensDev/Citizens2.git + scm:git:git:@github.com:CitizensDev/Citizens2.git + https://github.com/CitizensDev/Citizens2/tree/master/ + + + clean package install + ${basedir}/src/main/java - - - . - true - ${basedir} - - plugin.yml - - - + + + . + true + ${basedir}/src/main/resources + + plugin.yml + + + - + - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + - - org.apache.maven.plugins - maven-shade-plugin - 1.4 - - - package - - shade - - - - - - + + org.apache.maven.plugins + maven-shade-plugin + 1.4 + + + package + + shade + + + + + + \ No newline at end of file diff --git a/src/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java similarity index 100% rename from src/net/citizensnpcs/Citizens.java rename to src/main/java/net/citizensnpcs/Citizens.java diff --git a/src/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java similarity index 100% rename from src/net/citizensnpcs/EventListen.java rename to src/main/java/net/citizensnpcs/EventListen.java diff --git a/src/net/citizensnpcs/NPCUpdater.java b/src/main/java/net/citizensnpcs/NPCUpdater.java similarity index 100% rename from src/net/citizensnpcs/NPCUpdater.java rename to src/main/java/net/citizensnpcs/NPCUpdater.java diff --git a/src/net/citizensnpcs/Settings.java b/src/main/java/net/citizensnpcs/Settings.java similarity index 100% rename from src/net/citizensnpcs/Settings.java rename to src/main/java/net/citizensnpcs/Settings.java diff --git a/src/net/citizensnpcs/command/Command.java b/src/main/java/net/citizensnpcs/command/Command.java similarity index 100% rename from src/net/citizensnpcs/command/Command.java rename to src/main/java/net/citizensnpcs/command/Command.java diff --git a/src/net/citizensnpcs/command/CommandContext.java b/src/main/java/net/citizensnpcs/command/CommandContext.java similarity index 100% rename from src/net/citizensnpcs/command/CommandContext.java rename to src/main/java/net/citizensnpcs/command/CommandContext.java diff --git a/src/net/citizensnpcs/command/CommandManager.java b/src/main/java/net/citizensnpcs/command/CommandManager.java similarity index 100% rename from src/net/citizensnpcs/command/CommandManager.java rename to src/main/java/net/citizensnpcs/command/CommandManager.java diff --git a/src/net/citizensnpcs/command/Injector.java b/src/main/java/net/citizensnpcs/command/Injector.java similarity index 100% rename from src/net/citizensnpcs/command/Injector.java rename to src/main/java/net/citizensnpcs/command/Injector.java diff --git a/src/net/citizensnpcs/command/Requirements.java b/src/main/java/net/citizensnpcs/command/Requirements.java similarity index 100% rename from src/net/citizensnpcs/command/Requirements.java rename to src/main/java/net/citizensnpcs/command/Requirements.java diff --git a/src/net/citizensnpcs/command/ServerCommand.java b/src/main/java/net/citizensnpcs/command/ServerCommand.java similarity index 100% rename from src/net/citizensnpcs/command/ServerCommand.java rename to src/main/java/net/citizensnpcs/command/ServerCommand.java diff --git a/src/net/citizensnpcs/command/command/AdminCommands.java b/src/main/java/net/citizensnpcs/command/command/AdminCommands.java similarity index 100% rename from src/net/citizensnpcs/command/command/AdminCommands.java rename to src/main/java/net/citizensnpcs/command/command/AdminCommands.java diff --git a/src/net/citizensnpcs/command/command/EditorCommands.java b/src/main/java/net/citizensnpcs/command/command/EditorCommands.java similarity index 100% rename from src/net/citizensnpcs/command/command/EditorCommands.java rename to src/main/java/net/citizensnpcs/command/command/EditorCommands.java diff --git a/src/net/citizensnpcs/command/command/HelpCommands.java b/src/main/java/net/citizensnpcs/command/command/HelpCommands.java similarity index 100% rename from src/net/citizensnpcs/command/command/HelpCommands.java rename to src/main/java/net/citizensnpcs/command/command/HelpCommands.java diff --git a/src/net/citizensnpcs/command/command/NPCCommands.java b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java similarity index 100% rename from src/net/citizensnpcs/command/command/NPCCommands.java rename to src/main/java/net/citizensnpcs/command/command/NPCCommands.java diff --git a/src/net/citizensnpcs/command/exception/CommandException.java b/src/main/java/net/citizensnpcs/command/exception/CommandException.java similarity index 100% rename from src/net/citizensnpcs/command/exception/CommandException.java rename to src/main/java/net/citizensnpcs/command/exception/CommandException.java diff --git a/src/net/citizensnpcs/command/exception/CommandUsageException.java b/src/main/java/net/citizensnpcs/command/exception/CommandUsageException.java similarity index 100% rename from src/net/citizensnpcs/command/exception/CommandUsageException.java rename to src/main/java/net/citizensnpcs/command/exception/CommandUsageException.java diff --git a/src/net/citizensnpcs/command/exception/NoPermissionsException.java b/src/main/java/net/citizensnpcs/command/exception/NoPermissionsException.java similarity index 100% rename from src/net/citizensnpcs/command/exception/NoPermissionsException.java rename to src/main/java/net/citizensnpcs/command/exception/NoPermissionsException.java diff --git a/src/net/citizensnpcs/command/exception/RequirementMissingException.java b/src/main/java/net/citizensnpcs/command/exception/RequirementMissingException.java similarity index 100% rename from src/net/citizensnpcs/command/exception/RequirementMissingException.java rename to src/main/java/net/citizensnpcs/command/exception/RequirementMissingException.java diff --git a/src/net/citizensnpcs/command/exception/ServerCommandException.java b/src/main/java/net/citizensnpcs/command/exception/ServerCommandException.java similarity index 100% rename from src/net/citizensnpcs/command/exception/ServerCommandException.java rename to src/main/java/net/citizensnpcs/command/exception/ServerCommandException.java diff --git a/src/net/citizensnpcs/command/exception/UnhandledCommandException.java b/src/main/java/net/citizensnpcs/command/exception/UnhandledCommandException.java similarity index 100% rename from src/net/citizensnpcs/command/exception/UnhandledCommandException.java rename to src/main/java/net/citizensnpcs/command/exception/UnhandledCommandException.java diff --git a/src/net/citizensnpcs/command/exception/WrappedCommandException.java b/src/main/java/net/citizensnpcs/command/exception/WrappedCommandException.java similarity index 100% rename from src/net/citizensnpcs/command/exception/WrappedCommandException.java rename to src/main/java/net/citizensnpcs/command/exception/WrappedCommandException.java diff --git a/src/net/citizensnpcs/editor/Editor.java b/src/main/java/net/citizensnpcs/editor/Editor.java similarity index 100% rename from src/net/citizensnpcs/editor/Editor.java rename to src/main/java/net/citizensnpcs/editor/Editor.java diff --git a/src/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java similarity index 100% rename from src/net/citizensnpcs/editor/EquipmentEditor.java rename to src/main/java/net/citizensnpcs/editor/EquipmentEditor.java diff --git a/src/net/citizensnpcs/editor/PathEditor.java b/src/main/java/net/citizensnpcs/editor/PathEditor.java similarity index 100% rename from src/net/citizensnpcs/editor/PathEditor.java rename to src/main/java/net/citizensnpcs/editor/PathEditor.java diff --git a/src/net/citizensnpcs/editor/TextEditor.java b/src/main/java/net/citizensnpcs/editor/TextEditor.java similarity index 100% rename from src/net/citizensnpcs/editor/TextEditor.java rename to src/main/java/net/citizensnpcs/editor/TextEditor.java diff --git a/src/net/citizensnpcs/npc/CitizensMobNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensMobNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/CitizensMobNPC.java rename to src/main/java/net/citizensnpcs/npc/CitizensMobNPC.java diff --git a/src/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/CitizensNPC.java rename to src/main/java/net/citizensnpcs/npc/CitizensNPC.java diff --git a/src/net/citizensnpcs/npc/CitizensNPCManager.java b/src/main/java/net/citizensnpcs/npc/CitizensNPCManager.java similarity index 100% rename from src/net/citizensnpcs/npc/CitizensNPCManager.java rename to src/main/java/net/citizensnpcs/npc/CitizensNPCManager.java diff --git a/src/net/citizensnpcs/npc/NPCInventory.java b/src/main/java/net/citizensnpcs/npc/NPCInventory.java similarity index 100% rename from src/net/citizensnpcs/npc/NPCInventory.java rename to src/main/java/net/citizensnpcs/npc/NPCInventory.java diff --git a/src/net/citizensnpcs/npc/ai/CitizensAI.java b/src/main/java/net/citizensnpcs/npc/ai/CitizensAI.java similarity index 100% rename from src/net/citizensnpcs/npc/ai/CitizensAI.java rename to src/main/java/net/citizensnpcs/npc/ai/CitizensAI.java diff --git a/src/net/citizensnpcs/npc/ai/MoveStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MoveStrategy.java similarity index 100% rename from src/net/citizensnpcs/npc/ai/MoveStrategy.java rename to src/main/java/net/citizensnpcs/npc/ai/MoveStrategy.java diff --git a/src/net/citizensnpcs/npc/ai/PathStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/PathStrategy.java similarity index 100% rename from src/net/citizensnpcs/npc/ai/PathStrategy.java rename to src/main/java/net/citizensnpcs/npc/ai/PathStrategy.java diff --git a/src/net/citizensnpcs/npc/ai/TargetStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/TargetStrategy.java similarity index 100% rename from src/net/citizensnpcs/npc/ai/TargetStrategy.java rename to src/main/java/net/citizensnpcs/npc/ai/TargetStrategy.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensChickenNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensChickenNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensCowNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensCowNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensGhastNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensGhastNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensGiantNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensGiantNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensPigNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensPigNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensSheepNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensSheepNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensSquidNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensSquidNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensWolfNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensWolfNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java diff --git a/src/net/citizensnpcs/npc/entity/CitizensZombieNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java similarity index 100% rename from src/net/citizensnpcs/npc/entity/CitizensZombieNPC.java rename to src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java diff --git a/src/net/citizensnpcs/resource/lib/EntityHumanNPC.java b/src/main/java/net/citizensnpcs/resource/lib/EntityHumanNPC.java similarity index 100% rename from src/net/citizensnpcs/resource/lib/EntityHumanNPC.java rename to src/main/java/net/citizensnpcs/resource/lib/EntityHumanNPC.java diff --git a/src/net/citizensnpcs/resource/lib/NPCNetHandler.java b/src/main/java/net/citizensnpcs/resource/lib/NPCNetHandler.java similarity index 100% rename from src/net/citizensnpcs/resource/lib/NPCNetHandler.java rename to src/main/java/net/citizensnpcs/resource/lib/NPCNetHandler.java diff --git a/src/net/citizensnpcs/resource/lib/NPCNetworkManager.java b/src/main/java/net/citizensnpcs/resource/lib/NPCNetworkManager.java similarity index 100% rename from src/net/citizensnpcs/resource/lib/NPCNetworkManager.java rename to src/main/java/net/citizensnpcs/resource/lib/NPCNetworkManager.java diff --git a/src/net/citizensnpcs/resource/lib/NPCSocket.java b/src/main/java/net/citizensnpcs/resource/lib/NPCSocket.java similarity index 100% rename from src/net/citizensnpcs/resource/lib/NPCSocket.java rename to src/main/java/net/citizensnpcs/resource/lib/NPCSocket.java diff --git a/src/net/citizensnpcs/trait/LookClose.java b/src/main/java/net/citizensnpcs/trait/LookClose.java similarity index 100% rename from src/net/citizensnpcs/trait/LookClose.java rename to src/main/java/net/citizensnpcs/trait/LookClose.java diff --git a/src/net/citizensnpcs/trait/waypoint/Waypoint.java b/src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java similarity index 100% rename from src/net/citizensnpcs/trait/waypoint/Waypoint.java rename to src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java diff --git a/src/net/citizensnpcs/trait/waypoint/WaypointProvider.java b/src/main/java/net/citizensnpcs/trait/waypoint/WaypointProvider.java similarity index 100% rename from src/net/citizensnpcs/trait/waypoint/WaypointProvider.java rename to src/main/java/net/citizensnpcs/trait/waypoint/WaypointProvider.java diff --git a/src/net/citizensnpcs/trait/waypoint/Waypoints.java b/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java similarity index 100% rename from src/net/citizensnpcs/trait/waypoint/Waypoints.java rename to src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java diff --git a/src/net/citizensnpcs/util/ByIdArray.java b/src/main/java/net/citizensnpcs/util/ByIdArray.java similarity index 100% rename from src/net/citizensnpcs/util/ByIdArray.java rename to src/main/java/net/citizensnpcs/util/ByIdArray.java diff --git a/src/net/citizensnpcs/util/Messaging.java b/src/main/java/net/citizensnpcs/util/Messaging.java similarity index 100% rename from src/net/citizensnpcs/util/Messaging.java rename to src/main/java/net/citizensnpcs/util/Messaging.java diff --git a/src/net/citizensnpcs/util/Metrics.java b/src/main/java/net/citizensnpcs/util/Metrics.java similarity index 100% rename from src/net/citizensnpcs/util/Metrics.java rename to src/main/java/net/citizensnpcs/util/Metrics.java diff --git a/src/net/citizensnpcs/util/NPCBuilder.java b/src/main/java/net/citizensnpcs/util/NPCBuilder.java similarity index 100% rename from src/net/citizensnpcs/util/NPCBuilder.java rename to src/main/java/net/citizensnpcs/util/NPCBuilder.java diff --git a/src/net/citizensnpcs/util/StringHelper.java b/src/main/java/net/citizensnpcs/util/StringHelper.java similarity index 100% rename from src/net/citizensnpcs/util/StringHelper.java rename to src/main/java/net/citizensnpcs/util/StringHelper.java diff --git a/plugin.yml b/src/main/resources/plugin.yml similarity index 100% rename from plugin.yml rename to src/main/resources/plugin.yml