diff --git a/Manuals/Docbook/Book/parts.docbook b/Manuals/Docbook/Book/parts.docbook
index 4135e18..00a0bff 100644
--- a/Manuals/Docbook/Book/parts.docbook
+++ b/Manuals/Docbook/Book/parts.docbook
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <part>
     <title>The Repository</title>
-    &repository-history-chapter;
-    &repository-copying-chapter;
-    &repository-usage-chapter;
-    &repository-directories-chapter;
+    &repository-history;
+    &repository-copying;
+    &repository-usage;
+    &repository-directories;
 </part>
 
 <part>
     <title>Licenses</title>
-    &licenses-gpl-chapter;
-    &licenses-gfdl-chapter;
+    &licenses-gpl;
+    &licenses-gfdl;
 </part>
diff --git a/Manuals/Docbook/Licenses.docbook b/Manuals/Docbook/Licenses.docbook
new file mode 100644
index 0000000..5a7534e
--- /dev/null
+++ b/Manuals/Docbook/Licenses.docbook
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<part>
+    <title>Licenses</title>
+    &license-gpl;
+    &license-gfdl;
+</part>
diff --git a/Manuals/Docbook/Licenses/Gfdl.docbook b/Manuals/Docbook/Licenses/Gfdl.docbook
index 604e9e3..e6dd831 100644
--- a/Manuals/Docbook/Licenses/Gfdl.docbook
+++ b/Manuals/Docbook/Licenses/Gfdl.docbook
@@ -11,17 +11,17 @@
     <para>Everyone is permitted to copy and distribute verbatim copies
     of this license document, but changing it is not allowed.</para>
 
-    &licenses-gfdl-section-1;
-    &licenses-gfdl-section-2;
-    &licenses-gfdl-section-3;
-    &licenses-gfdl-section-4;
-    &licenses-gfdl-section-5;
-    &licenses-gfdl-section-6;
-    &licenses-gfdl-section-7;
-    &licenses-gfdl-section-8;
-    &licenses-gfdl-section-9;
-    &licenses-gfdl-section-10;
-    &licenses-gfdl-section-11;
-    &licenses-gfdl-section-12;
+    &licenses-gfdl-preamble;
+    &licenses-gfdl-applicability-and-definitions;
+    &licenses-gfdl-verbatim-copying;
+    &licenses-gfdl-copying-in-quantity;
+    &licenses-gfdl-modifications;
+    &licenses-gfdl-combining-documents;
+    &licenses-gfdl-collection-of-documents;
+    &licenses-gfdl-aggregation-with-independent-works;
+    &licenses-gfdl-translations;
+    &licenses-gfdl-termination;
+    &licenses-gfdl-future-revisions-of-this-license;
+    &licenses-gfdl-how-to-use-this-license;
 
 </appendix>
diff --git a/Manuals/Docbook/Licenses/Gpl.docbook b/Manuals/Docbook/Licenses/Gpl.docbook
index 6a4b5e1..21b56ae 100644
--- a/Manuals/Docbook/Licenses/Gpl.docbook
+++ b/Manuals/Docbook/Licenses/Gpl.docbook
@@ -11,8 +11,21 @@
     <para>Everyone is permitted to copy and distribute verbatim copies
     of this license document, but changing it is not allowed.</para>
 
-    &licenses-gpl-section-1;
-    &licenses-gpl-section-2;
-    &licenses-gpl-section-3;
+    &licenses-gpl-preamble;
+    &licenses-gpl-terms-and-conditions;
+    &licenses-gpl-terms-and-conditions-section-0;
+    &licenses-gpl-terms-and-conditions-section-1;
+    &licenses-gpl-terms-and-conditions-section-2;
+    &licenses-gpl-terms-and-conditions-section-3;
+    &licenses-gpl-terms-and-conditions-section-4;
+    &licenses-gpl-terms-and-conditions-section-5;
+    &licenses-gpl-terms-and-conditions-section-6;
+    &licenses-gpl-terms-and-conditions-section-7;
+    &licenses-gpl-terms-and-conditions-section-8;
+    &licenses-gpl-terms-and-conditions-section-9;
+    &licenses-gpl-terms-and-conditions-section-10;
+    &licenses-gpl-terms-and-conditions-section-11;
+    &licenses-gpl-terms-and-conditions-section-12;
+    &licenses-gpl-how-to-apply-this-license;
 
 </appendix>
