diff --git a/.gitignore b/.gitignore
index ebd2f77..b330747 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,8 @@ build/
 misc/
 lib/
 test/
+target/
 
 # Misc files
 MobArena.jar
-build.properties
\ No newline at end of file
+build.properties
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 11b8c77..0000000
--- a/build.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-    <!--
-    ###########################################################################
-    ###                                                                     ###
-    ###                        MobArena Build File                          ###
-    ###                                                                     ###
-    ###########################################################################
-
-    To build MobArena, you need the following dependencies, which can all be
-    found on their respective websites/Bukkit pages/whatever:
-
-        - Bukkit           by the Bukkit team       http://dl.bukkit.org/downloads/bukkit/
-        - Vault            by Sleaker               http://dev.bukkit.org/bukkit-plugins/vault/
-        - MagicSpells      by nisovin               http://dev.bukkit.org/bukkit-plugins/magicspells/
-
-    The dependencies (jar-files) should be placed in a lib-folder at the root
-    of the project file structure, i.e. in the same folder as 'src'.
-    -->
-<project name="MobArena" default="build-package-distribute" basedir=".">
-
-    <!--
-    ###########################################################################
-    ###                                                                     ###
-    ###                         Properties File                             ###
-    ###                                                                     ###
-    ###########################################################################
-
-    The properties file (build.properties) is optional. It can contain the
-    following properties, which can provide compilation convenience:
-
-        - server.dir    A path to a location that the MobArena.jar file will be
-                        copied to, upon packaging. This is useful for paths to
-                        a server's plugins-folder for easy testing.
-    -->
-    <property file="build.properties"/>
-
-    <!-- Folders -->
-    <property name="src" location="src"/>
-    <property name="bin" location="build"/>
-    <property name="lib" location="lib"/>
-    <property name="res" location="resources"/>
-
-    <!-- Classpath -->
-    <path id="classpath">
-        <fileset dir="${lib}" includes="*.jar"/>
-        <pathelement location="${bin}" />
-    </path>
-
-
-
-    <!--
-    ###########################################################################
-    ###                                                                     ###
-    ###                       Distribution targets                          ###
-    ###                                                                     ###
-    ###########################################################################
-    -->
-
-    <!-- Copy MobArena.jar to the server.dir folder from the properties file -->
-    <target name="copy-to-server" if="server.dir">
-        <copy file="${ant.project.name}.jar" tofile="${server.dir}/${ant.project.name}.jar" />
-    </target>
-
-    <!-- Copy MobArena.jar to the dropbox.dir folder from the properties file -->
-    <target name="copy-to-dropbox" if="dropbox.dir">
-        <copy file="${ant.project.name}.jar" tofile="${dropbox.dir}/${ant.project.name}.jar" />
-    </target>
-
-    <!-- Copy MobArena.jar to the remote.dir folder from the properties file -->
-    <target name="copy-to-remote" if="remote.dir">
-        <scp file="${ant.project.name}.jar" todir="${remote.usr}:${remote.pwd}@${remote.host}:${remote.dir}" />
-    </target>
-
-
-
-    <!--
-    ###########################################################################
-    ###                                                                     ###
-    ###                          Build targets                              ###
-    ###                                                                     ###
-    ###########################################################################
-    -->
-
-    <!-- Build the project files -->
-    <target name="build">
-        <antcall target="clean-bin"/>
-        <mkdir dir="${bin}"/>
-        <javac target="1.6" source="1.6"
-               srcdir="${src}" destdir="${bin}"
-               debug="on" debuglevel="lines,vars,source"
-               includeantruntime="no" classpathref="classpath">
-            <compilerarg value="-Xlint:deprecation"/>
-        </javac>
-    </target>
-
-    <!-- Build and package the project -->
-    <target name="build-package">
-        <antcall target="build"/>
-        <delete file="${ant.project.name}.jar" />
-        <jar jarfile="${ant.project.name}.jar">
-            <!-- Include the class-files (bin) and the resources (res) -->
-            <fileset dir="${bin}" />
-            <fileset dir="${res}" />
-        </jar>
-        <antcall target="clean-bin"/>
-    </target>
-
-    <!-- Build, package and distribute the project -->
-    <target name="build-package-distribute">
-        <antcall target="build-package"/>
-        <antcall target="copy-to-server"/>
-        <antcall target="copy-to-dropbox"/>
-    </target>
-
-    <!-- Build, package and distribute the project (includes remote) -->
-    <target name="build-package-distribute-remote">
-        <antcall target="build-package"/>
-        <antcall target="copy-to-server"/>
-        <antcall target="copy-to-dropbox"/>
-        <antcall target="copy-to-remote"/>
-    </target>
-
-
-
-    <!--
-    ###########################################################################
-    ###                                                                     ###
-    ###                          Clean targets                              ###
-    ###                                                                     ###
-    ###########################################################################
-    -->
-
-    <!-- Delete the bin folder -->
-    <target name="clean-bin">
-        <delete dir="${bin}"/>
-    </target>
-
-    <!-- Delete the bin folder and the jar-file -->
-    <target name="clean">
-        <antcall target="clean-bin"/>
-        <delete file="${ant.project.name}.jar"/>
-    </target>
-</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..7a4a9e0
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.garbagemule</groupId>
+  <artifactId>mobarena</artifactId>
+  <name>MobArena</name>
+  <version>0.96.10-SNAPSHOT</version>
+
+  <build>
+    <plugins>
+      <!-- Use Java 7 for compilation -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.3</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <!-- Rename the final jar-file to MobArena.jar -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <finalName>MobArena</finalName>
+        </configuration>
+      </plugin>
+    </plugins>
+
+    <resources>
+      <!-- Resource filtering; use Maven version in plugin.yml -->
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+  </build>
+
+  <repositories>
+    <!-- Spigot repo -->
+    <repository>
+      <id>spigot-repo</id>
+      <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+    </repository>
+    <!-- Vault repo -->
+    <repository>
+      <id>vault-repo</id>
+      <url>http://nexus.theyeticave.net/content/repositories/pub_releases/</url>
+    </repository>
+  </repositories>
+
+  <dependencies>
+    <!-- Spigot API -->
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.8.7-R0.1-SNAPSHOT</version>
+    </dependency>
+    <!-- Vault -->
+    <dependency>
+      <groupId>net.milkbowl.vault</groupId>
+      <artifactId>VaultAPI</artifactId>
+      <version>1.5</version>
+    </dependency>
+    <!-- Magic Spells (tentative) -->
+    <dependency>
+      <groupId>com.nisovin</groupId>
+      <artifactId>magicspells</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/MagicSpells.jar</systemPath>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/src/com/garbagemule/MobArena/ArenaClass.java b/src/main/java/com/garbagemule/MobArena/ArenaClass.java
similarity index 100%
rename from src/com/garbagemule/MobArena/ArenaClass.java
rename to src/main/java/com/garbagemule/MobArena/ArenaClass.java
diff --git a/src/com/garbagemule/MobArena/ArenaImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java
similarity index 100%
rename from src/com/garbagemule/MobArena/ArenaImpl.java
rename to src/main/java/com/garbagemule/MobArena/ArenaImpl.java
diff --git a/src/com/garbagemule/MobArena/ArenaListener.java b/src/main/java/com/garbagemule/MobArena/ArenaListener.java
similarity index 99%
rename from src/com/garbagemule/MobArena/ArenaListener.java
rename to src/main/java/com/garbagemule/MobArena/ArenaListener.java
index 4f95a00..ba2ff31 100644
--- a/src/com/garbagemule/MobArena/ArenaListener.java
+++ b/src/main/java/com/garbagemule/MobArena/ArenaListener.java
@@ -56,6 +56,7 @@ import com.garbagemule.MobArena.region.RegionPoint;
 import com.garbagemule.MobArena.repairable.*;
 import com.garbagemule.MobArena.util.TextUtils;
 import com.garbagemule.MobArena.waves.MABoss;
