diff --git a/docs/client-android.md b/docs/client/client-android.md
similarity index 100%
rename from docs/client-android.md
rename to docs/client/client-android.md
diff --git a/docs/client-apple.md b/docs/client/client-apple.md
similarity index 100%
rename from docs/client-apple.md
rename to docs/client/client-apple.md
diff --git a/docs/client-emclient.md b/docs/client/client-emclient.md
similarity index 100%
rename from docs/client-emclient.md
rename to docs/client/client-emclient.md
diff --git a/docs/client-kontact.md b/docs/client/client-kontact.md
similarity index 100%
rename from docs/client-kontact.md
rename to docs/client/client-kontact.md
diff --git a/docs/client-manual.md b/docs/client/client-manual.md
similarity index 100%
rename from docs/client-manual.md
rename to docs/client/client-manual.md
diff --git a/docs/client-outlook.md b/docs/client/client-outlook.md
similarity index 100%
rename from docs/client-outlook.md
rename to docs/client/client-outlook.md
diff --git a/docs/client-thunderbird.md b/docs/client/client-thunderbird.md
similarity index 100%
rename from docs/client-thunderbird.md
rename to docs/client/client-thunderbird.md
diff --git a/docs/client-windows.md b/docs/client/client-windows.md
similarity index 100%
rename from docs/client-windows.md
rename to docs/client/client-windows.md
diff --git a/docs/client-windowsphone.md b/docs/client/client-windowsphone.md
similarity index 100%
rename from docs/client-windowsphone.md
rename to docs/client/client-windowsphone.md
diff --git a/docs/client.md b/docs/client/client.md
similarity index 100%
rename from docs/client.md
rename to docs/client/client.md
diff --git a/docs/clients.js b/docs/client/clients.js
similarity index 100%
rename from docs/clients.js
rename to docs/client/clients.js
diff --git a/mkdocs.yml b/mkdocs.yml
index d02490be3..cb5e21198 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -77,16 +77,16 @@ pages:
   - 'Adjust Service Configurations': 'u_e-change_config.md'
   - 'Deinstall': 'u_e-deinstall.md'
 - 'Client Configuration':
-  - 'Overview': 'client.md'
-  - 'Android': 'client-android.md'
-  - 'Apple macOS / iOS': 'client-apple.md'
-  - 'eM Client': 'client-emclient.md'
-  - 'KDE Kontact': 'client-kontact.md'
-  - 'Microsoft Outlook': 'client-outlook.md'
-  - 'Mozilla Thunderbird': 'client-thunderbird.md'
-  - 'Windows Mail': 'client-windows.md'
-  - 'Windows Phone': 'client-windowsphone.md'
-  - 'Manual configuration': 'client-manual.md'
+  - 'Overview': 'client/client.md'
+  - 'Android': 'client/client-android.md'
+  - 'Apple macOS / iOS': 'client/client-apple.md'
+  - 'eM Client': 'client/client-emclient.md'
+  - 'KDE Kontact': 'client/client-kontact.md'
+  - 'Microsoft Outlook': 'client/client-outlook.md'
+  - 'Mozilla Thunderbird': 'client/client-thunderbird.md'
+  - 'Windows Mail': 'client/client-windows.md'
+  - 'Windows Phone': 'client/client-windowsphone.md'
+  - 'Manual configuration': 'client/client-manual.md'
 - 'Third party apps':
   - 'SOGo Integrator for Thunderbird': 'third_party-thunderbird.md'
   - 'Roundcube': 'third_party-roundcube.md'