diff --git a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
index 686a98a77c2c46d93542df32a0337d3c4b22d7de..fb985d4574b7c04590c0ebff963acc47b7a8f85e 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
@@ -8,20 +8,20 @@ spec:
       - configMap:
           name: "benchmark-resources-uc1-flink"
           files:
-          - "uc1-flink/flink-configuration-configmap.yaml"
-          - "uc1-flink/taskmanager-deployment.yaml"
-          - "uc1-flink/taskmanager-service.yaml"
-          - "uc1-flink/service-monitor.yaml"
-          - "uc1-flink/jobmanager-service.yaml"
-          - "uc1-flink/jobmanager-deployment.yaml"
-          #- "uc1-flink/jobmanager-rest-service.yaml"
+          - "flink-configuration-configmap.yaml"
+          - "taskmanager-deployment.yaml"
+          - "taskmanager-service.yaml"
+          - "service-monitor.yaml"
+          - "jobmanager-service.yaml"
+          - "jobmanager-deployment.yaml"
+          #- "jobmanager-rest-service.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc1-loadgen"
           files:
-          - "uc1-kstreams/uc1-load-generator-deployment.yaml"
-          - "uc1-kstreams/uc1-load-generator-service.yaml"
+          - "uc1-load-generator-deployment.yaml"
+          - "uc1-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
index 0fb630107598a6d1373763847c7ed3ef3b717278..3532e5d8cb869209309111c1654e4126b3dd6d2f 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
@@ -8,17 +8,17 @@ spec:
       - configMap:
           name: "benchmark-resources-uc1-kstreams"
           files:
-          - "uc1-kstreams/uc1-kstreams-deployment.yaml"
-          - "uc1-kstreams/uc1-kstreams-service.yaml"
-          - "uc1-kstreams/uc1-jmx-configmap.yaml"
-          - "uc1-kstreams/uc1-service-monitor.yaml"
+          - "uc1-kstreams-deployment.yaml"
+          - "uc1-kstreams-service.yaml"
+          - "uc1-jmx-configmap.yaml"
+          - "uc1-service-monitor.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc1-loadgen"
           files:
-          - "uc1-kstreams/uc1-load-generator-deployment.yaml"
-          - "uc1-kstreams/uc1-load-generator-service.yaml"
+          - "uc1-load-generator-deployment.yaml"
+          - "uc1-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
index d0ef1bbc87b4e92a09ccf669deeeb36b04677044..58f6d89d610f4eb8bd5ed34c5ab64850d7570154 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
@@ -4,17 +4,17 @@ sut:
     - configMap:
         name: "benchmark-resources-uc1-kstreams"
         files:
-        - "uc1-kstreams/uc1-kstreams-deployment.yaml"
-        - "uc1-kstreams/uc1-kstreams-service.yaml"
-        - "uc1-kstreams/uc1-jmx-configmap.yaml"
-        - "uc1-kstreams/uc1-service-monitor.yaml"
+        - "uc1-kstreams-deployment.yaml"
+        - "uc1-kstreams-service.yaml"
+        - "uc1-jmx-configmap.yaml"
+        - "uc1-service-monitor.yaml"
 loadGenerator:
   resources:
     - configMap:
         name: "benchmark-resources-uc1-loadgen"
         files:
-        - "uc1-kstreams/uc1-load-generator-deployment.yaml"
-        - "uc1-kstreams/uc1-load-generator-service.yaml"
+        - "uc1-load-generator-deployment.yaml"
+        - "uc1-load-generator-service.yaml"
 resourceTypes:
   - typeName: "Instances"
     patchers:
diff --git a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
index c838fb098b15cc5a2a83e8df5d412c75351d845c..d87d7575be5525ed78ab6ad2815dcbf66639838f 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
@@ -8,20 +8,20 @@ spec:
       - configMap:
           name: "benchmark-resources-uc2-flink"
           files:
-          - "uc2-flink/flink-configuration-configmap.yaml"
-          - "uc2-flink/taskmanager-deployment.yaml"
-          - "uc2-flink/taskmanager-service.yaml"
-          - "uc2-flink/service-monitor.yaml"
-          - "uc2-flink/jobmanager-service.yaml"
-          - "uc2-flink/jobmanager-deployment.yaml"
-          #- "uc2-flink/jobmanager-rest-service.yaml"
+          - "flink-configuration-configmap.yaml"
+          - "taskmanager-deployment.yaml"
+          - "taskmanager-service.yaml"
+          - "service-monitor.yaml"
+          - "jobmanager-service.yaml"
+          - "jobmanager-deployment.yaml"
+          #- "jobmanager-rest-service.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc2-loadgen"
           files:
