diff --git a/sphinx/_reclass.sls b/sphinx/_reclass.sls
index 40ce0d4..62db306 100644
--- a/sphinx/_reclass.sls
+++ b/sphinx/_reclass.sls
@@ -3,7 +3,7 @@
   file.directory:
   - names:
     - /srv/static/extern/reclass/source/_static
-    - /srv/static/extern/reclass/source/overview
+    - /srv/static/extern/reclass/source/services
     - /srv/static/extern/reclass/source/nodes
     - /srv/static/extern/reclass/source/devices
   - user: root
@@ -32,25 +32,33 @@
   - require:
     - file: reclass_doc_dirs
 
-/srv/static/extern/reclass/source/overview/nodes.rst:
+/srv/static/extern/reclass/source/nodes/index.rst:
   file.managed:
-  - source: salt://sphinx/files/reclass/source/overview/nodes.rst
+  - source: salt://sphinx/files/reclass/source/nodes/index.rst
   - template: jinja
   - mode: 644
   - require:
     - file: reclass_doc_dirs
 
-/srv/static/extern/reclass/source/overview/endpoints.rst:
+/srv/static/extern/reclass/source/services/index.rst:
   file.managed:
-  - source: salt://sphinx/files/reclass/source/overview/endpoints.rst
+  - source: salt://sphinx/files/reclass/source/services/index.rst
   - template: jinja
   - mode: 644
   - require:
     - file: reclass_doc_dirs
 
-/srv/static/extern/reclass/source/overview/services.rst:
+/srv/static/extern/reclass/source/services/endpoints.rst:
   file.managed:
-  - source: salt://sphinx/files/reclass/source/overview/services.rst
+  - source: salt://sphinx/files/reclass/source/services/endpoints.rst
+  - template: jinja
+  - mode: 644
+  - require:
+    - file: reclass_doc_dirs
+
+/srv/static/extern/reclass/source/services/catalog.rst:
+  file.managed:
+  - source: salt://sphinx/files/reclass/source/services/catalog.rst
   - template: jinja
   - mode: 644
   - require:
diff --git a/sphinx/files/reclass/source/index.rst b/sphinx/files/reclass/source/index.rst
index 0685514..0cb6c78 100644
--- a/sphinx/files/reclass/source/index.rst
+++ b/sphinx/files/reclass/source/index.rst
@@ -7,10 +7,5 @@
 .. toctree::
    :maxdepth: 2
 
-   overview/endpoints
-   overview/nodes
-   overview/services
-   {%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
-   nodes/{{ node_name }}
-   {%- endfor %}
-
+   services/index
+   nodes/index
diff --git a/sphinx/files/reclass/source/overview/nodes.rst b/sphinx/files/reclass/source/nodes/index.rst
similarity index 90%
rename from sphinx/files/reclass/source/overview/nodes.rst
rename to sphinx/files/reclass/source/nodes/index.rst
index 0c31b3a..59ca16f 100644
--- a/sphinx/files/reclass/source/overview/nodes.rst
+++ b/sphinx/files/reclass/source/nodes/index.rst
@@ -25,11 +25,8 @@
 .. toctree::
    :maxdepth: 2
 
-   overview/endpoints
-   overview/nodes
-   overview/services
    {%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
    {%- if node_grains.get('sphinx_doc', {}) != None %}
-   ../nodes/{{ node_name }}
+   {{ node_name }}
    {%- endif %}
    {%- endfor %}
diff --git a/sphinx/files/reclass/source/overview/services.rst b/sphinx/files/reclass/source/services/catalog.rst
similarity index 100%
rename from sphinx/files/reclass/source/overview/services.rst
rename to sphinx/files/reclass/source/services/catalog.rst
diff --git a/sphinx/files/reclass/source/overview/endpoints.rst b/sphinx/files/reclass/source/services/endpoints.rst
similarity index 100%
rename from sphinx/files/reclass/source/overview/endpoints.rst
rename to sphinx/files/reclass/source/services/endpoints.rst
diff --git a/sphinx/files/reclass/source/services/index.rst b/sphinx/files/reclass/source/services/index.rst
new file mode 100644
index 0000000..41f3619
--- /dev/null
+++ b/sphinx/files/reclass/source/services/index.rst
@@ -0,0 +1,12 @@
+
+===============================
+Infrastructure Services
+===============================
+
+Definition of all services within current infrastructure.
+
+.. toctree::
+   :maxdepth: 2
+
+   services/endpoints
+   services/catalog