diff --git a/src/test/java/tools/docs/UpdateDocsTask.java b/src/test/java/tools/docs/UpdateDocsTask.java
index df051bd61..86ba85ba6 100644
--- a/src/test/java/tools/docs/UpdateDocsTask.java
+++ b/src/test/java/tools/docs/UpdateDocsTask.java
@@ -1,9 +1,9 @@
 package tools.docs;
 
 import com.google.common.collect.ImmutableSet;
-import tools.commands.CommandPageCreater;
-import tools.hashmethods.HashAlgorithmsDescriptionTask;
-import tools.permissions.PermissionsListWriter;
+import tools.docs.commands.CommandPageCreater;
+import tools.docs.hashmethods.HashAlgorithmsDescriptionTask;
+import tools.docs.permissions.PermissionsListWriter;
 import tools.utils.AutoToolTask;
 import tools.utils.ToolTask;
 
diff --git a/src/test/java/tools/commands/CommandPageCreater.java b/src/test/java/tools/docs/commands/CommandPageCreater.java
similarity index 96%
rename from src/test/java/tools/commands/CommandPageCreater.java
rename to src/test/java/tools/docs/commands/CommandPageCreater.java
index d5375a2f8..6a2f5edfe 100644
--- a/src/test/java/tools/commands/CommandPageCreater.java
+++ b/src/test/java/tools/docs/commands/CommandPageCreater.java
@@ -1,4 +1,4 @@
-package tools.commands;
+package tools.docs.commands;
 
 import fr.xephi.authme.command.CommandArgumentDescription;
 import fr.xephi.authme.command.CommandDescription;
