[incubator-training] branch develop updated: chore(build): Refactored the structure of the content section and streamlined the names, groupIds and artifactIds in preparation of being able to auto-generate and deploy the generated slides.

[cdutz]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-training.git


The following commit(s) were added to refs/heads/develop by this push:
     new 349b7c4  chore(build): Refactored the structure of the content section 
and streamlined the names, groupIds and artifactIds in preparation of being 
able to auto-generate and deploy the generated slides.
349b7c4 is described below

commit 349b7c49ea05b737116f5d4967c1546617b5f02e
Author: cdutz <christofer.d...@c-ware.de>
AuthorDate: Wed Apr 6 10:48:37 2022 +0200

    chore(build): Refactored the structure of the content section and 
streamlined the names, groupIds and artifactIds in preparation of being able to 
auto-generate and deploy the generated slides.
---
 content/{ApacheAirflow => Apache/Airflow}/pom.xml  |   6 ++--
 .../Airflow}/src/main/asciidoc/index.adoc          |   0
 .../src/main/resources/images/logo-apache.png      | Bin
 .../Airflow}/src/main/theme/apache.css             |   0
 .../ComDev/ComDevIntro}/README.md                  |   0
 content/{ => Apache}/ComDev/ComDevIntro/pom.xml    |   7 ++--
 .../ComDevIntro/src/main/asciidoc/_settings.adoc   |   0
 .../ComDevIntro/src/main/asciidoc/index.adoc       |   0
 .../src/main/resources/images/ApacheLogo.png       | Bin
 .../resources/images/handshake-2009183_1920-1.png  | Bin
 content/{ => Apache}/ComDev/pom.xml                |   7 ++--
 content/{ApacheFlink => Apache/Druid}/pom.xml      |   6 ++--
 .../Druid}/src/main/asciidoc/index.adoc            |   0
 .../src/main/resources/images/logo-apache.png      | Bin
 .../Druid}/src/main/theme/apache.css               |   0
 content/{ApacheDruid => Apache/Flink}/pom.xml      |   6 ++--
 .../Flink}/src/main/asciidoc/index.adoc            |   0
 .../src/main/resources/images/logo-apache.png      | Bin
 .../Flink}/src/main/theme/apache.css               |   0
 content/{ => Apache}/Hadoop/pom.xml                |   6 ++--
 .../Hadoop/src/main/asciidoc/index.adoc            |   0
 .../src/main/resources/images/logo-apache.png      | Bin
 .../Hadoop}/src/main/theme/apache.css              |   0
 .../{ComDev/ComDevIntro => Apache/Hive}/README.md  |   0
 .../Hive}/install-deps-centos.sh                   |   0
 .../Hive}/install-deps-mac.sh                      |   0
 content/{ApacheAirflow => Apache/Hive}/pom.xml     |   6 ++--
 .../Hive}/src/main/asciidoc/index.adoc             |   0
 .../src/main/resources/images/logo-apache.png      | Bin
 .../Hive}/src/main/theme/apache.css                |   0
 content/{ => Apache}/Ignite/pom.xml                |   6 ++--
 .../Ignite/src/main/asciidoc/index.adoc            |   0
 .../src/main/java/example/PutGetExample.java       |   0
 .../Ignite/src/main/java/example/SqlExample.java   |   0
 .../src/main/java/example/StartClientNode.java     |   0
 .../src/main/java/example/StartServerNode.java     |   0
 .../src/main/resources/images/logo-apache.png      | Bin
 .../resources/images/replicated_vs_partitioned.png | Bin
 .../Ignite}/src/main/theme/apache.css              |   0
 .../Incubator}/IncubatorReleases/DISCLAIMER        |   0
 .../Incubator}/IncubatorReleases/LICENSE           |   0
 .../Incubator}/IncubatorReleases/NOTICE            |   0
 .../Incubator}/IncubatorReleases/README.md         |   0
 .../Incubator}/IncubatorReleases/clean-deps.sh     |   0
 .../Incubator/IncubatorReleases}/install-deps.sh   |   0
 .../Incubator/IncubatorReleases}/pom.xml           |   8 ++---
 .../Incubator}/IncubatorReleases/release.sh        |   0
 .../src/main/asciidoc/aboutme.adoc                 |   0
 .../IncubatorReleases/src/main/asciidoc/index.adoc |   0
 .../src/main/asciidoc/projectstats.adoc            |   0
 .../src/main/resources/images/33BSD.mp4            | Bin
 .../src/main/resources/images/ApacheLogo.png       | Bin
 .../main/resources/images/IncubatingProjects.png   | Bin
 .../src/main/resources/images/LICENSE.png          | Bin
 .../src/main/resources/images/NOTICE.png           | Bin
 .../src/main/resources/images/VoteData.png         | Bin
 .../src/main/resources/images/both.mp4             | Bin
 .../src/main/resources/images/deadpeople.mp4       | Bin
 .../src/main/resources/images/rat.png              | Bin
 .../src/main/resources/images/small-feather.png    | Bin
 .../src/main/resources/images/wtf.mp4              | Bin
 .../Incubator}/IncubatorReleases/src/main/stats.py |   0
 .../IncubatorReleases/src/main/theme/apache.css    |   0
 .../Incubator}/NavigatingASFIncubation/DISCLAIMER  |   0
 .../Incubator}/NavigatingASFIncubation/LICENSE     |   0
 .../Incubator}/NavigatingASFIncubation/NOTICE      |   0
 .../Incubator}/NavigatingASFIncubation/README.md   |   0
 .../NavigatingASFIncubation/clean-deps.sh          |   0
 .../NavigatingASFIncubation}/install-deps.sh       |   0
 .../Incubator}/NavigatingASFIncubation/pom.xml     |   6 ++--
 .../Incubator}/NavigatingASFIncubation/release.sh  |   0
 .../src/main/asciidoc/aboutme.adoc                 |   0
 .../src/main/asciidoc/index.adoc                   |   0
 .../src/main/asciidoc/projectstats.adoc            |   0
 .../src/main/resources/images/33BSD.mp4            | Bin
 .../src/main/resources/images/ApacheConEULogo.png  | Bin
 .../src/main/resources/images/ApacheConEurope.png  | Bin
 .../src/main/resources/images/ApacheLogo.png       | Bin
 .../main/resources/images/IncubatingProjects.png   | Bin
 .../src/main/resources/images/VoteData.png         | Bin
 .../src/main/resources/images/apachecon_eu.jpg     | Bin
 .../src/main/resources/images/both.mp4             | Bin
 .../src/main/resources/images/deadpeople.mp4       | Bin
 .../src/main/resources/images/small-feather.png    | Bin
 .../src/main/resources/images/wtf.mp4              | Bin
 .../NavigatingASFIncubation/src/main/stats.py      |   0
 .../src/main/theme/apache.css                      |   0
 .../Incubator/ReleaseChecklist/pom.xml             |   6 ++--
 .../src/main/asciidoc/index-docinfo-footer.html    |   0
 .../ReleaseChecklist/src/main/asciidoc/index.adoc  |   0
 content/{ApacheWay => Apache/Incubator}/pom.xml    |  12 +++----
 content/{ => Apache}/MyNewt/DISCLAIMER             |   0
 content/{ => Apache}/MyNewt/LICENSE                |   0
 content/{ApacheCon => Apache/MyNewt}/NOTICE        |   0
 content/{ => Apache}/MyNewt/README.md              |   0
 content/{ => Apache}/MyNewt/clean-deps.sh          |   0
 .../MyNewt}/install-deps.sh                        |   0
 content/{ => Apache}/MyNewt/pom.xml                |   6 ++--
 .../MyNewt/src/main/asciidoc/index_en.adoc         |   0
 .../src/main/resources/images/ApacheLogo.png       | Bin
 .../MyNewt/src/main/resources/images/mynewt.png    | Bin
 .../src/main/resources/images/small-feather.png    | Bin
 .../MyNewt/src/main/resources/images/stats.jpg     | Bin
 .../{ => Apache}/MyNewt/src/main/theme/apache.css  |   0
 content/{ApacheAirflow => Apache/Pulsar}/pom.xml   |   6 ++--
 .../Pulsar}/src/main/asciidoc/index.adoc           |   0
 .../src/main/resources/images/logo-apache.png      | Bin
 .../Pulsar}/src/main/theme/apache.css              |   0
 content/{ApacheHive => Apache/Samza}/pom.xml       |   6 ++--
 .../Samza}/src/main/asciidoc/index.adoc            |   0
 .../src/main/resources/images/logo-apache.png      | Bin
 .../Samza}/src/main/theme/apache.css               |   0
 content/{ => Apache}/Spark/1-Basics/pom.xml        |   6 ++--
 .../1-Basics/src/main/asciidoc/_settings.adoc      |   0
 .../Spark/1-Basics/src/main/asciidoc/index.adoc    |   0
 .../1-Basics/src/main/asciidoc/subdir/_b.adoc      |   0
 .../1-Basics/src/main/asciidoc/subdir/_c.adoc      |   0
 .../src/main/resources/images/logo-apache.png      | Bin
 .../1-Basics/src/main/resources/images/spark.png   | Bin
 .../Spark/1-Basics/src/main/theme/apache.css       |   0
 content/{ => Apache}/Spark/pom.xml                 |  11 +++---
 .../{ => Apache}/Training/Presentations/LICENSE    |   0
 .../Training/Presentations}/NOTICE                 |   0
 .../{ => Apache}/Training/Presentations/README.md  |   0
 .../Training/Presentations/clean-deps.sh           |   0
 .../Training/Presentations}/install-deps.sh        |   0
 .../Training/Presentations/licenses/CC0.txt        |   0
 .../Training/Presentations/licenses/JPL.txt        |   0
 .../Training/Presentations/licenses/Pixabay.txt    |   0
 .../{ => Apache}/Training/Presentations/pom.xml    |   6 ++--
 .../Presentations/src/main/asciidoc/index_en.adoc  |   0
 .../src/main/resources/images/ApacheLogo.png       | Bin
 .../src/main/resources/images/cat.jpg              | Bin
 .../src/main/resources/images/small-feather.png    | Bin
 .../src/main/resources/images/speakernotes.jpg     | Bin
 .../src/main/resources/images/stars.jpg            | Bin
 .../src/main/resources/images/sydney.mp4           | Bin
 .../src/main/resources/images/training.png         | Bin
 .../Presentations/src/main/theme/apache.css        |   0
 content/{ => Apache}/Training/pom.xml              |  12 +++----
 content/{ => Apache}/ZooKeeper/README.md           |   0
 content/{ => Apache}/ZooKeeper/pom.xml             |   6 ++--
 .../ZooKeeper/src/main/asciidoc/index_de.adoc      |   0
 .../ZooKeeper/src/main/asciidoc/index_en.adoc      |   0
 .../src/main/resources/images/data-model.graffle   | Bin
 .../src/main/resources/images/data-model.png       | Bin
 .../ZooKeeper/src/main/theme/apache.css            |   0
 content/{Incubator => Apache}/pom.xml              |  26 ++++++++++----
 content/ApachePulsar/pom.xml                       |  39 ---------------------
 content/ApacheSamza/pom.xml                        |  39 ---------------------
 content/ApacheWay/IncubatorReleases/pom.xml        |  39 ---------------------
 content/{ => Conferences}/ApacheCon/Gemfile        |   0
 content/{ => Conferences}/ApacheCon/LICENSE        |   0
 .../Presentations => Conferences/ApacheCon}/NOTICE |   0
 content/{ => Conferences}/ApacheCon/README.md      |   0
 .../{ => Conferences}/ApacheCon/convert-slides.js  |   0
 .../ApacheCon}/install-deps.sh                     |   0
 .../{ => Conferences}/ApacheCon/licenses/CC0.txt   |   0
 content/{ => Conferences}/ApacheCon/package.json   |   0
 content/{ => Conferences}/ApacheCon/pom.xml        |   6 ++--
 .../ApacheCon/src/main/asciidoc/index_en.adoc      |   0
 .../src/main/resources/images/ApacheConAtHome.png  | Bin
 .../main/resources/images/ApacheConAtHomeLogo.png  | Bin
 .../src/main/resources/images/ApacheConEULogo.png  | Bin
 .../src/main/resources/images/ApacheConEurope.png  | Bin
 .../src/main/resources/images/ApacheConNA.jpg      | Bin
 .../src/main/resources/images/ApacheConNALogo.png  | Bin
 .../src/main/resources/images/ApacheCon_bg.jpg     | Bin
 .../src/main/resources/images/AtHomeDesktop.jpg    | Bin
 .../src/main/resources/images/AtHomeDesktopII.jpg  | Bin
 .../src/main/resources/images/AtHomeOutside.jpg    | Bin
 .../src/main/resources/images/AtHomeSpiceRack.jpg  | Bin
 .../src/main/resources/images/NewOrleans.jpg       | Bin
 .../src/main/resources/images/NewOrleansII.jpg     | Bin
 .../src/main/resources/images/NewOrleansIII.jpg    | Bin
 .../src/main/resources/images/NewOrleansIV.jpg     | Bin
 .../main/resources/images/communityovercode.jpg    | Bin
 .../src/main/resources/images/favicon.ico          | Bin
 .../ApacheCon/src/main/theme/apachecon.css         |   0
 content/{Spark => Conferences}/pom.xml             |  13 ++++---
 content/IoT/IoTDeveloper/clean-deps.sh             |   0
 content/IoT/IoTDeveloper/install-deps.sh           |   0
 content/IoT/IoTDeveloper/pom.xml                   |   6 ++--
 .../src/main/resources/images/arduino.jpg          | Bin
 .../src/main/resources/images/arduinoIDE.png       | Bin
 .../src/main/resources/images/board.jpg            | Bin
 .../src/main/resources/images/breadboard.jpg       | Bin
 .../src/main/resources/images/fritzingbb.png       | Bin
 .../src/main/resources/images/fritzingpcb.png      | Bin
 .../src/main/resources/images/itworks.jpg          | Bin
 .../src/main/resources/images/prototype.jpg        | Bin
 content/IoT/pom.xml                                |   6 ++--
 content/pom.xml                                    |  20 ++---------
 site/mvnw                                          |   0
 .../lib/font/league-gothic/league-gothic.eot       | Bin
 .../lib/font/league-gothic/league-gothic.ttf       | Bin
 .../lib/font/league-gothic/league-gothic.woff      | Bin
 .../source-sans-pro/source-sans-pro-italic.eot     | Bin
 .../source-sans-pro/source-sans-pro-italic.ttf     | Bin
 .../source-sans-pro/source-sans-pro-italic.woff    | Bin
 .../source-sans-pro/source-sans-pro-regular.eot    | Bin
 .../source-sans-pro/source-sans-pro-regular.ttf    | Bin
 .../source-sans-pro/source-sans-pro-regular.woff   | Bin
 .../source-sans-pro/source-sans-pro-semibold.eot   | Bin
 .../source-sans-pro/source-sans-pro-semibold.ttf   | Bin
 .../source-sans-pro/source-sans-pro-semibold.woff  | Bin
 .../source-sans-pro-semibolditalic.eot             | Bin
 .../source-sans-pro-semibolditalic.ttf             | Bin
 .../source-sans-pro-semibolditalic.woff            | Bin
 .../reveal.js-3.7.0/plugin/markdown/markdown.js    |   0
 .../reveal.js-3.7.0/plugin/math/math.js            |   0
 211 files changed, 107 insertions(+), 228 deletions(-)

