diff --git a/legacy/elementary/doc/head.html b/legacy/elementary/doc/head.html
index ba2fec8435..1bb9f81654 100644
--- a/legacy/elementary/doc/head.html
+++ b/legacy/elementary/doc/head.html
@@ -52,7 +52,9 @@
             <ul class="current">
                 <li><a href="files.html">Files</a></li>
                 <li><a href="Elementary_8h_8in.html">API Reference</a></li>
-                <li><a href="moduleslist.html">Modules</a></li>
+                <li><a href="widgetslist.html">Widgets</a></li>
+                <li><a href="containerslist.html">Containers</a></li>
+                <li><a href="infralist.html">Infrastructure</a></li>
 	        <li class="current"><a  href="index.html">Main Page</a></li>
             </ul>
         </div>
diff --git a/legacy/elementary/doc/index.doxy b/legacy/elementary/doc/index.doxy
index d2450b8f3c..dcc0167e06 100644
--- a/legacy/elementary/doc/index.doxy
+++ b/legacy/elementary/doc/index.doxy
@@ -1,5 +1,5 @@
 /**
- * @page moduleslist Index
+ * @page infralist Infrastructure list
  *
  * Elementary is mostly composed of widgets, but it also contains some
  * infrastructure modules that facilitate the use of widgets. These are the
@@ -26,7 +26,15 @@
  * @li @ref Transit
  * @li @ref WidgetNavigation
  *
- * And here a list of the widgets and some images to give you an idea of what
+ * The other two main groups in Elementary are:
+ * @li @ref widgetslist - These are the widgets you'll compose your UI out of.
+ * @li @ref containerslist - These are the containers in which the widgets will be
+ *                           layouted.
+ */
+/**
+ * @page widgetslist Widget list
+ *
+ * Here is a list of the widgets and some images to give you an idea of what
  * they are:
  * @li @ref Actionslider
  *
@@ -217,10 +225,18 @@
  * @image html img/widget/win/preview-00.png
  * @image latex img/widget/win/preview-00.eps
  *
- * Elementary is also about displaing its widgets in a nice layout, for this
- * purpose it provides a number of containers. It's important to note that as
- * containers these widgets don't have their own visual identity, so here we
- * show one use for them and a diagram showing their component parts:
+ * The other two main groups in Elementary are:
+ * @li @ref infralist - These are modules that deal with Elementary as a whole.
+ * @li @ref containerslist - These are the containers in which the widgets will be
+ *                           layouted.
+ */
+/**
+ * @page containerslist Containers List
+ *
+ * Elementary is about displaing its widgets in a nice layout, for this purpose
+ * it provides a number of containers. It's important to note that as containers
+ * widgets don't have their own visual identity, so here we show one use for
+ * them and a diagram showing their component parts:
  * @li @ref Box
  *
  * @image html img/widget/box/preview-00.png
@@ -270,4 +286,8 @@
  *
  * @image html img/widget/table/preview-00.png
  * @image latex img/widget/table/preview-00.eps
+ *
+ * The other two main groups in Elementary are:
+ * @li @ref infralist - These are modules that deal with Elementary as a whole.
+ * @li @ref widgetslist - These are the widgets you'll compose your UI out of.
  */
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 7a0a063064..2925c375df 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -22,18 +22,24 @@ applications (yet). Small simple ones with simple needs.
 It is meant to make the programmers work almost brainless but give them lots
 of flexibility.
 
-License: LGPL v2 (see COPYING in the base of Elementary's source). This
-applies to all files in the source here.
+@section organization Organization
 
-Acknowledgements: There is a lot that goes into making a widget set, and
-they don't happen out of nothing. It's like trying to make everyone
-everywhere happy, regardless of age, gender, race or nationality - and
-that is really tough. So thanks to people and organisations behind this,
-as listed in the @ref authors page.
+One can divide Elemementary into three main groups:
+@li @ref infralist - These are modules that deal with Elementary as a whole.
+@li @ref widgetslist - These are the widgets you'll compose your UI out of.
+@li @ref containerslist - These are the containers in which the widgets will be
+                          layouted.
 
-@verbatim
-Pants
-@endverbatim
+@section license License
+
+LGPL v2 (see COPYING in the base of Elementary's source). This applies to
+all files in the source tree.
+
+@section ack Acknowledgements
+There is a lot that goes into making a widget set, and they don't happen out of
+nothing. It's like trying to make everyone everywhere happy, regardless of age,
+gender, race or nationality - and that is really tough. So thanks to people and
+organisations behind this, as listed in the @ref authors page.
 */
 
 /**