@@ -37,7 +37,7 @@ public class CommandPageCreater implements AutoToolTask {
         addCommandsInfo(commandTags, baseCommands);
 
         FileUtils.generateFileFromTemplate(
-            ToolsConstants.TOOLS_SOURCE_ROOT + "commands/commands.tpl.md",
+            ToolsConstants.TOOLS_SOURCE_ROOT + "docs/commands/commands.tpl.md",
             OUTPUT_FILE,
             TagValueHolder.create().put("commands", commandTags));
         System.out.println("Wrote to '" + OUTPUT_FILE + "' with " + baseCommands.size() + " base commands.");
diff --git a/src/test/java/tools/commands/commands.tpl.md b/src/test/java/tools/docs/commands/commands.tpl.md
similarity index 100%
rename from src/test/java/tools/commands/commands.tpl.md
rename to src/test/java/tools/docs/commands/commands.tpl.md
diff --git a/src/test/java/tools/hashmethods/EncryptionMethodInfoGatherer.java b/src/test/java/tools/docs/hashmethods/EncryptionMethodInfoGatherer.java
similarity index 99%
rename from src/test/java/tools/hashmethods/EncryptionMethodInfoGatherer.java
rename to src/test/java/tools/docs/hashmethods/EncryptionMethodInfoGatherer.java
index bcc48c7cf..00809a73a 100644
--- a/src/test/java/tools/hashmethods/EncryptionMethodInfoGatherer.java
+++ b/src/test/java/tools/docs/hashmethods/EncryptionMethodInfoGatherer.java
@@ -1,4 +1,4 @@
-package tools.hashmethods;
+package tools.docs.hashmethods;
 
 import ch.jalu.injector.Injector;
 import ch.jalu.injector.InjectorBuilder;
diff --git a/src/test/java/tools/hashmethods/HashAlgorithmsDescriptionTask.java b/src/test/java/tools/docs/hashmethods/HashAlgorithmsDescriptionTask.java
similarity index 97%
rename from src/test/java/tools/hashmethods/HashAlgorithmsDescriptionTask.java
rename to src/test/java/tools/docs/hashmethods/HashAlgorithmsDescriptionTask.java
index 9f0a7b366..95da44d53 100644
--- a/src/test/java/tools/hashmethods/HashAlgorithmsDescriptionTask.java
+++ b/src/test/java/tools/docs/hashmethods/HashAlgorithmsDescriptionTask.java
@@ -1,4 +1,4 @@
-package tools.hashmethods;
+package tools.docs.hashmethods;
 
 import fr.xephi.authme.security.HashAlgorithm;
 import tools.utils.AutoToolTask;
@@ -17,7 +17,7 @@ import java.util.Scanner;
  */
 public class HashAlgorithmsDescriptionTask implements AutoToolTask {
 
-    private static final String CUR_FOLDER = ToolsConstants.TOOLS_SOURCE_ROOT + "hashmethods/";
+    private static final String CUR_FOLDER = ToolsConstants.TOOLS_SOURCE_ROOT + "docs/hashmethods/";
     private static final String OUTPUT_FILE = ToolsConstants.DOCS_FOLDER + "hash_algorithms.md";
 
     @Override
diff --git a/src/test/java/tools/hashmethods/MethodDescription.java b/src/test/java/tools/docs/hashmethods/MethodDescription.java
similarity index 98%
rename from src/test/java/tools/hashmethods/MethodDescription.java
rename to src/test/java/tools/docs/hashmethods/MethodDescription.java
index 587654679..f4d8a255e 100644
--- a/src/test/java/tools/hashmethods/MethodDescription.java
+++ b/src/test/java/tools/docs/hashmethods/MethodDescription.java
@@ -1,4 +1,4 @@
-package tools.hashmethods;
+package tools.docs.hashmethods;
 
 import fr.xephi.authme.security.crypts.EncryptionMethod;
 import fr.xephi.authme.security.crypts.description.SaltType;
diff --git a/src/test/java/tools/hashmethods/hash_algorithms.tpl.md b/src/test/java/tools/docs/hashmethods/hash_algorithms.tpl.md
similarity index 100%
rename from src/test/java/tools/hashmethods/hash_algorithms.tpl.md
rename to src/test/java/tools/docs/hashmethods/hash_algorithms.tpl.md
diff --git a/src/test/java/tools/permissions/PermissionNodesGatherer.java b/src/test/java/tools/docs/permissions/PermissionNodesGatherer.java
similarity index 99%
rename from src/test/java/tools/permissions/PermissionNodesGatherer.java
rename to src/test/java/tools/docs/permissions/PermissionNodesGatherer.java
index d5f7e6e9d..9c469e8e0 100644
--- a/src/test/java/tools/permissions/PermissionNodesGatherer.java
+++ b/src/test/java/tools/docs/permissions/PermissionNodesGatherer.java
@@ -1,4 +1,4 @@
-package tools.permissions;
+package tools.docs.permissions;
 
 import fr.xephi.authme.ClassCollector;
 import fr.xephi.authme.permission.PermissionNode;
diff --git a/src/test/java/tools/permissions/PermissionsListWriter.java b/src/test/java/tools/docs/permissions/PermissionsListWriter.java
similarity index 87%
rename from src/test/java/tools/permissions/PermissionsListWriter.java
rename to src/test/java/tools/docs/permissions/PermissionsListWriter.java
index 43d3b4530..6d1b48d74 100644
--- a/src/test/java/tools/permissions/PermissionsListWriter.java
+++ b/src/test/java/tools/docs/permissions/PermissionsListWriter.java
@@ -1,4 +1,4 @@
-package tools.permissions;
+package tools.docs.permissions;
 
 import tools.utils.AutoToolTask;
 import tools.utils.FileUtils;
@@ -15,6 +15,7 @@ import java.util.Scanner;
  */
 public class PermissionsListWriter implements AutoToolTask {
 
+    private static final String TEMPLATE_FILE = ToolsConstants.TOOLS_SOURCE_ROOT + "docs/permissions/permission_nodes.tpl.md";
     private static final String PERMISSIONS_OUTPUT_FILE = ToolsConstants.DOCS_FOLDER + "permission_nodes.md";
 
     @Override
@@ -36,8 +37,7 @@ public class PermissionsListWriter implements AutoToolTask {
         final NestedTagValue permissionsTagValue = generatePermissionsList();
 
         TagValueHolder tags = TagValueHolder.create().put("nodes", permissionsTagValue);
-        FileUtils.generateFileFromTemplate(
-            ToolsConstants.TOOLS_SOURCE_ROOT + "permissions/permission_nodes.tpl.md", PERMISSIONS_OUTPUT_FILE, tags);
+        FileUtils.generateFileFromTemplate(TEMPLATE_FILE, PERMISSIONS_OUTPUT_FILE, tags);
         System.out.println("Wrote to '" + PERMISSIONS_OUTPUT_FILE + "'");
         System.out.println("Before committing, please verify the output!");
     }
diff --git a/src/test/java/tools/permissions/permission_nodes.tpl.md b/src/test/java/tools/docs/permissions/permission_nodes.tpl.md
similarity index 100%
rename from src/test/java/tools/permissions/permission_nodes.tpl.md
rename to src/test/java/tools/docs/permissions/permission_nodes.tpl.md
diff --git a/src/test/java/tools/permissions/README.md b/src/test/java/tools/permissions/README.md
deleted file mode 100644
index 9603cd386..000000000
--- a/src/test/java/tools/permissions/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# About
-Helper script to generate a page with an up-to-date list of permission nodes.