diff --git a/content/ApacheAirflow/pom.xml b/content/Apache/Airflow/pom.xml
similarity index 89%
copy from content/ApacheAirflow/pom.xml
copy to content/Apache/Airflow/pom.xml
index 63db653..757bb71 100644
--- a/content/ApacheAirflow/pom.xml
+++ b/content/Apache/Airflow/pom.xml
@@ -28,12 +28,12 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.apache.training</groupId>
-  <artifactId>apache-airflow</artifactId>
+  <groupId>org.apache.training.content</groupId>
+  <artifactId>training-content-apache-airflow</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
-  <name>Apache Airflow Slides</name>
+  <name>Training: Content: Apache: Airflow</name>
   <description></description>
 
 </project>
diff --git a/content/ApacheAirflow/src/main/asciidoc/index.adoc 
b/content/Apache/Airflow/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/ApacheAirflow/src/main/asciidoc/index.adoc
rename to content/Apache/Airflow/src/main/asciidoc/index.adoc
diff --git a/content/ApacheAirflow/src/main/resources/images/logo-apache.png 
b/content/Apache/Airflow/src/main/resources/images/logo-apache.png
similarity index 100%
rename from content/ApacheAirflow/src/main/resources/images/logo-apache.png
rename to content/Apache/Airflow/src/main/resources/images/logo-apache.png
diff --git a/content/ApacheAirflow/src/main/theme/apache.css 
b/content/Apache/Airflow/src/main/theme/apache.css
similarity index 100%
rename from content/ApacheAirflow/src/main/theme/apache.css
rename to content/Apache/Airflow/src/main/theme/apache.css
diff --git a/content/ApacheHive/README.md 
b/content/Apache/ComDev/ComDevIntro/README.md
similarity index 100%
rename from content/ApacheHive/README.md
rename to content/Apache/ComDev/ComDevIntro/README.md
diff --git a/content/ComDev/ComDevIntro/pom.xml 
b/content/Apache/ComDev/ComDevIntro/pom.xml
similarity index 88%
rename from content/ComDev/ComDevIntro/pom.xml
rename to content/Apache/ComDev/ComDevIntro/pom.xml
index 43d30d6..3c93326 100644
--- a/content/ComDev/ComDevIntro/pom.xml
+++ b/content/Apache/ComDev/ComDevIntro/pom.xml
@@ -26,13 +26,12 @@
         <relativePath/>
     </parent>
 
-    <artifactId>ComDevIntro</artifactId>
-
-    <groupId>org.apache.training</groupId>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content-apache-comdev-comdev-intro</artifactId>
     <version>1.0.0.SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>Introduction to Community Development: What is this ComDev 
Thing?</name>
+    <name>Training: Content: Apache: ComDev: ComDev Intro</name>
     <description>A short 30 minute introduction talk about what Apache 
Community Development is.</description>
 
 </project>
diff --git a/content/ComDev/ComDevIntro/src/main/asciidoc/_settings.adoc 
b/content/Apache/ComDev/ComDevIntro/src/main/asciidoc/_settings.adoc
similarity index 100%
rename from content/ComDev/ComDevIntro/src/main/asciidoc/_settings.adoc
rename to content/Apache/ComDev/ComDevIntro/src/main/asciidoc/_settings.adoc
diff --git a/content/ComDev/ComDevIntro/src/main/asciidoc/index.adoc 
b/content/Apache/ComDev/ComDevIntro/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/ComDev/ComDevIntro/src/main/asciidoc/index.adoc
rename to content/Apache/ComDev/ComDevIntro/src/main/asciidoc/index.adoc
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/resources/images/ApacheLogo.png 
b/content/Apache/ComDev/ComDevIntro/src/main/resources/images/ApacheLogo.png
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/resources/images/ApacheLogo.png
rename to 
content/Apache/ComDev/ComDevIntro/src/main/resources/images/ApacheLogo.png
diff --git 
a/content/ComDev/ComDevIntro/src/main/resources/images/handshake-2009183_1920-1.png
 
b/content/Apache/ComDev/ComDevIntro/src/main/resources/images/handshake-2009183_1920-1.png
similarity index 100%
rename from 
content/ComDev/ComDevIntro/src/main/resources/images/handshake-2009183_1920-1.png
rename to 
content/Apache/ComDev/ComDevIntro/src/main/resources/images/handshake-2009183_1920-1.png
diff --git a/content/ComDev/pom.xml b/content/Apache/ComDev/pom.xml
similarity index 87%
rename from content/ComDev/pom.xml
rename to content/Apache/ComDev/pom.xml
index fb1538a..ff47353 100644
--- a/content/ComDev/pom.xml
+++ b/content/Apache/ComDev/pom.xml
@@ -28,11 +28,12 @@
     <version>1.0.0</version>
   </parent>
 
-  <artifactId>training-content-comdev</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <groupId>org.apache.training.content</groupId>
+  <artifactId>training-content-apache-comdev</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Training: Content: ComDev</name>
+  <name>Training: Content: Apache: ComDev</name>
 
   <modules>
     <module>ComDevIntro</module>
diff --git a/content/ApacheFlink/pom.xml b/content/Apache/Druid/pom.xml
similarity index 89%
rename from content/ApacheFlink/pom.xml
rename to content/Apache/Druid/pom.xml
index 50d7c20..3a4d944 100644
--- a/content/ApacheFlink/pom.xml
+++ b/content/Apache/Druid/pom.xml
@@ -28,12 +28,12 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.apache.training</groupId>
-  <artifactId>apache-flink</artifactId>
+  <groupId>org.apache.training.content</groupId>
+  <artifactId>training-content-apache-druid</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
-  <name>Apache Flink Slides</name>
+  <name>Training: Content: Apache: Druid</name>
   <description></description>
 
 </project>
