--- a/src/source/index.rst	Mon Dec 10 18:17:20 2018 +0100
+++ b/src/source/index.rst	Tue Dec 11 16:29:56 2018 +0100
@@ -2,33 +2,39 @@
    sphinx-quickstart on Tue Nov 15 16:18:42 2016.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
+
 .. _index:
 
+Welcome to PyAMS's documentation!
+=================================
 
-Contents
+.. warning::
+    This is a "work-in-progress" documentation. All elements described here are not publicly available yet.
+
+
+Summary
 ---------
 
 .. toctree::
    :maxdepth: 2
-   :caption: Getting started
 
-   Introduction <introduction>
+   Overview <overview>
    Quickstart <quickstart>
 
 .. toctree::
    :maxdepth: 2
-   :caption: Tutorial
-
-   PyAMS CMS User’s Guide <userguide>
-   screenshots
+   :caption: Administrator Guide
 
-.. toctree::
-   :maxdepth: 2
-   :caption: Installation
+   PyAMS Architectures <administrator_guide/architecture>
+   PyAMS Security model <administrator_guide/security>
+   Installing PyAMS <administrator_guide/appinstall>
+   Database initialization
+   Database maintenance tasks
+   Scheduling tasks
+   Command line scripts
+   Application tuning
+   Troubleshooting
 
-   Architectures <architecture>
-   Database: ZODB Server <zodb>
-   Installing PyAMS <appinstall>
    Configuring and Running PyAMS <app>
    Managing PyAMS environment <manage>
    Additional Plugins <plugins>
@@ -36,24 +42,49 @@
 
 .. toctree::
    :maxdepth: 2
-   :caption:  Technical documentation
+   :caption: User Guide
 
-   Zope Component Architecture <zca>
-   developerguide
-   packages
+   Management interface
+   Site Manager Guide
+   Webmaster Guide
+   Contributor Guide
+
+   PyAMS CMS User’s Guide <user_guide/userguide>
+   screenshots
 
 
 .. toctree::
    :maxdepth: 2
-   :caption:  Toolkit
+   :caption:  Developer Guide
 
-   scripts
+   Understanding the Zope Component Architecture <developer_guide/zca>
+   Understanding PyAMS internals
+   Creating new PyAMS Packages
+   Overriding PyAMS features
+   Customizing site appearance
+   Understanding PyAMS forms
+   Creating new blocks
+   Creating new portlet
+   Creating new content type
+   Creating Custom workflows
+   Advanced features
+
+
 
 .. toctree::
    :maxdepth: 2
-   :caption:  Python Tests
+   :caption:  Reference Guide
+
+   PyAMS packages layout <reference_guide/package_layout>
+   PyAMS packages references <reference_guide/packages>
+   PyAMs Test <reference_guide/test>
 
-   tests
+
+.. toctree::
+   :maxdepth: 2
+   :caption: About
+
+   about
 
 
 Indices and tables