diff --git a/README.md b/README.md
index e8a38231b..be4a72918 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+---
 Example Voting (Instavote) App
 =========
 
diff --git a/redis/deployment.yaml b/redis/deployment.yaml
new file mode 100644
index 000000000..9a050d6d6
--- /dev/null
+++ b/redis/deployment.yaml
@@ -0,0 +1,22 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: redis
+  name: redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: redis
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        app: redis
+    spec:
+      containers:
+      - image: redis:alpine
+        name: redis
+        resources: {}
+status: {}
diff --git a/redis/service.yaml b/redis/service.yaml
new file mode 100644
index 000000000..86f4155ef
--- /dev/null
+++ b/redis/service.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: redis
+  name: redis
+spec:
+  ports:
+  - name: "6379"
+    port: 6379
+    protocol: TCP
+    targetPort: 6379
+  selector:
+    app: redis
+  type: ClusterIP
+status:
+  loadBalancer: {}
diff --git a/vote/deployment.yaml b/vote/deployment.yaml
new file mode 100644
index 000000000..08c366a71
--- /dev/null
+++ b/vote/deployment.yaml
@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: vote
+    tier: front
+  name: vote
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: vote
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        app: vote
+    spec:
+      containers:
+      - image: schoolofdevops/vote:v1
+        name: vote
+        resources: {}
+status: {}
diff --git a/vote/service.yaml b/vote/service.yaml
new file mode 100644
index 000000000..ae2ebd13b
--- /dev/null
+++ b/vote/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: vote
+    tier: front
+  name: vote
+spec:
+  ports:
+  - name: "80"
+    nodePort: 30000
+    port: 80
+    protocol: TCP
+    targetPort: 80
+  selector:
+    app: vote
+  type: NodePort
+status:
+  loadBalancer: {}
diff --git a/vote/Dockerfile b/vote_app/Dockerfile
similarity index 100%
rename from vote/Dockerfile
rename to vote_app/Dockerfile
diff --git a/vote/Dockerfile-scratch b/vote_app/Dockerfile-scratch
similarity index 100%
rename from vote/Dockerfile-scratch
rename to vote_app/Dockerfile-scratch
diff --git a/vote/app.py b/vote_app/app.py
similarity index 100%
rename from vote/app.py
rename to vote_app/app.py
diff --git a/vote/requirements.txt b/vote_app/requirements.txt
similarity index 100%
rename from vote/requirements.txt
rename to vote_app/requirements.txt
diff --git a/vote/sonar-project.properties b/vote_app/sonar-project.properties
similarity index 100%
rename from vote/sonar-project.properties
rename to vote_app/sonar-project.properties
diff --git a/vote/static/stylesheets/style.css b/vote_app/static/stylesheets/style.css
similarity index 100%
rename from vote/static/stylesheets/style.css
rename to vote_app/static/stylesheets/style.css
diff --git a/vote/templates/index.html b/vote_app/templates/index.html
similarity index 100%
rename from vote/templates/index.html
rename to vote_app/templates/index.html
diff --git a/vote/tests/test_frontend.py b/vote_app/tests/test_frontend.py
similarity index 100%
rename from vote/tests/test_frontend.py
rename to vote_app/tests/test_frontend.py
diff --git a/worker/.classpath b/worker/.classpath
index 71f5fefe4..5ff1ba9b2 100644
--- a/worker/.classpath
+++ b/worker/.classpath
@@ -31,6 +31,19 @@
 			<attribute name="m2e-apt" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
 		<attributes>
 			<attribute name="optional" value="true"/>
diff --git a/worker/.project b/worker/.project
index 49e0d9af1..5ac3f762e 100644
--- a/worker/.project
+++ b/worker/.project
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1783185566477</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/worker/.settings/org.eclipse.jdt.core.prefs b/worker/.settings/org.eclipse.jdt.core.prefs
index 1eb325ec7..b11489fa6 100644
--- a/worker/.settings/org.eclipse.jdt.core.prefs
+++ b/worker/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.compliance=1.7
+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.7
diff --git a/worker/target/classes/worker/Worker.class b/worker/target/classes/worker/Worker.class
deleted file mode 100644
index 0191c3845..000000000
Binary files a/worker/target/classes/worker/Worker.class and /dev/null differ