diff --git a/Manuals/Userguide/Directories.docbook b/Manuals/Userguide/Directories.docbook
index d3bb0bc..cc086e9 100644
--- a/Manuals/Userguide/Directories.docbook
+++ b/Manuals/Userguide/Directories.docbook
@@ -1,4 +1,4 @@
-<chapter id="directories" xreflabel="Directories">
+<part id="directories" xreflabel="Directories">
 
     <title>Directories</title>
 
@@ -7,16 +7,16 @@
     conceptual ideas are explained in each directory related
     documentation entry.</para>
 
-    <para>In this chapter you'll learn what each directory inside The
+    <para>In this part you'll learn what each directory inside The
     CentOS Artwork Repository is for and so, how you can make use of
     them. For that purpose, the following list of directories is
     available for you to explore:</para>
 
     &dir-trunk;
-    &dir-trunk-identity;
-    &dir-trunk-identity-models;
-    &dir-trunk-identity-models-themes;
-    &dir-trunk-identity-models-themes-default;
-    &dir-trunk-manuals;
+    &dir-trunk-Identity;
+    &dir-trunk-Identity-Models;
+    &dir-trunk-Identity-Models-Themes;
+    &dir-trunk-Identity-Models-Themes-Default;
+    &dir-trunk-Manuals;
 
-</chapter>
+</part>
diff --git a/Manuals/Userguide/Directories/trunk.docbook b/Manuals/Userguide/Directories/trunk.docbook
index 1847e6c..421cbc8 100644
--- a/Manuals/Userguide/Directories/trunk.docbook
+++ b/Manuals/Userguide/Directories/trunk.docbook
@@ -1,4 +1,4 @@
-<sect1 id="dir-trunk" xreflabel="trunk">
+<chapter id="dir-trunk" xreflabel="trunk">
 
     <title><filename class="directory">trunk</filename></title>
     
@@ -9,4 +9,4 @@
     the main development line inside the CentOS Artwork
     Repository.</para>
 
-</sect1>
+</chapter>
diff --git a/Manuals/Userguide/Directories/trunk/Identity.docbook b/Manuals/Userguide/Directories/trunk/Identity.docbook
index b2ad8a1..293ead8 100644
--- a/Manuals/Userguide/Directories/trunk/Identity.docbook
+++ b/Manuals/Userguide/Directories/trunk/Identity.docbook
@@ -1,4 +1,4 @@
-<sect1 id="dir-trunk-identity" xreflabel="trunk/Identity">
+<chapter id="dir-trunk-identity" xreflabel="trunk/Identity">
 
     <title><filename class="directory">trunk/Identity</filename></title>
 
@@ -207,4 +207,4 @@
     contradition we are precisely trying to solve by mean of themes
     production in the CentOS Artwork Repository.</para>
 
-</sect1>
+</chapter>
diff --git a/Manuals/Userguide/Directories/trunk/Identity/Models.docbook b/Manuals/Userguide/Directories/trunk/Identity/Models.docbook
index fba2893..c8380dc 100644
--- a/Manuals/Userguide/Directories/trunk/Identity/Models.docbook
+++ b/Manuals/Userguide/Directories/trunk/Identity/Models.docbook
@@ -1,4 +1,4 @@
-<sect1 id="dir-trunk-identity-models" xreflabel="trunk/Identity/Models">
+<chapter id="dir-trunk-identity-models" xreflabel="trunk/Identity/Models">
     <title><filename class="directory">trunk/Identity/Models</filename></title>
     <para>...</para>
-</sect1>
+</chapter>
diff --git a/Manuals/Userguide/Directories/trunk/Identity/Models/Themes.docbook b/Manuals/Userguide/Directories/trunk/Identity/Models/Themes.docbook
index a2660e4..a0ed386 100644
--- a/Manuals/Userguide/Directories/trunk/Identity/Models/Themes.docbook
+++ b/Manuals/Userguide/Directories/trunk/Identity/Models/Themes.docbook
@@ -1,4 +1,4 @@
-<sect1 id="dir-trunk-identity-models-themes" xreflabel="trunk/Identity/Models/Themes">
+<chapter id="dir-trunk-identity-models-themes" xreflabel="trunk/Identity/Models/Themes">
 
     <title><filename class="directory">trunk/Identity/Models/Themes</filename></title>
 
@@ -28,4 +28,4 @@
     can be localized using the <code>locale</code> functionality of
     <command>centos-art.sh</command> script.</para>
 