diff --git a/content/ApacheDruid/src/main/asciidoc/index.adoc 
b/content/Apache/Druid/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/ApacheDruid/src/main/asciidoc/index.adoc
rename to content/Apache/Druid/src/main/asciidoc/index.adoc
diff --git a/content/ApacheDruid/src/main/resources/images/logo-apache.png 
b/content/Apache/Druid/src/main/resources/images/logo-apache.png
similarity index 100%
rename from content/ApacheDruid/src/main/resources/images/logo-apache.png
rename to content/Apache/Druid/src/main/resources/images/logo-apache.png
diff --git a/content/ApacheDruid/src/main/theme/apache.css 
b/content/Apache/Druid/src/main/theme/apache.css
similarity index 100%
rename from content/ApacheDruid/src/main/theme/apache.css
rename to content/Apache/Druid/src/main/theme/apache.css
diff --git a/content/ApacheDruid/pom.xml b/content/Apache/Flink/pom.xml
similarity index 89%
rename from content/ApacheDruid/pom.xml
rename to content/Apache/Flink/pom.xml
index ee3693c..0d7f01f 100644
--- a/content/ApacheDruid/pom.xml
+++ b/content/Apache/Flink/pom.xml
@@ -28,12 +28,12 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.apache.training</groupId>
-  <artifactId>apache-druid</artifactId>
+  <groupId>org.apache.training.content</groupId>
+  <artifactId>training-content-apache-flink</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
-  <name>Apache Druid Slides</name>
+  <name>Training: Content: Apache: Flink</name>
   <description></description>
 
 </project>
diff --git a/content/ApacheFlink/src/main/asciidoc/index.adoc 
b/content/Apache/Flink/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/ApacheFlink/src/main/asciidoc/index.adoc
rename to content/Apache/Flink/src/main/asciidoc/index.adoc
diff --git a/content/ApacheFlink/src/main/resources/images/logo-apache.png 
b/content/Apache/Flink/src/main/resources/images/logo-apache.png
similarity index 100%
rename from content/ApacheFlink/src/main/resources/images/logo-apache.png
rename to content/Apache/Flink/src/main/resources/images/logo-apache.png
diff --git a/content/ApacheFlink/src/main/theme/apache.css 
b/content/Apache/Flink/src/main/theme/apache.css
similarity index 100%
rename from content/ApacheFlink/src/main/theme/apache.css
rename to content/Apache/Flink/src/main/theme/apache.css
diff --git a/content/Hadoop/pom.xml b/content/Apache/Hadoop/pom.xml
similarity index 89%
rename from content/Hadoop/pom.xml
rename to content/Apache/Hadoop/pom.xml
index bd2c7c0..1e841ee 100644
--- a/content/Hadoop/pom.xml
+++ b/content/Apache/Hadoop/pom.xml
@@ -28,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.apache.training</groupId>
-    <artifactId>apache-hadoop</artifactId>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content-apache-hadoop</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>Apache Hadoop Slides</name>
+    <name>Training: Content: Apache: Hadoop</name>
     <description></description>
 
 </project>
diff --git a/content/Hadoop/src/main/asciidoc/index.adoc 
b/content/Apache/Hadoop/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/Hadoop/src/main/asciidoc/index.adoc
rename to content/Apache/Hadoop/src/main/asciidoc/index.adoc
diff --git a/content/ApacheHive/src/main/resources/images/logo-apache.png 
b/content/Apache/Hadoop/src/main/resources/images/logo-apache.png
similarity index 100%
rename from content/ApacheHive/src/main/resources/images/logo-apache.png
rename to content/Apache/Hadoop/src/main/resources/images/logo-apache.png
diff --git a/content/ApacheHive/src/main/theme/apache.css 
b/content/Apache/Hadoop/src/main/theme/apache.css
similarity index 100%
rename from content/ApacheHive/src/main/theme/apache.css
rename to content/Apache/Hadoop/src/main/theme/apache.css
diff --git a/content/ComDev/ComDevIntro/README.md 
b/content/Apache/Hive/README.md
similarity index 100%
rename from content/ComDev/ComDevIntro/README.md
rename to content/Apache/Hive/README.md
diff --git a/content/ApacheHive/install-deps-centos.sh 
b/content/Apache/Hive/install-deps-centos.sh
similarity index 100%
rename from content/ApacheHive/install-deps-centos.sh
rename to content/Apache/Hive/install-deps-centos.sh
diff --git a/content/ApacheHive/install-deps-mac.sh 
b/content/Apache/Hive/install-deps-mac.sh
similarity index 100%
rename from content/ApacheHive/install-deps-mac.sh
rename to content/Apache/Hive/install-deps-mac.sh
diff --git a/content/ApacheAirflow/pom.xml b/content/Apache/Hive/pom.xml
similarity index 89%
copy from content/ApacheAirflow/pom.xml
copy to content/Apache/Hive/pom.xml
index 63db653..05bd03f 100644
--- a/content/ApacheAirflow/pom.xml
+++ b/content/Apache/Hive/pom.xml
@@ -28,12 +28,12 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.apache.training</groupId>
-  <artifactId>apache-airflow</artifactId>
+  <groupId>org.apache.training.content</groupId>
+  <artifactId>training-content-apache-hive</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
-  <name>Apache Airflow Slides</name>
+  <name>Training: Content: Apache: Hive</name>
   <description></description>
 
 </project>
diff --git a/content/ApacheHive/src/main/asciidoc/index.adoc 
b/content/Apache/Hive/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/ApacheHive/src/main/asciidoc/index.adoc
rename to content/Apache/Hive/src/main/asciidoc/index.adoc
diff --git a/content/ApachePulsar/src/main/resources/images/logo-apache.png 
b/content/Apache/Hive/src/main/resources/images/logo-apache.png
similarity index 100%
rename from content/ApachePulsar/src/main/resources/images/logo-apache.png
rename to content/Apache/Hive/src/main/resources/images/logo-apache.png
diff --git a/content/ApachePulsar/src/main/theme/apache.css 
b/content/Apache/Hive/src/main/theme/apache.css
similarity index 100%
rename from content/ApachePulsar/src/main/theme/apache.css
rename to content/Apache/Hive/src/main/theme/apache.css
diff --git a/content/Ignite/pom.xml b/content/Apache/Ignite/pom.xml
similarity index 91%
rename from content/Ignite/pom.xml
rename to content/Apache/Ignite/pom.xml
index f06fc43..29b4c9a 100644
--- a/content/Ignite/pom.xml
+++ b/content/Apache/Ignite/pom.xml
@@ -28,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.apache.training</groupId>
-    <artifactId>apache-ignite</artifactId>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content-apache-ignite</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>Apache Ignite Slides</name>
+    <name>Training: Content: Apache: Ignite</name>
     <description></description>
 
     <dependencies>
diff --git a/content/Ignite/src/main/asciidoc/index.adoc 
b/content/Apache/Ignite/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/Ignite/src/main/asciidoc/index.adoc
rename to content/Apache/Ignite/src/main/asciidoc/index.adoc
diff --git a/content/Ignite/src/main/java/example/PutGetExample.java 
b/content/Apache/Ignite/src/main/java/example/PutGetExample.java
similarity index 100%
rename from content/Ignite/src/main/java/example/PutGetExample.java
rename to content/Apache/Ignite/src/main/java/example/PutGetExample.java
diff --git a/content/Ignite/src/main/java/example/SqlExample.java 
b/content/Apache/Ignite/src/main/java/example/SqlExample.java
similarity index 100%
rename from content/Ignite/src/main/java/example/SqlExample.java
rename to content/Apache/Ignite/src/main/java/example/SqlExample.java
diff --git a/content/Ignite/src/main/java/example/StartClientNode.java 
b/content/Apache/Ignite/src/main/java/example/StartClientNode.java
similarity index 100%
rename from content/Ignite/src/main/java/example/StartClientNode.java
rename to content/Apache/Ignite/src/main/java/example/StartClientNode.java
diff --git a/content/Ignite/src/main/java/example/StartServerNode.java 
b/content/Apache/Ignite/src/main/java/example/StartServerNode.java
similarity index 100%
rename from content/Ignite/src/main/java/example/StartServerNode.java
rename to content/Apache/Ignite/src/main/java/example/StartServerNode.java
diff --git a/content/ApacheSamza/src/main/resources/images/logo-apache.png 
b/content/Apache/Ignite/src/main/resources/images/logo-apache.png
similarity index 100%
rename from content/ApacheSamza/src/main/resources/images/logo-apache.png
rename to content/Apache/Ignite/src/main/resources/images/logo-apache.png
diff --git 
a/content/Ignite/src/main/resources/images/replicated_vs_partitioned.png 
b/content/Apache/Ignite/src/main/resources/images/replicated_vs_partitioned.png
similarity index 100%
rename from 
content/Ignite/src/main/resources/images/replicated_vs_partitioned.png
rename to 
content/Apache/Ignite/src/main/resources/images/replicated_vs_partitioned.png
diff --git a/content/ApacheSamza/src/main/theme/apache.css 
b/content/Apache/Ignite/src/main/theme/apache.css
similarity index 100%
rename from content/ApacheSamza/src/main/theme/apache.css
rename to content/Apache/Ignite/src/main/theme/apache.css
diff --git a/content/ApacheWay/IncubatorReleases/DISCLAIMER 
b/content/Apache/Incubator/IncubatorReleases/DISCLAIMER
similarity index 100%
rename from content/ApacheWay/IncubatorReleases/DISCLAIMER
rename to content/Apache/Incubator/IncubatorReleases/DISCLAIMER
diff --git a/content/ApacheWay/IncubatorReleases/LICENSE 
b/content/Apache/Incubator/IncubatorReleases/LICENSE
similarity index 100%
rename from content/ApacheWay/IncubatorReleases/LICENSE
rename to content/Apache/Incubator/IncubatorReleases/LICENSE
diff --git a/content/ApacheWay/IncubatorReleases/NOTICE 
b/content/Apache/Incubator/IncubatorReleases/NOTICE
similarity index 100%
rename from content/ApacheWay/IncubatorReleases/NOTICE
rename to content/Apache/Incubator/IncubatorReleases/NOTICE
diff --git a/content/ApacheWay/IncubatorReleases/README.md 
b/content/Apache/Incubator/IncubatorReleases/README.md
similarity index 100%
rename from content/ApacheWay/IncubatorReleases/README.md
rename to content/Apache/Incubator/IncubatorReleases/README.md
diff --git a/content/ApacheWay/IncubatorReleases/clean-deps.sh 
b/content/Apache/Incubator/IncubatorReleases/clean-deps.sh
old mode 100755
new mode 100644
similarity index 100%
rename from content/ApacheWay/IncubatorReleases/clean-deps.sh
rename to content/Apache/Incubator/IncubatorReleases/clean-deps.sh
diff --git a/content/ApacheCon/install-deps.sh 
b/content/Apache/Incubator/IncubatorReleases/install-deps.sh
old mode 100755
new mode 100644
similarity index 100%
rename from content/ApacheCon/install-deps.sh
rename to content/Apache/Incubator/IncubatorReleases/install-deps.sh
diff --git a/content/ApacheAirflow/pom.xml 
b/content/Apache/Incubator/IncubatorReleases/pom.xml
similarity index 82%
copy from content/ApacheAirflow/pom.xml
copy to content/Apache/Incubator/IncubatorReleases/pom.xml
index 63db653..1846818 100644
--- a/content/ApacheAirflow/pom.xml
+++ b/content/Apache/Incubator/IncubatorReleases/pom.xml
@@ -28,12 +28,12 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.apache.training</groupId>
-  <artifactId>apache-airflow</artifactId>
+  <groupId>org.apache.training.content</groupId>
+  <artifactId>training-content-apache-incubator-incubator-releases</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
-  <name>Apache Airflow Slides</name>
-  <description></description>
+  <name>Training: Content: Apache: Incubator: Incubator Releases</name>
+  <description>How to make releases while you're in the 
Incubator.</description>
 
 </project>
