diff --git a/README.md b/README.md
index 98c1dc07..b05790b8 100644
--- a/README.md
+++ b/README.md
@@ -2,22 +2,18 @@
 <p align="center"><strong>The most used authentication plugin for CraftBukkit/Spigot!</strong></p>
 <hr>
 
-#####News:
-
-- Latest version of AuthMeBridge is finally compatible with latest AuthMe snapshots! ;)
-
 #####Development tools:
 
-- DEVELOPMENT TEAM REPO (<strong>please send PRs here!</strong>): <a href="https://github.com/AuthMe-Team/AuthMeReloaded">Github Development Page</a>
+- DEVELOPMENT TEAM REPO (**please send PRs here!**): [Github Development Page](https://github.com/AuthMe/AuthMeReloaded)
 
 - Developers ChatRoom: [![Join the chat at https://gitter.im/Xephi/AuthMeReloaded](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Xephi/AuthMeReloaded?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-- Build Server (<strong>DEVELOPMENT BUILDS</strong>): <a href="http://ci.xephi.fr/job/AuthMeReloaded">Xephi's Jenkins</a>
+- Build Server (**DEVELOPMENT BUILDS**): [Xephi's Jenkins](http://ci.xephi.fr/job/AuthMeReloaded)
 
-- Build status: [![Build Status](https://travis-ci.org/AuthMe-Team/AuthMeReloaded.svg?branch=master)](https://travis-ci.org/AuthMe-Team/AuthMeReloaded) [![Dependency Status](https://www.versioneye.com/user/projects/55bab9e8653762002000190a/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55bab9e8653762002000190a)
+- Build status: [![Build Status](https://travis-ci.org/AuthMe/AuthMeReloaded.svg?branch=master)](https://travis-ci.org/AuthMe/AuthMeReloaded) [![Dependency Status](https://www.versioneye.com/user/projects/55bab9e8653762002000190a/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55bab9e8653762002000190a)
 
-- Build status (CircleCI): [![Circle CI](https://circleci.com/gh/AuthMe-Team/AuthMeReloaded.svg?style=svg)](https://circleci.com/gh/AuthMe-Team/AuthMeReloaded)
-- Alternative Dev Build download link (via CircleCi): <a href="https://circleci-tkn.rhcloud.com/api/v1/project/AuthMe-Team/AuthMeReloaded/tree/master/latest/artifacts/AuthMe.jar">Download</a>
+- Build status (CircleCI): [![Circle CI](https://circleci.com/gh/AuthMe/AuthMeReloaded.svg?style=svg)](https://circleci.com/gh/AuthMe/AuthMeReloaded)
+- Alternative Dev Build download link (via CircleCi): <a href="https://circleci-tkn.rhcloud.com/api/v1/project/AuthMe/AuthMeReloaded/tree/master/latest/artifacts/AuthMe.jar">Download</a>
 - JitPack (just in case): [![](https://jitpack.io/v/AuthMe-Team/AuthMeReloaded.svg)](https://jitpack.io/#AuthMe-Team/AuthMeReloaded)
 
 - Code Coverage: [![Coverage Status](https://coveralls.io/repos/AuthMe-Team/AuthMeReloaded/badge.svg?branch=master&service=github)](https://coveralls.io/github/AuthMe-Team/AuthMeReloaded?branch=master)
@@ -62,13 +58,16 @@ McStats: http://mcstats.org/plugin/AuthMe
 
 #####"The best authentication plugin for the Bukkit/Spigot API!"
 
-<p>Prevent username stealing on your server!<br>
-Use it to secure your Offline mode server or to increase your Online mode server's protection!</p>
+Prevent username stealing on your server!<br>
+Use it to secure your Offline mode server or to increase your Online mode server's protection!
 
-<p>AuthMeReloaded disallows players who aren't authenticated to do actions like placing blocks, moving,<br>
-typing commands or using the inventory. It can also kick players with uncommonly long or short player names or kick players from banned countries.</p>
-<p>With the Session Login feature you don't have to execute the authentication command every time you connect to the server! Each command and every feature can be enabled or disabled from our well structured configuration file.</p>
-<p>You can also create your own translation file and, if you want, you can share it with us! :)</p>
+AuthMeReloaded disallows players who aren't authenticated to do actions like placing blocks, moving,<br>
+typing commands or using the inventory. It can also kick players with uncommonly long or short player names or kick players from banned countries.
+
+With the Session Login feature you don't have to execute the authentication command every time you connect to the server! 
+Each command and every feature can be enabled or disabled from our well structured configuration file.
+
+You can also create your own translation file and, if you want, you can share it with us! :)
 
 ####Features:
 <ul>
@@ -114,24 +113,25 @@ typing commands or using the inventory. It can also kick players with uncommonly
 ####Email Recovery Dependency
 <a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-configure-email-recovery-system/">How to configure email recovery system?</a>
 ####Commands
-<a href="https://github.com/AuthMe-Team/AuthMeReloaded/blob/master/docs/commands.md">Command list and usage</a>
+[Command list and usage](https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/commands.md)
 ####Permissions
-<ul><li>authme.player.* - for all user commands
-</li><li>authme.admin.* - for all admin commands
-</li><li><a href="https://github.com/AuthMe-Team/AuthMeReloaded/blob/master/docs/permission_nodes.md">List of all single permissions</a>
-</li></ul>
+- authme.player.* - for all user commands
+- authme.admin.* - for all admin commands
+- [List of all permission nodes](http://github.com/AuthMe-Team/AuthMeReloaded/blob/master/docs/permission_nodes.md)
+
 ####How To
-<ul><li><a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-install-and-initial-configuration/">How to Install and Setup</a>
-</li><li><a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-import-database-from-xauth/">How to import database from xAuth</a>
-</li><li><a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/web-site-integration/">Website Integration</a>
-</li><li><a href="https://raw.githubusercontent.com/Xephi/AuthMeReloaded/master/src/main/resources/config.yml">Click here for an example of the Config file</a>
-</li><li><a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-import-database-from-rakamak/">How to convert from Rakamak</a>
-</li><li>Convert from FlatFile (auths.db but not the sqlite one) to MySQL: /authme converter
-</li></ul>
+- [How to install and set up](http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-install-and-initial-configuration/)
+- [How to import database from xAuth](http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-import-database-from-xauth/)
+- [Website integration](http://dev.bukkit.org/server-mods/authme-reloaded/pages/web-site-integration/)
+- [Click here for an example of the config file](https://raw.githubusercontent.com/Xephi/AuthMeReloaded/master/src/main/resources/config.yml)
+- [How to convert from Rakamak](http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-import-database-from-rakamak/)
+- Convert from FlatFile (auths.db but not the sqlite one) to MySQL: /authme converter
+
 <hr>
 
 #####GeoIP
-<p>This product uses data from the GeoLite API created by MaxMind, available at <a href="http://www.maxmind.com">http://www.maxmind.com</a></p>
+This product uses data from the GeoLite API created by MaxMind, available at http://www.maxmind.com
+
 <hr>
 
 #####Donate
@@ -144,6 +144,6 @@ GameHosting.it is leader in Italy as Game Server Provider. With its own DataCent
 [![GameHosting](http://www.gamehosting.it/images/bn3.png)](http://www.gamehosting.it)
 
 #####Credits
-<p>Team members: look at the <a href="https://github.com/AuthMe-Team/AuthMeReloaded/blob/master/team.txt">team.txt file</a>
+<p>Team members: look at the <a href="https://github.com/AuthMe/AuthMeReloaded/blob/master/team.txt">team.txt file</a>
 <p>Credit for old version of the plugin to: d4rkwarriors, fabe1337, Whoami2 and pomo4ka</p>
 <p>Thanks also to: AS1LV3RN1NJA, Hoeze and eprimex</p>
diff --git a/pom.xml b/pom.xml
index 458f8360..d715a3b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,13 +16,13 @@
 
     <organization>
         <name>AuthMe-Team</name>
-        <url>https://github.com/AuthMe-Team</url>
+        <url>https://github.com/AuthMe</url>
     </organization>
 
     <scm>
-        <connection>scm:git:https://github.com/AuthMe-Team/AuthMeReloaded.git</connection>
-        <developerConnection>scm:git:git@github.com:AuthMe-Team/AuthMeReloaded.git</developerConnection>
-        <url>https://github.com/AuthMe-Team/AuthMeReloaded</url>
+        <connection>scm:git:https://github.com/AuthMe/AuthMeReloaded.git</connection>
+        <developerConnection>scm:git:git@github.com:AuthMe/AuthMeReloaded.git</developerConnection>
+        <url>https://github.com/AuthMe/AuthMeReloaded</url>
     </scm>
 
     <ciManagement>
diff --git a/samples/website_integration/AuthMeController.php b/samples/website_integration/AuthMeController.php
index d1e94ddf..66fe03b4 100644
--- a/samples/website_integration/AuthMeController.php
+++ b/samples/website_integration/AuthMeController.php
@@ -7,7 +7,7 @@
  * verification). Don't forget to update the AUTHME_TABLE value and your     *
  * database credentials in getAuthmeMySqli().                                *
  *                                                                           *
- * Source: https://github.com/AuthMe-Team/AuthMeReloaded/                    *
+ * Source: https://github.com/AuthMe/AuthMeReloaded/                         *
  *****************************************************************************/
 abstract class AuthMeController {
 
@@ -123,4 +123,4 @@ abstract class AuthMeController {
         return null;
     }
 
-}
\ No newline at end of file
+}
diff --git a/samples/website_integration/Bcrypt.php b/samples/website_integration/Bcrypt.php
index 225baf80..ebc7b700 100644
--- a/samples/website_integration/Bcrypt.php
+++ b/samples/website_integration/Bcrypt.php
@@ -5,7 +5,7 @@
  * ------------------------------------------------------- *
  * See AuthMeController for details.                       *
  *                                                         *
- * Source: https://github.com/AuthMe-Team/AuthMeReloaded/  *
+ * Source: https://github.com/AuthMe/AuthMeReloaded/       *
  ***********************************************************/
 class Bcrypt extends AuthMeController {
 
diff --git a/samples/website_integration/Sha256.php b/samples/website_integration/Sha256.php
index 74c0ea51..815abe59 100644
--- a/samples/website_integration/Sha256.php
+++ b/samples/website_integration/Sha256.php
@@ -5,7 +5,7 @@
  * ------------------------------------------------------- *
  * See AuthMeController for details.                       *
  *                                                         *
- * Source: https://github.com/AuthMe-Team/AuthMeReloaded/  *
+ * Source: https://github.com/AuthMe/AuthMeReloaded/       *
  ***********************************************************/
 class Sha256 extends AuthMeController {
 
diff --git a/src/test/java/tools/utils/TagReplacer.java b/src/test/java/tools/utils/TagReplacer.java
index 9b5a74bb..32c74452 100644
--- a/src/test/java/tools/utils/TagReplacer.java
+++ b/src/test/java/tools/utils/TagReplacer.java
@@ -61,7 +61,7 @@ public class TagReplacer {
             .replace("{gen_date}", curDate)
             .replace("{gen_warning}", "AUTO-GENERATED FILE! Do not edit this directly")
             .replace("{gen_footer}", "---\n\nThis page was automatically generated on the"
-                + " [AuthMe-Team/AuthMeReloaded repository](" + ToolsConstants.DOCS_FOLDER_URL + ")"
+                + " [AuthMe/AuthMeReloaded repository](" + ToolsConstants.DOCS_FOLDER_URL + ")"
                 + " on " + curDate);
     }
 
diff --git a/src/test/java/tools/utils/ToolsConstants.java b/src/test/java/tools/utils/ToolsConstants.java
index 6708fd77..5986c378 100644
--- a/src/test/java/tools/utils/ToolsConstants.java
+++ b/src/test/java/tools/utils/ToolsConstants.java
@@ -16,7 +16,7 @@ public final class ToolsConstants {
 
     public static final String DOCS_FOLDER = "docs/";
 
-    public static final String DOCS_FOLDER_URL = "https://github.com/AuthMe-Team/AuthMeReloaded/tree/master/docs/";
+    public static final String DOCS_FOLDER_URL = "https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/";
 
     private ToolsConstants() {
     }