diff --git a/doc/training-guides/bk003-ch001-developer-getting-started.xml b/doc/training-guides/developer-guide/bk003-ch001-developer-getting-started.xml
similarity index 52%
rename from doc/training-guides/bk003-ch001-developer-getting-started.xml
rename to doc/training-guides/developer-guide/bk003-ch001-developer-getting-started.xml
index f6b02e05..e66ad37f 100644
--- a/doc/training-guides/bk003-ch001-developer-getting-started.xml
+++ b/doc/training-guides/developer-guide/bk003-ch001-developer-getting-started.xml
@@ -20,37 +20,37 @@
     </section>
     <section xml:id="developer-intro-text">
         <title>Review Operator Introduction</title>
-        <xi:include href="./common/module001-ch001-intro-text.xml"
+        <xi:include href="../common/module001-ch001-intro-text.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'module001-ch001-intro-text']/*[not(self::db:title)])">
-          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
+          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
     <section xml:id="developer-brief-overview">
         <title>Review Operator Brief Overview</title>
-        <xi:include href="./common/module001-ch002-brief-overview.xml"
+        <xi:include href="../common/module001-ch002-brief-overview.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'module001-ch002-brief-overview']/*[not(self::db:title)])">
-          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
+          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
     <section xml:id="developer-core-projects">
         <title>Review Operator Core Projects</title>
-        <xi:include href="./common/module001-ch003-core-projects.xml"
+        <xi:include href="../common/module001-ch003-core-projects.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'module001-ch003-core-projects']/*[not(self::db:title)])">
-          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
+          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
     <section xml:id="developer-openstack-architecture">
         <title>Review Operator OpenStack Architecture</title>
-        <xi:include href="./common/module001-ch004-openstack-architecture.xml"
+        <xi:include href="../common/module001-ch004-openstack-architecture.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'module001-ch004-openstack-architecture']/*[not(self::db:title)])">
-          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
+          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
     <section xml:id="developer-vm-provisioning-walk-through">
         <title>Review Operator Virtual Machine Provisioning Walk-Through</title>
-        <xi:include href="./common/module001-ch005-vm-provisioning-walk-through.xml"
+        <xi:include href="../common/module001-ch005-vm-provisioning-walk-through.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'module001-ch005-vm-provisioning-walk-through']/*[not(self::db:title)])">
-          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
+          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
 </chapter>
diff --git a/doc/training-guides/bk003-ch002-developer-getting-started-lab.xml b/doc/training-guides/developer-guide/bk003-ch002-developer-getting-started-lab.xml
similarity index 52%
rename from doc/training-guides/bk003-ch002-developer-getting-started-lab.xml
rename to doc/training-guides/developer-guide/bk003-ch002-developer-getting-started-lab.xml
index e985476d..a786366b 100644
--- a/doc/training-guides/bk003-ch002-developer-getting-started-lab.xml
+++ b/doc/training-guides/developer-guide/bk003-ch002-developer-getting-started-lab.xml
@@ -12,35 +12,35 @@
         <title>Getting the Tools and Accounts for Committing Code</title>
         <xi:include href="./operator-editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'getting-tools-and-accounts']/*[not(self::db:title)])">
-          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
+          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
         <section xml:id="developer-fix-doc-bug">
         <title>Fix a Documentation Bug</title>
         <xi:include href="./operator-editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'fix-doc-bug']/*[not(self::db:title)])">
-          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
+          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
         <section xml:id="developer-submit-doc-bug">
         <title>Submit a Documentation Bug</title>
         <xi:include href="./operator-editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'submit-doc-bug']/*[not(self::db:title)])">
-          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
+          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
     <section xml:id="developer-create-branch">
         <title>Create a Branch</title>
         <xi:include href="./operator-editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'create-branch']/*[not(self::db:title)])">
-          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
+          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
         <section xml:id="developer-add-training-content">
         <title>Optional: Add to the Training Guide Documentation</title>
         <xi:include href="./operator-editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'add-training-content']/*[not(self::db:title)])">
