diff --git a/Documentation/Models/Docbook/Book/Book.ent b/Documentation/Models/Docbook/Book/Book.ent
new file mode 100644
index 0000000..d3b1984
--- /dev/null
+++ b/Documentation/Models/Docbook/Book/Book.ent
@@ -0,0 +1,53 @@
+<!--  
+    $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.
+-->
+
+<!-- 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/Docbook/Book/common-entities.ent b/Documentation/Models/Docbook/Book/common-entities.ent
deleted file mode 100644
index d3b1984..0000000
--- a/Documentation/Models/Docbook/Book/common-entities.ent
+++ /dev/null
@@ -1,53 +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.
--->
-
-<!-- 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>">
-