diff --git a/Manuals/Docbook/Preface.docbook b/Manuals/Docbook/Preface.docbook
new file mode 100644
index 0000000..3090ff8
--- /dev/null
+++ b/Manuals/Docbook/Preface.docbook
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<preface>
+
+    <title>Introduction</title>
+
+    <para>Welcome to <emphasis>The CentOS Artwork Repository
+    Manual</emphasis>.</para>
+
+    <para>The CentOS Artwork Repository Manual describes how The
+    CentOS Project Corporate Visual Identity is organized and produced
+    inside the CentOS Artwork Repository (<ulink
+    url="https://projects.centos.org/svn/artwork/" />).  If you are
+    looking for a comprehensive, task-oriented guide for understanding
+    how The CentOS Project Corporate Visual Identity is produced, this
+    is the manual for you.</para>
+
+    <para>This manual discusses the following intermedite
+    topics:
+
+    <itemizedlist>
+        <listitem><para>The CentOS Brand</para></listitem>
+        <listitem><para>The CentOS Corporate Visual Structure</para></listitem>
+        <listitem><para>The CentOS Corporate Visual Style</para></listitem>
+    </itemizedlist></para>
+
+    <para>This guide assumes you have a basic understanding of your
+    CentOS system. If you need help with CentOS, refer to the help
+    page on the CentOS Wiki (<ulink url="http://wiki.centos.org/Help"
+    />) for a list of different places you can find help.</para>
+
+    &preface-document-convenctions;
+    &preface-send-in-your-feedback;
+
+</preface>
diff --git a/Manuals/Docbook/Preface/chapter.docbook b/Manuals/Docbook/Preface/chapter.docbook
deleted file mode 100644
index c905eee..0000000
--- a/Manuals/Docbook/Preface/chapter.docbook
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<preface>
-
-    <title>Introduction</title>
-
-    <para>Welcome to <emphasis>The CentOS Artwork Repository
-    Manual</emphasis>.</para>
-
-    <para>The CentOS Artwork Repository Manual describes how The
-    CentOS Project Corporate Visual Identity is organized and produced
-    inside the CentOS Artwork Repository (<ulink
-    url="https://projects.centos.org/svn/artwork/" />).  If you are
-    looking for a comprehensive, task-oriented guide for understanding
-    how The CentOS Project Corporate Visual Identity is produced, this
-    is the manual for you.</para>
-
-    <para>This manual discusses the following intermedite
-    topics:
-
-    <itemizedlist>
-        <listitem><para>The CentOS Brand</para></listitem>
-        <listitem><para>The CentOS Corporate Visual Structure</para></listitem>
-        <listitem><para>The CentOS Corporate Visual Style</para></listitem>
-    </itemizedlist></para>
-
-    <para>This guide assumes you have a basic understanding of your
-    CentOS system. If you need help with CentOS, refer to the help
-    page on the CentOS Wiki (<ulink url="http://wiki.centos.org/Help"
-    />) for a list of different places you can find help.</para>
-
-    &preface-section-1;
-    &preface-section-2;
-
-</preface>
diff --git a/Manuals/Docbook/Repository.docbook b/Manuals/Docbook/Repository.docbook
new file mode 100644
index 0000000..e8575d3
--- /dev/null
+++ b/Manuals/Docbook/Repository.docbook
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<part>
+    <title>The Repository</title>
+
+    &repository-history;
+    &repository-copying;
+    &repository-usage;
+    &repository-directories;
+
+</part>
diff --git a/Manuals/Docbook/Repository/Directories/chapter.docbook b/Manuals/Docbook/Repository/Directories/chapter.docbook
new file mode 100644
index 0000000..eb5bc14
--- /dev/null
+++ b/Manuals/Docbook/Repository/Directories/chapter.docbook
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<chapter id="repository-directories-chapter" xreflabel="Directories">
+
+    <title>Directories</title>
+
+    <para>The CentOS Artwork Repository uses directories to organize
+    files and describe conceptual idea about corporate identity. Such
+    conceptual ideas are explained in each directory related
+    documentation entry.</para>
+
+    <para>In this chapter 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>
+
+    &repository-directories-section-1;
+    &repository-directories-section-2;
+    &repository-directories-section-3;
+    &repository-directories-section-4;
+    &repository-directories-section-5;
+    &repository-directories-section-6;
+
+</chapter>
diff --git a/Manuals/Docbook/Repository/Directories/trunk.docbook b/Manuals/Docbook/Repository/Directories/trunk.docbook
new file mode 100644
index 0000000..b209cd2
--- /dev/null
+++ b/Manuals/Docbook/Repository/Directories/trunk.docbook
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sect1 id="repository-directories-section-1" xreflabel="trunk" label="4.1">
+    <title><filename class="directory">trunk</filename></title>
+    <para></para>
+</sect1>
diff --git a/Manuals/Docbook/Repository/Directories/trunk/Identity.docbook b/Manuals/Docbook/Repository/Directories/trunk/Identity.docbook
new file mode 100644
index 0000000..8414fe4
--- /dev/null
+++ b/Manuals/Docbook/Repository/Directories/trunk/Identity.docbook
@@ -0,0 +1,260 @@
+<?xml version="1.0"?>
+<sect1 id="repository-directories-section-2" xreflabel="trunk/Identity" label="4.2">
+    <title><filename class="directory">trunk/Identity</filename></title>
+
+    <para>This directory implements The CentOS Project
+    <emphasis>corporate identity</emphasis> based on the The CentOS
+    Project <emphasis>mission</emphasis> and <emphasis>release
+    schema</emphasis>.</para>
+
+    <sect2 id="corporate-mission" xreflabel="The corporate mission" label="4.2.1">
+
+        <title>The corporate mission</title>
+
+        <para>The CentOS Project exists to provide The CentOS
+        Distribution.  Additionally, The CentOS Project provides The
+        CentOS Web and The CentOS Showroom to support and promote the
+        existence of The CentOS Distribution, respectively.</para>
+
+    </sect2>
+
+    <sect2 id="corporate-identity" xreflabel="The corporate identity" label="4.2.2">
+        <title>The corporate identity</title>
+
+        <para>The CentOS Project corporate identity is the ``persona''
+        of the organization known as The CentOS Project.  The CentOS
+        Project corporate identity plays a significant role in the way
+        The CentOS Project, as organization, presents itself to both
+        internal and external stakeholders. In general terms, The
+        CentOS Project corporate identity expresses the values and
+        ambitions of The CentOS Project organization, its business,
+        and its characteristics.</para>  
+
+        <para>The CentOS Project corporate identity provides
+        visibility, recognizability, reputation, structure and
+        identification to The CentOS Project organization by means of
+        <emphasis>corporate design</emphasis>, <emphasis>corporate
+        communication</emphasis>, and <emphasis>corporate
+        behaviour</emphasis>.</para>
+
+    </sect2>
+
+    <sect2 id="corporate-design" xreflabel="The corporate design" label="4.2.3">
+
+        <title>The corporate design</title>
+
+        <para>The corporate design is focused on the effective
+        communication of corporate messages. Corporate messages are
+        all the information emitted from the corporation to a target
+        audience.  In order for such communication to happen, it is
+        required to put the messages on a medium available for the
+        target audience to react upon.  These media are know as
+        <emphasis>corporate manifestations</emphasis>, because the
+        corporation manifests its existence through them. The specific
+        way used by the corporation to set their messages on different
+        media is what the corporate design is about.</para>
+
+        <para>The amount of manifestations a corporation uses to
+        communicate its existence may very from one corporation to
+        another. In the very specific case of The CentOS Project, the
+        following corporate manifestations come to mind:</para>
+
+        <orderedlist>
+            <listitem>
+
+                <para>The CentOS Distribution &mdash; The CentOS
+                Distribution corporate manifestaion is made from SRPM
+                packages. There are packages that make a remarkable
+                use of images (e.g., Anaconda, Grub, Syslinux, Gdm,
+                Kdm, Gsplash, Ksplash, Rhgb, Firstboot, etc.),
+                packages that make a moderated use of images and
+                packages that don't use images at all.  Also, there
+                are some packages that make use of text-based
+                information that need to be changed, too (e.g.,
+                release notes, eula, the welcome page of the web
+                browser, etc.), in order for The CentOS Project to
+                comply with upstream's redistribution guidelines.  The
+                CentOS Distribution corporate manifestation focuses
+                its attention on SRPM packages that do use images in a
+                remarkable way, specifically those packages that
+                involve upstream branding, and those files with
+                text-based information that need to be changed. This
+                way, through image and text-based files, is
+                implemented the corporate design of The CentOS
+                Distribution corporate manifestations (i.e., all the
+                releases of the operating system).</para>
+
+            </listitem>
+            <listitem>
+
+                <para>The CentOS Web &mdash; This corporate
+                manifestation exists to support The CentOS
+                Distribution corporate manifestation.  The CentOS Web
+                corporate manifestation covers web applications used
+                by The CentOS Project to manifest its existence on the
+                Internet.  These web applications are free software
+                and come from different providers which distribute
+                their work with predefined visual styles.  Frequently,
+                these predefined visual styles have no visual relation
+                among themselves and introduce some visual
+                contraditions when they all are put together.  These
+                visual contraditions need to be removed in order to
+                comply with The CentOS Project corporate structure
+                guidelines.</para>
+
+            </listitem>
+            <listitem>
+
+                <para>The CentOS Showroom &mdash; This corporate
+                manifestation exists to promote The CentOS
+                Distribution.  The CentOS Showroom corporate
+                manifestation covers industrial production of objects
+                branded by The CentOS Project (e.g., clothes,
+                stationery and installation media).  These branded
+                objects are for distribution on social events and/or
+                shops.  They provide a way of promotion and a route
+                for commercialization that may help to aliviate The
+                CentOS Project expenses (e.g., hosting, servers,
+                full-time-developers, etc.), in a similar way as
+                donations may do.</para>
+
+            </listitem>
+        </orderedlist>
+
+        <para>The corporate manifestations above seem to cover all the
+        media required by The CentOS Project, as organization, to show
+        its existence.  However, other corporate manifestations could
+        be added in the future, if needed, to cover different areas
+        like building, offices, transportation and whaterver medium
+        The CentOS Project thouches to show its existence.</para> 
+
+    </sect2>
+
+    <sect2 id="corporate-communication" xreflabel="The corporate
+    communication" label="4.2.4">
+
+        <title>The corporate communication</title>
+
+        <para> The CentOS Project corporate communication is based on
+        <emphasis>community communication</emphasis> and takes place
+        through the following avenues: 
+
+        <itemizedlist>
+            <listitem><para>The CentOS Chat (#centos, #centos-social},
+#centos-devel on irc.freenode.net)</para></listitem>
+            <listitem><para>The CentOS Mailing Lists (<ulink url="http://lists.centos.org/" />).</para></listitem>
+            <listitem><para>The CentOS Forums (<ulink url="http://forums.centos.org/" />).</para></listitem>
+            <listitem><para>The CentOS Wiki (<ulink url="http://wiki.centos.org/" />).</para></listitem>
+            <listitem><para>Social events, interviews, conferences, etc.</para></listitem>
+        </itemizedlist>
+        
+        </para>
+
+    </sect2>
+
+    <sect2 id="corporate-behaviour" xreflabel="The corporate behaviour"
+    label="4.2.5">
+
+        <title>The corporate behaviour</title>
+
+        <para>The CentOS Project corporate behaviour is based on
+        <emphasis>community behaviour</emphasis> which take place in
+        <xref linkend="corporate-communication" />.</para>
+
+    </sect2>
+
+    <sect2 id="corporate-structure" xreflabel="The corporate structure"
+    label="4.2.6">
+        
+            <title>The corporate structure</title>
+
+            <para> The CentOS Project corporate structure is based on
+            a <emphasis>monolithic corporate visual identity
+            structure</emphasis>.  In this configuration, one unique
+            name and one unique visual style is used in all corporate
+            manifestations of The CentOS Project.</para>
+
+            <para>In a monolithic corporate visual identity structure,
+            internal and external stakeholders feel a strong sensation
+            of uniformity, orientation, and identification with the
+            organization. No matter if you are visiting web sites,
+            using the distribution, or acting on social events, the
+            one unique name and one unique visual style connects them
+            all to say: <emphasis>Hey! we are all part of The CentOS
+            Project</emphasis>.</para>
+
+            <para>Other corporate structures for The CentOS Project
+            have been considered as well. Such is the case of
+            producing one different visual style for each major
+            release of The CentOS Distribution. This structure isn't
+            inconvenient at all, but some visual contradictions could
+            be introduced if it isn't applied correctly and we need to
+            be aware of it. To apply it correctly, we need to know
+            what The CentOS Project is made of.</para>
+
+            <para>The CentOS Project, as organization, is mainly made
+            of (but not limited to) three corporate manifestions: The
+            CentOS Distribution, The CentOS Web and The CentOS
+            Showroom.  Inside The CentOS Distribution corporate
+            manifestations, The CentOS Project maintains near to four
+            different major releases of The CentOS Distribution (e.g.,
+            the operating system), parallely in time.  However, inside
+            The CentOS Web visual manifestations, the content is
+            produced for no specific release information (e.g., there
+            is no a complete web site for each major release of The
+            CentOS Distribution individually, but one web site to
+            cover them all).  Likewise, the content produced in The
+            CentOS Showroom is created for no release-specific at all,
+            but for The CentOS Project in general.</para>
+
+            <para>In order to produce the correct corporate structure
+            for The CentOS Project, we need to concider all the
+            corporate manifestations The CentOS Project is made of,
+            not just one of them.  If one different visual style is
+            used for each major release of The CentOS Distribution,
+            which one of those different visual styles would be used
+            to cover the remaining visual manifestations The CentOS
+            Project is made of (e.g., The CentOS Web and The CentOS
+            Showroom)?</para>
+
+            <para>Probably you are thinking, that's right, but The
+            CentOS Brand connects them all already, why would we need
+            to join them up into the same visual style too, isn't it
+            more work to do, and harder to maintain?</para>
+
+            <para>Harder to maintain, more work to do, probably.
+            Specially when you consider that The CentOS Project has
+            proven stability and consistency through time and, that,
+            certainly, didn't come through swinging magical wands or
+            something but hardly working out to automate tasks and
+            providing maintainance through time. Said that, we
+            consider that The CentOS Project corporate structure must
+            be consequent with such stability and consistency
+            tradition, beyond the work it might require initially. It
+            is true that The CentOS Brand does connect all the visual
+            manifestations it is present on, but that connection would
+            be stronger if one unique visual style backups it, too.
+            In fact, whatever thing you do to strength the visual
+            connection among The CentOS Project corporate
+            manifestations would be very good in favor of The CentOS
+            Project recognition.</para>
+
+            <para>Obviously, having just one visual style in all
+            corporate manifestations for eternity would be a very
+            boring thing and would give the impression of a visually
+            dead project.  So, there is no problem on creating a brand
+            new visual style for each new major release of The CentOS
+            Distribution, in order to refresh The CentOS Distribution
+            visual style; the problem itself is in not propagating the
+            brand new visual style created for the new release of The
+            CentOS Distribution to all other visual manifestations The
+            CentOS Project is made of, in a way The CentOS Project
+            could be recognized no matter what corporate manifestation
+            be in front of us. Such lack of uniformity is what
+            introduces the visual contradition we are precisely trying
+            to solve by mean of themes production in the CentOS
+            Artwork Repository.</para>
+
+    </sect2>
+
+</sect1>
diff --git a/Manuals/Docbook/Repository/Directories/trunk/Identity/Models.docbook b/Manuals/Docbook/Repository/Directories/trunk/Identity/Models.docbook
new file mode 100644
index 0000000..9abd711
--- /dev/null
+++ b/Manuals/Docbook/Repository/Directories/trunk/Identity/Models.docbook
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sect1 id="repository-directories-section-3" xreflabel="trunk/Identity/Models" label="4.3">
+    <title><filename class="directory">trunk/Identity/Models</filename></title>
+    <para></para>
+</sect1>
diff --git a/Manuals/Docbook/Repository/Directories/trunk/Identity/Models/Themes.docbook b/Manuals/Docbook/Repository/Directories/trunk/Identity/Models/Themes.docbook
new file mode 100644
index 0000000..f6fc57f
--- /dev/null
+++ b/Manuals/Docbook/Repository/Directories/trunk/Identity/Models/Themes.docbook
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<sect1 id="repository-directories-section-4" xreflabel="trunk/Identity/Models/Themes" label="4.4">
+
+    <title><filename class="directory">trunk/Identity/Models/Themes</filename></title>
+
+    <para>This directory implements the concept of <emphasis>themes'
+    design models</emphasis>.</para>
+
+    <para>Themes' design models provide the structural part of images
+    (e.g., dimensions, translation markers, position of each element
+    on the visible area, etc.) required by
+    <command>centos-art.sh</command> to perform theme rendition.  The
+    provide the modeling characteristics for all the different visual
+    manifestations a theme is made of.  Using themes' design models
+    reduce the time needed for propagating an artistic motif to
+    different visual manifestations.</para>
+
+    <para>In this directory, themes' design models are organized by
+    name. There is one directory for each theme's design model. Each
+    design model directory must be named as specified in <xref
+    linkend="repository-usage-section-3" />.  Inside themes' design
+    models directories, there is one directory for each visual
+    manifestions a theme is made of.  These directories are named
+    <emphasis>visual manifestation directories</emphasis> and contain
+    one or more SVG files to describe the visual structure of that
+    visual manifestion.</para>
+
+    <para>Themes' design models are <acronym>SVG</acronym> files and
+    can be localized using the <code>locale</code> functionality of
+    <command>centos-art.sh</command> script.</para>
+
+</sect1>
diff --git a/Manuals/Docbook/Repository/Directories/trunk/Identity/Models/Themes/Default.docbook b/Manuals/Docbook/Repository/Directories/trunk/Identity/Models/Themes/Default.docbook
new file mode 100644
index 0000000..deb4f77
--- /dev/null
+++ b/Manuals/Docbook/Repository/Directories/trunk/Identity/Models/Themes/Default.docbook
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<sect1 id="repository-directories-section-5" xreflabel="trunk/Identity/Models/Themes/Default" label="4.5">
+
+    <title><filename class="directory">trunk/Identity/Models/Themes/Default</filename></title>
+
+    <para>This directory implements the concept of <emphasis>themes'
+    default design models</emphasis>.</para>
+
+    <para>Themes' default design models provide the common structural
+    information (e.g., image dimensions, translation markers,
+    trademark position, etc.) the <command>centos-art.sh</command>
+    script uses to produce images when no other design model is
+    specified through the <option>--theme-model</option> option at
+    rendition time.</para>
+
+</sect1>
diff --git a/Manuals/Docbook/Repository/Directories/trunk/Manuals.docbook b/Manuals/Docbook/Repository/Directories/trunk/Manuals.docbook
new file mode 100644
index 0000000..f3099b6
--- /dev/null
+++ b/Manuals/Docbook/Repository/Directories/trunk/Manuals.docbook
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sect1 id="repository-directories-section-6" xreflabel="trunk/Manuals" label="4.6">
+    <title><filename class="directory">trunk/Manuals</filename></title>
+    <para></para>
+</sect1>
diff --git a/Manuals/Docbook/repository.docbook b/Manuals/Docbook/repository.docbook
index 4ea9afc..841bc23 100644
--- a/Manuals/Docbook/repository.docbook
+++ b/Manuals/Docbook/repository.docbook
@@ -15,24 +15,24 @@
         <!ENTITY book-parts                                         SYSTEM "Book/parts.docbook">
 
         <!-- Preface -->
-        <!ENTITY preface-chapter                                    SYSTEM "Preface/chapter.docbook">
-        <!ENTITY preface-section-1                                  SYSTEM "Preface/introduction.docbook">
-        <!ENTITY preface-section-2                                  SYSTEM "Preface/document-convenctions.docbook">
+        <!ENTITY preface                                            SYSTEM "Preface.docbook">
+        <!ENTITY preface-document-convenctions                      SYSTEM "Preface/document-convenctions.docbook">
+        <!ENTITY preface-send-in-your-feedback                      SYSTEM "Preface/send-in-your-feedback.docbook">
 
     <!-- Mainmatter -->
 
         <!-- Part I: The Repository -->
-        <!ENTITY repo-history                                       SYSTEM "Repository/History/chapter.docbook">
+        <!ENTITY repo-history                                       SYSTEM "Repository/History.docbook">
         <!ENTITY repo-history-2008                                  SYSTEM "Repository/History/2008.docbook">
         <!ENTITY repo-history-2009                                  SYSTEM "Repository/History/2009.docbook">
         <!ENTITY repo-history-2010                                  SYSTEM "Repository/History/2010.docbook">
         <!ENTITY repo-history-2011                                  SYSTEM "Repository/History/2011.docbook">
 
-        <!ENTITY repo-copying-chapter                               SYSTEM "Repository/Copying/chapter.docbook">
+        <!ENTITY repo-copying                                       SYSTEM "Repository/Copying.docbook">
         <!ENTITY repo-copying-preamble                              SYSTEM "Repository/Copying/preamble.docbook">
         <!ENTITY repo-copying-the-centos-brand                      SYSTEM "Repository/Copying/the-centos-brand.docbook">
 
-        <!ENTITY repo-usage-chapter                                 SYSTEM "Repository/Usage/chapter.docbook">
+        <!ENTITY repo-usage                                         SYSTEM "Repository/Usage.docbook">
         <!ENTITY repo-usage-preamble                                SYSTEM "Repository/Usage/preamble.docbook">
         <!ENTITY repo-usage-organization                            SYSTEM "Repository/Usage/organization.docbook">
         <!ENTITY repo-usage-filenames                               SYSTEM "Repository/Usage/filenames.docbook">
@@ -45,7 +45,7 @@
         <!ENTITY repo-usage-syncronizing-paths                      SYSTEM "Repository/Usage/syncronizing-paths.docbook">
         <!ENTITY repo-usage-extending-repository                    SYSTEM "Repository/Usage/extending-repository.docbook">
 
-        <!ENTITY repo-dir-chapter                                   SYSTEM "Repository/Directories/chapter.docbook">
+        <!ENTITY repo-dir                                           SYSTEM "Repository/Directories.docbook">
         <!ENTITY repo-dir-trunk                                     SYSTEM "Repository/Directories/trunk.docbook">
         <!ENTITY repo-dir-trunk-identity                            SYSTEM "Repository/Directories/trunk/Identity.docbook">
         <!ENTITY repo-dir-trunk-identity-models                     SYSTEM "Repository/Directories/trunk/Identity/Models.docbook">
@@ -54,37 +54,37 @@
         <!ENTITY repo-dir-trunk-manual                              SYSTEM "Repository/Directories/trunk/Manuals.docbook">
 
         <!-- Part II: Licenses -->
-        <!ENTITY licenses-gpl-chapter                               SYSTEM "Licenses/Gpl/chapter.docbook">
-        <!ENTITY licenses-gpl-section-1                             SYSTEM "Licenses/Gpl/section-1.docbook">
-        <!ENTITY licenses-gpl-section-2                             SYSTEM "Licenses/Gpl/section-2.docbook">
-        <!ENTITY licenses-gpl-section-2-0                           SYSTEM "Licenses/Gpl/section-2-0.docbook">
-        <!ENTITY licenses-gpl-section-2-1                           SYSTEM "Licenses/Gpl/section-2-1.docbook">
-        <!ENTITY licenses-gpl-section-2-2                           SYSTEM "Licenses/Gpl/section-2-2.docbook">
-        <!ENTITY licenses-gpl-section-2-3                           SYSTEM "Licenses/Gpl/section-2-3.docbook">
-        <!ENTITY licenses-gpl-section-2-4                           SYSTEM "Licenses/Gpl/section-2-4.docbook">
-        <!ENTITY licenses-gpl-section-2-5                           SYSTEM "Licenses/Gpl/section-2-5.docbook">
-        <!ENTITY licenses-gpl-section-2-6                           SYSTEM "Licenses/Gpl/section-2-6.docbook">
-        <!ENTITY licenses-gpl-section-2-7                           SYSTEM "Licenses/Gpl/section-2-7.docbook">
-        <!ENTITY licenses-gpl-section-2-8                           SYSTEM "Licenses/Gpl/section-2-8.docbook">
-        <!ENTITY licenses-gpl-section-2-9                           SYSTEM "Licenses/Gpl/section-2-9.docbook">
-        <!ENTITY licenses-gpl-section-2-10                          SYSTEM "Licenses/Gpl/section-2-10.docbook">
-        <!ENTITY licenses-gpl-section-2-11                          SYSTEM "Licenses/Gpl/section-2-11.docbook">
-        <!ENTITY licenses-gpl-section-2-12                          SYSTEM "Licenses/Gpl/section-2-12.docbook">
-        <!ENTITY licenses-gpl-section-3                             SYSTEM "Licenses/Gpl/section-3.docbook">
+        <!ENTITY licenses-gpl                                       SYSTEM "Licenses/Gpl.docbook">
+        <!ENTITY licenses-gpl-preamble                              SYSTEM "Licenses/Gpl/preamble.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions                  SYSTEM "Licenses/Gpl/Terms-and-conditions.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-0        SYSTEM "Licenses/Gpl/Terms-and-conditions/section-0.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-1        SYSTEM "Licenses/Gpl/Terms-and-conditions/section-1.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-2        SYSTEM "Licenses/Gpl/Terms-and-conditions/terms-and-conditions-section.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-3        SYSTEM "Licenses/Gpl/Terms-and-conditions/section-3.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-4        SYSTEM "Licenses/Gpl/Terms-and-conditions/section-4.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-5        SYSTEM "Licenses/Gpl/Terms-and-conditions/section-5.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-6        SYSTEM "Licenses/Gpl/Terms-and-conditions/section-6.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-7        SYSTEM "Licenses/Gpl/Terms-and-conditions/section-7.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-8        SYSTEM "Licenses/Gpl/Terms-and-conditions/section-8.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-9        SYSTEM "Licenses/Gpl/Terms-and-conditions/section-9.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-10       SYSTEM "Licenses/Gpl/Terms-and-conditions/section-10.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-11       SYSTEM "Licenses/Gpl/Terms-and-conditions/section-11.docbook">
+        <!ENTITY licenses-gpl-terms-and-conditions-section-12       SYSTEM "Licenses/Gpl/Terms-and-conditions/section-12.docbook">
+        <!ENTITY licenses-gpl-how-to-apply-this-license             SYSTEM "Licenses/Gpl/how-to-apply-this-license.docbook">
 
-        <!ENTITY licenses-gfdl-chapter                              SYSTEM "Licenses/Gfdl/chapter.docbook">
-        <!ENTITY licenses-gfdl-section-1                            SYSTEM "Licenses/Gfdl/section-1.docbook">
-        <!ENTITY licenses-gfdl-section-2                            SYSTEM "Licenses/Gfdl/section-2.docbook">
-        <!ENTITY licenses-gfdl-section-3                            SYSTEM "Licenses/Gfdl/section-3.docbook">
-        <!ENTITY licenses-gfdl-section-4                            SYSTEM "Licenses/Gfdl/section-4.docbook">
-        <!ENTITY licenses-gfdl-section-5                            SYSTEM "Licenses/Gfdl/section-5.docbook">
-        <!ENTITY licenses-gfdl-section-6                            SYSTEM "Licenses/Gfdl/section-6.docbook">
-        <!ENTITY licenses-gfdl-section-7                            SYSTEM "Licenses/Gfdl/section-7.docbook">
-        <!ENTITY licenses-gfdl-section-8                            SYSTEM "Licenses/Gfdl/section-8.docbook">
-        <!ENTITY licenses-gfdl-section-9                            SYSTEM "Licenses/Gfdl/section-9.docbook">
-        <!ENTITY licenses-gfdl-section-10                           SYSTEM "Licenses/Gfdl/section-10.docbook">
-        <!ENTITY licenses-gfdl-section-11                           SYSTEM "Licenses/Gfdl/section-11.docbook">
-        <!ENTITY licenses-gfdl-section-12                           SYSTEM "Licenses/Gfdl/section-12.docbook">
+        <!ENTITY licenses-gfdl                                      SYSTEM "Licenses/Gfdl.docbook">
+        <!ENTITY licenses-gfdl-preamble                             SYSTEM "Licenses/Gfdl/preamble.docbook">
+        <!ENTITY licenses-gfdl-applicability-and-definitions        SYSTEM "Licenses/Gfdl/applicability-and-definitions.docbook">
+        <!ENTITY licenses-gfdl-verbatim-copying                     SYSTEM "Licenses/Gfdl/verbatim-copying.docbook">
+        <!ENTITY licenses-gfdl-copying-in-quantity                  SYSTEM "Licenses/Gfdl/copying-in-quantity.docbook">
+        <!ENTITY licenses-gfdl-modifications                        SYSTEM "Licenses/Gfdl/modifications.docbook">
+        <!ENTITY licenses-gfdl-combining-documents                  SYSTEM "Licenses/Gfdl/combining-documents.docbook">
+        <!ENTITY licenses-gfdl-collection-of-documents              SYSTEM "Licenses/Gfdl/collection-of-documents.docbook">
+        <!ENTITY licenses-gfdl-aggregation-with-independent-works   SYSTEM "Licenses/Gfdl/aggregation-with-independent-works.docbook">
+        <!ENTITY licenses-gfdl-translations                         SYSTEM "Licenses/Gfdl/translations.docbook">
+        <!ENTITY licenses-gfdl-Termination                          SYSTEM "Licenses/Gfdl/Termination.docbook">
+        <!ENTITY licenses-gfdl-future-revisions-of-this-license     SYSTEM "Licenses/Gfdl/future-revisions-of-this-license.docbook">
+        <!ENTITY licenses-gfdl-how-to-use-this-license              SYSTEM "Licenses/Gfdl/how-to-use-this-license.docbook">
 
     <!-- Backmatter -->