-            - "uc2-kstreams/uc2-load-generator-deployment.yaml"
-            - "uc2-kstreams/uc2-load-generator-service.yaml"
+            - "uc2-load-generator-deployment.yaml"
+            - "uc2-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
index e94cce184f205fc59a2314a4fe7d59f681f37058..302fe6b251415ecc94e09961d7471cdce4fdaa39 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
@@ -8,17 +8,17 @@ spec:
     - configMap:
         name: "benchmark-resources-uc2-kstreams"
         files:
-          - "uc2-kstreams/uc2-kstreams-deployment.yaml"
-          - "uc2-kstreams/uc2-kstreams-service.yaml"
-          - "uc2-kstreams/uc2-jmx-configmap.yaml"
-          - "uc2-kstreams/uc2-service-monitor.yaml"
+          - "uc2-kstreams-deployment.yaml"
+          - "uc2-kstreams-service.yaml"
+          - "uc2-jmx-configmap.yaml"
+          - "uc2-service-monitor.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc2-loadgen"
           files:
-            - "uc2-kstreams/uc2-load-generator-deployment.yaml"
-            - "uc2-kstreams/uc2-load-generator-service.yaml"
+            - "uc2-load-generator-deployment.yaml"
+            - "uc2-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml
index f9e5e2c170c9d84238f252adbddc2bf108a832e3..d70c4669ff485eeb801e6db16f9d333d843d3f51 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml
@@ -4,17 +4,17 @@ sut:
     - configMap:
         name: "benchmark-resources-uc2-kstreams"
         files:
-          - "uc2-kstreams/uc2-kstreams-deployment.yaml"
-          - "uc2-kstreams/uc2-kstreams-service.yaml"
-          - "uc2-kstreams/uc2-jmx-configmap.yaml"
-          - "uc2-kstreams/uc2-service-monitor.yaml"
+          - "uc2-kstreams-deployment.yaml"
+          - "uc2-kstreams-service.yaml"
+          - "uc2-jmx-configmap.yaml"
+          - "uc2-service-monitor.yaml"
 loadGenerator:
   resources:
     - configMap:
         name: "benchmark-resources-uc2-loadgen"
         files:
-          - "uc2-kstreams/uc2-load-generator-deployment.yaml"
-          - "uc2-kstreams/uc2-load-generator-service.yaml"
+          - "uc2-load-generator-deployment.yaml"
+          - "uc2-load-generator-service.yaml"
 resourceTypes:
   - typeName: "Instances"
     patchers:
diff --git a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
index cd6ee5b9c175b707c383a9cd229e9ee8e2d463d6..bd58d7de0b985d7f4a3f5d0a8ea01e1947de5af9 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
@@ -8,20 +8,20 @@ spec:
       - configMap:
           name: "benchmark-resources-uc3-flink"
           files:
-            - "uc3-flink/flink-configuration-configmap.yaml"
-            - "uc3-flink/taskmanager-deployment.yaml"
-            - "uc3-flink/taskmanager-service.yaml"
-            - "uc3-flink/service-monitor.yaml"
-            - "uc3-flink/jobmanager-service.yaml"
-            - "uc3-flink/jobmanager-deployment.yaml"
-            #- "uc3-flink/jobmanager-rest-service.yaml"
+            - "flink-configuration-configmap.yaml"
+            - "taskmanager-deployment.yaml"
+            - "taskmanager-service.yaml"
+            - "service-monitor.yaml"
+            - "jobmanager-service.yaml"
+            - "jobmanager-deployment.yaml"
+            #- "jobmanager-rest-service.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc3-loadgen"
           files:
-            - "uc3-kstreams/uc3-load-generator-deployment.yaml"
-            - "uc3-kstreams/uc3-load-generator-service.yaml"
+            - "uc3-load-generator-deployment.yaml"
+            - "uc3-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
index 003ce2fae0f91252a3aff6b7ad673fa88286b1dc..9151fb14ec77d3ace0cf0fe491c37dd624a335f1 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
@@ -8,17 +8,17 @@ spec:
       - configMap:
           name: "benchmark-resources-uc3-kstreams"
           files:
-          - "uc3-kstreams/uc3-kstreams-deployment.yaml"
-          - "uc3-kstreams/uc3-kstreams-service.yaml"
-          - "uc3-kstreams/uc3-jmx-configmap.yaml"
-          - "uc3-kstreams/uc3-service-monitor.yaml"
+          - "uc3-kstreams-deployment.yaml"
+          - "uc3-kstreams-service.yaml"
+          - "uc3-jmx-configmap.yaml"
+          - "uc3-service-monitor.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc3-loadgen"
           files:
-            - "uc3-kstreams/uc3-load-generator-deployment.yaml"
-            - "uc3-kstreams/uc3-load-generator-service.yaml"
+            - "uc3-load-generator-deployment.yaml"
+            - "uc3-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml
index 48f2501928924677e5c5590a0d84c80e033c8f23..8783a3d5e2efffe723d52d1f260a4914a6e6f578 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml
@@ -4,17 +4,17 @@ sut:
     - configMap:
         name: "benchmark-resources-uc3-kstreams"
         files:
