diff --git a/libs/.keep b/libs/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/libs/ChestShop.jar b/libs/ChestShop.jar
new file mode 100644
index 000000000..e2a7f458f
Binary files /dev/null and b/libs/ChestShop.jar differ
diff --git a/libs/Citizens.jar b/libs/Citizens.jar
new file mode 100644
index 000000000..9cf4d17c4
Binary files /dev/null and b/libs/Citizens.jar differ
diff --git a/libs/Notifications.jar b/libs/Notifications.jar
new file mode 100644
index 000000000..0a862e664
Binary files /dev/null and b/libs/Notifications.jar differ
diff --git a/libs/xAuth.jar b/libs/xAuth.jar
new file mode 100644
index 000000000..0b9432121
Binary files /dev/null and b/libs/xAuth.jar differ
diff --git a/pom.xml b/pom.xml
index 4de18fc21..c117639eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,19 +9,26 @@
     <version>5.0-SNAPSHOT</version>
     
     <name>AuthMeReloaded</name>
-    <description>/login /register plugin for Bukkit!</description>
+    <description>Authentication plugin for CraftBukkit/Spigot!</description>
     <url>http://dev.bukkit.org/bukkit-plugins/authme-reloaded/</url>
     
     <packaging>jar</packaging>
     
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        
+        <!-- Change Compiler Version (JDK) HERE! -->
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
+        
+        <!-- Change MC Version HERE! -->
         <bukkitVersion>1.8.7-R0.1-SNAPSHOT</bukkitVersion>
+        
         <mainClass>${project.groupId}.${project.artifactId}</mainClass>
     </properties>
     
+    <!-- Official Build Server
+         ALLERT: sometimes jenkins is offline, no panic! -->
     <ciManagement>
         <system>jenkins</system>
         <url>http://ci.xephi.fr</url>
@@ -33,40 +40,7 @@
     </issueManagement>
     
     <build>
-        <plugins>
-            
-            <!-- Non Maven Dependencies download -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>download-files</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- download file -->
-                                <get src="http://dev.bukkit.org/media/files/881/956/ChestShop.jar"
-                                     dest="${project.build.directory}/libs/"
-                                     verbose="false"
-                                     usetimestamp="true"/>
-                                <get src="https://github.com/sgdc3/NonMavenPluginsRepo/raw/master/xAuth2.0.26.jar"
-                                     dest="${project.build.directory}/libs/"
-                                     verbose="false"
-                                     usetimestamp="true"/>
-                                <get src="http://dev.bukkit.org/media/files/767/798/Notifications.jar"
-                                     dest="${project.build.directory}/libs/"
-                                     verbose="false"
-                                     usetimestamp="true"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            
+    	<plugins>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.5</version>
@@ -81,39 +55,57 @@
     </build>
     
     <repositories>
+    	
+    	<!-- SpigotMC Repo (Bukkit and SpigotAPI) -->
         <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>
+        
+        <!-- Citizens 2.X Repo -->
         <repository>
             <id>everything</id>
             <url>http://repo.citizensnpcs.co</url>
         </repository>
+        
+        <!-- Multiverse Repo -->
         <repository>
             <id>onarandombox</id>
             <url>http://repo.onarandombox.com/content/groups/public</url>
         </repository>
+        
+        <!-- EssentialsX Repo -->
         <repository>
             <id>ess-repo</id>
             <url>https://ci.drtshock.net/plugin/repository/everything/</url>
         </repository>
+        
+        <!-- CombatTagPlus Repo -->
         <repository>
             <id>minelink-thirdparty</id>
             <url>http://repo.minelink.net/content/repositories/public</url>
         </repository>
+        
+        <!-- CombatTag Repo, Unofficial (needs replacement) -->
         <repository>
             <id>techcable-repo</id>
             <url>http://repo.techcable.net/content/repositories/snapshots/</url>
         </repository>
+        
+        <!-- XAuth Repo -->
         <repository>
             <id>bukkit-plugins-releases</id>
             <name>repo.luricos.de releases</name>
             <url>http://repo.luricos.de/content/repositories/releases/</url>
         </repository>
+        
+        <!-- SpoutCraft Repo -->
         <repository>
             <id>sonatype-nexus-releases</id>
             <url>https://oss.sonatype.org/content/repositories/releases</url>
@@ -126,83 +118,104 @@
                 <updatePolicy>always</updatePolicy>
             </snapshots>
         </repository>
+        <!-- End of Spout Repo -->
+        
     </repositories>
     
     <dependencies>
         
