--- a/src/source/index.rst	Tue Aug 14 18:26:02 2018 +0200
+++ b/src/source/index.rst	Tue Aug 14 18:27:10 2018 +0200
@@ -13,7 +13,6 @@
    :caption: Getting started
 
    Introduction <introduction>
-   Application architecture <architecture>
    Quickstart <quickstart>
 
 .. toctree::
@@ -27,7 +26,8 @@
    :maxdepth: 2
    :caption: Installation
 
-   ZODB Server <zodb>
+   Architectures <architecture>
+   Database: ZODB Server <zodb>
    Installing PyAMS <appinstall>
    Configuring and Running PyAMS <app>
    Managing PyAMS environment <manage>
@@ -38,9 +38,10 @@
    :maxdepth: 2
    :caption:  Technical documentation
 
+   Zope Component Architecture <zca>
    developerguide
    packages
-   tests
+
 
 .. toctree::
    :maxdepth: 2
@@ -48,6 +49,12 @@
 
    scripts
 
+.. toctree::
+   :maxdepth: 2
+   :caption:  Python Tests
+
+   tests
+
 
 Indices and tables
 ------------------