diff --git a/source/guides/database.rst b/source/guides/advanced-setup/database.rst
similarity index 100%
rename from source/guides/database.rst
rename to source/guides/advanced-setup/database.rst
diff --git a/source/guides/common-problems.rst b/source/guides/help/common-problems.rst
similarity index 100%
rename from source/guides/common-problems.rst
rename to source/guides/help/common-problems.rst
diff --git a/source/guides/contributing.rst b/source/guides/help/contributing.rst
similarity index 100%
rename from source/guides/contributing.rst
rename to source/guides/help/contributing.rst
diff --git a/source/guides/getting-help.rst b/source/guides/help/getting-help.rst
similarity index 100%
rename from source/guides/getting-help.rst
rename to source/guides/help/getting-help.rst
diff --git a/source/guides/nginx.rst b/source/guides/proxy/10.nginx.rst
similarity index 100%
rename from source/guides/nginx.rst
rename to source/guides/proxy/10.nginx.rst
diff --git a/source/guides/apache.rst b/source/guides/proxy/20.apache.rst
similarity index 100%
rename from source/guides/apache.rst
rename to source/guides/proxy/20.apache.rst
diff --git a/source/guides/caddy.rst b/source/guides/proxy/30.caddy.rst
similarity index 100%
rename from source/guides/caddy.rst
rename to source/guides/proxy/30.caddy.rst
diff --git a/source/guides/ssl-setup-nginx.rst b/source/guides/proxy/40.ssl-setup-nginx.rst
similarity index 100%
rename from source/guides/ssl-setup-nginx.rst
rename to source/guides/proxy/40.ssl-setup-nginx.rst
diff --git a/source/index.rst b/source/index.rst
index 8747ecc..e7d4eba 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -13,43 +13,35 @@ PufferPanel - Open Source Game Server Management
 .. toctree::
    :maxdepth: 1
    :caption: Environments
+   :glob:
 
-   environments/docker
-   environments/standard
+   environments/**
 
 .. toctree::
    :maxdepth: 1
    :caption: Guides
+   :glob:
 
-   guides/nginx
-   guides/apache
-   guides/caddy
-   guides/database
-   guides/ssl-setup-nginx
-   guides/email
-   templates/templates
-   guides/contributing
-   guides/import-minecraft-server
-   guides/themes/installing
-   guides/themes/creating
-   guides/create-node
-   guides/common-problems
-   guides/getting-help
+   guides/proxy/*
+   guides/advanced-setup/*
+   guides/*
+   guides/themes/*
+   templates/**
+   guides/help/*
 
 .. toctree::
    :maxdepth: 1
    :caption: About
+   :glob:
 
-   about/about
-   about/team
-   about/accessibility
+   about/**
 
 .. toctree::
    :maxdepth: 1
    :caption: Game specific guides
+   :glob:
 
-   games/sourceds/autoupdate
-   games/srcds/dependencies
+   games/**
 
 .. toctree::
    :maxdepth: 1
diff --git a/source/installing.rst b/source/installing.rst
index ee3658a..c5689e6 100644
--- a/source/installing.rst
+++ b/source/installing.rst
@@ -129,6 +129,6 @@ And that's it! Your panel is now available on port 8080 of your server.
 
 Additional resources:
 
-* :doc:`Enabling SSL with Nginx <guides/ssl-setup-nginx>`
+* :doc:`Enabling SSL with Nginx <guides/proxy/40.ssl-setup-nginx>`
 * :doc:`Running servers without Docker <environments/standard>`
 * :doc:`Running servers with Docker <environments/docker>`