diff --git a/content/ApacheWay/IncubatorReleases/release.sh 
b/content/Apache/Incubator/IncubatorReleases/release.sh
old mode 100755
new mode 100644
similarity index 100%
rename from content/ApacheWay/IncubatorReleases/release.sh
rename to content/Apache/Incubator/IncubatorReleases/release.sh
diff --git a/content/ApacheWay/IncubatorReleases/src/main/asciidoc/aboutme.adoc 
b/content/Apache/Incubator/IncubatorReleases/src/main/asciidoc/aboutme.adoc
similarity index 100%
rename from content/ApacheWay/IncubatorReleases/src/main/asciidoc/aboutme.adoc
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/asciidoc/aboutme.adoc
diff --git a/content/ApacheWay/IncubatorReleases/src/main/asciidoc/index.adoc 
b/content/Apache/Incubator/IncubatorReleases/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/ApacheWay/IncubatorReleases/src/main/asciidoc/index.adoc
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/asciidoc/index.adoc
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/asciidoc/projectstats.adoc 
b/content/Apache/Incubator/IncubatorReleases/src/main/asciidoc/projectstats.adoc
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/asciidoc/projectstats.adoc
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/asciidoc/projectstats.adoc
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/resources/images/33BSD.mp4 
b/content/Apache/Incubator/IncubatorReleases/src/main/resources/images/33BSD.mp4
old mode 100755
new mode 100644
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/resources/images/33BSD.mp4
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/resources/images/33BSD.mp4
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/ApacheLogo.png
 
b/content/Apache/Incubator/IncubatorReleases/src/main/resources/images/ApacheLogo.png
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/ApacheLogo.png
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/resources/images/ApacheLogo.png
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/resources/images/IncubatingProjects.png
 
b/content/Apache/Incubator/IncubatorReleases/src/main/resources/images/IncubatingProjects.png
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/resources/images/IncubatingProjects.png
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/resources/images/IncubatingProjects.png
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/resources/images/LICENSE.png 
b/content/Apache/Incubator/IncubatorReleases/src/main/resources/images/LICENSE.png
old mode 100755
new mode 100644
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/resources/images/LICENSE.png
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/resources/images/LICENSE.png
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/resources/images/NOTICE.png 
b/content/Apache/Incubator/IncubatorReleases/src/main/resources/images/NOTICE.png
old mode 100755
new mode 100644
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/resources/images/NOTICE.png
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/resources/images/NOTICE.png
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/resources/images/VoteData.png 
b/content/Apache/Incubator/IncubatorReleases/src/main/resources/images/VoteData.png
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/resources/images/VoteData.png
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/resources/images/VoteData.png
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/resources/images/both.mp4 
b/content/Apache/Incubator/IncubatorReleases/src/main/resources/images/both.mp4
old mode 100755
new mode 100644
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/resources/images/both.mp4
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/resources/images/both.mp4
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/resources/images/deadpeople.mp4 
b/content/Apache/Incubator/IncubatorReleases/src/main/resources/images/deadpeople.mp4
old mode 100755
new mode 100644
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/resources/images/deadpeople.mp4
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/resources/images/deadpeople.mp4
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/resources/images/rat.png 
b/content/Apache/Incubator/IncubatorReleases/src/main/resources/images/rat.png
old mode 100755
new mode 100644
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/resources/images/rat.png
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/resources/images/rat.png
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/resources/images/small-feather.png
 
b/content/Apache/Incubator/IncubatorReleases/src/main/resources/images/small-feather.png
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/resources/images/small-feather.png
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/resources/images/small-feather.png
diff --git 
a/content/ApacheWay/IncubatorReleases/src/main/resources/images/wtf.mp4 
b/content/Apache/Incubator/IncubatorReleases/src/main/resources/images/wtf.mp4
old mode 100755
new mode 100644
similarity index 100%
rename from 
content/ApacheWay/IncubatorReleases/src/main/resources/images/wtf.mp4
rename to 
content/Apache/Incubator/IncubatorReleases/src/main/resources/images/wtf.mp4
diff --git a/content/ApacheWay/IncubatorReleases/src/main/stats.py 
b/content/Apache/Incubator/IncubatorReleases/src/main/stats.py
similarity index 100%
rename from content/ApacheWay/IncubatorReleases/src/main/stats.py
rename to content/Apache/Incubator/IncubatorReleases/src/main/stats.py
diff --git a/content/ApacheWay/IncubatorReleases/src/main/theme/apache.css 
b/content/Apache/Incubator/IncubatorReleases/src/main/theme/apache.css
similarity index 100%
rename from content/ApacheWay/IncubatorReleases/src/main/theme/apache.css
rename to content/Apache/Incubator/IncubatorReleases/src/main/theme/apache.css
diff --git a/content/ApacheWay/NavigatingASFIncubation/DISCLAIMER 
b/content/Apache/Incubator/NavigatingASFIncubation/DISCLAIMER
similarity index 100%
rename from content/ApacheWay/NavigatingASFIncubation/DISCLAIMER
rename to content/Apache/Incubator/NavigatingASFIncubation/DISCLAIMER
diff --git a/content/ApacheWay/NavigatingASFIncubation/LICENSE 
b/content/Apache/Incubator/NavigatingASFIncubation/LICENSE
similarity index 100%
rename from content/ApacheWay/NavigatingASFIncubation/LICENSE
rename to content/Apache/Incubator/NavigatingASFIncubation/LICENSE
diff --git a/content/ApacheWay/NavigatingASFIncubation/NOTICE 
b/content/Apache/Incubator/NavigatingASFIncubation/NOTICE
similarity index 100%
rename from content/ApacheWay/NavigatingASFIncubation/NOTICE
rename to content/Apache/Incubator/NavigatingASFIncubation/NOTICE
diff --git a/content/ApacheWay/NavigatingASFIncubation/README.md 
b/content/Apache/Incubator/NavigatingASFIncubation/README.md
similarity index 100%
rename from content/ApacheWay/NavigatingASFIncubation/README.md
rename to content/Apache/Incubator/NavigatingASFIncubation/README.md
diff --git a/content/ApacheWay/NavigatingASFIncubation/clean-deps.sh 
b/content/Apache/Incubator/NavigatingASFIncubation/clean-deps.sh
old mode 100755
new mode 100644
similarity index 100%
rename from content/ApacheWay/NavigatingASFIncubation/clean-deps.sh
rename to content/Apache/Incubator/NavigatingASFIncubation/clean-deps.sh
diff --git a/content/ApacheWay/IncubatorReleases/install-deps.sh 
b/content/Apache/Incubator/NavigatingASFIncubation/install-deps.sh
old mode 100755
new mode 100644
similarity index 100%
rename from content/ApacheWay/IncubatorReleases/install-deps.sh
rename to content/Apache/Incubator/NavigatingASFIncubation/install-deps.sh
diff --git a/content/ApacheWay/NavigatingASFIncubation/pom.xml 
b/content/Apache/Incubator/NavigatingASFIncubation/pom.xml
similarity index 86%
rename from content/ApacheWay/NavigatingASFIncubation/pom.xml
rename to content/Apache/Incubator/NavigatingASFIncubation/pom.xml
index d382ce0..d114782 100644
--- a/content/ApacheWay/NavigatingASFIncubation/pom.xml
+++ b/content/Apache/Incubator/NavigatingASFIncubation/pom.xml
@@ -28,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.apache.training</groupId>
-    <artifactId>navigating-ASF-incubation</artifactId>
+    <groupId>org.apache.training.content</groupId>
+    
<artifactId>training-content-apache-incubator-navigating-asf-incubation</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>Navigating the ASF Incubator Process</name>
+    <name>Training: Content: Apache: Incubator: Navigating ASF 
Incubation</name>
     <description>All about taking a project through incubation from start to 
finish.</description>
 
 </project>
diff --git a/content/ApacheWay/NavigatingASFIncubation/release.sh 
b/content/Apache/Incubator/NavigatingASFIncubation/release.sh
old mode 100755
new mode 100644
similarity index 100%
rename from content/ApacheWay/NavigatingASFIncubation/release.sh
rename to content/Apache/Incubator/NavigatingASFIncubation/release.sh
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/asciidoc/aboutme.adoc 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/asciidoc/aboutme.adoc
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/asciidoc/aboutme.adoc
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/asciidoc/aboutme.adoc
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/asciidoc/index.adoc 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/asciidoc/index.adoc
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/asciidoc/index.adoc
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/asciidoc/index.adoc
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/asciidoc/projectstats.adoc 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/asciidoc/projectstats.adoc
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/asciidoc/projectstats.adoc
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/asciidoc/projectstats.adoc
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/33BSD.mp4 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/33BSD.mp4
old mode 100755
new mode 100644
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/33BSD.mp4
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/33BSD.mp4
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/ApacheConEULogo.png
 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/ApacheConEULogo.png
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/ApacheConEULogo.png
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/ApacheConEULogo.png
diff --git a/content/ApacheCon/src/main/resources/images/ApacheConEurope.png 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/ApacheConEurope.png
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/ApacheConEurope.png
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/ApacheConEurope.png
diff --git 
a/content/ComDev/ComDevIntro/src/main/resources/images/ApacheLogo.png 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/ApacheLogo.png
similarity index 100%
rename from content/ComDev/ComDevIntro/src/main/resources/images/ApacheLogo.png
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/ApacheLogo.png
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/IncubatingProjects.png
 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/IncubatingProjects.png
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/IncubatingProjects.png
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/IncubatingProjects.png
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/VoteData.png
 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/VoteData.png
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/VoteData.png
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/VoteData.png
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/apachecon_eu.jpg
 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/apachecon_eu.jpg
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/apachecon_eu.jpg
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/apachecon_eu.jpg
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/both.mp4 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/both.mp4
old mode 100755
new mode 100644
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/both.mp4
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/both.mp4
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/deadpeople.mp4
 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/deadpeople.mp4
