diff --git a/workloads/echoserver/deployment.yml b/workloads/echoserver/deployment.yml
new file mode 100644
index 0000000..4d5edd5
--- /dev/null
+++ b/workloads/echoserver/deployment.yml
@@ -0,0 +1,20 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: echoserver
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: echoserver
+  template:
+    metadata:
+      labels:
+        app: echoserver
+    spec:
+      containers:
+      - image: k8s.gcr.io/echoserver:1.4
+        imagePullPolicy: IfNotPresent
+        name: echoserver
+        ports:
+        - containerPort: 8080
diff --git a/workloads/echoserver.yml b/workloads/echoserver/service.yml
similarity index 51%
rename from workloads/echoserver.yml
rename to workloads/echoserver/service.yml
index 2dc25b4..7a85f9b 100644
--- a/workloads/echoserver.yml
+++ b/workloads/echoserver/service.yml
@@ -1,24 +1,3 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: echoserver
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: echoserver
-  template:
-    metadata:
-      labels:
-        app: echoserver
-    spec:
-      containers:
-      - image: k8s.gcr.io/echoserver:1.4
-        imagePullPolicy: IfNotPresent
-        name: echoserver
-        ports:
-        - containerPort: 8080
----
 kind: Service
 apiVersion: v1
 metadata: