diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9f923b4eb3376d3910a1b3b26dfac2b75b16692..5a074d945ca61cb4414d7f6d2b958b1423b8286f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ lint-helm:
     entrypoint: [""]
   tags:
     - exec-docker
-  script: helm lint execution/helm/
+  script: helm lint helm/
 
 
 # Theodolite Benchmarks
diff --git a/execution/helm/.gitignore b/helm/.gitignore
similarity index 100%
rename from execution/helm/.gitignore
rename to helm/.gitignore
diff --git a/execution/helm/.helmignore b/helm/.helmignore
similarity index 100%
rename from execution/helm/.helmignore
rename to helm/.helmignore
diff --git a/execution/helm/Chart.yaml b/helm/Chart.yaml
similarity index 100%
rename from execution/helm/Chart.yaml
rename to helm/Chart.yaml
diff --git a/execution/helm/README.md b/helm/README.md
similarity index 100%
rename from execution/helm/README.md
rename to helm/README.md
diff --git a/execution/helm/build-package.sh b/helm/build-package.sh
similarity index 100%
rename from execution/helm/build-package.sh
rename to helm/build-package.sh
diff --git a/execution/helm/preconfigs/one-broker-values.yaml b/helm/preconfigs/one-broker-values.yaml
similarity index 100%
rename from execution/helm/preconfigs/one-broker-values.yaml
rename to helm/preconfigs/one-broker-values.yaml
diff --git a/execution/helm/templates/NOTES.txt b/helm/templates/NOTES.txt
similarity index 100%
rename from execution/helm/templates/NOTES.txt
rename to helm/templates/NOTES.txt
diff --git a/execution/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
similarity index 100%
rename from execution/helm/templates/_helpers.tpl
rename to helm/templates/_helpers.tpl
diff --git a/execution/helm/templates/grafana/dashboard-config-map.yaml b/helm/templates/grafana/dashboard-config-map.yaml
similarity index 100%
rename from execution/helm/templates/grafana/dashboard-config-map.yaml
rename to helm/templates/grafana/dashboard-config-map.yaml
diff --git a/execution/helm/templates/kafka/kafka-client.yaml b/helm/templates/kafka/kafka-client.yaml
similarity index 100%
rename from execution/helm/templates/kafka/kafka-client.yaml
rename to helm/templates/kafka/kafka-client.yaml
diff --git a/execution/helm/templates/kafka/service-monitor.yaml b/helm/templates/kafka/service-monitor.yaml
similarity index 100%
rename from execution/helm/templates/kafka/service-monitor.yaml
rename to helm/templates/kafka/service-monitor.yaml
diff --git a/execution/helm/templates/prometheus/cluster-role-binding.yaml b/helm/templates/prometheus/cluster-role-binding.yaml
similarity index 100%
rename from execution/helm/templates/prometheus/cluster-role-binding.yaml
rename to helm/templates/prometheus/cluster-role-binding.yaml
diff --git a/execution/helm/templates/prometheus/cluster-role.yaml b/helm/templates/prometheus/cluster-role.yaml
similarity index 100%
rename from execution/helm/templates/prometheus/cluster-role.yaml
rename to helm/templates/prometheus/cluster-role.yaml
diff --git a/execution/helm/templates/prometheus/datasource-config-map.yaml b/helm/templates/prometheus/datasource-config-map.yaml
similarity index 100%
rename from execution/helm/templates/prometheus/datasource-config-map.yaml
rename to helm/templates/prometheus/datasource-config-map.yaml
diff --git a/execution/helm/templates/prometheus/prometheus.yaml b/helm/templates/prometheus/prometheus.yaml
similarity index 100%
rename from execution/helm/templates/prometheus/prometheus.yaml
rename to helm/templates/prometheus/prometheus.yaml
diff --git a/execution/helm/templates/prometheus/service-account.yaml b/helm/templates/prometheus/service-account.yaml
similarity index 100%
rename from execution/helm/templates/prometheus/service-account.yaml
rename to helm/templates/prometheus/service-account.yaml
diff --git a/execution/helm/templates/tests/test-connection.yaml b/helm/templates/tests/test-connection.yaml
similarity index 100%
rename from execution/helm/templates/tests/test-connection.yaml
rename to helm/templates/tests/test-connection.yaml
diff --git a/execution/helm/templates/theodolite/crd-benchmark.yaml b/helm/templates/theodolite/crd-benchmark.yaml
similarity index 100%
rename from execution/helm/templates/theodolite/crd-benchmark.yaml
rename to helm/templates/theodolite/crd-benchmark.yaml
diff --git a/execution/helm/templates/theodolite/crd-execution.yaml b/helm/templates/theodolite/crd-execution.yaml
similarity index 100%
rename from execution/helm/templates/theodolite/crd-execution.yaml
rename to helm/templates/theodolite/crd-execution.yaml
diff --git a/execution/helm/templates/theodolite/random-scheduler/cluster-role-binding.yaml b/helm/templates/theodolite/random-scheduler/cluster-role-binding.yaml
similarity index 100%
rename from execution/helm/templates/theodolite/random-scheduler/cluster-role-binding.yaml
rename to helm/templates/theodolite/random-scheduler/cluster-role-binding.yaml
diff --git a/execution/helm/templates/theodolite/random-scheduler/deployment.yaml b/helm/templates/theodolite/random-scheduler/deployment.yaml
similarity index 100%
rename from execution/helm/templates/theodolite/random-scheduler/deployment.yaml
rename to helm/templates/theodolite/random-scheduler/deployment.yaml
diff --git a/execution/helm/templates/theodolite/random-scheduler/service-account.yaml b/helm/templates/theodolite/random-scheduler/service-account.yaml
similarity index 100%
rename from execution/helm/templates/theodolite/random-scheduler/service-account.yaml
rename to helm/templates/theodolite/random-scheduler/service-account.yaml
diff --git a/execution/helm/templates/theodolite/role-binding.yaml b/helm/templates/theodolite/role-binding.yaml
similarity index 100%
rename from execution/helm/templates/theodolite/role-binding.yaml
rename to helm/templates/theodolite/role-binding.yaml
diff --git a/execution/helm/templates/theodolite/role.yaml b/helm/templates/theodolite/role.yaml
similarity index 100%
rename from execution/helm/templates/theodolite/role.yaml
rename to helm/templates/theodolite/role.yaml
diff --git a/execution/helm/templates/theodolite/serviceaccount.yaml b/helm/templates/theodolite/serviceaccount.yaml
similarity index 100%
rename from execution/helm/templates/theodolite/serviceaccount.yaml
rename to helm/templates/theodolite/serviceaccount.yaml
diff --git a/execution/helm/templates/theodolite/theodolite-operator.yaml b/helm/templates/theodolite/theodolite-operator.yaml
similarity index 100%
rename from execution/helm/templates/theodolite/theodolite-operator.yaml
rename to helm/templates/theodolite/theodolite-operator.yaml
diff --git a/execution/helm/update-index.sh b/helm/update-index.sh
similarity index 100%
rename from execution/helm/update-index.sh
rename to helm/update-index.sh
diff --git a/execution/helm/values.yaml b/helm/values.yaml
similarity index 100%
rename from execution/helm/values.yaml
rename to helm/values.yaml