old mode 100755
new mode 100644
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/deadpeople.mp4
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/deadpeople.mp4
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/small-feather.png
 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/small-feather.png
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/small-feather.png
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/small-feather.png
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/wtf.mp4 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/wtf.mp4
old mode 100755
new mode 100644
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/wtf.mp4
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/resources/images/wtf.mp4
diff --git a/content/ApacheWay/NavigatingASFIncubation/src/main/stats.py 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/stats.py
similarity index 100%
rename from content/ApacheWay/NavigatingASFIncubation/src/main/stats.py
rename to content/Apache/Incubator/NavigatingASFIncubation/src/main/stats.py
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/theme/apache.css 
b/content/Apache/Incubator/NavigatingASFIncubation/src/main/theme/apache.css
similarity index 100%
rename from content/ApacheWay/NavigatingASFIncubation/src/main/theme/apache.css
rename to 
content/Apache/Incubator/NavigatingASFIncubation/src/main/theme/apache.css
diff --git a/content/Incubator/ReleaseChecklist/pom.xml 
b/content/Apache/Incubator/ReleaseChecklist/pom.xml
similarity index 87%
rename from content/Incubator/ReleaseChecklist/pom.xml
rename to content/Apache/Incubator/ReleaseChecklist/pom.xml
index 1ad9eb2..a8b11a1 100644
--- a/content/Incubator/ReleaseChecklist/pom.xml
+++ b/content/Apache/Incubator/ReleaseChecklist/pom.xml
@@ -28,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.apache.training</groupId>
-    <artifactId>incubator-release-checklist</artifactId>
+    <groupId>org.apache.training.content</groupId>
+    
<artifactId>training-content-apache-incubator-incubator-relese-checklist</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>Incubator Release Chacklist</name>
+    <name>Training: Content: Apache: Incubator: Release Checklist</name>
     <description>A release checklist to see if a release complies with 
incubator and ASF.</description>
 
 </project>
diff --git 
a/content/Incubator/ReleaseChecklist/src/main/asciidoc/index-docinfo-footer.html
 
b/content/Apache/Incubator/ReleaseChecklist/src/main/asciidoc/index-docinfo-footer.html
similarity index 100%
rename from 
content/Incubator/ReleaseChecklist/src/main/asciidoc/index-docinfo-footer.html
rename to 
content/Apache/Incubator/ReleaseChecklist/src/main/asciidoc/index-docinfo-footer.html
diff --git a/content/Incubator/ReleaseChecklist/src/main/asciidoc/index.adoc 
b/content/Apache/Incubator/ReleaseChecklist/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/Incubator/ReleaseChecklist/src/main/asciidoc/index.adoc
rename to content/Apache/Incubator/ReleaseChecklist/src/main/asciidoc/index.adoc
diff --git a/content/ApacheWay/pom.xml b/content/Apache/Incubator/pom.xml
similarity index 81%
rename from content/ApacheWay/pom.xml
rename to content/Apache/Incubator/pom.xml
index ff92b25..80b4af2 100644
--- a/content/ApacheWay/pom.xml
+++ b/content/Apache/Incubator/pom.xml
@@ -23,20 +23,20 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.training</groupId>
-    <artifactId>content-parent-pom</artifactId>
-    <version>1.0.0</version>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content-apache</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>training-content-apache-way</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <artifactId>training-content-apache-incubator</artifactId>
   <packaging>pom</packaging>
 
-  <name>Training: Content: Apache Way</name>
+  <name>Training: Content: Apache: Incubator</name>
 
   <modules>
     <module>IncubatorReleases</module>
     <module>NavigatingASFIncubation</module>
+    <module>ReleaseChecklist</module>
   </modules>
 
 </project>
diff --git a/content/MyNewt/DISCLAIMER b/content/Apache/MyNewt/DISCLAIMER
similarity index 100%
rename from content/MyNewt/DISCLAIMER
rename to content/Apache/MyNewt/DISCLAIMER
diff --git a/content/MyNewt/LICENSE b/content/Apache/MyNewt/LICENSE
similarity index 100%
rename from content/MyNewt/LICENSE
rename to content/Apache/MyNewt/LICENSE
diff --git a/content/ApacheCon/NOTICE b/content/Apache/MyNewt/NOTICE
similarity index 100%
rename from content/ApacheCon/NOTICE
rename to content/Apache/MyNewt/NOTICE
diff --git a/content/MyNewt/README.md b/content/Apache/MyNewt/README.md
similarity index 100%
rename from content/MyNewt/README.md
rename to content/Apache/MyNewt/README.md
diff --git a/content/MyNewt/clean-deps.sh b/content/Apache/MyNewt/clean-deps.sh
old mode 100755
new mode 100644
similarity index 100%
rename from content/MyNewt/clean-deps.sh
rename to content/Apache/MyNewt/clean-deps.sh
diff --git a/content/ApacheWay/NavigatingASFIncubation/install-deps.sh 
b/content/Apache/MyNewt/install-deps.sh
old mode 100755
new mode 100644
similarity index 100%
rename from content/ApacheWay/NavigatingASFIncubation/install-deps.sh
rename to content/Apache/MyNewt/install-deps.sh
diff --git a/content/MyNewt/pom.xml b/content/Apache/MyNewt/pom.xml
similarity index 90%
rename from content/MyNewt/pom.xml
rename to content/Apache/MyNewt/pom.xml
index 4c7a369..ce8394f 100644
--- a/content/MyNewt/pom.xml
+++ b/content/Apache/MyNewt/pom.xml
@@ -28,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.apache.training</groupId>
-    <artifactId>Apache-Mynewt-Talk</artifactId>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content-apache-mynewt</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>IoT Mynewt Talk</name>
+    <name>Training: Content: Apache: MyNewt</name>
     <description>How to be an IoT develper (and have fun!)</description>
 
     <properties>
diff --git a/content/MyNewt/src/main/asciidoc/index_en.adoc 
b/content/Apache/MyNewt/src/main/asciidoc/index_en.adoc
similarity index 100%
rename from content/MyNewt/src/main/asciidoc/index_en.adoc
rename to content/Apache/MyNewt/src/main/asciidoc/index_en.adoc
diff --git a/content/MyNewt/src/main/resources/images/ApacheLogo.png 
b/content/Apache/MyNewt/src/main/resources/images/ApacheLogo.png
similarity index 100%
rename from content/MyNewt/src/main/resources/images/ApacheLogo.png
rename to content/Apache/MyNewt/src/main/resources/images/ApacheLogo.png
diff --git a/content/MyNewt/src/main/resources/images/mynewt.png 
b/content/Apache/MyNewt/src/main/resources/images/mynewt.png
similarity index 100%
rename from content/MyNewt/src/main/resources/images/mynewt.png
rename to content/Apache/MyNewt/src/main/resources/images/mynewt.png
diff --git a/content/MyNewt/src/main/resources/images/small-feather.png 
b/content/Apache/MyNewt/src/main/resources/images/small-feather.png
similarity index 100%
rename from content/MyNewt/src/main/resources/images/small-feather.png
rename to content/Apache/MyNewt/src/main/resources/images/small-feather.png
diff --git a/content/MyNewt/src/main/resources/images/stats.jpg 
b/content/Apache/MyNewt/src/main/resources/images/stats.jpg
similarity index 100%
rename from content/MyNewt/src/main/resources/images/stats.jpg
rename to content/Apache/MyNewt/src/main/resources/images/stats.jpg
diff --git a/content/MyNewt/src/main/theme/apache.css 
b/content/Apache/MyNewt/src/main/theme/apache.css
similarity index 100%
rename from content/MyNewt/src/main/theme/apache.css
rename to content/Apache/MyNewt/src/main/theme/apache.css
diff --git a/content/ApacheAirflow/pom.xml b/content/Apache/Pulsar/pom.xml
similarity index 89%
rename from content/ApacheAirflow/pom.xml
rename to content/Apache/Pulsar/pom.xml
index 63db653..9d7e7fb 100644
--- a/content/ApacheAirflow/pom.xml
+++ b/content/Apache/Pulsar/pom.xml
@@ -28,12 +28,12 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.apache.training</groupId>
-  <artifactId>apache-airflow</artifactId>
+  <groupId>org.apache.training.content</groupId>
+  <artifactId>training-content-apache-pulsar</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
-  <name>Apache Airflow Slides</name>
+  <name>Training: Content: Apache: Pulsar</name>
   <description></description>
 
 </project>
diff --git a/content/ApachePulsar/src/main/asciidoc/index.adoc 
b/content/Apache/Pulsar/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/ApachePulsar/src/main/asciidoc/index.adoc
rename to content/Apache/Pulsar/src/main/asciidoc/index.adoc
diff --git a/content/Hadoop/src/main/resources/images/logo-apache.png 
b/content/Apache/Pulsar/src/main/resources/images/logo-apache.png
similarity index 100%
rename from content/Hadoop/src/main/resources/images/logo-apache.png
rename to content/Apache/Pulsar/src/main/resources/images/logo-apache.png
diff --git a/content/Hadoop/src/main/theme/apache.css 
b/content/Apache/Pulsar/src/main/theme/apache.css
similarity index 100%
rename from content/Hadoop/src/main/theme/apache.css
rename to content/Apache/Pulsar/src/main/theme/apache.css
diff --git a/content/ApacheHive/pom.xml b/content/Apache/Samza/pom.xml
similarity index 89%
rename from content/ApacheHive/pom.xml
rename to content/Apache/Samza/pom.xml
index 1e87241..be2012d 100644
--- a/content/ApacheHive/pom.xml
+++ b/content/Apache/Samza/pom.xml
@@ -28,12 +28,12 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.apache.training</groupId>
-  <artifactId>apache-hive</artifactId>
+  <groupId>org.apache.training.content</groupId>
+  <artifactId>training-content-apache-samza</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
-  <name>Apache Hive Slides</name>
+  <name>Training: Content: Apache: Samza</name>
   <description></description>
 
 </project>