-</sect1>
+</chapter>
diff --git a/Manuals/Userguide/Directories/trunk/Identity/Models/Themes/Default.docbook b/Manuals/Userguide/Directories/trunk/Identity/Models/Themes/Default.docbook
index 30fe79b..1c68583 100644
--- a/Manuals/Userguide/Directories/trunk/Identity/Models/Themes/Default.docbook
+++ b/Manuals/Userguide/Directories/trunk/Identity/Models/Themes/Default.docbook
@@ -1,4 +1,4 @@
-<sect1 id="dir-trunk-identity-models-themes-default"
+<chapter id="dir-trunk-identity-models-themes-default"
        xreflabel="trunk/Identity/Models/Themes/Default">
 
     <title><filename class="directory">trunk/Identity/Models/Themes/Default</filename></title>
@@ -13,4 +13,4 @@
     specified through the <option>--theme-model</option> option at
     rendition time.</para>
 
-</sect1>
+</chapter>
diff --git a/Manuals/Userguide/Directories/trunk/Manuals.docbook b/Manuals/Userguide/Directories/trunk/Manuals.docbook
index f089182..07fa3c5 100644
--- a/Manuals/Userguide/Directories/trunk/Manuals.docbook
+++ b/Manuals/Userguide/Directories/trunk/Manuals.docbook
@@ -1,4 +1,4 @@
-<sect1 id="dir-trunk-manuals" xreflabel="trunk/Manuals">
+<chapter id="dir-trunk-manuals" xreflabel="trunk/Manuals">
     <title><filename class="directory">trunk/Manuals</filename></title>
     <para>...</para>
-</sect1>
+</chapter>
diff --git a/Manuals/Userguide/Introduction.docbook b/Manuals/Userguide/Introduction.docbook
index c0a4d95..4a7c61a 100644
--- a/Manuals/Userguide/Introduction.docbook
+++ b/Manuals/Userguide/Introduction.docbook
@@ -1,4 +1,4 @@
-<chapter id="intro" xreflabel="Introduction">
+<part id="intro" xreflabel="Introduction">
 
     <title>Introduction</title>
 
@@ -21,6 +21,5 @@
 
     &intro-history;
     &intro-copying;
-    &intro-usage;
 
-</chapter>
+</part>
diff --git a/Manuals/Userguide/Introduction/copying.docbook b/Manuals/Userguide/Introduction/copying.docbook
index 1c679e0..b7c3e19 100644
--- a/Manuals/Userguide/Introduction/copying.docbook
+++ b/Manuals/Userguide/Introduction/copying.docbook
@@ -1,12 +1,21 @@
-<sect1 id="intro-copying" xreflabel="Copying conditions">
+<chapter id="intro-copying" xreflabel="Copying conditions">
 
     <title>Copying conditions</title>
+    <chapterinfo>
+        <copyright>
+            <year>2009</year>
+            <year>2010</year>
+            <year>2011</year>
+            <holder>The CentOS Artwork SIG</holder>
+        </copyright>
+        <legalnotice>
+            <para>Everyone is permitted to copy and distribute
+            verbatim copies of this license document, but changing it
+            is not allowed.</para>
+        </legalnotice>
+    </chapterinfo>
 
-    <para>Copyright &copy; 2009, 2010, 2011 The CentOS Project</para>
-    <para>Everyone is permitted to copy and distribute verbatim copies
-    of this license document, but changing it is not allowed.</para>
-
-    <sect2 id="intro-copying-preamble" xreflabel="Preamble">
+    <sect1 id="intro-copying-preamble" xreflabel="Preamble">
 
     <title>Preamble</title>
 
@@ -60,9 +69,10 @@
     <command>centos-art.sh</command> script are found in the <xref
     linkend="licenses-gpl" />. This manual specifically is
     covered by the <xref linkend="licenses-gfdl" />.</para>
-    </sect2>
+
+    </sect1>
     
-    <sect2 id="intro-copying-brand" xreflabel="The CentOS Brand">
+    <sect1 id="intro-copying-brand" xreflabel="The CentOS Brand">
 
     <title>The CentOS Brand</title>
     
@@ -85,7 +95,7 @@
     The CentOS Developers mailing list
     (centos-devel@centos.org).</para>
 
-    </sect2>
+    </sect1>
 
-</sect1>
+</chapter>
 
