diff --git a/doc/training-guide/bk000-preface.xml b/doc/training-guide/bk000-preface.xml
index 9e363049f6..588aca70dd 100644
--- a/doc/training-guide/bk000-preface.xml
+++ b/doc/training-guide/bk000-preface.xml
@@ -15,6 +15,6 @@
         <?rax revhistory?>
         <para><link xlink:href="https://blueprints.launchpad.net/openstack-manuals/+filebug" xlink:show="new">Submit a bug. Enter the summary as "Training, " with a few words. Be descriptive as possible in the description field. Open the tag pull-down and enter training-manuals.</link></para>
     </section>
-    <!--   <xi:include href="https://raw.github.com/openstack/operations-guide/master/doc/src/docbkx/openstack-ops/src/preface_ops.xml" parse="xml" xpointer="chapter_gk2_jpr_lj"/> -->
+    <!--   <xi:include href="https://raw.github.com/openstack/operations-guide/master/doc/openstack-ops/src/preface_ops.xml" parse="xml" xpointer="chapter_gk2_jpr_lj"/> -->
     </preface>
-</book>
\ No newline at end of file
+</book>
diff --git a/doc/training-guide/bk002-ch003-operator-general.xml b/doc/training-guide/bk002-ch003-operator-general.xml
index 2769c35462..49c79ceaca 100644
--- a/doc/training-guide/bk002-ch003-operator-general.xml
+++ b/doc/training-guide/bk002-ch003-operator-general.xml
@@ -6,4 +6,4 @@
   <title>OpenStack Operator, General Material To Learn</title>
   <para>User Stories are referenced here</para>
   <xi:include href="operator-editing-code.xml"/>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/training-guide/operator-editing-code.xml b/doc/training-guide/operator-editing-code.xml
index dfb6f5cd72..699c0e9dae 100644
--- a/doc/training-guide/operator-editing-code.xml
+++ b/doc/training-guide/operator-editing-code.xml
@@ -168,7 +168,7 @@ $ git config --global user.email "your_email@youremail.com" </userinput></screen
                 </step>
                 <step>
                     <para>Using oXygen, open the
-                        /Users/&lt;username>/code/openstack-manuals/doc/src/docbkx/openstack-compute-admin/bk_compute_adminguide.xml
+                        /Users/&lt;username>/code/openstack-manuals/doc/admin-guide-cloud/bk-admin-guide-cloud.xml
                         master page for this example. It links together the rest
                         of the material. Find the page with the bug. Open the page
                         that is referenced in the bug description by selecting the
@@ -178,7 +178,7 @@ $ git config --global user.email "your_email@youremail.com" </userinput></screen
                 </step>
                 <step>
                     <para>In the shell,</para>
-                    <screen><prompt>$</prompt><userinput>cd /Users/&lt;username>/code/openstack-manuals/doc/src/docbkx/openstack-compute-admin/</userinput></screen>
+                    <screen><prompt>$</prompt><userinput>cd /Users/&lt;username>/code/openstack-manuals/doc/admin-guide-cloud/</userinput></screen>
                 </step>
                 <step>
                     <para>Verify that you are on master with</para>
diff --git a/doc/training-guide/user-story-includes-template.xml b/doc/training-guide/user-story-includes-template.xml
index fb12dce629..a2322dcdd1 100644
--- a/doc/training-guide/user-story-includes-template.xml
+++ b/doc/training-guide/user-story-includes-template.xml
@@ -29,7 +29,7 @@
       the section above. Short description for the bug summary. Paragraph for the description and
       then tag with training-manuals.</link></para>
     <!-- this maps to user story "blah blah" -->
-    <xi:include href="https://raw.github.com/openstack/openstack-manuals/master/doc/src/docbkx/openstack-install/ch_installing-openstack-overview.xml" xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'scripted-dev-installation'])">
+    <xi:include href="https://raw.github.com/openstack/openstack-manuals/master/doc/install-guide/ch_installing-openstack-overview.xml" xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'scripted-dev-installation'])">
       <xi:fallback>
         <para>
           <mediaobject>