diff --git a/content/ApacheSamza/src/main/asciidoc/index.adoc 
b/content/Apache/Samza/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/ApacheSamza/src/main/asciidoc/index.adoc
rename to content/Apache/Samza/src/main/asciidoc/index.adoc
diff --git a/content/Ignite/src/main/resources/images/logo-apache.png 
b/content/Apache/Samza/src/main/resources/images/logo-apache.png
similarity index 100%
rename from content/Ignite/src/main/resources/images/logo-apache.png
rename to content/Apache/Samza/src/main/resources/images/logo-apache.png
diff --git a/content/Ignite/src/main/theme/apache.css 
b/content/Apache/Samza/src/main/theme/apache.css
similarity index 100%
rename from content/Ignite/src/main/theme/apache.css
rename to content/Apache/Samza/src/main/theme/apache.css
diff --git a/content/Spark/1-Basics/pom.xml 
b/content/Apache/Spark/1-Basics/pom.xml
similarity index 89%
rename from content/Spark/1-Basics/pom.xml
rename to content/Apache/Spark/1-Basics/pom.xml
index 8385709..de0b747 100644
--- a/content/Spark/1-Basics/pom.xml
+++ b/content/Apache/Spark/1-Basics/pom.xml
@@ -28,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.apache.training</groupId>
-    <artifactId>Apache-Spark-Basics</artifactId>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content-apache-spark-basics</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>Apache Spark Basics</name>
+    <name>Training: Content: Apache: Spark: Basics</name>
     <description>An example project that demonstrates how to integrate convert 
Asciidoc to a reveal.js presentation with the Asciidoctor Maven 
plugin.</description>
 
 </project>
diff --git a/content/Spark/1-Basics/src/main/asciidoc/_settings.adoc 
b/content/Apache/Spark/1-Basics/src/main/asciidoc/_settings.adoc
similarity index 100%
rename from content/Spark/1-Basics/src/main/asciidoc/_settings.adoc
rename to content/Apache/Spark/1-Basics/src/main/asciidoc/_settings.adoc
diff --git a/content/Spark/1-Basics/src/main/asciidoc/index.adoc 
b/content/Apache/Spark/1-Basics/src/main/asciidoc/index.adoc
similarity index 100%
rename from content/Spark/1-Basics/src/main/asciidoc/index.adoc
rename to content/Apache/Spark/1-Basics/src/main/asciidoc/index.adoc
diff --git a/content/Spark/1-Basics/src/main/asciidoc/subdir/_b.adoc 
b/content/Apache/Spark/1-Basics/src/main/asciidoc/subdir/_b.adoc
similarity index 100%
rename from content/Spark/1-Basics/src/main/asciidoc/subdir/_b.adoc
rename to content/Apache/Spark/1-Basics/src/main/asciidoc/subdir/_b.adoc
diff --git a/content/Spark/1-Basics/src/main/asciidoc/subdir/_c.adoc 
b/content/Apache/Spark/1-Basics/src/main/asciidoc/subdir/_c.adoc
similarity index 100%
rename from content/Spark/1-Basics/src/main/asciidoc/subdir/_c.adoc
rename to content/Apache/Spark/1-Basics/src/main/asciidoc/subdir/_c.adoc
diff --git a/content/Spark/1-Basics/src/main/resources/images/logo-apache.png 
b/content/Apache/Spark/1-Basics/src/main/resources/images/logo-apache.png
similarity index 100%
rename from content/Spark/1-Basics/src/main/resources/images/logo-apache.png
rename to 
content/Apache/Spark/1-Basics/src/main/resources/images/logo-apache.png
diff --git a/content/Spark/1-Basics/src/main/resources/images/spark.png 
b/content/Apache/Spark/1-Basics/src/main/resources/images/spark.png
similarity index 100%
rename from content/Spark/1-Basics/src/main/resources/images/spark.png
rename to content/Apache/Spark/1-Basics/src/main/resources/images/spark.png
diff --git a/content/Spark/1-Basics/src/main/theme/apache.css 
b/content/Apache/Spark/1-Basics/src/main/theme/apache.css
similarity index 100%
rename from content/Spark/1-Basics/src/main/theme/apache.css
rename to content/Apache/Spark/1-Basics/src/main/theme/apache.css
diff --git a/content/Spark/pom.xml b/content/Apache/Spark/pom.xml
similarity index 82%
copy from content/Spark/pom.xml
copy to content/Apache/Spark/pom.xml
index 22ea204..de50b9b 100644
--- a/content/Spark/pom.xml
+++ b/content/Apache/Spark/pom.xml
@@ -23,16 +23,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.training</groupId>
-    <artifactId>content-parent-pom</artifactId>
-    <version>1.0.0</version>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content-apache</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>training-content-spark</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <artifactId>training-content-apache-spark</artifactId>
   <packaging>pom</packaging>
 
-  <name>Training: Content: Spark</name>
+  <name>Training: Content: Apache: Spark</name>
 
   <modules>
     <module>1-Basics</module>
diff --git a/content/Training/Presentations/LICENSE 
b/content/Apache/Training/Presentations/LICENSE
similarity index 100%
rename from content/Training/Presentations/LICENSE
rename to content/Apache/Training/Presentations/LICENSE
diff --git a/content/MyNewt/NOTICE 
b/content/Apache/Training/Presentations/NOTICE
similarity index 100%
rename from content/MyNewt/NOTICE
rename to content/Apache/Training/Presentations/NOTICE
diff --git a/content/Training/Presentations/README.md 
b/content/Apache/Training/Presentations/README.md
similarity index 100%
rename from content/Training/Presentations/README.md
rename to content/Apache/Training/Presentations/README.md
diff --git a/content/Training/Presentations/clean-deps.sh 
b/content/Apache/Training/Presentations/clean-deps.sh
old mode 100755
new mode 100644
similarity index 100%
rename from content/Training/Presentations/clean-deps.sh
rename to content/Apache/Training/Presentations/clean-deps.sh
diff --git a/content/MyNewt/install-deps.sh 
b/content/Apache/Training/Presentations/install-deps.sh
old mode 100755
new mode 100644
similarity index 100%
rename from content/MyNewt/install-deps.sh
rename to content/Apache/Training/Presentations/install-deps.sh
diff --git a/content/Training/Presentations/licenses/CC0.txt 
b/content/Apache/Training/Presentations/licenses/CC0.txt
similarity index 100%
rename from content/Training/Presentations/licenses/CC0.txt
rename to content/Apache/Training/Presentations/licenses/CC0.txt
diff --git a/content/Training/Presentations/licenses/JPL.txt 
b/content/Apache/Training/Presentations/licenses/JPL.txt
similarity index 100%
rename from content/Training/Presentations/licenses/JPL.txt
rename to content/Apache/Training/Presentations/licenses/JPL.txt
diff --git a/content/Training/Presentations/licenses/Pixabay.txt 
b/content/Apache/Training/Presentations/licenses/Pixabay.txt
similarity index 100%
rename from content/Training/Presentations/licenses/Pixabay.txt
rename to content/Apache/Training/Presentations/licenses/Pixabay.txt
diff --git a/content/Training/Presentations/pom.xml 
b/content/Apache/Training/Presentations/pom.xml
similarity index 87%
rename from content/Training/Presentations/pom.xml
rename to content/Apache/Training/Presentations/pom.xml
index 7b2dbde..f4cd17e 100644
--- a/content/Training/Presentations/pom.xml
+++ b/content/Apache/Training/Presentations/pom.xml
@@ -28,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.apache.training</groupId>
-    <artifactId>Training-ASF-Talk</artifactId>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content-apache-training-presentation</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>Apache Training talk</name>
+    <name>Training: Content: Apache: Training: Presentation</name>
     <description>An Apache Training talk</description>
 
 </project>
diff --git a/content/Training/Presentations/src/main/asciidoc/index_en.adoc 
b/content/Apache/Training/Presentations/src/main/asciidoc/index_en.adoc
similarity index 100%
rename from content/Training/Presentations/src/main/asciidoc/index_en.adoc
rename to content/Apache/Training/Presentations/src/main/asciidoc/index_en.adoc
diff --git 
a/content/Training/Presentations/src/main/resources/images/ApacheLogo.png 
b/content/Apache/Training/Presentations/src/main/resources/images/ApacheLogo.png
similarity index 100%
rename from 
content/Training/Presentations/src/main/resources/images/ApacheLogo.png
rename to 
content/Apache/Training/Presentations/src/main/resources/images/ApacheLogo.png
diff --git a/content/Training/Presentations/src/main/resources/images/cat.jpg 
b/content/Apache/Training/Presentations/src/main/resources/images/cat.jpg
similarity index 100%
rename from content/Training/Presentations/src/main/resources/images/cat.jpg
rename to 
content/Apache/Training/Presentations/src/main/resources/images/cat.jpg
diff --git 
a/content/Training/Presentations/src/main/resources/images/small-feather.png 
b/content/Apache/Training/Presentations/src/main/resources/images/small-feather.png
similarity index 100%
rename from 
content/Training/Presentations/src/main/resources/images/small-feather.png
rename to 
content/Apache/Training/Presentations/src/main/resources/images/small-feather.png
diff --git 
a/content/Training/Presentations/src/main/resources/images/speakernotes.jpg 
b/content/Apache/Training/Presentations/src/main/resources/images/speakernotes.jpg
similarity index 100%
rename from 
content/Training/Presentations/src/main/resources/images/speakernotes.jpg
rename to 
content/Apache/Training/Presentations/src/main/resources/images/speakernotes.jpg
diff --git a/content/Training/Presentations/src/main/resources/images/stars.jpg 
b/content/Apache/Training/Presentations/src/main/resources/images/stars.jpg
similarity index 100%
rename from content/Training/Presentations/src/main/resources/images/stars.jpg
rename to 
content/Apache/Training/Presentations/src/main/resources/images/stars.jpg
diff --git 
a/content/Training/Presentations/src/main/resources/images/sydney.mp4 
b/content/Apache/Training/Presentations/src/main/resources/images/sydney.mp4
similarity index 100%
rename from content/Training/Presentations/src/main/resources/images/sydney.mp4
rename to 
content/Apache/Training/Presentations/src/main/resources/images/sydney.mp4
diff --git 
a/content/Training/Presentations/src/main/resources/images/training.png 
b/content/Apache/Training/Presentations/src/main/resources/images/training.png
similarity index 100%
rename from 
content/Training/Presentations/src/main/resources/images/training.png
rename to 
content/Apache/Training/Presentations/src/main/resources/images/training.png
diff --git a/content/Training/Presentations/src/main/theme/apache.css 
b/content/Apache/Training/Presentations/src/main/theme/apache.css
similarity index 100%
rename from content/Training/Presentations/src/main/theme/apache.css
rename to content/Apache/Training/Presentations/src/main/theme/apache.css
diff --git a/content/Training/pom.xml b/content/Apache/Training/pom.xml
similarity index 82%
rename from content/Training/pom.xml
rename to content/Apache/Training/pom.xml
index 3904306..076588a 100644
--- a/content/Training/pom.xml
+++ b/content/Apache/Training/pom.xml
@@ -23,16 +23,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.training</groupId>
-    <artifactId>content-parent-pom</artifactId>
-    <version>1.0.0</version>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content-apache</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>training-content-training</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+
+  <artifactId>training-content-apache-training</artifactId>
   <packaging>pom</packaging>
 
-  <name>Training: Content: Training</name>
+  <name>Training: Content: Apache: Training</name>
 
   <modules>
     <module>Presentations</module>
diff --git a/content/ZooKeeper/README.md b/content/Apache/ZooKeeper/README.md
similarity index 100%
rename from content/ZooKeeper/README.md
rename to content/Apache/ZooKeeper/README.md
diff --git a/content/ZooKeeper/pom.xml b/content/Apache/ZooKeeper/pom.xml
similarity index 88%
rename from content/ZooKeeper/pom.xml
rename to content/Apache/ZooKeeper/pom.xml
index 283aa8f..c562b0f 100644
--- a/content/ZooKeeper/pom.xml
+++ b/content/Apache/ZooKeeper/pom.xml
@@ -28,11 +28,11 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.apache.training</groupId>
-    <artifactId>apache-zookeeper</artifactId>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content-apache-zookeeper</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>Training: Apache ZooKeeper</name>
+    <name>Training: Content: Apache: ZooKeeper</name>
 
 </project>
diff --git a/content/ZooKeeper/src/main/asciidoc/index_de.adoc 
b/content/Apache/ZooKeeper/src/main/asciidoc/index_de.adoc
similarity index 100%
rename from content/ZooKeeper/src/main/asciidoc/index_de.adoc
rename to content/Apache/ZooKeeper/src/main/asciidoc/index_de.adoc
diff --git a/content/ZooKeeper/src/main/asciidoc/index_en.adoc 
b/content/Apache/ZooKeeper/src/main/asciidoc/index_en.adoc
similarity index 100%
rename from content/ZooKeeper/src/main/asciidoc/index_en.adoc
rename to content/Apache/ZooKeeper/src/main/asciidoc/index_en.adoc
diff --git a/content/ZooKeeper/src/main/resources/images/data-model.graffle 
b/content/Apache/ZooKeeper/src/main/resources/images/data-model.graffle
similarity index 100%
rename from content/ZooKeeper/src/main/resources/images/data-model.graffle
rename to content/Apache/ZooKeeper/src/main/resources/images/data-model.graffle
diff --git a/content/ZooKeeper/src/main/resources/images/data-model.png 
b/content/Apache/ZooKeeper/src/main/resources/images/data-model.png
similarity index 100%
rename from content/ZooKeeper/src/main/resources/images/data-model.png
rename to content/Apache/ZooKeeper/src/main/resources/images/data-model.png
diff --git a/content/ZooKeeper/src/main/theme/apache.css 
b/content/Apache/ZooKeeper/src/main/theme/apache.css
similarity index 100%
rename from content/ZooKeeper/src/main/theme/apache.css
rename to content/Apache/ZooKeeper/src/main/theme/apache.css
diff --git a/content/Incubator/pom.xml b/content/Apache/pom.xml
similarity index 65%
rename from content/Incubator/pom.xml
rename to content/Apache/pom.xml
index 6fdc0bb..0a8b121 100644
--- a/content/Incubator/pom.xml
+++ b/content/Apache/pom.xml
@@ -23,19 +23,31 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.training</groupId>
-    <artifactId>content-parent-pom</artifactId>
-    <version>1.0.0</version>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>training-content-incubator</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <artifactId>training-content-apache</artifactId>
   <packaging>pom</packaging>
 
-  <name>Training: Content: Incubator</name>
+  <name>Training: Content: Apache</name>
 
   <modules>
-    <module>ReleaseChecklist</module>
+    <module>Airflow</module>
+    <module>ComDev</module>
+    <module>Druid</module>
+    <module>Flink</module>
+    <module>Hadoop</module>
+    <module>Hive</module>
+    <module>Ignite</module>
+    <module>Incubator</module>
+    <module>MyNewt</module>
+    <module>Pulsar</module>
+    <module>Samza</module>
+    <module>Spark</module>
+    <module>Training</module>
+    <module>ZooKeeper</module>
   </modules>
 
 </project>
diff --git a/content/ApachePulsar/pom.xml b/content/ApachePulsar/pom.xml
deleted file mode 100644
index cefb7dc..0000000
--- a/content/ApachePulsar/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.training</groupId>
-    <artifactId>content-parent-pom</artifactId>
-    <version>1.0.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.apache.training</groupId>
-  <artifactId>apache-pulsar</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>war</packaging>
-
-  <name>Apache Pulsar Slides</name>
-  <description></description>
-
-</project>
diff --git a/content/ApacheSamza/pom.xml b/content/ApacheSamza/pom.xml
deleted file mode 100644
index 6dfb8d8..0000000
--- a/content/ApacheSamza/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.training</groupId>
-    <artifactId>content-parent-pom</artifactId>
-    <version>1.0.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.apache.training</groupId>
-  <artifactId>apache-samza</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>war</packaging>
-
-  <name>Apache Samza Slides</name>
-  <description></description>
-
-</project>
diff --git a/content/ApacheWay/IncubatorReleases/pom.xml 
b/content/ApacheWay/IncubatorReleases/pom.xml
deleted file mode 100644
index 5fea17c..0000000
--- a/content/ApacheWay/IncubatorReleases/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.training</groupId>
-    <artifactId>content-parent-pom</artifactId>
-    <version>1.0.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.apache.training</groupId>
-  <artifactId>incubator-releases</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>war</packaging>
-
-  <name>How To Slide Your Release Past The Incubator</name>
-  <description>How to make making releases while your are an ASF incubating 
project.</description>
-
-</project>
diff --git a/content/ApacheCon/Gemfile b/content/Conferences/ApacheCon/Gemfile
similarity index 100%
rename from content/ApacheCon/Gemfile
rename to content/Conferences/ApacheCon/Gemfile
diff --git a/content/ApacheCon/LICENSE b/content/Conferences/ApacheCon/LICENSE
similarity index 100%
rename from content/ApacheCon/LICENSE
rename to content/Conferences/ApacheCon/LICENSE
diff --git a/content/Training/Presentations/NOTICE 
b/content/Conferences/ApacheCon/NOTICE
similarity index 100%
rename from content/Training/Presentations/NOTICE
rename to content/Conferences/ApacheCon/NOTICE
diff --git a/content/ApacheCon/README.md 
b/content/Conferences/ApacheCon/README.md
similarity index 100%
rename from content/ApacheCon/README.md
rename to content/Conferences/ApacheCon/README.md
diff --git a/content/ApacheCon/convert-slides.js 
b/content/Conferences/ApacheCon/convert-slides.js
similarity index 100%
rename from content/ApacheCon/convert-slides.js
rename to content/Conferences/ApacheCon/convert-slides.js
diff --git a/content/Training/Presentations/install-deps.sh 
b/content/Conferences/ApacheCon/install-deps.sh
old mode 100755
new mode 100644
similarity index 100%
rename from content/Training/Presentations/install-deps.sh
rename to content/Conferences/ApacheCon/install-deps.sh
diff --git a/content/ApacheCon/licenses/CC0.txt 
b/content/Conferences/ApacheCon/licenses/CC0.txt
similarity index 100%
rename from content/ApacheCon/licenses/CC0.txt
rename to content/Conferences/ApacheCon/licenses/CC0.txt
diff --git a/content/ApacheCon/package.json 
b/content/Conferences/ApacheCon/package.json
similarity index 100%
rename from content/ApacheCon/package.json
rename to content/Conferences/ApacheCon/package.json
diff --git a/content/ApacheCon/pom.xml b/content/Conferences/ApacheCon/pom.xml
similarity index 88%
rename from content/ApacheCon/pom.xml
rename to content/Conferences/ApacheCon/pom.xml
index 374e7bd..cd2adbe 100644
--- a/content/ApacheCon/pom.xml
+++ b/content/Conferences/ApacheCon/pom.xml
@@ -29,12 +29,12 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.apache.training</groupId>
-  <artifactId>Apache-Con-Slides</artifactId>
+  <groupId>org.apache.training.content</groupId>
+  <artifactId>training-content-conferences-apache-con-slides</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
-  <name>ApacheCon slides</name>
+  <name>Training: Content: Conferences: ApacheCon slides</name>
   <description>Slides for ApacheCon</description>
 
   <properties>
diff --git a/content/ApacheCon/src/main/asciidoc/index_en.adoc 
b/content/Conferences/ApacheCon/src/main/asciidoc/index_en.adoc
similarity index 100%
rename from content/ApacheCon/src/main/asciidoc/index_en.adoc
rename to content/Conferences/ApacheCon/src/main/asciidoc/index_en.adoc
diff --git a/content/ApacheCon/src/main/resources/images/ApacheConAtHome.png 
b/content/Conferences/ApacheCon/src/main/resources/images/ApacheConAtHome.png
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/ApacheConAtHome.png
rename to 
content/Conferences/ApacheCon/src/main/resources/images/ApacheConAtHome.png
diff --git 
a/content/ApacheCon/src/main/resources/images/ApacheConAtHomeLogo.png 
b/content/Conferences/ApacheCon/src/main/resources/images/ApacheConAtHomeLogo.png
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/ApacheConAtHomeLogo.png
rename to 
content/Conferences/ApacheCon/src/main/resources/images/ApacheConAtHomeLogo.png
diff --git a/content/ApacheCon/src/main/resources/images/ApacheConEULogo.png 
b/content/Conferences/ApacheCon/src/main/resources/images/ApacheConEULogo.png
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/ApacheConEULogo.png
rename to 
content/Conferences/ApacheCon/src/main/resources/images/ApacheConEULogo.png
diff --git 
a/content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/ApacheConEurope.png
 b/content/Conferences/ApacheCon/src/main/resources/images/ApacheConEurope.png