diff --git a/Manuals/Userguide/Introduction/history.docbook b/Manuals/Userguide/Introduction/history.docbook
index 8d75b67..c1b0fe1 100644
--- a/Manuals/Userguide/Introduction/history.docbook
+++ b/Manuals/Userguide/Introduction/history.docbook
@@ -1,4 +1,4 @@
-<sect1 id="intro-history" xreflabel="History">
+<chapter id="intro-history" xreflabel="History">
 
     <title>History</title>
 
@@ -145,4 +145,4 @@
     rendition, content localization, content documentation and content
     maintainance.</para>
 
-</sect1>
+</chapter>
diff --git a/Manuals/Userguide/repository.docbook b/Manuals/Userguide/repository.docbook
index 43287c8..32f233b 100644
--- a/Manuals/Userguide/repository.docbook
+++ b/Manuals/Userguide/repository.docbook
@@ -3,33 +3,67 @@
                "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
                [
 
-<!-- Preamble -->
-<!ENTITY repository-preamble    SYSTEM "repository-preamble.docbook">
-<!ENTITY repository-parts       SYSTEM "repository-parts.docbook">
-
-<!-- Introduction -->
-<!ENTITY intro                  SYSTEM "Introduction.docbook">
-<!ENTITY intro-history          SYSTEM "Introduction/history.docbook">
-<!ENTITY intro-copying          SYSTEM "Introduction/copying.docbook">
-<!ENTITY intro-usage            SYSTEM "Introduction/usage.docbook">
-<!ENTITY intro-docs             SYSTEM "Introduction/document-convenctions.docbook">
-
-<!-- Directories -->
-<!ENTITY dir SYSTEM "Directories.docbook">
-<!ENTITY dir-trunk SYSTEM "Directories/trunk.docbook">
-<!ENTITY dir-trunk-identity SYSTEM "Directories/trunk/Identity.docbook">
-<!ENTITY dir-trunk-identity-models SYSTEM "Directories/trunk/Identity/Models.docbook">
-<!ENTITY dir-trunk-identity-models-themes SYSTEM "Directories/trunk/Identity/Models/Themes.docbook">
-<!ENTITY dir-trunk-identity-models-themes-default SYSTEM "Directories/trunk/Identity/Models/Themes/Default.docbook">
-<!ENTITY dir-trunk-manuals SYSTEM "Directories/trunk/Manuals.docbook">
-
-<!-- Licenses -->
-<!ENTITY licenses-gpl           SYSTEM "Licenses/gpl.docbook">
-<!ENTITY licenses-gfdl          SYSTEM "Licenses/gfdl.docbook">
+<!ENTITY % Introduction.ent     SYSTEM "Introduction.ent">
+<!ENTITY % Directories.ent      SYSTEM "Directories.ent">
+<!ENTITY % Licenses.ent         SYSTEM "Licenses.ent">
 
+%Introduction.ent;
+%Directories.ent;
+%Licenses.ent;
 ]>
 
 <book lang="en-US">
-&repository-preamble;
-&repository-parts;
+
+    <!-- Front matter -->
+    <title>The CentOS Artwork Repository</title>
+    <subtitle>User's Guide</subtitle>
+
+    <bookinfo>
+        <authorgroup>
+            <author>
+                <firstname>Alain</firstname>
+                <surname>Reguera Delgado</surname>
+            </author>
+        </authorgroup>
+
+        <!-- Copyright: The copyright page is verso and contains the
+        copyright notice, the publishing/printing history, the country
+        where printed, ISBN and/or CIP information.  The page is
+        usually typeset in a smaller font than the normal text. -->
+        <copyright>
+            <year>2009</year>
+            <year>2010</year>
+            <year>2011</year>
+            <holder>The CentOS Artwork SIG</holder>
+        </copyright>
+
+        <legalnotice>
+            <para>
+              Permission is granted to copy, distribute and/or modify
+              this document under the terms of the GNU Free
+              Documentation License, Version 1.2 or any later version
+              published by the Free Software Foundation; with no
+              Invariant Sections, no Front-Cover Texts, and no
+              Back-Cover Texts. A copy of the license is included in
+              the section entitled <xref linkend="licenses-gfdl" />.
+            </para>
+        </legalnotice>
+
+        <date>Jun, 2011</date>
+
+        <abstract>
+            <para>
+              This manuals documents relevant information regarding
+              the deployment, organization, and administration of
+              CentOS Artwork Repository.
+            </para>
+        </abstract>
+
+    </bookinfo>
+
+    <!-- Main matter -->
+    &intro;
+    &dir;
+    &licenses;
+
 </book>