diff --git a/charts/templates/jobs/Chart.yaml b/charts/jobs/Chart.yaml
similarity index 100%
rename from charts/templates/jobs/Chart.yaml
rename to charts/jobs/Chart.yaml
diff --git a/charts/templates/jobs/deployment.yaml b/charts/jobs/templates/deployment.yaml
similarity index 100%
rename from charts/templates/jobs/deployment.yaml
rename to charts/jobs/templates/deployment.yaml
diff --git a/charts/templates/jobs/storage-class.yaml b/charts/jobs/templates/storage-class.yaml
similarity index 100%
rename from charts/templates/jobs/storage-class.yaml
rename to charts/jobs/templates/storage-class.yaml
diff --git a/charts/templates/jobs/temporal-auto-start-secrets.yaml b/charts/jobs/templates/temporal-auto-start-secrets.yaml
similarity index 100%
rename from charts/templates/jobs/temporal-auto-start-secrets.yaml
rename to charts/jobs/templates/temporal-auto-start-secrets.yaml
diff --git a/charts/templates/jobs/temporal-secrets.yaml b/charts/jobs/templates/temporal-secrets.yaml
similarity index 100%
rename from charts/templates/jobs/temporal-secrets.yaml
rename to charts/jobs/templates/temporal-secrets.yaml
diff --git a/charts/templates/runner/Chart.yaml b/charts/runner/Chart.yaml
similarity index 100%
rename from charts/templates/runner/Chart.yaml
rename to charts/runner/Chart.yaml
diff --git a/charts/templates/runner/deployment.yaml b/charts/runner/templates/deployment.yaml
similarity index 100%
rename from charts/templates/runner/deployment.yaml
rename to charts/runner/templates/deployment.yaml
diff --git a/charts/templates/runner/service.yaml b/charts/runner/templates/service.yaml
similarity index 100%
rename from charts/templates/runner/service.yaml
rename to charts/runner/templates/service.yaml
diff --git a/charts/templates/server/Chart.yaml b/charts/server/Chart.yaml
similarity index 100%
rename from charts/templates/server/Chart.yaml
rename to charts/server/Chart.yaml
diff --git a/charts/templates/server/deployment.yaml b/charts/server/templates/deployment.yaml
similarity index 100%
rename from charts/templates/server/deployment.yaml
rename to charts/server/templates/deployment.yaml
diff --git a/charts/templates/server/service.yaml b/charts/server/templates/service.yaml
similarity index 100%
rename from charts/templates/server/service.yaml
rename to charts/server/templates/service.yaml