similarity index 100%
rename from 
content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/ApacheConEurope.png
rename to 
content/Conferences/ApacheCon/src/main/resources/images/ApacheConEurope.png
diff --git a/content/ApacheCon/src/main/resources/images/ApacheConNA.jpg 
b/content/Conferences/ApacheCon/src/main/resources/images/ApacheConNA.jpg
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/ApacheConNA.jpg
rename to 
content/Conferences/ApacheCon/src/main/resources/images/ApacheConNA.jpg
diff --git a/content/ApacheCon/src/main/resources/images/ApacheConNALogo.png 
b/content/Conferences/ApacheCon/src/main/resources/images/ApacheConNALogo.png
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/ApacheConNALogo.png
rename to 
content/Conferences/ApacheCon/src/main/resources/images/ApacheConNALogo.png
diff --git a/content/ApacheCon/src/main/resources/images/ApacheCon_bg.jpg 
b/content/Conferences/ApacheCon/src/main/resources/images/ApacheCon_bg.jpg
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/ApacheCon_bg.jpg
rename to 
content/Conferences/ApacheCon/src/main/resources/images/ApacheCon_bg.jpg
diff --git a/content/ApacheCon/src/main/resources/images/AtHomeDesktop.jpg 
b/content/Conferences/ApacheCon/src/main/resources/images/AtHomeDesktop.jpg
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/AtHomeDesktop.jpg
rename to 
content/Conferences/ApacheCon/src/main/resources/images/AtHomeDesktop.jpg
diff --git a/content/ApacheCon/src/main/resources/images/AtHomeDesktopII.jpg 
b/content/Conferences/ApacheCon/src/main/resources/images/AtHomeDesktopII.jpg
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/AtHomeDesktopII.jpg
rename to 
content/Conferences/ApacheCon/src/main/resources/images/AtHomeDesktopII.jpg
diff --git a/content/ApacheCon/src/main/resources/images/AtHomeOutside.jpg 
b/content/Conferences/ApacheCon/src/main/resources/images/AtHomeOutside.jpg
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/AtHomeOutside.jpg
rename to 
content/Conferences/ApacheCon/src/main/resources/images/AtHomeOutside.jpg
diff --git a/content/ApacheCon/src/main/resources/images/AtHomeSpiceRack.jpg 
b/content/Conferences/ApacheCon/src/main/resources/images/AtHomeSpiceRack.jpg
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/AtHomeSpiceRack.jpg
rename to 
content/Conferences/ApacheCon/src/main/resources/images/AtHomeSpiceRack.jpg
diff --git a/content/ApacheCon/src/main/resources/images/NewOrleans.jpg 
b/content/Conferences/ApacheCon/src/main/resources/images/NewOrleans.jpg
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/NewOrleans.jpg
rename to content/Conferences/ApacheCon/src/main/resources/images/NewOrleans.jpg
diff --git a/content/ApacheCon/src/main/resources/images/NewOrleansII.jpg 
b/content/Conferences/ApacheCon/src/main/resources/images/NewOrleansII.jpg
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/NewOrleansII.jpg
rename to 
content/Conferences/ApacheCon/src/main/resources/images/NewOrleansII.jpg
diff --git a/content/ApacheCon/src/main/resources/images/NewOrleansIII.jpg 
b/content/Conferences/ApacheCon/src/main/resources/images/NewOrleansIII.jpg
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/NewOrleansIII.jpg
rename to 
content/Conferences/ApacheCon/src/main/resources/images/NewOrleansIII.jpg
diff --git a/content/ApacheCon/src/main/resources/images/NewOrleansIV.jpg 
b/content/Conferences/ApacheCon/src/main/resources/images/NewOrleansIV.jpg
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/NewOrleansIV.jpg
rename to 
content/Conferences/ApacheCon/src/main/resources/images/NewOrleansIV.jpg
diff --git a/content/ApacheCon/src/main/resources/images/communityovercode.jpg 
b/content/Conferences/ApacheCon/src/main/resources/images/communityovercode.jpg
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/communityovercode.jpg
rename to 
content/Conferences/ApacheCon/src/main/resources/images/communityovercode.jpg
diff --git a/content/ApacheCon/src/main/resources/images/favicon.ico 
b/content/Conferences/ApacheCon/src/main/resources/images/favicon.ico
similarity index 100%
rename from content/ApacheCon/src/main/resources/images/favicon.ico
rename to content/Conferences/ApacheCon/src/main/resources/images/favicon.ico
diff --git a/content/ApacheCon/src/main/theme/apachecon.css 
b/content/Conferences/ApacheCon/src/main/theme/apachecon.css
similarity index 100%
rename from content/ApacheCon/src/main/theme/apachecon.css
rename to content/Conferences/ApacheCon/src/main/theme/apachecon.css
diff --git a/content/Spark/pom.xml b/content/Conferences/pom.xml
similarity index 80%
rename from content/Spark/pom.xml
rename to content/Conferences/pom.xml
index 22ea204..ede1ccc 100644
--- a/content/Spark/pom.xml
+++ b/content/Conferences/pom.xml
@@ -23,19 +23,18 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.training</groupId>
-    <artifactId>content-parent-pom</artifactId>
-    <version>1.0.0</version>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>training-content-spark</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <artifactId>training-content-conferences</artifactId>
   <packaging>pom</packaging>
 
-  <name>Training: Content: Spark</name>
+  <name>Training: Content: Conferences</name>
 
   <modules>
-    <module>1-Basics</module>
+    <module>ApacheCon</module>
   </modules>
 
 </project>
diff --git a/content/IoT/IoTDeveloper/clean-deps.sh 
b/content/IoT/IoTDeveloper/clean-deps.sh
old mode 100755
new mode 100644
diff --git a/content/IoT/IoTDeveloper/install-deps.sh 
b/content/IoT/IoTDeveloper/install-deps.sh
old mode 100755
new mode 100644
diff --git a/content/IoT/IoTDeveloper/pom.xml b/content/IoT/IoTDeveloper/pom.xml
index 7b5ad9f..9d222b1 100644
--- a/content/IoT/IoTDeveloper/pom.xml
+++ b/content/IoT/IoTDeveloper/pom.xml
@@ -28,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.apache.training</groupId>
-    <artifactId>IoT-Developer-Talk</artifactId>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content-iot-iot-developer-talk</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>IoT Developer Talk</name>
+    <name>Training: Content: IoT: IoT Developer Talk</name>
     <description>How to be an IoT develper (and have fun!)</description>
 
 </project>
diff --git a/content/IoT/IoTDeveloper/src/main/resources/images/arduino.jpg 
b/content/IoT/IoTDeveloper/src/main/resources/images/arduino.jpg
old mode 100755
new mode 100644
diff --git a/content/IoT/IoTDeveloper/src/main/resources/images/arduinoIDE.png 
b/content/IoT/IoTDeveloper/src/main/resources/images/arduinoIDE.png
old mode 100755
new mode 100644
diff --git a/content/IoT/IoTDeveloper/src/main/resources/images/board.jpg 
b/content/IoT/IoTDeveloper/src/main/resources/images/board.jpg
old mode 100755
new mode 100644
diff --git a/content/IoT/IoTDeveloper/src/main/resources/images/breadboard.jpg 
b/content/IoT/IoTDeveloper/src/main/resources/images/breadboard.jpg
old mode 100755
new mode 100644
diff --git a/content/IoT/IoTDeveloper/src/main/resources/images/fritzingbb.png 
b/content/IoT/IoTDeveloper/src/main/resources/images/fritzingbb.png
old mode 100755
new mode 100644
diff --git a/content/IoT/IoTDeveloper/src/main/resources/images/fritzingpcb.png 
b/content/IoT/IoTDeveloper/src/main/resources/images/fritzingpcb.png
old mode 100755
new mode 100644
diff --git a/content/IoT/IoTDeveloper/src/main/resources/images/itworks.jpg 
b/content/IoT/IoTDeveloper/src/main/resources/images/itworks.jpg
old mode 100755
new mode 100644
diff --git a/content/IoT/IoTDeveloper/src/main/resources/images/prototype.jpg 
b/content/IoT/IoTDeveloper/src/main/resources/images/prototype.jpg
old mode 100755
new mode 100644
diff --git a/content/IoT/pom.xml b/content/IoT/pom.xml
index 372f9b2..3930399 100644
--- a/content/IoT/pom.xml
+++ b/content/IoT/pom.xml
@@ -23,9 +23,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.training</groupId>
-    <artifactId>content-parent-pom</artifactId>
-    <version>1.0.0</version>
+    <groupId>org.apache.training.content</groupId>
+    <artifactId>training-content</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>training-content-iot</artifactId>
diff --git a/content/pom.xml b/content/pom.xml
index 8aed32a..5e1229e 100644
--- a/content/pom.xml
+++ b/content/pom.xml
@@ -28,30 +28,16 @@
     <version>0.4.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.training.content</groupId>
   <artifactId>training-content</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Training: Content</name>
 
   <modules>
-    <module>ApacheAirflow</module>
-    <module>ApacheCon</module>
-    <module>ApacheDruid</module>
-    <module>ApacheFlink</module>
-    <module>ApacheHive</module>
-    <module>ApachePulsar</module>
-    <module>ApacheSamza</module>
-    <module>ApacheWay</module>
-    <module>ComDev</module>
-    <module>Hadoop</module>
-    <module>Ignite</module>
-    <module>Incubator</module>
+    <module>Apache</module>
+    <module>Conferences</module>
     <module>IoT</module>
-    <module>MyNewt</module>
-    <module>Spark</module>
-    <module>Training</module>
-    <module>ZooKeeper</module>
   </modules>
 
 </project>
diff --git a/site/mvnw b/site/mvnw
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/league-gothic/league-gothic.eot
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/league-gothic/league-gothic.eot
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/league-gothic/league-gothic.ttf
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/league-gothic/league-gothic.ttf
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/league-gothic/league-gothic.woff
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/league-gothic/league-gothic.woff
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-italic.eot
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-italic.eot
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-italic.ttf
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-italic.ttf
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-italic.woff
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-italic.woff
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-regular.eot
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-regular.eot
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-regular.ttf
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-regular.ttf
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-regular.woff
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-regular.woff
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibold.eot
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibold.eot
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibold.ttf
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibold.ttf
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibold.woff
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibold.woff
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/plugin/markdown/markdown.js
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/plugin/markdown/markdown.js
old mode 100755
new mode 100644
diff --git 
a/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/plugin/math/math.js
 
b/site/src/site/resources/topics/ApacheWay/NavigatingASFIncubator/reveal.js-3.7.0/plugin/math/math.js
old mode 100755
new mode 100644