diff --git a/.gitignore b/.gitignore
index 1395c2d..4ce2af9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .idea/
 out/
+target/
\ No newline at end of file
diff --git a/HubThat.iml b/HubThat.iml
new file mode 100644
index 0000000..6ad7bd5
--- /dev/null
+++ b/HubThat.iml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_9">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.15-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.15.2-R0.1-SNAPSHOT" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/ant_build_increment.xml b/ant_build_increment.xml
index c4d5559..63a38bf 100644
--- a/ant_build_increment.xml
+++ b/ant_build_increment.xml
@@ -12,7 +12,7 @@
   <target name="init">
     <echo file="ant_buildversion_init.txt">Changing build version from BUILD_VERSION to ${version}.${build.number} in file plugin.yml...</echo>
 
-    <replaceregexp file="${src}/plugin.yml"
+    <replaceregexp file="${src}/main/resources/plugin.yml"
                match="BUILD_NUMBER"
                replace="${version}.${build.number}"
                byline="true"
@@ -26,7 +26,7 @@
     <echo file="ant_buildversion_end.txt">Changing back build version ${version}.${build.number} in file plugin.yml to BUILD_VERSION...</echo>
 	
 	
-    <replaceregexp file="${src}/plugin.yml"
+    <replaceregexp file="${src}/java/resources/plugin.yml"
                match="${version}.${build.number}"
                replace="BUILD_NUMBER"
                byline="true"
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..3461de7
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,54 @@
+<?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>net.mindoverflow.hubthat</groupId>
+    <artifactId>HubThat</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <properties>
+        <maven.compiler.source>1.9</maven.compiler.source>
+        <maven.compiler.target>1.9</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <repositories>
+        <!-- This adds the Spigot Maven repository to the build -->
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <!--This adds the Spigot API artifact to the build -->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.15.2-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--This adds the Bukkit API artifact to the build -->
+        <!-- Do not include this in the pom.xml file if the Spigot API is already added -->
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>1.15.2-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/src/net/mindoverflow/hubthat/HubThat.java b/src/main/java/net/mindoverflow/hubthat/HubThat.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/HubThat.java
rename to src/main/java/net/mindoverflow/hubthat/HubThat.java
diff --git a/src/net/mindoverflow/hubthat/commands/HubCommand.java b/src/main/java/net/mindoverflow/hubthat/commands/HubCommand.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/commands/HubCommand.java
rename to src/main/java/net/mindoverflow/hubthat/commands/HubCommand.java
diff --git a/src/net/mindoverflow/hubthat/commands/HubThatCommand.java b/src/main/java/net/mindoverflow/hubthat/commands/HubThatCommand.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/commands/HubThatCommand.java
rename to src/main/java/net/mindoverflow/hubthat/commands/HubThatCommand.java
diff --git a/src/net/mindoverflow/hubthat/commands/SetHubCommand.java b/src/main/java/net/mindoverflow/hubthat/commands/SetHubCommand.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/commands/SetHubCommand.java
rename to src/main/java/net/mindoverflow/hubthat/commands/SetHubCommand.java
diff --git a/src/net/mindoverflow/hubthat/commands/SetSpawnCommand.java b/src/main/java/net/mindoverflow/hubthat/commands/SetSpawnCommand.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/commands/SetSpawnCommand.java
rename to src/main/java/net/mindoverflow/hubthat/commands/SetSpawnCommand.java
diff --git a/src/net/mindoverflow/hubthat/commands/SpawnCommand.java b/src/main/java/net/mindoverflow/hubthat/commands/SpawnCommand.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/commands/SpawnCommand.java
rename to src/main/java/net/mindoverflow/hubthat/commands/SpawnCommand.java
diff --git a/src/net/mindoverflow/hubthat/commands/WorldCreatorCommand.java b/src/main/java/net/mindoverflow/hubthat/commands/WorldCreatorCommand.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/commands/WorldCreatorCommand.java
rename to src/main/java/net/mindoverflow/hubthat/commands/WorldCreatorCommand.java
diff --git a/src/net/mindoverflow/hubthat/commands/WorldListCommand.java b/src/main/java/net/mindoverflow/hubthat/commands/WorldListCommand.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/commands/WorldListCommand.java
rename to src/main/java/net/mindoverflow/hubthat/commands/WorldListCommand.java
diff --git a/src/net/mindoverflow/hubthat/commands/WorldTpCommand.java b/src/main/java/net/mindoverflow/hubthat/commands/WorldTpCommand.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/commands/WorldTpCommand.java
rename to src/main/java/net/mindoverflow/hubthat/commands/WorldTpCommand.java
diff --git a/src/net/mindoverflow/hubthat/commands/hubthatcommands/HelpCommand.java b/src/main/java/net/mindoverflow/hubthat/commands/hubthatcommands/HelpCommand.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/commands/hubthatcommands/HelpCommand.java
rename to src/main/java/net/mindoverflow/hubthat/commands/hubthatcommands/HelpCommand.java
diff --git a/src/net/mindoverflow/hubthat/commands/hubthatcommands/ReloadCommand.java b/src/main/java/net/mindoverflow/hubthat/commands/hubthatcommands/ReloadCommand.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/commands/hubthatcommands/ReloadCommand.java
rename to src/main/java/net/mindoverflow/hubthat/commands/hubthatcommands/ReloadCommand.java
diff --git a/src/net/mindoverflow/hubthat/completers/InfoCompleter.java b/src/main/java/net/mindoverflow/hubthat/completers/InfoCompleter.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/completers/InfoCompleter.java
rename to src/main/java/net/mindoverflow/hubthat/completers/InfoCompleter.java
diff --git a/src/net/mindoverflow/hubthat/completers/SpawnCompleter.java b/src/main/java/net/mindoverflow/hubthat/completers/SpawnCompleter.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/completers/SpawnCompleter.java
rename to src/main/java/net/mindoverflow/hubthat/completers/SpawnCompleter.java
diff --git a/src/net/mindoverflow/hubthat/listeners/PlayerChatListener.java b/src/main/java/net/mindoverflow/hubthat/listeners/PlayerChatListener.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/listeners/PlayerChatListener.java
rename to src/main/java/net/mindoverflow/hubthat/listeners/PlayerChatListener.java
diff --git a/src/net/mindoverflow/hubthat/listeners/PlayerJoinListener.java b/src/main/java/net/mindoverflow/hubthat/listeners/PlayerJoinListener.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/listeners/PlayerJoinListener.java
rename to src/main/java/net/mindoverflow/hubthat/listeners/PlayerJoinListener.java
diff --git a/src/net/mindoverflow/hubthat/listeners/PlayerMoveListener.java b/src/main/java/net/mindoverflow/hubthat/listeners/PlayerMoveListener.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/listeners/PlayerMoveListener.java
rename to src/main/java/net/mindoverflow/hubthat/listeners/PlayerMoveListener.java
diff --git a/src/net/mindoverflow/hubthat/listeners/PlayerRespawnListener.java b/src/main/java/net/mindoverflow/hubthat/listeners/PlayerRespawnListener.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/listeners/PlayerRespawnListener.java
rename to src/main/java/net/mindoverflow/hubthat/listeners/PlayerRespawnListener.java
diff --git a/src/net/mindoverflow/hubthat/utils/CommonValues.java b/src/main/java/net/mindoverflow/hubthat/utils/CommonValues.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/CommonValues.java
rename to src/main/java/net/mindoverflow/hubthat/utils/CommonValues.java
diff --git a/src/net/mindoverflow/hubthat/utils/ConfigEntries.java b/src/main/java/net/mindoverflow/hubthat/utils/ConfigEntries.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/ConfigEntries.java
rename to src/main/java/net/mindoverflow/hubthat/utils/ConfigEntries.java
diff --git a/src/net/mindoverflow/hubthat/utils/Debugger.java b/src/main/java/net/mindoverflow/hubthat/utils/Debugger.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/Debugger.java
rename to src/main/java/net/mindoverflow/hubthat/utils/Debugger.java
diff --git a/src/net/mindoverflow/hubthat/utils/LocalizedMessages.java b/src/main/java/net/mindoverflow/hubthat/utils/LocalizedMessages.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/LocalizedMessages.java
rename to src/main/java/net/mindoverflow/hubthat/utils/LocalizedMessages.java
diff --git a/src/net/mindoverflow/hubthat/utils/MessageUtils.java b/src/main/java/net/mindoverflow/hubthat/utils/MessageUtils.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/MessageUtils.java
rename to src/main/java/net/mindoverflow/hubthat/utils/MessageUtils.java
diff --git a/src/net/mindoverflow/hubthat/utils/PermissionUtils.java b/src/main/java/net/mindoverflow/hubthat/utils/PermissionUtils.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/PermissionUtils.java
rename to src/main/java/net/mindoverflow/hubthat/utils/PermissionUtils.java
diff --git a/src/net/mindoverflow/hubthat/utils/Permissions.java b/src/main/java/net/mindoverflow/hubthat/utils/Permissions.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/Permissions.java
rename to src/main/java/net/mindoverflow/hubthat/utils/Permissions.java
diff --git a/src/net/mindoverflow/hubthat/utils/TeleportUtils.java b/src/main/java/net/mindoverflow/hubthat/utils/TeleportUtils.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/TeleportUtils.java
rename to src/main/java/net/mindoverflow/hubthat/utils/TeleportUtils.java
diff --git a/src/net/mindoverflow/hubthat/utils/files/FileUtils.java b/src/main/java/net/mindoverflow/hubthat/utils/files/FileUtils.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/files/FileUtils.java
rename to src/main/java/net/mindoverflow/hubthat/utils/files/FileUtils.java
diff --git a/src/net/mindoverflow/hubthat/utils/files/OldConfigConversion.java b/src/main/java/net/mindoverflow/hubthat/utils/files/OldConfigConversion.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/files/OldConfigConversion.java
rename to src/main/java/net/mindoverflow/hubthat/utils/files/OldConfigConversion.java
diff --git a/src/net/mindoverflow/hubthat/utils/statistics/Metrics.java b/src/main/java/net/mindoverflow/hubthat/utils/statistics/Metrics.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/statistics/Metrics.java
rename to src/main/java/net/mindoverflow/hubthat/utils/statistics/Metrics.java
diff --git a/src/net/mindoverflow/hubthat/utils/statistics/UpdateChecker.java b/src/main/java/net/mindoverflow/hubthat/utils/statistics/UpdateChecker.java
similarity index 100%
rename from src/net/mindoverflow/hubthat/utils/statistics/UpdateChecker.java
rename to src/main/java/net/mindoverflow/hubthat/utils/statistics/UpdateChecker.java
diff --git a/src/spawn.yml b/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from src/spawn.yml
rename to src/main/resources/META-INF/MANIFEST.MF
diff --git a/src/config.yml b/src/main/resources/config.yml
similarity index 100%
rename from src/config.yml
rename to src/main/resources/config.yml
diff --git a/src/hub.yml b/src/main/resources/hub.yml
similarity index 100%
rename from src/hub.yml
rename to src/main/resources/hub.yml
diff --git a/src/lang.yml b/src/main/resources/lang.yml
similarity index 100%
rename from src/lang.yml
rename to src/main/resources/lang.yml
diff --git a/src/plugin.yml b/src/main/resources/plugin.yml
similarity index 96%
rename from src/plugin.yml
rename to src/main/resources/plugin.yml
index d5f6a4a..28d3656 100644
--- a/src/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: HubThat
-version: BUILD_NUMBER
+version: 10.0.167
 author: mind_overflow
 main: net.mindoverflow.hubthat.HubThat
 api-version: 1.13
diff --git a/src/main/resources/spawn.yml b/src/main/resources/spawn.yml
new file mode 100644
index 0000000..e69de29