-        - "uc3-kstreams/uc3-kstreams-deployment.yaml"
-        - "uc3-kstreams/uc3-kstreams-service.yaml"
-        - "uc3-kstreams/uc3-jmx-configmap.yaml"
-        - "uc3-kstreams/uc3-service-monitor.yaml"
+        - "uc3-kstreams-deployment.yaml"
+        - "uc3-kstreams-service.yaml"
+        - "uc3-jmx-configmap.yaml"
+        - "uc3-service-monitor.yaml"
 loadGenerator:
   resources:
     - configMap:
         name: "benchmark-resources-uc3-loadgen"
         files:
-          - "uc3-kstreams/uc3-load-generator-deployment.yaml"
-          - "uc3-kstreams/uc3-load-generator-service.yaml"
+          - "uc3-load-generator-deployment.yaml"
+          - "uc3-load-generator-service.yaml"
 resourceTypes:
   - typeName: "Instances"
     patchers:
diff --git a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
index 74d445bee18d7e5c1b6345a3c432e8c3eb5d2729..0ee6a3d9b2879bbb1642cb0c0bfb3984f53b66ac 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
@@ -8,20 +8,20 @@ spec:
       - configMap:
           name: "benchmark-resources-uc4-flink"
           files:
-            - "uc4-flink/flink-configuration-configmap.yaml"
-            - "uc4-flink/taskmanager-deployment.yaml"
-            - "uc4-flink/taskmanager-service.yaml"
-            - "uc4-flink/service-monitor.yaml"
-            - "uc4-flink/jobmanager-service.yaml"
-            - "uc4-flink/jobmanager-deployment.yaml"
-            #- "uc4-flink/jobmanager-rest-service.yaml"
+            - "flink-configuration-configmap.yaml"
+            - "taskmanager-deployment.yaml"
+            - "taskmanager-service.yaml"
+            - "service-monitor.yaml"
+            - "jobmanager-service.yaml"
+            - "jobmanager-deployment.yaml"
+            #- "jobmanager-rest-service.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc4-loadgen"
           files:
-            - "uc4-kstreams/uc4-load-generator-deployment.yaml"
-            - "uc4-kstreams/uc4-load-generator-service.yaml"
+            - "uc4-load-generator-deployment.yaml"
+            - "uc4-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
index 6f991eb5e76fa164eb7949985452f1b63a55e857..8cb5638828d545a751f22ce94a52ff8bb6ab7e86 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
@@ -8,17 +8,17 @@ spec:
       - configMap:
           name: "benchmark-resources-uc4-kstreams"
           files:
-            - "uc4-kstreams/uc4-kstreams-deployment.yaml"
-            - "uc4-kstreams/uc4-kstreams-service.yaml"
-            - "uc4-kstreams/uc4-jmx-configmap.yaml"
-          - "uc4-kstreams/uc4-service-monitor.yaml"
+            - "uc4-kstreams-deployment.yaml"
+            - "uc4-kstreams-service.yaml"
+            - "uc4-jmx-configmap.yaml"
+            - "uc4-service-monitor.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc4-loadgen"
           files:
-            - "uc4-kstreams/uc4-load-generator-deployment.yaml"
-            - "uc4-kstreams/uc4-load-generator-service.yaml"
+            - "uc4-load-generator-deployment.yaml"
+            - "uc4-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
index b09cd420b39b0189090ad8895fda30fb7fd4bddc..39e65f36d4dbff84f1ae1bab3b76a5c912f4a7d6 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
@@ -4,17 +4,17 @@ sut:
     - configMap:
         name: "benchmark-resources-uc4-kstreams"
         files:
-          - "uc4-kstreams/uc4-kstreams-deployment.yaml"
-          - "uc4-kstreams/uc4-kstreams-service.yaml"
-          - "uc4-kstreams/uc4-jmx-configmap.yaml"
-          - "uc4-kstreams/uc4-service-monitor.yaml"
+          - "uc4-kstreams-deployment.yaml"
+          - "uc4-kstreams-service.yaml"
+          - "uc4-jmx-configmap.yaml"
+          - "uc4-service-monitor.yaml"
 loadGenerator:
   resources:
     - configMap:
         name: "benchmark-resources-uc4-loadgen"
         files:
-          - "uc4-kstreams/uc4-load-generator-deployment.yaml"
-          - "uc4-kstreams/uc4-load-generator-service.yaml"
+          - "uc4-load-generator-deployment.yaml"
+          - "uc4-load-generator-service.yaml"
 resourceTypes:
   - typeName: "Instances"
     patchers: