Change directory structure of benchmark defs

theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml

 apiVersion: theodolite.com/v1
 kind: benchmark
+metadata:
+  name: uc2-kstreams
 spec:
-  metadata:
-    name: uc2-kstreams
   appResource:
-    - "uc2-kstreams-deployment.yaml"
-    - "uc2-kstreams-service.yaml"
-    - "uc2-jmx-configmap.yaml"
-    - "uc2-service-monitor.yaml"
+    - "uc2-kstreams/uc2-kstreams-deployment.yaml"
+    - "uc2-kstreams/uc2-kstreams-service.yaml"
+    - "uc2-kstreams/uc2-jmx-configmap.yaml"
+    - "uc2-kstreams/uc2-service-monitor.yaml"
   loadGenResource:
-    - "uc2-load-generator-deployment.yaml"
-    - "uc2-load-generator-service.yaml"
+    - "uc2-kstreams/uc2-load-generator-deployment.yaml"
+    - "uc2-kstreams/uc2-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
         - type: "ReplicaPatcher"
-          resource: "uc2-kstreams-deployment.yaml"
+          resource: "uc2-kstreams/uc2-kstreams-deployment.yaml"
   loadTypes:
     - typeName: "NumSensors"
       patchers:
         - type: "EnvVarPatcher"
-          resource: "uc2-load-generator-deployment.yaml"
+          resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
           properties:
             container: "workload-generator"
             variableName: "NUM_SENSORS"
         - type: NumSensorsLoadGeneratorReplicaPatcher
-          resource: "uc2-load-generator-deployment.yaml"
+          resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
           properties:
             loadGenMaxRecords: "15000"
   kafkaConfig:

theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml

-apiVersion: theodolite.com/v1
-kind: benchmark
-metadata:
-  name: uc3-kstreams
-spec:
-  appResource:
-    - "uc3-kstreams/uc3-kstreams-deployment.yaml"
-    - "uc3-kstreams/uc3-kstreams-service.yaml"
-    - "uc3-kstreams/uc3-jmx-configmap.yaml"
-    - "uc3-kstreams/uc3-service-monitor.yaml"
-  loadGenResource:
-    - "uc3-kstreams/uc3-load-generator-deployment.yaml"
-    - "uc3-kstreams/uc3-load-generator-service.yaml"
-  resourceTypes:
-    - typeName: "Instances"
-      patchers:
-        - type: "ReplicaPatcher"
-          resource: "uc3-kstreams/uc3-kstreams-deployment.yaml"
-  loadTypes:
-    - typeName: "NumSensors"
-      patchers:
-        - type: "EnvVarPatcher"
-          resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
-          properties:
-            container: "workload-generator"
-            variableName: "NUM_SENSORS"
-        - type: NumSensorsLoadGeneratorReplicaPatcher
-          resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
-          properties:
-            loadGenMaxRecords: "15000"
-  kafkaConfig:
-    bootstrapServer: "theodolite-cp-kafka:9092"
-    topics:
-      - name: "input"
-        numPartitions: 40
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 40
-        replicationFactor: 1
-      - name: "theodolite-.*"
-        removeOnly: True