diff --git a/Documentation/Models/Book/Book.docbook b/Documentation/Models/Book/Book.docbook
deleted file mode 100644
index 697eb90..0000000
--- a/Documentation/Models/Book/Book.docbook
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
-    [
-
-    <!-- Common content -->
-
-    <!ENTITY % Entities SYSTEM "Entities.ent">
-    %Entities;
-
-    <!-- Specific content -->
-
-    ]>
-
-<book lang="en_US">
-
-    <!-- Front matter -->
-
-    <title>=TITLE=</title>
-    <subtitle>=SUBTITLE=</subtitle>
-
-    <bookinfo>
-        <author>
-            <firstname>=AUTHOR_FIRSTNAME=</firstname>
-            <surname>=AUTHOR_SURNAME=</surname>
-        </author>
-
-        <!-- 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>
-            <year>2012</year>
-            <holder>&TCP;. All rights reserved.</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
-              <xref linkend="licenses-gfdl" />.
-            </para>
-        </legalnotice>
-
-        <revhistory>
-            <revision> 
-            <revnumber>1.0</revnumber>
-            <date>Today</date>
-            <author>
-                <firstname>=AUTHOR_FIRSTNAME=</firstname>
-                <surname>=AUTHOR_SURNAME=</surname>
-            </author>
-            <revdescription>
-            <para>
-                Under development.
-            </para>
-            </revdescription>
-            </revision> 
-        </revhistory>
-
-    </bookinfo>
-
-    <!-- Main matter -->
-    &preface;
-
-    <!-- Back matter -->
-
-</book>
diff --git a/Documentation/Models/Book/Entities.ent b/Documentation/Models/Book/Entities.ent
deleted file mode 100644
index a99e657..0000000
--- a/Documentation/Models/Book/Entities.ent
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--  
-    $Id$
-    This file defines entities for words and phrases frequently used
-    inside The CentOS Artwork Repository User's Guide.  It is a way of
-    normalizing the use of concepts inside the documentation and make
-    their maintainance easier to realize.
--->
-
-<!-- Common document structure -->
-
-<!ENTITY preface                SYSTEM "Preface.docbook">
-<!ENTITY preface-docconvs       SYSTEM "Preface/docconvs.docbook">
-<!ENTITY preface-feedback       SYSTEM "Preface/feedback.docbook">
-
-<!ENTITY licenses               SYSTEM "Licenses.docbook">
-<!ENTITY licenses-gpl           SYSTEM "Licenses/gpl.docbook">
-<!ENTITY licenses-gfdl          SYSTEM "Licenses/gfdl.docbook">
-
-<!-- About Corporate Identity -->
-
-<!ENTITY CI         "Corporate Identity">
-<!ENTITY CVI        "Corporate Visual Identity">
-<!ENTITY CVIS       "Corporate Visual Identity Structure">
-<!ENTITY MCVIS      "Monolithic Corporate Visual Identity Structure">
-<!ENTITY VS         "Visual Style">
-
-<!-- About The CentOS Project -->
-
-<!ENTITY C          "CentOS">
-<!ENTITY TC         "The &C;">
-<!ENTITY TCP        "<ulink type='http' url='http://www.centos.org'>&TC; Project</ulink>">
-<!ENTITY TCC        "&TC; Community">
-<!ENTITY TCD        "&TC; Distribution">
-<!ENTITY TCA        "&TC; Artwork">
-<!ENTITY TCM        "<ulink url='http://mirrors.centos.org/'>&TC; Mirrors</ulink>">
-
-<!ENTITY TCPCI      "&TCP; &CI;">
-<!ENTITY TCPCVI     "&TCP; &CVI;">
-<!ENTITY TCPCVI     "&TCP; &CVI;">
-<!ENTITY TCPCVIS    "&TCP; &CVIS;">
-<!ENTITY TCPMCVIS   "&TCP; &MCVIS;">
-
-<!ENTITY TCAR       "<ulink type='https' url='https://projects.centos.org/svn/artwork'>&TCA; Repository</ulink>">
-<!ENTITY TCAS       "<ulink type='https' url='https://projects.centos.org/trac/artwork'>&TCA; SIG</ulink>">
-
-<!ENTITY TCARUG     "<citetitle>The CentOS Artwork Repository User's Guide</citetitle>">
-<!ENTITY TCDRS      "&TCD; Release Schema">
-<!ENTITY TCAML      "<email>centos-artwork@centos.org</email> mailing list">
-<!ENTITY TCDML      "<email>centos-devel@centos.org</email> mailing list">
-<!ENTITY TCML       "<email>centos-info@centos.org</email> mailing list">
-<!ENTITY TCW        "&TC; Web">
-<!ENTITY TCWIKI     "<ulink type='http' url='http://wiki.centos.org/'>&TC; Wiki</ulink>">
-<!ENTITY TCML       "<ulink type='http' url='http://lists.centos.org/'>&TC; Mailing Lists</ulink>">
-
-<!ENTITY TCS        "&TC; Showroom">
-<!ENTITY TCBRAND    "&TC; Brand">
-<!ENTITY TCLOGO     "<xref linkend='identity-brand-logo' />">
-<!ENTITY TCTYPE     "<xref linkend='identity-brand-type' />">
-<!ENTITY TCSYMBOL   "<xref linkend='identity-brand-symbol' />">
-<!ENTITY TCMOTIF    "<xref linkend='identity-brand-motif' />">
-<!ENTITY TCM        "&TC; Mission">
-<!ENTITY TCDOCS     "<ulink type='http' url='http://www.centos.org/docs/'>&TC; Documentation</ulink>">
-
diff --git a/Documentation/Models/Book/Preface.docbook b/Documentation/Models/Book/Preface.docbook
deleted file mode 100644
index a7a4818..0000000
--- a/Documentation/Models/Book/Preface.docbook
+++ /dev/null
@@ -1,7 +0,0 @@
-<preface id="preface">
-
-    <title>Preface</title>
-
-    &preface-feedback;
-
-</preface>
diff --git a/Documentation/Models/Book/book.docbook b/Documentation/Models/Book/book.docbook
new file mode 100644
index 0000000..697eb90
--- /dev/null
+++ b/Documentation/Models/Book/book.docbook
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+    [
+
+    <!-- Common content -->
+
+    <!ENTITY % Entities SYSTEM "Entities.ent">
+    %Entities;
+
+    <!-- Specific content -->
+
+    ]>
+
+<book lang="en_US">
+
+    <!-- Front matter -->
+
+    <title>=TITLE=</title>
+    <subtitle>=SUBTITLE=</subtitle>
+
+    <bookinfo>
+        <author>
+            <firstname>=AUTHOR_FIRSTNAME=</firstname>
+            <surname>=AUTHOR_SURNAME=</surname>
+        </author>
+
+        <!-- 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>
+            <year>2012</year>
+            <holder>&TCP;. All rights reserved.</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
+              <xref linkend="licenses-gfdl" />.
+            </para>
+        </legalnotice>
+
+        <revhistory>
+            <revision> 
+            <revnumber>1.0</revnumber>
+            <date>Today</date>
+            <author>
+                <firstname>=AUTHOR_FIRSTNAME=</firstname>
+                <surname>=AUTHOR_SURNAME=</surname>
+            </author>
+            <revdescription>
+            <para>
+                Under development.
+            </para>
+            </revdescription>
+            </revision> 
+        </revhistory>
+
+    </bookinfo>
+
+    <!-- Main matter -->
+    &preface;
+
+    <!-- Back matter -->
+
+</book>
diff --git a/Documentation/Models/Book/entities.ent b/Documentation/Models/Book/entities.ent
new file mode 100644
index 0000000..a99e657
--- /dev/null
+++ b/Documentation/Models/Book/entities.ent
@@ -0,0 +1,63 @@
+<!--  
+    $Id$
+    This file defines entities for words and phrases frequently used
+    inside The CentOS Artwork Repository User's Guide.  It is a way of
+    normalizing the use of concepts inside the documentation and make
+    their maintainance easier to realize.
+-->
+
+<!-- Common document structure -->
+
+<!ENTITY preface                SYSTEM "Preface.docbook">
+<!ENTITY preface-docconvs       SYSTEM "Preface/docconvs.docbook">
+<!ENTITY preface-feedback       SYSTEM "Preface/feedback.docbook">
+
+<!ENTITY licenses               SYSTEM "Licenses.docbook">
+<!ENTITY licenses-gpl           SYSTEM "Licenses/gpl.docbook">
+<!ENTITY licenses-gfdl          SYSTEM "Licenses/gfdl.docbook">
+
+<!-- About Corporate Identity -->
+
+<!ENTITY CI         "Corporate Identity">
+<!ENTITY CVI        "Corporate Visual Identity">
+<!ENTITY CVIS       "Corporate Visual Identity Structure">
+<!ENTITY MCVIS      "Monolithic Corporate Visual Identity Structure">
+<!ENTITY VS         "Visual Style">
+
+<!-- About The CentOS Project -->
+
+<!ENTITY C          "CentOS">
+<!ENTITY TC         "The &C;">
+<!ENTITY TCP        "<ulink type='http' url='http://www.centos.org'>&TC; Project</ulink>">
+<!ENTITY TCC        "&TC; Community">
+<!ENTITY TCD        "&TC; Distribution">
+<!ENTITY TCA        "&TC; Artwork">
+<!ENTITY TCM        "<ulink url='http://mirrors.centos.org/'>&TC; Mirrors</ulink>">
+
+<!ENTITY TCPCI      "&TCP; &CI;">
+<!ENTITY TCPCVI     "&TCP; &CVI;">
+<!ENTITY TCPCVI     "&TCP; &CVI;">
+<!ENTITY TCPCVIS    "&TCP; &CVIS;">
+<!ENTITY TCPMCVIS   "&TCP; &MCVIS;">
+
+<!ENTITY TCAR       "<ulink type='https' url='https://projects.centos.org/svn/artwork'>&TCA; Repository</ulink>">
+<!ENTITY TCAS       "<ulink type='https' url='https://projects.centos.org/trac/artwork'>&TCA; SIG</ulink>">
+
+<!ENTITY TCARUG     "<citetitle>The CentOS Artwork Repository User's Guide</citetitle>">
+<!ENTITY TCDRS      "&TCD; Release Schema">
+<!ENTITY TCAML      "<email>centos-artwork@centos.org</email> mailing list">
+<!ENTITY TCDML      "<email>centos-devel@centos.org</email> mailing list">
+<!ENTITY TCML       "<email>centos-info@centos.org</email> mailing list">
+<!ENTITY TCW        "&TC; Web">
+<!ENTITY TCWIKI     "<ulink type='http' url='http://wiki.centos.org/'>&TC; Wiki</ulink>">
+<!ENTITY TCML       "<ulink type='http' url='http://lists.centos.org/'>&TC; Mailing Lists</ulink>">
+
+<!ENTITY TCS        "&TC; Showroom">
+<!ENTITY TCBRAND    "&TC; Brand">
+<!ENTITY TCLOGO     "<xref linkend='identity-brand-logo' />">
+<!ENTITY TCTYPE     "<xref linkend='identity-brand-type' />">
+<!ENTITY TCSYMBOL   "<xref linkend='identity-brand-symbol' />">
+<!ENTITY TCMOTIF    "<xref linkend='identity-brand-motif' />">
+<!ENTITY TCM        "&TC; Mission">
+<!ENTITY TCDOCS     "<ulink type='http' url='http://www.centos.org/docs/'>&TC; Documentation</ulink>">
+
diff --git a/Documentation/Models/Book/preface.docbook b/Documentation/Models/Book/preface.docbook
new file mode 100644
index 0000000..a7a4818
--- /dev/null
+++ b/Documentation/Models/Book/preface.docbook
@@ -0,0 +1,7 @@
+<preface id="preface">
+
+    <title>Preface</title>
+
+    &preface-feedback;
+
+</preface>