+import org.bukkit.projectiles.ProjectileSource;
 
 public class ArenaListener
 {
@@ -540,7 +541,10 @@ public class ArenaListener
 
         // Make sure to grab the owner of a projectile/pet
         if (damager instanceof Projectile) {
-            damager = ((Projectile) damager).getShooter();
+            ProjectileSource shooter = ((Projectile) damager).getShooter();
+            if (shooter instanceof Entity) {
+                damager = (Entity) shooter;
+            }
         }
         else if (damager instanceof Wolf && arena.hasPet(damager)) {
             damager = (Player) ((Wolf) damager).getOwner();
@@ -626,7 +630,10 @@ public class ArenaListener
             damager = edbe.getDamager();
 
             if (damager instanceof Projectile) {
-                damager = ((Projectile) damager).getShooter();
+                ProjectileSource shooter = ((Projectile) damager).getShooter();
+                if (shooter instanceof Entity) {
+                    damager = (Entity) shooter;
+                }
             }
 
             // Repair weapons if necessary
diff --git a/src/com/garbagemule/MobArena/ArenaMasterImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java
similarity index 100%
rename from src/com/garbagemule/MobArena/ArenaMasterImpl.java
rename to src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java
diff --git a/src/com/garbagemule/MobArena/ArenaPlayer.java b/src/main/java/com/garbagemule/MobArena/ArenaPlayer.java
similarity index 100%
rename from src/com/garbagemule/MobArena/ArenaPlayer.java
rename to src/main/java/com/garbagemule/MobArena/ArenaPlayer.java
diff --git a/src/com/garbagemule/MobArena/ArenaPlayerStatistics.java b/src/main/java/com/garbagemule/MobArena/ArenaPlayerStatistics.java
similarity index 100%
rename from src/com/garbagemule/MobArena/ArenaPlayerStatistics.java
rename to src/main/java/com/garbagemule/MobArena/ArenaPlayerStatistics.java
diff --git a/src/com/garbagemule/MobArena/ClassLimitManager.java b/src/main/java/com/garbagemule/MobArena/ClassLimitManager.java
similarity index 100%
rename from src/com/garbagemule/MobArena/ClassLimitManager.java
rename to src/main/java/com/garbagemule/MobArena/ClassLimitManager.java
diff --git a/src/com/garbagemule/MobArena/MASpawnThread.java b/src/main/java/com/garbagemule/MobArena/MASpawnThread.java
similarity index 100%
rename from src/com/garbagemule/MobArena/MASpawnThread.java
rename to src/main/java/com/garbagemule/MobArena/MASpawnThread.java
diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/main/java/com/garbagemule/MobArena/MAUtils.java
similarity index 100%
rename from src/com/garbagemule/MobArena/MAUtils.java
rename to src/main/java/com/garbagemule/MobArena/MAUtils.java
diff --git a/src/com/garbagemule/MobArena/Messenger.java b/src/main/java/com/garbagemule/MobArena/Messenger.java
similarity index 100%
rename from src/com/garbagemule/MobArena/Messenger.java
rename to src/main/java/com/garbagemule/MobArena/Messenger.java
diff --git a/src/com/garbagemule/MobArena/MobArena.java b/src/main/java/com/garbagemule/MobArena/MobArena.java
similarity index 100%
rename from src/com/garbagemule/MobArena/MobArena.java
rename to src/main/java/com/garbagemule/MobArena/MobArena.java
diff --git a/src/com/garbagemule/MobArena/MobArenaHandler.java b/src/main/java/com/garbagemule/MobArena/MobArenaHandler.java
similarity index 100%
rename from src/com/garbagemule/MobArena/MobArenaHandler.java
rename to src/main/java/com/garbagemule/MobArena/MobArenaHandler.java
diff --git a/src/com/garbagemule/MobArena/MonsterManager.java b/src/main/java/com/garbagemule/MobArena/MonsterManager.java
similarity index 100%
rename from src/com/garbagemule/MobArena/MonsterManager.java
rename to src/main/java/com/garbagemule/MobArena/MonsterManager.java
diff --git a/src/com/garbagemule/MobArena/Msg.java b/src/main/java/com/garbagemule/MobArena/Msg.java
similarity index 100%
rename from src/com/garbagemule/MobArena/Msg.java
rename to src/main/java/com/garbagemule/MobArena/Msg.java
diff --git a/src/com/garbagemule/MobArena/PlayerData.java b/src/main/java/com/garbagemule/MobArena/PlayerData.java
similarity index 100%
rename from src/com/garbagemule/MobArena/PlayerData.java
rename to src/main/java/com/garbagemule/MobArena/PlayerData.java
diff --git a/src/com/garbagemule/MobArena/RewardManager.java b/src/main/java/com/garbagemule/MobArena/RewardManager.java
similarity index 100%
rename from src/com/garbagemule/MobArena/RewardManager.java
rename to src/main/java/com/garbagemule/MobArena/RewardManager.java
diff --git a/src/com/garbagemule/MobArena/ScoreboardManager.java b/src/main/java/com/garbagemule/MobArena/ScoreboardManager.java
similarity index 100%
rename from src/com/garbagemule/MobArena/ScoreboardManager.java
rename to src/main/java/com/garbagemule/MobArena/ScoreboardManager.java
diff --git a/src/com/garbagemule/MobArena/commands/Command.java b/src/main/java/com/garbagemule/MobArena/commands/Command.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/Command.java
rename to src/main/java/com/garbagemule/MobArena/commands/Command.java
diff --git a/src/com/garbagemule/MobArena/commands/CommandHandler.java b/src/main/java/com/garbagemule/MobArena/commands/CommandHandler.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/CommandHandler.java
rename to src/main/java/com/garbagemule/MobArena/commands/CommandHandler.java
diff --git a/src/com/garbagemule/MobArena/commands/CommandInfo.java b/src/main/java/com/garbagemule/MobArena/commands/CommandInfo.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/CommandInfo.java
rename to src/main/java/com/garbagemule/MobArena/commands/CommandInfo.java
diff --git a/src/com/garbagemule/MobArena/commands/Commands.java b/src/main/java/com/garbagemule/MobArena/commands/Commands.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/Commands.java
rename to src/main/java/com/garbagemule/MobArena/commands/Commands.java
diff --git a/src/com/garbagemule/MobArena/commands/admin/DisableCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/DisableCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/admin/DisableCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/admin/DisableCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/admin/EnableCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/EnableCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/admin/EnableCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/admin/EnableCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/admin/ForceCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/ForceCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/admin/ForceCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/admin/ForceCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/admin/KickCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/KickCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/admin/KickCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/admin/KickCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/admin/RestoreCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/RestoreCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/admin/RestoreCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/admin/RestoreCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/CheckSpawnsCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/CheckSpawnsCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/CheckSpawnsCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/CheckSpawnsCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java
similarity index 94%
rename from src/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java
index 39b4899..4e1a9e5 100644
--- a/src/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java
+++ b/src/main/java/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java
@@ -8,10 +8,13 @@ import com.garbagemule.MobArena.commands.CommandInfo;
 import com.garbagemule.MobArena.commands.Commands;
 import com.garbagemule.MobArena.framework.ArenaMaster;
 import com.garbagemule.MobArena.util.config.ConfigUtils;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.HashSet;
+
 import static com.garbagemule.MobArena.util.config.ConfigUtils.setLocation;
 
 @CommandInfo(
@@ -39,11 +42,10 @@ public class ClassChestCommand implements Command {
         }
 
         Player p = (Player) sender;
-        Block b = p.getTargetBlock(null, 10);
+        Block b = p.getTargetBlock(new HashSet<Material>(), 10);
 
         switch (b.getType()) {
             case CHEST:
-            case LOCKED_CHEST:
             case ENDER_CHEST:
             case TRAPPED_CHEST:
                 break;
diff --git a/src/com/garbagemule/MobArena/commands/setup/ConfigCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ConfigCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/ConfigCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/ConfigCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/SetClassCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/SetClassCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/SetClassCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/SettingCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/SettingCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/SettingCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/SettingCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/SetupCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/setup/SetupCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/setup/SetupCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/user/ArenaListCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/ArenaListCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/user/ArenaListCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/user/ArenaListCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/user/JoinCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/JoinCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/user/JoinCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/user/JoinCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/user/LeaveCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/LeaveCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/user/LeaveCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/user/LeaveCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/user/NotReadyCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/NotReadyCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/user/NotReadyCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/user/NotReadyCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/user/PickClassCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/user/PickClassCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/user/PlayerListCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/PlayerListCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/user/PlayerListCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/user/PlayerListCommand.java
diff --git a/src/com/garbagemule/MobArena/commands/user/SpecCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/SpecCommand.java
similarity index 100%
rename from src/com/garbagemule/MobArena/commands/user/SpecCommand.java
rename to src/main/java/com/garbagemule/MobArena/commands/user/SpecCommand.java
diff --git a/src/com/garbagemule/MobArena/events/ArenaCompleteEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaCompleteEvent.java
similarity index 100%
rename from src/com/garbagemule/MobArena/events/ArenaCompleteEvent.java
rename to src/main/java/com/garbagemule/MobArena/events/ArenaCompleteEvent.java
diff --git a/src/com/garbagemule/MobArena/events/ArenaEndEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaEndEvent.java
similarity index 100%
rename from src/com/garbagemule/MobArena/events/ArenaEndEvent.java
rename to src/main/java/com/garbagemule/MobArena/events/ArenaEndEvent.java
diff --git a/src/com/garbagemule/MobArena/events/ArenaKillEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaKillEvent.java
similarity index 100%
rename from src/com/garbagemule/MobArena/events/ArenaKillEvent.java
rename to src/main/java/com/garbagemule/MobArena/events/ArenaKillEvent.java
diff --git a/src/com/garbagemule/MobArena/events/ArenaPlayerDeathEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerDeathEvent.java
similarity index 100%
rename from src/com/garbagemule/MobArena/events/ArenaPlayerDeathEvent.java
rename to src/main/java/com/garbagemule/MobArena/events/ArenaPlayerDeathEvent.java
diff --git a/src/com/garbagemule/MobArena/events/ArenaPlayerJoinEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerJoinEvent.java
similarity index 100%
rename from src/com/garbagemule/MobArena/events/ArenaPlayerJoinEvent.java
rename to src/main/java/com/garbagemule/MobArena/events/ArenaPlayerJoinEvent.java
diff --git a/src/com/garbagemule/MobArena/events/ArenaPlayerLeaveEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerLeaveEvent.java
similarity index 100%
rename from src/com/garbagemule/MobArena/events/ArenaPlayerLeaveEvent.java
rename to src/main/java/com/garbagemule/MobArena/events/ArenaPlayerLeaveEvent.java
diff --git a/src/com/garbagemule/MobArena/events/ArenaPlayerReadyEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerReadyEvent.java
similarity index 100%
rename from src/com/garbagemule/MobArena/events/ArenaPlayerReadyEvent.java
rename to src/main/java/com/garbagemule/MobArena/events/ArenaPlayerReadyEvent.java
diff --git a/src/com/garbagemule/MobArena/events/ArenaStartEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaStartEvent.java
similarity index 100%
rename from src/com/garbagemule/MobArena/events/ArenaStartEvent.java
rename to src/main/java/com/garbagemule/MobArena/events/ArenaStartEvent.java
diff --git a/src/com/garbagemule/MobArena/events/NewWaveEvent.java b/src/main/java/com/garbagemule/MobArena/events/NewWaveEvent.java
similarity index 100%
rename from src/com/garbagemule/MobArena/events/NewWaveEvent.java
rename to src/main/java/com/garbagemule/MobArena/events/NewWaveEvent.java
diff --git a/src/com/garbagemule/MobArena/framework/Arena.java b/src/main/java/com/garbagemule/MobArena/framework/Arena.java
similarity index 100%
rename from src/com/garbagemule/MobArena/framework/Arena.java
rename to src/main/java/com/garbagemule/MobArena/framework/Arena.java
diff --git a/src/com/garbagemule/MobArena/framework/ArenaMaster.java b/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java
similarity index 100%
rename from src/com/garbagemule/MobArena/framework/ArenaMaster.java
rename to src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java
diff --git a/src/com/garbagemule/MobArena/leaderboards/AbstractLeaderboardColumn.java b/src/main/java/com/garbagemule/MobArena/leaderboards/AbstractLeaderboardColumn.java
similarity index 100%
rename from src/com/garbagemule/MobArena/leaderboards/AbstractLeaderboardColumn.java
rename to src/main/java/com/garbagemule/MobArena/leaderboards/AbstractLeaderboardColumn.java
diff --git a/src/com/garbagemule/MobArena/leaderboards/ClassLeaderboardColumn.java b/src/main/java/com/garbagemule/MobArena/leaderboards/ClassLeaderboardColumn.java
similarity index 100%
rename from src/com/garbagemule/MobArena/leaderboards/ClassLeaderboardColumn.java
rename to src/main/java/com/garbagemule/MobArena/leaderboards/ClassLeaderboardColumn.java
diff --git a/src/com/garbagemule/MobArena/leaderboards/IntLeaderboardColumn.java b/src/main/java/com/garbagemule/MobArena/leaderboards/IntLeaderboardColumn.java
similarity index 100%
rename from src/com/garbagemule/MobArena/leaderboards/IntLeaderboardColumn.java
rename to src/main/java/com/garbagemule/MobArena/leaderboards/IntLeaderboardColumn.java
diff --git a/src/com/garbagemule/MobArena/leaderboards/Leaderboard.java b/src/main/java/com/garbagemule/MobArena/leaderboards/Leaderboard.java
similarity index 100%
rename from src/com/garbagemule/MobArena/leaderboards/Leaderboard.java
rename to src/main/java/com/garbagemule/MobArena/leaderboards/Leaderboard.java
diff --git a/src/com/garbagemule/MobArena/leaderboards/LeaderboardColumn.java b/src/main/java/com/garbagemule/MobArena/leaderboards/LeaderboardColumn.java
similarity index 100%
rename from src/com/garbagemule/MobArena/leaderboards/LeaderboardColumn.java
rename to src/main/java/com/garbagemule/MobArena/leaderboards/LeaderboardColumn.java
diff --git a/src/com/garbagemule/MobArena/leaderboards/PlayerLeaderboardColumn.java b/src/main/java/com/garbagemule/MobArena/leaderboards/PlayerLeaderboardColumn.java
similarity index 100%
rename from src/com/garbagemule/MobArena/leaderboards/PlayerLeaderboardColumn.java
rename to src/main/java/com/garbagemule/MobArena/leaderboards/PlayerLeaderboardColumn.java
diff --git a/src/com/garbagemule/MobArena/leaderboards/Stats.java b/src/main/java/com/garbagemule/MobArena/leaderboards/Stats.java
similarity index 100%
rename from src/com/garbagemule/MobArena/leaderboards/Stats.java
rename to src/main/java/com/garbagemule/MobArena/leaderboards/Stats.java
diff --git a/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java b/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java
similarity index 100%
rename from src/com/garbagemule/MobArena/listeners/MAGlobalListener.java
rename to src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java
diff --git a/src/com/garbagemule/MobArena/listeners/MagicSpellsListener.java b/src/main/java/com/garbagemule/MobArena/listeners/MagicSpellsListener.java
similarity index 100%
rename from src/com/garbagemule/MobArena/listeners/MagicSpellsListener.java
rename to src/main/java/com/garbagemule/MobArena/listeners/MagicSpellsListener.java
diff --git a/src/com/garbagemule/MobArena/metrics/Metrics.java b/src/main/java/com/garbagemule/MobArena/metrics/Metrics.java
similarity index 99%
rename from src/com/garbagemule/MobArena/metrics/Metrics.java
rename to src/main/java/com/garbagemule/MobArena/metrics/Metrics.java
index 134a820..5cb4ade 100644
--- a/src/com/garbagemule/MobArena/metrics/Metrics.java
+++ b/src/main/java/com/garbagemule/MobArena/metrics/Metrics.java
@@ -354,7 +354,7 @@ public class Metrics {
         boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
         String pluginVersion = description.getVersion();
         String serverVersion = Bukkit.getVersion();
-        int playersOnline = Bukkit.getServer().getOnlinePlayers().length;
+        int playersOnline = Bukkit.getServer().getOnlinePlayers().size();
  
         // END server software specific section -- all code below does not use any code outside of this class / Java
  
diff --git a/src/com/garbagemule/MobArena/region/ArenaRegion.java b/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java
similarity index 100%
rename from src/com/garbagemule/MobArena/region/ArenaRegion.java
rename to src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java
diff --git a/src/com/garbagemule/MobArena/region/RegionPoint.java b/src/main/java/com/garbagemule/MobArena/region/RegionPoint.java
similarity index 100%
rename from src/com/garbagemule/MobArena/region/RegionPoint.java
rename to src/main/java/com/garbagemule/MobArena/region/RegionPoint.java
diff --git a/src/com/garbagemule/MobArena/region/RegionSerializer.java b/src/main/java/com/garbagemule/MobArena/region/RegionSerializer.java
similarity index 100%
rename from src/com/garbagemule/MobArena/region/RegionSerializer.java
rename to src/main/java/com/garbagemule/MobArena/region/RegionSerializer.java
diff --git a/src/com/garbagemule/MobArena/repairable/Repairable.java b/src/main/java/com/garbagemule/MobArena/repairable/Repairable.java
similarity index 100%
rename from src/com/garbagemule/MobArena/repairable/Repairable.java
rename to src/main/java/com/garbagemule/MobArena/repairable/Repairable.java
diff --git a/src/com/garbagemule/MobArena/repairable/RepairableAttachable.java b/src/main/java/com/garbagemule/MobArena/repairable/RepairableAttachable.java
similarity index 100%
rename from src/com/garbagemule/MobArena/repairable/RepairableAttachable.java
rename to src/main/java/com/garbagemule/MobArena/repairable/RepairableAttachable.java
diff --git a/src/com/garbagemule/MobArena/repairable/RepairableBed.java b/src/main/java/com/garbagemule/MobArena/repairable/RepairableBed.java
similarity index 100%
rename from src/com/garbagemule/MobArena/repairable/RepairableBed.java
rename to src/main/java/com/garbagemule/MobArena/repairable/RepairableBed.java
diff --git a/src/com/garbagemule/MobArena/repairable/RepairableBlock.java b/src/main/java/com/garbagemule/MobArena/repairable/RepairableBlock.java
similarity index 100%
rename from src/com/garbagemule/MobArena/repairable/RepairableBlock.java
rename to src/main/java/com/garbagemule/MobArena/repairable/RepairableBlock.java
diff --git a/src/com/garbagemule/MobArena/repairable/RepairableComparator.java b/src/main/java/com/garbagemule/MobArena/repairable/RepairableComparator.java
similarity index 100%
rename from src/com/garbagemule/MobArena/repairable/RepairableComparator.java
rename to src/main/java/com/garbagemule/MobArena/repairable/RepairableComparator.java
diff --git a/src/com/garbagemule/MobArena/repairable/RepairableContainer.java b/src/main/java/com/garbagemule/MobArena/repairable/RepairableContainer.java
similarity index 100%
rename from src/com/garbagemule/MobArena/repairable/RepairableContainer.java
rename to src/main/java/com/garbagemule/MobArena/repairable/RepairableContainer.java
diff --git a/src/com/garbagemule/MobArena/repairable/RepairableDoor.java b/src/main/java/com/garbagemule/MobArena/repairable/RepairableDoor.java
similarity index 100%
rename from src/com/garbagemule/MobArena/repairable/RepairableDoor.java
rename to src/main/java/com/garbagemule/MobArena/repairable/RepairableDoor.java
diff --git a/src/com/garbagemule/MobArena/repairable/RepairableSign.java b/src/main/java/com/garbagemule/MobArena/repairable/RepairableSign.java
similarity index 100%
rename from src/com/garbagemule/MobArena/repairable/RepairableSign.java
rename to src/main/java/com/garbagemule/MobArena/repairable/RepairableSign.java
diff --git a/src/com/garbagemule/MobArena/time/Time.java b/src/main/java/com/garbagemule/MobArena/time/Time.java
similarity index 100%
rename from src/com/garbagemule/MobArena/time/Time.java
rename to src/main/java/com/garbagemule/MobArena/time/Time.java
diff --git a/src/com/garbagemule/MobArena/time/TimeStrategy.java b/src/main/java/com/garbagemule/MobArena/time/TimeStrategy.java
similarity index 100%
rename from src/com/garbagemule/MobArena/time/TimeStrategy.java
rename to src/main/java/com/garbagemule/MobArena/time/TimeStrategy.java
diff --git a/src/com/garbagemule/MobArena/time/TimeStrategyLocked.java b/src/main/java/com/garbagemule/MobArena/time/TimeStrategyLocked.java
similarity index 100%
rename from src/com/garbagemule/MobArena/time/TimeStrategyLocked.java
rename to src/main/java/com/garbagemule/MobArena/time/TimeStrategyLocked.java
diff --git a/src/com/garbagemule/MobArena/time/TimeStrategyNull.java b/src/main/java/com/garbagemule/MobArena/time/TimeStrategyNull.java
similarity index 100%
rename from src/com/garbagemule/MobArena/time/TimeStrategyNull.java
rename to src/main/java/com/garbagemule/MobArena/time/TimeStrategyNull.java
diff --git a/src/com/garbagemule/MobArena/util/Delays.java b/src/main/java/com/garbagemule/MobArena/util/Delays.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/Delays.java
rename to src/main/java/com/garbagemule/MobArena/util/Delays.java
diff --git a/src/com/garbagemule/MobArena/util/EntityPosition.java b/src/main/java/com/garbagemule/MobArena/util/EntityPosition.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/EntityPosition.java
rename to src/main/java/com/garbagemule/MobArena/util/EntityPosition.java
diff --git a/src/com/garbagemule/MobArena/util/Enums.java b/src/main/java/com/garbagemule/MobArena/util/Enums.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/Enums.java
rename to src/main/java/com/garbagemule/MobArena/util/Enums.java
diff --git a/src/com/garbagemule/MobArena/util/ItemParser.java b/src/main/java/com/garbagemule/MobArena/util/ItemParser.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/ItemParser.java
rename to src/main/java/com/garbagemule/MobArena/util/ItemParser.java
diff --git a/src/com/garbagemule/MobArena/util/MutableInt.java b/src/main/java/com/garbagemule/MobArena/util/MutableInt.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/MutableInt.java
rename to src/main/java/com/garbagemule/MobArena/util/MutableInt.java
diff --git a/src/com/garbagemule/MobArena/util/PotionEffectParser.java b/src/main/java/com/garbagemule/MobArena/util/PotionEffectParser.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/PotionEffectParser.java
rename to src/main/java/com/garbagemule/MobArena/util/PotionEffectParser.java
diff --git a/src/com/garbagemule/MobArena/util/TextUtils.java b/src/main/java/com/garbagemule/MobArena/util/TextUtils.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/TextUtils.java
rename to src/main/java/com/garbagemule/MobArena/util/TextUtils.java
diff --git a/src/com/garbagemule/MobArena/util/TimeUtils.java b/src/main/java/com/garbagemule/MobArena/util/TimeUtils.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/TimeUtils.java
rename to src/main/java/com/garbagemule/MobArena/util/TimeUtils.java
diff --git a/src/com/garbagemule/MobArena/util/Updater.java b/src/main/java/com/garbagemule/MobArena/util/Updater.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/Updater.java
rename to src/main/java/com/garbagemule/MobArena/util/Updater.java
diff --git a/src/com/garbagemule/MobArena/util/VersionChecker.java b/src/main/java/com/garbagemule/MobArena/util/VersionChecker.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/VersionChecker.java
rename to src/main/java/com/garbagemule/MobArena/util/VersionChecker.java
diff --git a/src/com/garbagemule/MobArena/util/config/ConfigUtils.java b/src/main/java/com/garbagemule/MobArena/util/config/ConfigUtils.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/config/ConfigUtils.java
rename to src/main/java/com/garbagemule/MobArena/util/config/ConfigUtils.java
diff --git a/src/com/garbagemule/MobArena/util/inventory/InventoryManager.java b/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/inventory/InventoryManager.java
rename to src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java
diff --git a/src/com/garbagemule/MobArena/util/inventory/InventoryUtils.java b/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryUtils.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/inventory/InventoryUtils.java
rename to src/main/java/com/garbagemule/MobArena/util/inventory/InventoryUtils.java
diff --git a/src/com/garbagemule/MobArena/util/timer/AbstractTimer.java b/src/main/java/com/garbagemule/MobArena/util/timer/AbstractTimer.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/timer/AbstractTimer.java
rename to src/main/java/com/garbagemule/MobArena/util/timer/AbstractTimer.java
diff --git a/src/com/garbagemule/MobArena/util/timer/AutoStartTimer.java b/src/main/java/com/garbagemule/MobArena/util/timer/AutoStartTimer.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/timer/AutoStartTimer.java
rename to src/main/java/com/garbagemule/MobArena/util/timer/AutoStartTimer.java
diff --git a/src/com/garbagemule/MobArena/util/timer/ChatCallback.java b/src/main/java/com/garbagemule/MobArena/util/timer/ChatCallback.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/timer/ChatCallback.java
rename to src/main/java/com/garbagemule/MobArena/util/timer/ChatCallback.java
diff --git a/src/com/garbagemule/MobArena/util/timer/Common.java b/src/main/java/com/garbagemule/MobArena/util/timer/Common.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/timer/Common.java
rename to src/main/java/com/garbagemule/MobArena/util/timer/Common.java
diff --git a/src/com/garbagemule/MobArena/util/timer/CountdownTimer.java b/src/main/java/com/garbagemule/MobArena/util/timer/CountdownTimer.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/timer/CountdownTimer.java
rename to src/main/java/com/garbagemule/MobArena/util/timer/CountdownTimer.java
diff --git a/src/com/garbagemule/MobArena/util/timer/LevelCallback.java b/src/main/java/com/garbagemule/MobArena/util/timer/LevelCallback.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/timer/LevelCallback.java
rename to src/main/java/com/garbagemule/MobArena/util/timer/LevelCallback.java
diff --git a/src/com/garbagemule/MobArena/util/timer/StartDelayTimer.java b/src/main/java/com/garbagemule/MobArena/util/timer/StartDelayTimer.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/timer/StartDelayTimer.java
rename to src/main/java/com/garbagemule/MobArena/util/timer/StartDelayTimer.java
diff --git a/src/com/garbagemule/MobArena/util/timer/StopwatchTimer.java b/src/main/java/com/garbagemule/MobArena/util/timer/StopwatchTimer.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/timer/StopwatchTimer.java
rename to src/main/java/com/garbagemule/MobArena/util/timer/StopwatchTimer.java
diff --git a/src/com/garbagemule/MobArena/util/timer/Timer.java b/src/main/java/com/garbagemule/MobArena/util/timer/Timer.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/timer/Timer.java
rename to src/main/java/com/garbagemule/MobArena/util/timer/Timer.java
diff --git a/src/com/garbagemule/MobArena/util/timer/TimerCallback.java b/src/main/java/com/garbagemule/MobArena/util/timer/TimerCallback.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/timer/TimerCallback.java
rename to src/main/java/com/garbagemule/MobArena/util/timer/TimerCallback.java
diff --git a/src/com/garbagemule/MobArena/util/timer/TimerCallbackAdapter.java b/src/main/java/com/garbagemule/MobArena/util/timer/TimerCallbackAdapter.java
similarity index 100%
rename from src/com/garbagemule/MobArena/util/timer/TimerCallbackAdapter.java
rename to src/main/java/com/garbagemule/MobArena/util/timer/TimerCallbackAdapter.java
diff --git a/src/com/garbagemule/MobArena/waves/AbstractWave.java b/src/main/java/com/garbagemule/MobArena/waves/AbstractWave.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/AbstractWave.java
rename to src/main/java/com/garbagemule/MobArena/waves/AbstractWave.java
diff --git a/src/com/garbagemule/MobArena/waves/BossAbilityThread.java b/src/main/java/com/garbagemule/MobArena/waves/BossAbilityThread.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/BossAbilityThread.java
rename to src/main/java/com/garbagemule/MobArena/waves/BossAbilityThread.java
diff --git a/src/com/garbagemule/MobArena/waves/MABoss.java b/src/main/java/com/garbagemule/MobArena/waves/MABoss.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/MABoss.java
rename to src/main/java/com/garbagemule/MobArena/waves/MABoss.java
diff --git a/src/com/garbagemule/MobArena/waves/MACreature.java b/src/main/java/com/garbagemule/MobArena/waves/MACreature.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/MACreature.java
rename to src/main/java/com/garbagemule/MobArena/waves/MACreature.java
diff --git a/src/com/garbagemule/MobArena/waves/SheepBouncer.java b/src/main/java/com/garbagemule/MobArena/waves/SheepBouncer.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/SheepBouncer.java
rename to src/main/java/com/garbagemule/MobArena/waves/SheepBouncer.java
diff --git a/src/com/garbagemule/MobArena/waves/Wave.java b/src/main/java/com/garbagemule/MobArena/waves/Wave.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/Wave.java
rename to src/main/java/com/garbagemule/MobArena/waves/Wave.java
diff --git a/src/com/garbagemule/MobArena/waves/WaveManager.java b/src/main/java/com/garbagemule/MobArena/waves/WaveManager.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/WaveManager.java
rename to src/main/java/com/garbagemule/MobArena/waves/WaveManager.java
diff --git a/src/com/garbagemule/MobArena/waves/WaveParser.java b/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/WaveParser.java
rename to src/main/java/com/garbagemule/MobArena/waves/WaveParser.java
diff --git a/src/com/garbagemule/MobArena/waves/WaveUtils.java b/src/main/java/com/garbagemule/MobArena/waves/WaveUtils.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/WaveUtils.java
rename to src/main/java/com/garbagemule/MobArena/waves/WaveUtils.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/Ability.java b/src/main/java/com/garbagemule/MobArena/waves/ability/Ability.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/Ability.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/Ability.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/AbilityInfo.java b/src/main/java/com/garbagemule/MobArena/waves/ability/AbilityInfo.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/AbilityInfo.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/AbilityInfo.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/AbilityManager.java b/src/main/java/com/garbagemule/MobArena/waves/ability/AbilityManager.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/AbilityManager.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/AbilityManager.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/AbilityUtils.java b/src/main/java/com/garbagemule/MobArena/waves/ability/AbilityUtils.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/AbilityUtils.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/AbilityUtils.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/ChainLightning.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/ChainLightning.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/ChainLightning.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/ChainLightning.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/DisorientDistant.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/DisorientDistant.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/DisorientDistant.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/DisorientDistant.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/DisorientNearby.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/DisorientNearby.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/DisorientNearby.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/DisorientNearby.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/DisorientTarget.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/DisorientTarget.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/DisorientTarget.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/DisorientTarget.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/FetchDistant.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/FetchDistant.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/FetchDistant.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/FetchDistant.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/FetchNearby.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/FetchNearby.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/FetchNearby.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/FetchNearby.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/FetchTarget.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/FetchTarget.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/FetchTarget.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/FetchTarget.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/FireAura.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/FireAura.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/FireAura.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/FireAura.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/Flood.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/Flood.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/Flood.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/Flood.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/LightningAura.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/LightningAura.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/LightningAura.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/LightningAura.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/LivingBomb.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/LivingBomb.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/LivingBomb.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/LivingBomb.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/ObsidianBomb.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/ObsidianBomb.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/ObsidianBomb.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/ObsidianBomb.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/PullDistant.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/PullDistant.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/PullDistant.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/PullDistant.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/PullNearby.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/PullNearby.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/PullNearby.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/PullNearby.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/PullTarget.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/PullTarget.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/PullTarget.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/PullTarget.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/RootTarget.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/RootTarget.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/RootTarget.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/RootTarget.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/ShootArrow.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/ShootArrow.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/ShootArrow.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/ShootArrow.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/ShootFireball.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/ShootFireball.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/ShootFireball.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/ShootFireball.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/ShufflePositions.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/ShufflePositions.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/ShufflePositions.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/ShufflePositions.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/ThrowDistant.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/ThrowDistant.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/ThrowDistant.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/ThrowDistant.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/ThrowNearby.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/ThrowNearby.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/ThrowNearby.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/ThrowNearby.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/ThrowTarget.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/ThrowTarget.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/ThrowTarget.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/ThrowTarget.java
diff --git a/src/com/garbagemule/MobArena/waves/ability/core/WarpToPlayer.java b/src/main/java/com/garbagemule/MobArena/waves/ability/core/WarpToPlayer.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/ability/core/WarpToPlayer.java
rename to src/main/java/com/garbagemule/MobArena/waves/ability/core/WarpToPlayer.java
diff --git a/src/com/garbagemule/MobArena/waves/enums/BossHealth.java b/src/main/java/com/garbagemule/MobArena/waves/enums/BossHealth.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/enums/BossHealth.java
rename to src/main/java/com/garbagemule/MobArena/waves/enums/BossHealth.java
diff --git a/src/com/garbagemule/MobArena/waves/enums/SwarmAmount.java b/src/main/java/com/garbagemule/MobArena/waves/enums/SwarmAmount.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/enums/SwarmAmount.java
rename to src/main/java/com/garbagemule/MobArena/waves/enums/SwarmAmount.java
diff --git a/src/com/garbagemule/MobArena/waves/enums/WaveBranch.java b/src/main/java/com/garbagemule/MobArena/waves/enums/WaveBranch.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/enums/WaveBranch.java
rename to src/main/java/com/garbagemule/MobArena/waves/enums/WaveBranch.java
diff --git a/src/com/garbagemule/MobArena/waves/enums/WaveError.java b/src/main/java/com/garbagemule/MobArena/waves/enums/WaveError.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/enums/WaveError.java
rename to src/main/java/com/garbagemule/MobArena/waves/enums/WaveError.java
diff --git a/src/com/garbagemule/MobArena/waves/enums/WaveGrowth.java b/src/main/java/com/garbagemule/MobArena/waves/enums/WaveGrowth.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/enums/WaveGrowth.java
rename to src/main/java/com/garbagemule/MobArena/waves/enums/WaveGrowth.java
diff --git a/src/com/garbagemule/MobArena/waves/enums/WaveType.java b/src/main/java/com/garbagemule/MobArena/waves/enums/WaveType.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/enums/WaveType.java
rename to src/main/java/com/garbagemule/MobArena/waves/enums/WaveType.java
diff --git a/src/com/garbagemule/MobArena/waves/types/BossWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/BossWave.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/types/BossWave.java
rename to src/main/java/com/garbagemule/MobArena/waves/types/BossWave.java
diff --git a/src/com/garbagemule/MobArena/waves/types/DefaultWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/DefaultWave.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/types/DefaultWave.java
rename to src/main/java/com/garbagemule/MobArena/waves/types/DefaultWave.java
diff --git a/src/com/garbagemule/MobArena/waves/types/SpecialWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/SpecialWave.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/types/SpecialWave.java
rename to src/main/java/com/garbagemule/MobArena/waves/types/SpecialWave.java
diff --git a/src/com/garbagemule/MobArena/waves/types/SupplyWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/SupplyWave.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/types/SupplyWave.java
rename to src/main/java/com/garbagemule/MobArena/waves/types/SupplyWave.java
diff --git a/src/com/garbagemule/MobArena/waves/types/SwarmWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/SwarmWave.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/types/SwarmWave.java
rename to src/main/java/com/garbagemule/MobArena/waves/types/SwarmWave.java
diff --git a/src/com/garbagemule/MobArena/waves/types/UpgradeWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/UpgradeWave.java
similarity index 100%
rename from src/com/garbagemule/MobArena/waves/types/UpgradeWave.java
rename to src/main/java/com/garbagemule/MobArena/waves/types/UpgradeWave.java
diff --git a/resources/config.yml b/src/main/resources/config.yml
similarity index 100%
rename from resources/config.yml
rename to src/main/resources/config.yml
diff --git a/resources/magicspells.yml b/src/main/resources/magicspells.yml
similarity index 100%
rename from resources/magicspells.yml
rename to src/main/resources/magicspells.yml
diff --git a/resources/plugin.yml b/src/main/resources/plugin.yml
similarity index 98%
rename from resources/plugin.yml
rename to src/main/resources/plugin.yml
index 69464f1..ccd7f43 100644
--- a/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
-name: MobArena
+name: ${project.name}
 author: garbagemule
 main: com.garbagemule.MobArena.MobArena
-version: 0.96.9.1
+version: ${project.version}
 softdepend: [Multiverse-Core,Towny,Heroes,MagicSpells,Vault]
 commands:
     ma:
diff --git a/resources/res/classes.yml b/src/main/resources/res/classes.yml
similarity index 100%
rename from resources/res/classes.yml
rename to src/main/resources/res/classes.yml
diff --git a/resources/res/config.yml b/src/main/resources/res/config.yml
similarity index 100%
rename from resources/res/config.yml
rename to src/main/resources/res/config.yml
diff --git a/resources/res/global-settings.yml b/src/main/resources/res/global-settings.yml
similarity index 100%
rename from resources/res/global-settings.yml
rename to src/main/resources/res/global-settings.yml
diff --git a/resources/res/rewards.yml b/src/main/resources/res/rewards.yml
similarity index 100%
rename from resources/res/rewards.yml
rename to src/main/resources/res/rewards.yml
diff --git a/resources/res/settings.yml b/src/main/resources/res/settings.yml
similarity index 100%
rename from resources/res/settings.yml
rename to src/main/resources/res/settings.yml
diff --git a/resources/res/totals.yml b/src/main/resources/res/totals.yml
similarity index 100%
rename from resources/res/totals.yml
rename to src/main/resources/res/totals.yml
diff --git a/resources/res/waves.yml b/src/main/resources/res/waves.yml
similarity index 100%
rename from resources/res/waves.yml
rename to src/main/resources/res/waves.yml