diff --git a/hello-swarm/Dockerfile b/hello-java/Dockerfile
similarity index 100%
rename from hello-swarm/Dockerfile
rename to hello-java/Dockerfile
diff --git a/hello-swarm/app-src/pom.xml b/hello-java/app-src/pom.xml
similarity index 100%
rename from hello-swarm/app-src/pom.xml
rename to hello-java/app-src/pom.xml
diff --git a/hello-swarm/app-src/src/main/java/com/redhat/training/openshift/hello/HelloResource.java b/hello-java/app-src/src/main/java/com/redhat/training/openshift/hello/HelloResource.java
similarity index 100%
rename from hello-swarm/app-src/src/main/java/com/redhat/training/openshift/hello/HelloResource.java
rename to hello-java/app-src/src/main/java/com/redhat/training/openshift/hello/HelloResource.java
diff --git a/hello-swarm/app-src/src/main/java/com/redhat/training/openshift/hello/JaxRsActivator.java b/hello-java/app-src/src/main/java/com/redhat/training/openshift/hello/JaxRsActivator.java
similarity index 100%
rename from hello-swarm/app-src/src/main/java/com/redhat/training/openshift/hello/JaxRsActivator.java
rename to hello-java/app-src/src/main/java/com/redhat/training/openshift/hello/JaxRsActivator.java
diff --git a/hello-swarm/app-src/src/main/java/com/redhat/training/openshift/hello/Main.java b/hello-java/app-src/src/main/java/com/redhat/training/openshift/hello/Main.java
similarity index 100%
rename from hello-swarm/app-src/src/main/java/com/redhat/training/openshift/hello/Main.java
rename to hello-java/app-src/src/main/java/com/redhat/training/openshift/hello/Main.java
diff --git a/hello-swarm/app-src/src/main/resources/WEB-INF/beans.xml b/hello-java/app-src/src/main/resources/WEB-INF/beans.xml
similarity index 100%
rename from hello-swarm/app-src/src/main/resources/WEB-INF/beans.xml
rename to hello-java/app-src/src/main/resources/WEB-INF/beans.xml
diff --git a/hello-swarm/app-src/src/main/resources/WEB-INF/web.xml b/hello-java/app-src/src/main/resources/WEB-INF/web.xml
similarity index 100%
rename from hello-swarm/app-src/src/main/resources/WEB-INF/web.xml
rename to hello-java/app-src/src/main/resources/WEB-INF/web.xml
diff --git a/hello-swarm/run-app.sh b/hello-java/run-app.sh
similarity index 100%
rename from hello-swarm/run-app.sh
rename to hello-java/run-app.sh
diff --git a/hello-swarm/app-src/.classpath b/hello-swarm/app-src/.classpath
deleted file mode 100644
index 39abf1c5e9..0000000000
--- a/hello-swarm/app-src/.classpath
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sources/annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/hello-swarm/app-src/.project b/hello-swarm/app-src/.project
deleted file mode 100644
index 5934090a41..0000000000
--- a/hello-swarm/app-src/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>hello-swarm</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/hello-swarm/app-src/.settings/org.eclipse.core.resources.prefs b/hello-swarm/app-src/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index abdea9ac03..0000000000
--- a/hello-swarm/app-src/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/hello-swarm/app-src/.settings/org.eclipse.jdt.apt.core.prefs b/hello-swarm/app-src/.settings/org.eclipse.jdt.apt.core.prefs
deleted file mode 100644
index d4313d4b25..0000000000
--- a/hello-swarm/app-src/.settings/org.eclipse.jdt.apt.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=false
diff --git a/hello-swarm/app-src/.settings/org.eclipse.jdt.core.prefs b/hello-swarm/app-src/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1b6e1ef22f..0000000000
--- a/hello-swarm/app-src/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.processAnnotations=disabled
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/hello-swarm/app-src/.settings/org.eclipse.m2e.core.prefs b/hello-swarm/app-src/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb..0000000000
--- a/hello-swarm/app-src/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/hello-swarm/app-src/target/classes/WEB-INF/beans.xml b/hello-swarm/app-src/target/classes/WEB-INF/beans.xml
deleted file mode 100644
index 1724d41bb4..0000000000
--- a/hello-swarm/app-src/target/classes/WEB-INF/beans.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-                      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all">
-</beans>
diff --git a/hello-swarm/app-src/target/classes/WEB-INF/web.xml b/hello-swarm/app-src/target/classes/WEB-INF/web.xml
deleted file mode 100644
index 77716b63e4..0000000000
--- a/hello-swarm/app-src/target/classes/WEB-INF/web.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
-	
-</web-app>
diff --git a/hello-swarm/app-src/target/classes/com/redhat/training/openshift/hello/HelloResource.class b/hello-swarm/app-src/target/classes/com/redhat/training/openshift/hello/HelloResource.class
deleted file mode 100644
index b79fc34608..0000000000
Binary files a/hello-swarm/app-src/target/classes/com/redhat/training/openshift/hello/HelloResource.class and /dev/null differ
diff --git a/hello-swarm/app-src/target/classes/com/redhat/training/openshift/hello/JaxRsActivator.class b/hello-swarm/app-src/target/classes/com/redhat/training/openshift/hello/JaxRsActivator.class
deleted file mode 100644
index 9c8a6063d0..0000000000
Binary files a/hello-swarm/app-src/target/classes/com/redhat/training/openshift/hello/JaxRsActivator.class and /dev/null differ
diff --git a/hello-swarm/app-src/target/classes/com/redhat/training/openshift/hello/Main.class b/hello-swarm/app-src/target/classes/com/redhat/training/openshift/hello/Main.class
deleted file mode 100644
index f752251175..0000000000
Binary files a/hello-swarm/app-src/target/classes/com/redhat/training/openshift/hello/Main.class and /dev/null differ
diff --git a/hello-swarm/training.repo b/hello-swarm/training.repo
deleted file mode 100644
index 18e48ef2b5..0000000000
--- a/hello-swarm/training.repo
+++ /dev/null
@@ -1,54 +0,0 @@
-[rhel-7-dvd]
-baseurl = http://content.example.com/rhel7.6/x86_64/dvd
-enabled = true
-gpgcheck = false
-name = Remote classroom copy of RHEL DVD
-
-[rhel-server-rhscl-7-rpms]
-baseurl = http://content.example.com/ocp4.0/x86_64/rhelrhscl
-enabled = true
-gpgcheck = false
-name = Remote classroom copy of RHSCL
-
-[rhel-7-server-datapath-rpms]
-baseurl = http://content.example.com/ocp4.0/x86_64/rheladditional/rhel-7-fast-datapath-rpms
-enabled = true
-gpgcheck = false
-name = Remote classroom copy of RHEL 7.6 Datapath Packages
-
-[rhel-7-server-ansible-26]
-baseurl = http://content.example.com/ocp4.0/x86_64/rheladditional/rhel-7-server-ansible-2.6-rpms
-enabled = true
-gpgcheck = false
-name = Remote classroom copy of RHEL 7.6 Ansible Packages
-
-[rhel-7-server-extras-rpms]
-baseurl = http://content.example.com/ocp4.0/x86_64/rheladditional/rhel-7-server-extras-rpms
-enabled = true
-gpgcheck = false
-name = Remote classroom copy of RHEL 7.6 Extra Packages
-
-[rhel-7-server-common-rpms]
-baseurl = http://content.example.com/ocp4.0/x86_64/rheladditional/rhel-7-server-rh-common-rpms
-enabled = true
-gpgcheck = false
-name = Remote classroom copy of RHEL 7.6 Common Packages
-
-[rhel-7-server-supplementary]
-baseurl = http://content.example.com/ocp4.0/x86_64/rhelsupplementary
-enabled = true
-gpgcheck = false
-name = Remote classroom copy of RHEL 7.6 Supplementary Packages
-
-[rhel-7-server-optional-rpms]
-baseurl = http://content.example.com/ocp4.0/x86_64/rhelopt
-enabled = true
-gpgcheck = false
-name = Remote classroom copy of RHEL 7.6 Optional Packages
-
-[rhel-7-server-updates]
-baseurl = http://content.example.com/ocp4.0/x86_64/rhelupdates
-enabled = true
-gpgcheck = false
-name = Remote classroom copy of RHEL 7.6 Updates
-