-          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
+          <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/training-guides/bk003-ch003-developer-getting-started-quiz.xml b/doc/training-guides/developer-guide/bk003-ch003-developer-getting-started-quiz.xml
similarity index 100%
rename from doc/training-guides/bk003-ch003-developer-getting-started-quiz.xml
rename to doc/training-guides/developer-guide/bk003-ch003-developer-getting-started-quiz.xml
diff --git a/doc/training-guides/bk003-ch004-developer-apis-in-depth.xml b/doc/training-guides/developer-guide/bk003-ch004-developer-apis-in-depth.xml
similarity index 100%
rename from doc/training-guides/bk003-ch004-developer-apis-in-depth.xml
rename to doc/training-guides/developer-guide/bk003-ch004-developer-apis-in-depth.xml
diff --git a/doc/training-guides/bk003-ch005-developer-apis-day-two-lab.xml b/doc/training-guides/developer-guide/bk003-ch005-developer-apis-day-two-lab.xml
similarity index 100%
rename from doc/training-guides/bk003-ch005-developer-apis-day-two-lab.xml
rename to doc/training-guides/developer-guide/bk003-ch005-developer-apis-day-two-lab.xml
diff --git a/doc/training-guides/bk003-ch006-developer-apis-day-two-quiz.xml b/doc/training-guides/developer-guide/bk003-ch006-developer-apis-day-two-quiz.xml
similarity index 100%
rename from doc/training-guides/bk003-ch006-developer-apis-day-two-quiz.xml
rename to doc/training-guides/developer-guide/bk003-ch006-developer-apis-day-two-quiz.xml
diff --git a/doc/training-guides/bk003-ch007-developer-apis-day-three-lab.xml b/doc/training-guides/developer-guide/bk003-ch007-developer-apis-day-three-lab.xml
similarity index 100%
rename from doc/training-guides/bk003-ch007-developer-apis-day-three-lab.xml
rename to doc/training-guides/developer-guide/bk003-ch007-developer-apis-day-three-lab.xml
diff --git a/doc/training-guides/bk003-ch008-developer-apis-day-three-quiz.xml b/doc/training-guides/developer-guide/bk003-ch008-developer-apis-day-three-quiz.xml
similarity index 100%
rename from doc/training-guides/bk003-ch008-developer-apis-day-three-quiz.xml
rename to doc/training-guides/developer-guide/bk003-ch008-developer-apis-day-three-quiz.xml
diff --git a/doc/training-guides/bk003-ch009-developer-apis-day-four-lab.xml b/doc/training-guides/developer-guide/bk003-ch009-developer-apis-day-four-lab.xml
similarity index 100%
rename from doc/training-guides/bk003-ch009-developer-apis-day-four-lab.xml
rename to doc/training-guides/developer-guide/bk003-ch009-developer-apis-day-four-lab.xml
diff --git a/doc/training-guides/bk003-ch010-developer-apis-day-four-quiz.xml b/doc/training-guides/developer-guide/bk003-ch010-developer-apis-day-four-quiz.xml
similarity index 100%
rename from doc/training-guides/bk003-ch010-developer-apis-day-four-quiz.xml
rename to doc/training-guides/developer-guide/bk003-ch010-developer-apis-day-four-quiz.xml
diff --git a/doc/training-guides/bk003-ch011-developer-how-to-partipate.xml b/doc/training-guides/developer-guide/bk003-ch011-developer-how-to-partipate.xml
similarity index 100%
rename from doc/training-guides/bk003-ch011-developer-how-to-partipate.xml
rename to doc/training-guides/developer-guide/bk003-ch011-developer-how-to-partipate.xml
diff --git a/doc/training-guides/bk003-ch012-developer-how-to-participate-day-five-lab.xml b/doc/training-guides/developer-guide/bk003-ch012-developer-how-to-participate-day-five-lab.xml
similarity index 100%
rename from doc/training-guides/bk003-ch012-developer-how-to-participate-day-five-lab.xml
rename to doc/training-guides/developer-guide/bk003-ch012-developer-how-to-participate-day-five-lab.xml
diff --git a/doc/training-guides/bk003-ch013-developer-how-to-participate-day-five-quiz.xml b/doc/training-guides/developer-guide/bk003-ch013-developer-how-to-participate-day-five-quiz.xml
similarity index 100%
rename from doc/training-guides/bk003-ch013-developer-how-to-participate-day-five-quiz.xml
rename to doc/training-guides/developer-guide/bk003-ch013-developer-how-to-participate-day-five-quiz.xml
diff --git a/doc/training-guides/bk003-ch014-developer-how-to-participate-day-six-lab.xml b/doc/training-guides/developer-guide/bk003-ch014-developer-how-to-participate-day-six-lab.xml
similarity index 100%
rename from doc/training-guides/bk003-ch014-developer-how-to-participate-day-six-lab.xml
rename to doc/training-guides/developer-guide/bk003-ch014-developer-how-to-participate-day-six-lab.xml
diff --git a/doc/training-guides/bk003-ch015-developer-how-to-participate-day-six-quiz.xml b/doc/training-guides/developer-guide/bk003-ch015-developer-how-to-participate-day-six-quiz.xml
similarity index 100%
rename from doc/training-guides/bk003-ch015-developer-how-to-participate-day-six-quiz.xml
rename to doc/training-guides/developer-guide/bk003-ch015-developer-how-to-participate-day-six-quiz.xml
diff --git a/doc/training-guides/bk003-ch016-developer-how-to-participate-day-seven-lab.xml b/doc/training-guides/developer-guide/bk003-ch016-developer-how-to-participate-day-seven-lab.xml
similarity index 100%
rename from doc/training-guides/bk003-ch016-developer-how-to-participate-day-seven-lab.xml
rename to doc/training-guides/developer-guide/bk003-ch016-developer-how-to-participate-day-seven-lab.xml
diff --git a/doc/training-guides/bk003-ch017-developer-how-to-participate-day-seven-quiz.xml b/doc/training-guides/developer-guide/bk003-ch017-developer-how-to-participate-day-seven-quiz.xml
similarity index 100%
rename from doc/training-guides/bk003-ch017-developer-how-to-participate-day-seven-quiz.xml
rename to doc/training-guides/developer-guide/bk003-ch017-developer-how-to-participate-day-seven-quiz.xml
diff --git a/doc/training-guides/bk003-ch018-developer-how-to-participate-day-eight-lab.xml b/doc/training-guides/developer-guide/bk003-ch018-developer-how-to-participate-day-eight-lab.xml
similarity index 100%
rename from doc/training-guides/bk003-ch018-developer-how-to-participate-day-eight-lab.xml
rename to doc/training-guides/developer-guide/bk003-ch018-developer-how-to-participate-day-eight-lab.xml
diff --git a/doc/training-guides/bk003-ch019-developer-how-to-participate-day-eight-quiz.xml b/doc/training-guides/developer-guide/bk003-ch019-developer-how-to-participate-day-eight-quiz.xml
similarity index 100%
rename from doc/training-guides/bk003-ch019-developer-how-to-participate-day-eight-quiz.xml
rename to doc/training-guides/developer-guide/bk003-ch019-developer-how-to-participate-day-eight-quiz.xml
diff --git a/doc/training-guides/bk003-ch020-developer-how-to-participate-day-nine-lab.xml b/doc/training-guides/developer-guide/bk003-ch020-developer-how-to-participate-day-nine-lab.xml
similarity index 100%
rename from doc/training-guides/bk003-ch020-developer-how-to-participate-day-nine-lab.xml
rename to doc/training-guides/developer-guide/bk003-ch020-developer-how-to-participate-day-nine-lab.xml
diff --git a/doc/training-guides/bk003-ch021-developer-how-to-participate-day-nine-quiz.xml b/doc/training-guides/developer-guide/bk003-ch021-developer-how-to-participate-day-nine-quiz.xml
similarity index 100%
rename from doc/training-guides/bk003-ch021-developer-how-to-participate-day-nine-quiz.xml
rename to doc/training-guides/developer-guide/bk003-ch021-developer-how-to-participate-day-nine-quiz.xml
diff --git a/doc/training-guides/bk003-ch022-developer-assessment.xml b/doc/training-guides/developer-guide/bk003-ch022-developer-assessment.xml
similarity index 100%
rename from doc/training-guides/bk003-ch022-developer-assessment.xml
rename to doc/training-guides/developer-guide/bk003-ch022-developer-assessment.xml
diff --git a/doc/training-guides/bk003-ch023-developer-how-to-participate-bootcamp.xml b/doc/training-guides/developer-guide/bk003-ch023-developer-how-to-participate-bootcamp.xml
similarity index 100%
rename from doc/training-guides/bk003-ch023-developer-how-to-participate-bootcamp.xml
rename to doc/training-guides/developer-guide/bk003-ch023-developer-how-to-participate-bootcamp.xml
diff --git a/doc/training-guides/bk003-developer-training-guide.xml b/doc/training-guides/developer-guide/bk003-developer-training-guide.xml
similarity index 100%
rename from doc/training-guides/bk003-developer-training-guide.xml
rename to doc/training-guides/developer-guide/bk003-developer-training-guide.xml
diff --git a/doc/training-guides/st-training-guides.xml b/doc/training-guides/st-training-guides.xml
index 76203ce6..4219d251 100644
--- a/doc/training-guides/st-training-guides.xml
+++ b/doc/training-guides/st-training-guides.xml
@@ -85,6 +85,6 @@
     <xi:include href="bk000-preface.xml"/>
     <xi:include href="associate-guide/bk001-associate-training-guide.xml"/>
     <xi:include href="operator-guide/bk002-operator-training-guide.xml"/>
-    <xi:include href="bk003-developer-training-guide.xml"/>
+    <xi:include href="developer-guide/bk003-developer-training-guide.xml"/>
     <xi:include href="bk004-architect-training-guide.xml"/>
    </set>