diff --git a/pom.xml b/pom.xml
index 39bb5567..71df4db6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,21 +48,25 @@
     </prerequisites>
 
     <properties>
-        <!-- Project Encoding -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
-
         <!-- Project Properties -->
+        <projectEncoding>UTF-8</projectEncoding>
+        <project.build.sourceEncoding>${projectEncoding}</project.build.sourceEncoding>
+        <project.build.outputEncoding>${projectEncoding}</project.build.outputEncoding>
+        <jdkVersion>1.7</jdkVersion>
+        <testJreVersion>1.7</testJreVersion>
+
+        <!-- Output properties -->
         <pluginName>AuthMe</pluginName>
         <jarName>${pluginName}-${project.version}</jarName>
-        <mainClass>fr.xephi.authme.AuthMe</mainClass>
+        <mainClass>${project.groupId}.${project.artifactId}.${pluginName}</mainClass>
         <pluginAuthors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu</pluginAuthors>
         <buildNumber>Unknown</buildNumber>
 
         <!-- Change Bukkit Version HERE! -->
-        <bukkitVersion>1.9-pre1-SNAPSHOT</bukkitVersion>
+        <bukkitVersion>1.8.8-R0.1-SNAPSHOT</bukkitVersion>
     </properties>
 
+    <!-- Jenkins profile (add the real buildNumber to the version string) -->
     <profiles>
         <profile>
             <id>jenkins</id>
@@ -83,33 +87,21 @@
         <testSourceDirectory>src/test/java</testSourceDirectory>
 
         <resources>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>src/main/resources/</directory>
-                <includes>
-                    <include>plugin.yml</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>src/main/resources/</directory>
-                <includes>
-                    <include>email.html</include>
-                    <include>welcome.txt</include>
-                </includes>
-            </resource>
             <resource>
                 <targetPath>.</targetPath>
                 <filtering>false</filtering>
+                <directory>.</directory>
+                <includes>
+                    <include>LICENSE</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
                 <directory>src/main/resources/</directory>
                 <includes>
-                    <include>*.yml</include>
+                    <include>*</include>
                 </includes>
-                <excludes>
-                    <exclude>plugin.yml</exclude>
-                </excludes>
             </resource>
             <resource>
                 <targetPath>./messages/</targetPath>
@@ -126,37 +118,17 @@
             </testResource>
         </testResources>
 
-        <pluginManagement>
-            <plugins>
-                <!-- Lambda expressions for Java 6 and 7 -->
-                <plugin>
-                    <groupId>net.orfjackal.retrolambda</groupId>
-                    <artifactId>retrolambda-maven-plugin</artifactId>
-                    <version>2.1.0</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>process-main</goal>
-                                <goal>process-test</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
-            <!-- Maven Java Compiler (compile under 1.8 but allow 1.7/1.6 thanks to Retrolambda) -->
+            <!-- Maven Java Compiler -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.5.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <!-- We need to run tests with java 1.7 to avoid errors with retrolambda! -->
-                    <testSource>1.7</testSource>
-                    <testTarget>1.7</testTarget>
+                    <source>${jdkVersion}</source>
+                    <target>${jdkVersion}</target>
+                    <testSource>${testJreVersion}</testSource>
+                    <testTarget>${testJreVersion}</testTarget>
                 </configuration>
             </plugin>
             <!-- Test Plugin -->
@@ -165,9 +137,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.19.1</version>
                 <configuration>
-                    <forkCount>3</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <argLine>-client -Xmx512M -Dfile.encoding=UTF-8 ${argLine}</argLine>
+                    <argLine>-Dfile.encoding=${projectEncoding} ${argLine}</argLine>
                 </configuration>
             </plugin>
             <!-- Libs Shading and Relocation -->
@@ -195,33 +165,11 @@
                                 </excludes>
                             </artifactSet>
                             <relocations>
-                                <!--We use a newer version of gson so include it to the jar and reference to the new version-->
+                                <!-- We use a newer version of gson so we need to include it! -->
                                 <relocation>
                                     <pattern>com.google.gson</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.google</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.mcstats</pattern>
-                                    <shadedPattern>fr.xephi.authme</shadedPattern>
-                                </relocation>
-                                <!--
-                                <relocation>
-                                    <pattern>org.apache</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.apache</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>javax.mail</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.javax.mail</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>javax.activation</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.javax.activation</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.sun</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.sun</shadedPattern>
-                                </relocation>
-                                -->
                                 <relocation>
                                     <pattern>com.zaxxer.hikari</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.hikari</shadedPattern>
@@ -238,6 +186,11 @@
                                     <pattern>net.ricecode.similarity</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.similarity</shadedPattern>
                                 </relocation>
+                                <!-- MCStats.org metrics -->
+                                <relocation>
+                                    <pattern>org.mcstats</pattern>
+                                    <shadedPattern>fr.xephi.authme</shadedPattern>
+                                </relocation>
                             </relocations>
                             <outputFile>target/${jarName}-spigot.jar</outputFile>
                         </configuration>
@@ -249,34 +202,12 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <!--Include all google libraries, because they are not avaialbe before 1.8-->
+                            <!-- Include all google libraries, because they are not available before 1.8 -->
                             <relocations>
                                 <relocation>
                                     <pattern>com.google</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.google</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.mcstats</pattern>
-                                    <shadedPattern>fr.xephi.authme</shadedPattern>
-                                </relocation>
-                                <!--
-                                <relocation>
-                                    <pattern>org.apache</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.apache</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>javax.mail</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.javax.mail</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>javax.activation</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.javax.activation</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.sun</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.sun</shadedPattern>
-                                </relocation>
-                                -->
                                 <relocation>
                                     <pattern>com.zaxxer.hikari</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.hikari</shadedPattern>
@@ -293,6 +224,11 @@
                                     <pattern>net.ricecode.similarity</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.similarity</shadedPattern>
                                 </relocation>
+                                <!-- MCStats.org metrics -->
+                                <relocation>
+                                    <pattern>org.mcstats</pattern>
+                                    <shadedPattern>fr.xephi.authme</shadedPattern>
+                                </relocation>
                             </relocations>
                             <outputFile>target/${jarName}-legacy.jar</outputFile>
                         </configuration>
@@ -303,7 +239,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.5.201505241946</version>
+                <version>0.7.6.201602180812</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>
@@ -318,7 +254,7 @@
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
                 <version>4.1.0</version>
-                <!-- Token is provided by mvn command -->
+                <!-- The secret token is provided by console! -->
             </plugin>
             <!-- Javadocs settings -->
             <plugin>
@@ -328,7 +264,10 @@
                 <configuration>
                     <charset>UTF-8</charset>
                     <docencoding>UTF-8</docencoding>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                     <docfilessubdirs>true</docfilessubdirs>
+                    <show>public</show>
+                    <failOnError>false</failOnError>
                 </configuration>
             </plugin>
         </plugins>
@@ -391,13 +330,6 @@
     </repositories>
 
     <dependencies>
-        <!-- Lombok expressions -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.6</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- Database Connection Pool -->
         <dependency>
             <groupId>com.zaxxer</groupId>