diff --git a/Identity/Models/Manual/Notes/eula.docbook b/Identity/Models/Manual/Notes/eula.docbook
new file mode 100644
index 0000000..be51955
--- /dev/null
+++ b/Identity/Models/Manual/Notes/eula.docbook
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+    "/usr/share/sgml/docbook/xml-dtd-4.2-1.0-30.1/docbookx.dtd">
+<article lang="=LOCALE_LL=">
+    <articleinfo>
+        <title>CentOS =RELEASE= EULA</title>
+    </articleinfo>
+
+    <para>CentOS =RELEASE= comes with no guarantees or warranties of any
+    sorts, either written or implied.</para>
+
+    <para>The Distribution is released as GPL. Individual packages in
+    the distribution come with their own licences.</para>
+
+</article>
diff --git a/Identity/Models/Manual/Notes/release-notes.docbook b/Identity/Models/Manual/Notes/release-notes.docbook
new file mode 100644
index 0000000..5007013
--- /dev/null
+++ b/Identity/Models/Manual/Notes/release-notes.docbook
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+    "/usr/share/sgml/docbook/xml-dtd-4.2-1.0-30.1/docbookx.dtd">
+<article lang="=LOCALE_LL=">
+    <articleinfo>
+        <title>CentOS =RELEASE= Release Notes</title>
+        <copyright>
+            <year>=COPYRIGHT_YEAR=</year>
+            <holder>=COPYRIGHT_HOLDER=</holder>
+        </copyright>
+        <legalnotice>
+            <para>License: <ulink url="=LICENSE_URL=">=LICENSE=</ulink>.</para>
+        </legalnotice>
+    </articleinfo>
+
+    <para>The CentOS project welcomes you to CentOS =RELEASE=.</para>
+
+    <para>The complete release notes for CentOS =RELEASE= can be found
+    online at: <ulink
+    url="=URL_WIKI=Manuals/ReleaseNotes/=RELEASE=/">=URL_WIKI=Manuals/ReleaseNotes/=RELEASE=/</ulink>.</para>
+
+    <para>A list of frequently asked questions and answers about
+    CentOS =MAJOR_RELEASE= can be found online at: <ulink
+    url="=URL_WIKI=FAQs/=MAJOR_RELEASE=/">=URL_WIKI=FAQs/=MAJOR_RELEASE=/</ulink>.</para>
+
+    <para>If you are looking for help with CentOS, we recommend you
+    start at the <ulink
+    url="=URL_WIKI=GettingHelp/">=URL_WIKI=GettingHelp/</ulink> for
+    pointers to the different sources where you can get help.</para>
+
+    <para>If you would like to contribute to the CentOS Project, see
+    <ulink url="=URL_WIKI=Contribute/">=URL_WIKI=Contribute/</ulink>
+    for areas where you could help.</para>
+    
+    <para>For more information about The CentOS Project in general
+    please visit our homepage at: <ulink
+    url="=URL=">=URL=</ulink>.</para>
+
+</article>
diff --git a/Identity/Models/Manual/Rnotes/eula.docbook b/Identity/Models/Manual/Rnotes/eula.docbook
deleted file mode 100644
index be51955..0000000
--- a/Identity/Models/Manual/Rnotes/eula.docbook
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-    "/usr/share/sgml/docbook/xml-dtd-4.2-1.0-30.1/docbookx.dtd">
-<article lang="=LOCALE_LL=">
-    <articleinfo>
-        <title>CentOS =RELEASE= EULA</title>
-    </articleinfo>
-
-    <para>CentOS =RELEASE= comes with no guarantees or warranties of any
-    sorts, either written or implied.</para>
-
-    <para>The Distribution is released as GPL. Individual packages in
-    the distribution come with their own licences.</para>
-
-</article>
diff --git a/Identity/Models/Manual/Rnotes/release-notes.docbook b/Identity/Models/Manual/Rnotes/release-notes.docbook
deleted file mode 100644
index 5007013..0000000
--- a/Identity/Models/Manual/Rnotes/release-notes.docbook
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-    "/usr/share/sgml/docbook/xml-dtd-4.2-1.0-30.1/docbookx.dtd">
-<article lang="=LOCALE_LL=">
-    <articleinfo>
-        <title>CentOS =RELEASE= Release Notes</title>
-        <copyright>
-            <year>=COPYRIGHT_YEAR=</year>
-            <holder>=COPYRIGHT_HOLDER=</holder>
-        </copyright>
-        <legalnotice>
-            <para>License: <ulink url="=LICENSE_URL=">=LICENSE=</ulink>.</para>
-        </legalnotice>
-    </articleinfo>
-
-    <para>The CentOS project welcomes you to CentOS =RELEASE=.</para>
-
-    <para>The complete release notes for CentOS =RELEASE= can be found
-    online at: <ulink
-    url="=URL_WIKI=Manuals/ReleaseNotes/=RELEASE=/">=URL_WIKI=Manuals/ReleaseNotes/=RELEASE=/</ulink>.</para>
-
-    <para>A list of frequently asked questions and answers about
-    CentOS =MAJOR_RELEASE= can be found online at: <ulink
-    url="=URL_WIKI=FAQs/=MAJOR_RELEASE=/">=URL_WIKI=FAQs/=MAJOR_RELEASE=/</ulink>.</para>
-
-    <para>If you are looking for help with CentOS, we recommend you
-    start at the <ulink
-    url="=URL_WIKI=GettingHelp/">=URL_WIKI=GettingHelp/</ulink> for
-    pointers to the different sources where you can get help.</para>
-
-    <para>If you would like to contribute to the CentOS Project, see
-    <ulink url="=URL_WIKI=Contribute/">=URL_WIKI=Contribute/</ulink>
-    for areas where you could help.</para>
-    
-    <para>For more information about The CentOS Project in general
-    please visit our homepage at: <ulink
-    url="=URL=">=URL=</ulink>.</para>
-
-</article>