diff --git a/Documentation/Configuration/General.rst b/Documentation/Configuration/General/Index.rst
similarity index 100%
rename from Documentation/Configuration/General.rst
rename to Documentation/Configuration/General/Index.rst
diff --git a/Documentation/Configuration/Index.rst b/Documentation/Configuration/Index.rst
index 6c077da..faec660 100644
--- a/Documentation/Configuration/Index.rst
+++ b/Documentation/Configuration/Index.rst
@@ -10,4 +10,4 @@ Configuration
    :maxdepth: 5
    :titlesonly:
 
-   General
+   General/Index
diff --git a/Documentation/Index.rst b/Documentation/Index.rst
index 4bc17bc..3c3de0c 100644
--- a/Documentation/Index.rst
+++ b/Documentation/Index.rst
@@ -48,11 +48,3 @@ This extension provides plugins to edit the assigned profiles from the TYPO3 fro
     Configuration/Index
     Templates/Index
     KnownProblems/Index
-
-..  Meta Menu
-
-..  toctree::
-    :hidden:
-
-    Sitemap
-    genindex
diff --git a/Documentation/Sitemap.rst b/Documentation/Sitemap.rst
deleted file mode 100644
index cd06f7d..0000000
--- a/Documentation/Sitemap.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-:template: sitemap.html
-
-..  include:: /Includes.rst.txt
-
-=======
-Sitemap
-=======
-
-..  The sitemap.html template will insert here the page tree automatically.
diff --git a/Documentation/Templates/Index.rst b/Documentation/Templates/Index.rst
index 3c61f26..ff5be66 100644
--- a/Documentation/Templates/Index.rst
+++ b/Documentation/Templates/Index.rst
@@ -12,4 +12,4 @@ This chapter is all about templating EXT:academic_persons_edit
     :maxdepth: 5
     :titlesonly:
 
-    Override
+    Override/Index
diff --git a/Documentation/Templates/Override.rst b/Documentation/Templates/Override/Index.rst
similarity index 100%
rename from Documentation/Templates/Override.rst
rename to Documentation/Templates/Override/Index.rst
diff --git a/Documentation/genindex.rst b/Documentation/genindex.rst
deleted file mode 100644
index 38a804f..0000000
--- a/Documentation/genindex.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-..  include:: /Includes.rst.txt
-
-=====
-Index
-=====
-
-..  Sphinx will insert here the general index automatically.