diff --git a/docs/wiki/README.md b/docs/wiki/README.md
index c929eba..0a86eab 100644
--- a/docs/wiki/README.md
+++ b/docs/wiki/README.md
@@ -11,12 +11,12 @@
 - [Running PowerDNS-Admin on FreeBSD 12.1-RELEASE](install/Running-on-FreeBSD.md)
 
 ## Web Server configuration
-- [Supervisord](Supervisord-example)
-- [Systemd](Systemd-example)
-- [Systemd + Gunicorn + Nginx](Running-PowerDNS-Admin-with-Systemd,-Gunicorn--and--Nginx)
-- [Systemd + Gunicorn + Apache](Running-PowerDNS-Admin-with-Systemd,-Gunicorn-and-Apache)
-- [uWSGI](uWSGI-example)
-- [WSGI-Apache](WSGI-Apache-example)
+- [Supervisord](web-server/Supervisord-example.md)
+- [Systemd](web-server/Systemd-example.md)
+- [Systemd + Gunicorn + Nginx](web-server/Running-PowerDNS-Admin-with-Systemd,-Gunicorn--and--Nginx)
+- [Systemd + Gunicorn + Apache](web-server/Running-PowerDNS-Admin-with-Systemd,-Gunicorn-and-Apache)
+- [uWSGI](web-server/uWSGI-example)
+- [WSGI-Apache](web-server/WSGI-Apache-example)
 
 ## Feature usage
 - [DynDNS2](https://github.com/ngoduykhanh/PowerDNS-Admin/wiki/DynDNS2)
\ No newline at end of file
diff --git a/docs/wiki/Running-PowerDNS-Admin-with-Systemd,-Gunicorn--and--Nginx.md b/docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd,-Gunicorn--and--Nginx.md
similarity index 100%
rename from docs/wiki/Running-PowerDNS-Admin-with-Systemd,-Gunicorn--and--Nginx.md
rename to docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd,-Gunicorn--and--Nginx.md
diff --git a/docs/wiki/Running-PowerDNS-Admin-with-Systemd,-Gunicorn-and-Apache.md b/docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd,-Gunicorn-and-Apache.md
similarity index 100%
rename from docs/wiki/Running-PowerDNS-Admin-with-Systemd,-Gunicorn-and-Apache.md
rename to docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd,-Gunicorn-and-Apache.md
diff --git a/docs/wiki/Supervisord-example.md b/docs/wiki/web-server/Supervisord-example.md
similarity index 100%
rename from docs/wiki/Supervisord-example.md
rename to docs/wiki/web-server/Supervisord-example.md
diff --git a/docs/wiki/Systemd-example.md b/docs/wiki/web-server/Systemd-example.md
similarity index 100%
rename from docs/wiki/Systemd-example.md
rename to docs/wiki/web-server/Systemd-example.md
diff --git a/docs/wiki/WSGI-Apache-example.md b/docs/wiki/web-server/WSGI-Apache-example.md
similarity index 100%
rename from docs/wiki/WSGI-Apache-example.md
rename to docs/wiki/web-server/WSGI-Apache-example.md
diff --git a/docs/wiki/uWSGI-example.md b/docs/wiki/web-server/uWSGI-example.md
similarity index 100%
rename from docs/wiki/uWSGI-example.md
rename to docs/wiki/web-server/uWSGI-example.md