--- a/src/source/packages.rst	Mon Dec 10 18:16:35 2018 +0100
+++ b/src/source/packages.rst	Mon Dec 10 18:17:20 2018 +0100
@@ -1,51 +1,60 @@
 .. _packages:
 
-PyAMS packages
-==============
+PyAMS packages reference
+========================
 
 
-PyAMS core
-----------
+Core packages
+-------------
 
 .. toctree::
    :maxdepth: 1
 
+   PyAMS Template <api-doc/pyams_template/pyams_template>
+   PyAMS Viewlet <api-doc/pyams_viewlet/pyams_viewlet>
+   PyAMS Pagelet <api-doc/pyams_pagelet/pyams_pagelet>
    PyAMS Utils <api-doc/pyams_utils/pyams_utils>
-   PyAMS ZMI <api-doc/pyams_zmi/pyams_zmi>
-   PyAMS Content <api-doc/pyams_content/pyams_content>
    PyAMS Skin <api-doc/pyams_skin/pyams_skin>
+   PyAMS Form <api-doc/pyams_form/pyams_form>
+   PyAMS File <api-doc/pyams_file/pyams_file>
+   PyAMS I18N <api-doc/pyams_i18n/pyams_i18n>
+   PyAMS Security <api-doc/pyams_security/pyams_security>
    PyAMS Catalog <api-doc/pyams_catalog/pyams_catalog>
-   PyAMS Form <api-doc/pyams_form/pyams_form>
-   PyAMS Portal <api-doc/pyams_portal/pyams_portal>
-   PyAMS Template <api-doc/pyams_template/pyams_template>
-   PyAMS Pagelet <api-doc/pyams_pagelet/pyams_pagelet>
-   PyAMS Viewlet <api-doc/pyams_viewlet/pyams_viewlet>
+   PyAMS Mail <api-doc/pyams_mail/pyams_mail>
+   PyAMS Cache <api-doc/pyams_cache/pyams_cache>
+   PyAMS ZMQ <api-doc/pyams_zmq/pyams_zmq>
+   PyAMS Scheduler <api-doc/pyams_scheduler/pyams_scheduler>
+   PyAMS ZMI <api-doc/pyams_zmi/pyams_zmi>
 
 
-Additional PyAMS packages
--------------------------
+CMS Packages
+------------
+
+.. toctree::
+   :maxdepth: 1
+
+   PyAMS Sequence <api-doc/pyams_sequence/pyams_sequence>
+   PyAMS Workflow <api-doc/pyams_workflow/pyams_workflow>
+   PyAMS Thesaurus <api-doc/pyams_thesaurus/pyams_thesaurus>
+   PyAMS Portal <api-doc/pyams_portal/pyams_portal>
+   PyAMS Content <api-doc/pyams_content/pyams_content>
+   PyAMS Default theme <api-doc/pyams_default_theme/pyams_default_theme>
+
+
+Optional packages
+-----------------
 
 PyAMS is built on many additional packages, and provides a whole set of extensions. Here is a list of them:
 
 .. toctree::
    :maxdepth: 1
 
+   PyAMS Content with ElasticSearch <api-doc/pyams_content_es/pyams_content_es>
+   PyAMS APM  <api-doc/pyams_alchemy/pyams_apm>
+   PyAMS ZODBbrowser <api-doc/pyams_zodbbrowser/pyams_zodbbrowser>
+   PyAMS LDAP <api-doc/pyams_ldap/pyams_ldap>
+   PyAMS GIS <api-doc/pyams_gis/pyams_gis>
    PyAMS Alchemy  <api-doc/pyams_alchemy/pyams_alchemy>
-   PyAMS Cache <api-doc/pyams_cache/pyams_cache>
-   PyAMS Content with ElasticSearch <api-doc/pyams_content_es/pyams_content_es>
-   PyAMS Default theme <api-doc/pyams_default_theme/pyams_default_theme>
-   PyAMS File <api-doc/pyams_file/pyams_file>
-   PyAMS GIS <api-doc/pyams_gis/pyams_gis>
-   PyAMS I18N <api-doc/pyams_i18n/pyams_i18n>
-   PyAMS LDAP <api-doc/pyams_ldap/pyams_ldap>
-   PyAMS Mail <api-doc/pyams_mail/pyams_mail>
    PyAMS Media <api-doc/pyams_media/pyams_media>
    PyAMS Notify <api-doc/pyams_notify/pyams_notify>
    PyAMS Notify with WebSocket<api-doc/pyams_notify_ws/pyams_notify_ws>
-   PyAMS Scheduler <api-doc/pyams_scheduler/pyams_scheduler>
-   PyAMS Thesaurus <api-doc/pyams_thesaurus/pyams_thesaurus>
-   PyAMS Security <api-doc/pyams_security/pyams_security>
-   PyAMS Sequence <api-doc/pyams_sequence/pyams_sequence>
-   PyAMS Workflow <api-doc/pyams_workflow/pyams_workflow>
-   PyAMS ZMQ <api-doc/pyams_zmq/pyams_zmq>
-   PyAMS ZODBbrowser <api-doc/pyams_zodbbrowser/pyams_zodbbrowser>