diff --git a/pom.xml b/pom.xml
index 27c85c2c..62fd9c5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,20 +6,20 @@
     <version>9.6.0-SNAPSHOT</version>
 
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <defaultGoal>clean install</defaultGoal>
-        <directory>target</directory>
         <finalName>LibsDisguises</finalName>
 
         <resources>
             <resource>
-                <targetPath>.</targetPath>
+                <directory>src/main/resources</directory>
                 <filtering>true</filtering>
+                <includes>
+                    <include>*</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>${project.basedir}</directory>
                 <includes>
-                    <include>plugin.yml</include>
-                    <include>config.yml</include>
-                    <include>disguises.yml</include>
                     <include>README.md</include>
                 </includes>
             </resource>
diff --git a/src/me/libraryaddict/disguise/DisguiseAPI.java b/src/main/java/me/libraryaddict/disguise/DisguiseAPI.java
similarity index 100%
rename from src/me/libraryaddict/disguise/DisguiseAPI.java
rename to src/main/java/me/libraryaddict/disguise/DisguiseAPI.java
diff --git a/src/me/libraryaddict/disguise/DisguiseConfig.java b/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java
similarity index 100%
rename from src/me/libraryaddict/disguise/DisguiseConfig.java
rename to src/main/java/me/libraryaddict/disguise/DisguiseConfig.java
diff --git a/src/me/libraryaddict/disguise/DisguiseListener.java b/src/main/java/me/libraryaddict/disguise/DisguiseListener.java
similarity index 100%
rename from src/me/libraryaddict/disguise/DisguiseListener.java
rename to src/main/java/me/libraryaddict/disguise/DisguiseListener.java
diff --git a/src/me/libraryaddict/disguise/LibsDisguises.java b/src/main/java/me/libraryaddict/disguise/LibsDisguises.java
similarity index 100%
rename from src/me/libraryaddict/disguise/LibsDisguises.java
rename to src/main/java/me/libraryaddict/disguise/LibsDisguises.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguiseCloneCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseCloneCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguiseCloneCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguiseCloneCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguiseCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguiseCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguiseCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguiseHelpCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseHelpCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguiseHelpCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguiseHelpCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguiseModifyCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseModifyCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguiseModifyCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguiseModifyCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguiseModifyEntityCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseModifyEntityCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguiseModifyEntityCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguiseModifyEntityCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguiseModifyPlayerCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseModifyPlayerCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguiseModifyPlayerCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguiseModifyPlayerCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguiseModifyRadiusCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseModifyRadiusCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguiseModifyRadiusCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguiseModifyRadiusCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguisePlayerCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguisePlayerCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguisePlayerCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguisePlayerCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/DisguiseViewSelfCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseViewSelfCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/DisguiseViewSelfCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/DisguiseViewSelfCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/LibsDisguisesCommand.java b/src/main/java/me/libraryaddict/disguise/commands/LibsDisguisesCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/LibsDisguisesCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/LibsDisguisesCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/UndisguiseCommand.java b/src/main/java/me/libraryaddict/disguise/commands/UndisguiseCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/UndisguiseCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/UndisguiseCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/UndisguiseEntityCommand.java b/src/main/java/me/libraryaddict/disguise/commands/UndisguiseEntityCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/UndisguiseEntityCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/UndisguiseEntityCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/UndisguisePlayerCommand.java b/src/main/java/me/libraryaddict/disguise/commands/UndisguisePlayerCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/UndisguisePlayerCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/UndisguisePlayerCommand.java
diff --git a/src/me/libraryaddict/disguise/commands/UndisguiseRadiusCommand.java b/src/main/java/me/libraryaddict/disguise/commands/UndisguiseRadiusCommand.java
similarity index 100%
rename from src/me/libraryaddict/disguise/commands/UndisguiseRadiusCommand.java
rename to src/main/java/me/libraryaddict/disguise/commands/UndisguiseRadiusCommand.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/AnimalColor.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/AnimalColor.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/AnimalColor.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/AnimalColor.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/Disguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/Disguise.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseType.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseType.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/MetaIndex.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/MetaIndex.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/MetaIndex.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/MetaIndex.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/MobDisguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/MobDisguise.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/MobDisguise.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/MobDisguise.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/RabbitType.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/RabbitType.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/RabbitType.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/RabbitType.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/TargetedDisguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/TargetedDisguise.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/TargetedDisguise.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/TargetedDisguise.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/AgeableWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AgeableWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/AgeableWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AgeableWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/AreaEffectCloudWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AreaEffectCloudWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/AreaEffectCloudWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AreaEffectCloudWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/ArmorStandWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArmorStandWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/ArmorStandWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArmorStandWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/ArrowWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArrowWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/ArrowWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArrowWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/BatWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BatWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/BatWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BatWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/BlazeWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BlazeWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/BlazeWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BlazeWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/BoatWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BoatWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/BoatWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BoatWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/ChestedHorseWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ChestedHorseWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/ChestedHorseWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ChestedHorseWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/CreeperWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CreeperWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/CreeperWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CreeperWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/DolphinWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DolphinWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/DolphinWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DolphinWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/DonkeyWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DonkeyWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/DonkeyWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DonkeyWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/EnderCrystalWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderCrystalWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/EnderCrystalWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderCrystalWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/EnderDragonWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderDragonWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/EnderDragonWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderDragonWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/EndermanWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EndermanWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/EndermanWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EndermanWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/FireworkWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FireworkWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/FireworkWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FireworkWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/FishWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/FishWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/FishingHookWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishingHookWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/FishingHookWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishingHookWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/GhastWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GhastWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/GhastWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GhastWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/GuardianWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GuardianWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/GuardianWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GuardianWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWizardWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWizardWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWizardWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWizardWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/InsentientWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/InsentientWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/InsentientWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/InsentientWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/IronGolemWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IronGolemWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/IronGolemWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IronGolemWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/MinecartCommandWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartCommandWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/MinecartCommandWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartCommandWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/MinecartFurnaceWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartFurnaceWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/MinecartFurnaceWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartFurnaceWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/MinecartWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/MinecartWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/MuleWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MuleWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/MuleWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MuleWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/OcelotWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/OcelotWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/OcelotWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/OcelotWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/PaintingWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PaintingWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/PaintingWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PaintingWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/ParrotWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ParrotWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/ParrotWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ParrotWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/PhantomWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PhantomWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/PhantomWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PhantomWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/PigWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PigWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/PigWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PigWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/PolarBearWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PolarBearWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/PolarBearWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PolarBearWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/PufferFishWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PufferFishWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/PufferFishWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PufferFishWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/RabbitWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RabbitWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/RabbitWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RabbitWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/SheepWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SheepWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/SheepWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SheepWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/ShulkerWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ShulkerWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/ShulkerWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ShulkerWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonHorseWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonHorseWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonHorseWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonHorseWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/SlimeWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SlimeWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/SlimeWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SlimeWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/SnowmanWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnowmanWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/SnowmanWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnowmanWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/SpiderWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SpiderWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/SpiderWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SpiderWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/SplashPotionWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SplashPotionWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/SplashPotionWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SplashPotionWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/SquidWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SquidWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/SquidWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SquidWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/TNTWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TNTWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/TNTWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TNTWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/TameableWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TameableWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/TameableWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TameableWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/TippedArrowWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TippedArrowWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/TippedArrowWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TippedArrowWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/TridentWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TridentWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/TridentWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TridentWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/TropicalFishWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TropicalFishWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/TropicalFishWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TropicalFishWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/TurtleWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TurtleWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/TurtleWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TurtleWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/VexWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VexWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/VexWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VexWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/VillagerWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VillagerWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/VillagerWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VillagerWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/VindicatorWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VindicatorWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/VindicatorWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VindicatorWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/WitchWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitchWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/WitchWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitchWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkullWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkullWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkullWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkullWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/WitherWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/WitherWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieHorseWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieHorseWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieHorseWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieHorseWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieVillagerWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieVillagerWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieVillagerWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieVillagerWatcher.java
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieWatcher.java
rename to src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieWatcher.java
diff --git a/src/me/libraryaddict/disguise/events/DisguiseEvent.java b/src/main/java/me/libraryaddict/disguise/events/DisguiseEvent.java
similarity index 100%
rename from src/me/libraryaddict/disguise/events/DisguiseEvent.java
rename to src/main/java/me/libraryaddict/disguise/events/DisguiseEvent.java
diff --git a/src/me/libraryaddict/disguise/events/UndisguiseEvent.java b/src/main/java/me/libraryaddict/disguise/events/UndisguiseEvent.java
similarity index 100%
rename from src/me/libraryaddict/disguise/events/UndisguiseEvent.java
rename to src/main/java/me/libraryaddict/disguise/events/UndisguiseEvent.java
diff --git a/src/me/libraryaddict/disguise/utilities/ClassGetter.java b/src/main/java/me/libraryaddict/disguise/utilities/ClassGetter.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/ClassGetter.java
rename to src/main/java/me/libraryaddict/disguise/utilities/ClassGetter.java
diff --git a/src/me/libraryaddict/disguise/utilities/DisguiseParser.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseParser.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/DisguiseParser.java
rename to src/main/java/me/libraryaddict/disguise/utilities/DisguiseParser.java
diff --git a/src/me/libraryaddict/disguise/utilities/DisguiseSound.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseSound.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/DisguiseSound.java
rename to src/main/java/me/libraryaddict/disguise/utilities/DisguiseSound.java
diff --git a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
rename to src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
diff --git a/src/me/libraryaddict/disguise/utilities/DisguiseValues.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseValues.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/DisguiseValues.java
rename to src/main/java/me/libraryaddict/disguise/utilities/DisguiseValues.java
diff --git a/src/me/libraryaddict/disguise/utilities/FakeBoundingBox.java b/src/main/java/me/libraryaddict/disguise/utilities/FakeBoundingBox.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/FakeBoundingBox.java
rename to src/main/java/me/libraryaddict/disguise/utilities/FakeBoundingBox.java
diff --git a/src/me/libraryaddict/disguise/utilities/LibsMsg.java b/src/main/java/me/libraryaddict/disguise/utilities/LibsMsg.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/LibsMsg.java
rename to src/main/java/me/libraryaddict/disguise/utilities/LibsMsg.java
diff --git a/src/me/libraryaddict/disguise/utilities/LibsPremium.java b/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/LibsPremium.java
rename to src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java
diff --git a/src/me/libraryaddict/disguise/utilities/LibsProfileLookup.java b/src/main/java/me/libraryaddict/disguise/utilities/LibsProfileLookup.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/LibsProfileLookup.java
rename to src/main/java/me/libraryaddict/disguise/utilities/LibsProfileLookup.java
diff --git a/src/me/libraryaddict/disguise/utilities/LibsProfileLookupCaller.java b/src/main/java/me/libraryaddict/disguise/utilities/LibsProfileLookupCaller.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/LibsProfileLookupCaller.java
rename to src/main/java/me/libraryaddict/disguise/utilities/LibsProfileLookupCaller.java
diff --git a/src/me/libraryaddict/disguise/utilities/Metrics.java b/src/main/java/me/libraryaddict/disguise/utilities/Metrics.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/Metrics.java
rename to src/main/java/me/libraryaddict/disguise/utilities/Metrics.java
diff --git a/src/me/libraryaddict/disguise/utilities/PacketsManager.java b/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/PacketsManager.java
rename to src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java
diff --git a/src/me/libraryaddict/disguise/utilities/ReflectionFlagWatchers.java b/src/main/java/me/libraryaddict/disguise/utilities/ReflectionFlagWatchers.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/ReflectionFlagWatchers.java
rename to src/main/java/me/libraryaddict/disguise/utilities/ReflectionFlagWatchers.java
diff --git a/src/me/libraryaddict/disguise/utilities/ReflectionManager.java b/src/main/java/me/libraryaddict/disguise/utilities/ReflectionManager.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/ReflectionManager.java
rename to src/main/java/me/libraryaddict/disguise/utilities/ReflectionManager.java
diff --git a/src/me/libraryaddict/disguise/utilities/TranslateFiller.java b/src/main/java/me/libraryaddict/disguise/utilities/TranslateFiller.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/TranslateFiller.java
rename to src/main/java/me/libraryaddict/disguise/utilities/TranslateFiller.java
diff --git a/src/me/libraryaddict/disguise/utilities/TranslateType.java b/src/main/java/me/libraryaddict/disguise/utilities/TranslateType.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/TranslateType.java
rename to src/main/java/me/libraryaddict/disguise/utilities/TranslateType.java
diff --git a/src/me/libraryaddict/disguise/utilities/UpdateChecker.java b/src/main/java/me/libraryaddict/disguise/utilities/UpdateChecker.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/UpdateChecker.java
rename to src/main/java/me/libraryaddict/disguise/utilities/UpdateChecker.java
diff --git a/src/me/libraryaddict/disguise/utilities/json/SerializerDisguise.java b/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerDisguise.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/json/SerializerDisguise.java
rename to src/main/java/me/libraryaddict/disguise/utilities/json/SerializerDisguise.java
diff --git a/src/me/libraryaddict/disguise/utilities/json/SerializerFlagWatcher.java b/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerFlagWatcher.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/json/SerializerFlagWatcher.java
rename to src/main/java/me/libraryaddict/disguise/utilities/json/SerializerFlagWatcher.java
diff --git a/src/me/libraryaddict/disguise/utilities/json/SerializerGameProfile.java b/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerGameProfile.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/json/SerializerGameProfile.java
rename to src/main/java/me/libraryaddict/disguise/utilities/json/SerializerGameProfile.java
diff --git a/src/me/libraryaddict/disguise/utilities/json/SerializerItemStack.java b/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerItemStack.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/json/SerializerItemStack.java
rename to src/main/java/me/libraryaddict/disguise/utilities/json/SerializerItemStack.java
diff --git a/src/me/libraryaddict/disguise/utilities/json/SerializerMetaIndex.java b/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerMetaIndex.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/json/SerializerMetaIndex.java
rename to src/main/java/me/libraryaddict/disguise/utilities/json/SerializerMetaIndex.java
diff --git a/src/me/libraryaddict/disguise/utilities/json/SerializerWrappedBlockData.java b/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerWrappedBlockData.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/json/SerializerWrappedBlockData.java
rename to src/main/java/me/libraryaddict/disguise/utilities/json/SerializerWrappedBlockData.java
diff --git a/src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerClientInteract.java b/src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerClientInteract.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerClientInteract.java
rename to src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerClientInteract.java
diff --git a/src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerInventory.java b/src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerInventory.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerInventory.java
rename to src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerInventory.java
diff --git a/src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerMain.java b/src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerMain.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerMain.java
rename to src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerMain.java
diff --git a/src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerSounds.java b/src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerSounds.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerSounds.java
rename to src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerSounds.java
diff --git a/src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerTabList.java b/src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerTabList.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerTabList.java
rename to src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerTabList.java
diff --git a/src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerViewDisguises.java b/src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerViewDisguises.java
similarity index 100%
rename from src/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerViewDisguises.java
rename to src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerViewDisguises.java
diff --git a/config.yml b/src/main/resources/config.yml
similarity index 100%
rename from config.yml
rename to src/main/resources/config.yml
diff --git a/disguises.yml b/src/main/resources/disguises.yml
similarity index 100%
rename from disguises.yml
rename to src/main/resources/disguises.yml
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