-        <!-- Remote dependencies -->
+        <!-- Maven Dependencies -->
         
+        <!-- MySql Library -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>LATEST</version>
+            <version>5.1.35</version>
         </dependency>
+        
+        <!-- SQLite Library -->
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>LATEST</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2</groupId>
-            <artifactId>h2</artifactId>
-            <version>LATEST</version>
+            <version>3.8.10.1</version>
         </dependency>
+        
+        <!-- Database Library -->
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<version>1.4.187</version>
+		</dependency>
+		
+		<!-- Spigot-Api, http://www.spigotmc.org/
+		     Based on the Bukkit project, http://bukkit.org/ -->
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
             <version>${bukkitVersion}</version>
         </dependency>
+        
+        <!-- Vault, http://dev.bukkit.org/bukkit-plugins/vault/ -->
         <dependency>
             <groupId>net.milkbowl.vault</groupId>
             <artifactId>Vault</artifactId>
             <version>1.5.4</version>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Citizens 2.X, NPC plugin, http://dev.bukkit.org/bukkit-plugins/citizens/ -->
         <dependency>
             <groupId>net.citizensnpcs</groupId>
             <artifactId>citizensapi</artifactId>
             <version>2.0.16-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>net.citizensnpcs</groupId>
-            <artifactId>citizens</artifactId>
-            <version>2.0.16-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.onarandombox</groupId>
-            <artifactId>MultiverseCore</artifactId>
-            <version>2.5</version>
-        </dependency>
+        
+        <!--  Multi World plugin, http://www.spigotmc.org/resources/multiverse-core.390/ -->
+		<dependency>
+			<groupId>com.onarandombox.multiversecore</groupId>
+			<artifactId>Multiverse-Core</artifactId>
+			<version>2.5</version>
+		</dependency>
+		
+		<!-- EssentialsX, a fork of Spigot Essentials (1.8) with fixes and optimizations, https://github.com/drtshock/Essentials/ -->
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>EssentialsX</artifactId>
             <version>2.0.1-SNAPSHOT</version>
         </dependency>
+        
+        <!-- Anti PvPLogging plugin, https://github.com/MinelinkNetwork/CombatTagPlus -->
         <dependency>
             <groupId>net.minelink</groupId>
             <artifactId>CombatTagPlus</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
+        
+        <!-- Anti PvPLogging plugin, http://www.spigotmc.org/resources/combat-tag.3182/ -->
         <dependency>
             <groupId>com.trc202</groupId>
             <artifactId>combattag</artifactId>
             <version>6.4.1-SNAPSHOT</version>
         </dependency>
+        
+        <!-- XAuth, another authentication plugin, required by the database converter -->
         <dependency>
             <groupId>de.luricos.bukkit</groupId>
             <artifactId>xAuth</artifactId>
             <version>2.6</version>
         </dependency>
+        
+        <!-- Spout API, https://spoutcraft.org/downloads/ -->
         <dependency>
-            <groupId>org.spoutcraft</groupId>
-            <artifactId>spoutplugin</artifactId>
-            <version>1.6.4-SNAPSHOT</version>
-        </dependency>
+			<groupId>org.spoutcraft</groupId>
+			<artifactId>spoutcraftplugin</artifactId>
+			<version>1.6.4-SNAPSHOT</version>
+		</dependency>
         
-        <!-- Wget Dependencies -->
+        <!-- Local Dependencies -->
         
+        <!-- It doesn't have a Maven Repo, http://dev.bukkit.org/bukkit-plugins/chestshop/ -->
         <dependency>
             <groupId>com.Acrobot</groupId>
             <artifactId>ChestShop</artifactId>
@@ -210,13 +223,26 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/libs/ChestShop.jar</systemPath>
         </dependency>
+        
+        <!-- Citizens 1.X (No API) -->
+        <dependency>
+            <groupId>net.citizensnpcs</groupId>
+            <artifactId>citizens</artifactId>
+            <version>1.2.4</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/Citizens.jar</systemPath>
+        </dependency>
+        
+        <!-- Old version of xAuth by Cypherx -->
         <dependency>
             <groupId>com.cypherx</groupId>
             <artifactId>xauth</artifactId>
             <version>2.0.26</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/lib/xAuth.jar</systemPath>
+            <systemPath>${project.basedir}/libs/xAuth.jar</systemPath>
         </dependency>
+        
+        <!-- A SpoutApi Plugin, http://dev.bukkit.org/bukkit-plugins/notifications/ -->
         <dependency>
             <groupId>me.muizers</groupId>
             <artifactId>Notifications</artifactId>