diff --git a/headlamp/.helmignore b/charts/headlamp/.helmignore
similarity index 100%
rename from headlamp/.helmignore
rename to charts/headlamp/.helmignore
diff --git a/headlamp/Chart.yaml b/charts/headlamp/Chart.yaml
similarity index 100%
rename from headlamp/Chart.yaml
rename to charts/headlamp/Chart.yaml
diff --git a/headlamp/README.md b/charts/headlamp/README.md
similarity index 100%
rename from headlamp/README.md
rename to charts/headlamp/README.md
diff --git a/headlamp/templates/NOTES.txt b/charts/headlamp/templates/NOTES.txt
similarity index 100%
rename from headlamp/templates/NOTES.txt
rename to charts/headlamp/templates/NOTES.txt
diff --git a/headlamp/templates/_helpers.tpl b/charts/headlamp/templates/_helpers.tpl
similarity index 100%
rename from headlamp/templates/_helpers.tpl
rename to charts/headlamp/templates/_helpers.tpl
diff --git a/headlamp/templates/clusterrolebinding.yaml b/charts/headlamp/templates/clusterrolebinding.yaml
similarity index 100%
rename from headlamp/templates/clusterrolebinding.yaml
rename to charts/headlamp/templates/clusterrolebinding.yaml
diff --git a/headlamp/templates/deployment.yaml b/charts/headlamp/templates/deployment.yaml
similarity index 100%
rename from headlamp/templates/deployment.yaml
rename to charts/headlamp/templates/deployment.yaml
diff --git a/headlamp/templates/extra-manifests.yaml b/charts/headlamp/templates/extra-manifests.yaml
similarity index 100%
rename from headlamp/templates/extra-manifests.yaml
rename to charts/headlamp/templates/extra-manifests.yaml
diff --git a/headlamp/templates/httproute.yaml b/charts/headlamp/templates/httproute.yaml
similarity index 100%
rename from headlamp/templates/httproute.yaml
rename to charts/headlamp/templates/httproute.yaml
diff --git a/headlamp/templates/ingress.yaml b/charts/headlamp/templates/ingress.yaml
similarity index 100%
rename from headlamp/templates/ingress.yaml
rename to charts/headlamp/templates/ingress.yaml
diff --git a/headlamp/templates/pdb.yaml b/charts/headlamp/templates/pdb.yaml
similarity index 100%
rename from headlamp/templates/pdb.yaml
rename to charts/headlamp/templates/pdb.yaml
diff --git a/headlamp/templates/plugin-configmap.yaml b/charts/headlamp/templates/plugin-configmap.yaml
similarity index 100%
rename from headlamp/templates/plugin-configmap.yaml
rename to charts/headlamp/templates/plugin-configmap.yaml
diff --git a/headlamp/templates/pvc.yaml b/charts/headlamp/templates/pvc.yaml
similarity index 100%
rename from headlamp/templates/pvc.yaml
rename to charts/headlamp/templates/pvc.yaml
diff --git a/headlamp/templates/secret.yaml b/charts/headlamp/templates/secret.yaml
similarity index 100%
rename from headlamp/templates/secret.yaml
rename to charts/headlamp/templates/secret.yaml
diff --git a/headlamp/templates/service.yaml b/charts/headlamp/templates/service.yaml
similarity index 100%
rename from headlamp/templates/service.yaml
rename to charts/headlamp/templates/service.yaml
diff --git a/headlamp/templates/serviceaccount.yaml b/charts/headlamp/templates/serviceaccount.yaml
similarity index 100%
rename from headlamp/templates/serviceaccount.yaml
rename to charts/headlamp/templates/serviceaccount.yaml
diff --git a/headlamp/tests/expected_templates/azure-oidc-with-validators.yaml b/charts/headlamp/tests/expected_templates/azure-oidc-with-validators.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/azure-oidc-with-validators.yaml
rename to charts/headlamp/tests/expected_templates/azure-oidc-with-validators.yaml
diff --git a/headlamp/tests/expected_templates/default.yaml b/charts/headlamp/tests/expected_templates/default.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/default.yaml
rename to charts/headlamp/tests/expected_templates/default.yaml
diff --git a/headlamp/tests/expected_templates/extra-args.yaml b/charts/headlamp/tests/expected_templates/extra-args.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/extra-args.yaml
rename to charts/headlamp/tests/expected_templates/extra-args.yaml
diff --git a/headlamp/tests/expected_templates/extra-manifests.yaml b/charts/headlamp/tests/expected_templates/extra-manifests.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/extra-manifests.yaml
rename to charts/headlamp/tests/expected_templates/extra-manifests.yaml
diff --git a/headlamp/tests/expected_templates/host-users-override.yaml b/charts/headlamp/tests/expected_templates/host-users-override.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/host-users-override.yaml
rename to charts/headlamp/tests/expected_templates/host-users-override.yaml
diff --git a/headlamp/tests/expected_templates/httproute-enabled.yaml b/charts/headlamp/tests/expected_templates/httproute-enabled.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/httproute-enabled.yaml
rename to charts/headlamp/tests/expected_templates/httproute-enabled.yaml
diff --git a/headlamp/tests/expected_templates/me-user-info-url-directly.yaml b/charts/headlamp/tests/expected_templates/me-user-info-url-directly.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/me-user-info-url-directly.yaml
rename to charts/headlamp/tests/expected_templates/me-user-info-url-directly.yaml
diff --git a/headlamp/tests/expected_templates/me-user-info-url.yaml b/charts/headlamp/tests/expected_templates/me-user-info-url.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/me-user-info-url.yaml
rename to charts/headlamp/tests/expected_templates/me-user-info-url.yaml
diff --git a/headlamp/tests/expected_templates/namespace-override-oidc-create-secret.yaml b/charts/headlamp/tests/expected_templates/namespace-override-oidc-create-secret.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/namespace-override-oidc-create-secret.yaml
rename to charts/headlamp/tests/expected_templates/namespace-override-oidc-create-secret.yaml
diff --git a/headlamp/tests/expected_templates/namespace-override.yaml b/charts/headlamp/tests/expected_templates/namespace-override.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/namespace-override.yaml
rename to charts/headlamp/tests/expected_templates/namespace-override.yaml
diff --git a/headlamp/tests/expected_templates/non-azure-oidc.yaml b/charts/headlamp/tests/expected_templates/non-azure-oidc.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/non-azure-oidc.yaml
rename to charts/headlamp/tests/expected_templates/non-azure-oidc.yaml
diff --git a/headlamp/tests/expected_templates/oidc-create-secret.yaml b/charts/headlamp/tests/expected_templates/oidc-create-secret.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/oidc-create-secret.yaml
rename to charts/headlamp/tests/expected_templates/oidc-create-secret.yaml
diff --git a/headlamp/tests/expected_templates/oidc-directly-env.yaml b/charts/headlamp/tests/expected_templates/oidc-directly-env.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/oidc-directly-env.yaml
rename to charts/headlamp/tests/expected_templates/oidc-directly-env.yaml
diff --git a/headlamp/tests/expected_templates/oidc-directly.yaml b/charts/headlamp/tests/expected_templates/oidc-directly.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/oidc-directly.yaml
rename to charts/headlamp/tests/expected_templates/oidc-directly.yaml
diff --git a/headlamp/tests/expected_templates/oidc-external-secret.yaml b/charts/headlamp/tests/expected_templates/oidc-external-secret.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/oidc-external-secret.yaml
rename to charts/headlamp/tests/expected_templates/oidc-external-secret.yaml
diff --git a/headlamp/tests/expected_templates/oidc-pkce.yaml b/charts/headlamp/tests/expected_templates/oidc-pkce.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/oidc-pkce.yaml
rename to charts/headlamp/tests/expected_templates/oidc-pkce.yaml
diff --git a/headlamp/tests/expected_templates/oidc-validator-overrides.yaml b/charts/headlamp/tests/expected_templates/oidc-validator-overrides.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/oidc-validator-overrides.yaml
rename to charts/headlamp/tests/expected_templates/oidc-validator-overrides.yaml
diff --git a/headlamp/tests/expected_templates/pod-disruption.yaml b/charts/headlamp/tests/expected_templates/pod-disruption.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/pod-disruption.yaml
rename to charts/headlamp/tests/expected_templates/pod-disruption.yaml
diff --git a/headlamp/tests/expected_templates/security-context.yaml b/charts/headlamp/tests/expected_templates/security-context.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/security-context.yaml
rename to charts/headlamp/tests/expected_templates/security-context.yaml
diff --git a/headlamp/tests/expected_templates/tls-added.yaml b/charts/headlamp/tests/expected_templates/tls-added.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/tls-added.yaml
rename to charts/headlamp/tests/expected_templates/tls-added.yaml
diff --git a/headlamp/tests/expected_templates/topology-spread-constraints-custom-selector.yaml b/charts/headlamp/tests/expected_templates/topology-spread-constraints-custom-selector.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/topology-spread-constraints-custom-selector.yaml
rename to charts/headlamp/tests/expected_templates/topology-spread-constraints-custom-selector.yaml
diff --git a/headlamp/tests/expected_templates/topology-spread-constraints.yaml b/charts/headlamp/tests/expected_templates/topology-spread-constraints.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/topology-spread-constraints.yaml
rename to charts/headlamp/tests/expected_templates/topology-spread-constraints.yaml
diff --git a/headlamp/tests/expected_templates/volumes-added.yaml b/charts/headlamp/tests/expected_templates/volumes-added.yaml
similarity index 100%
rename from headlamp/tests/expected_templates/volumes-added.yaml
rename to charts/headlamp/tests/expected_templates/volumes-added.yaml
diff --git a/headlamp/tests/readme.md b/charts/headlamp/tests/readme.md
similarity index 100%
rename from headlamp/tests/readme.md
rename to charts/headlamp/tests/readme.md
diff --git a/headlamp/tests/test.sh b/charts/headlamp/tests/test.sh
similarity index 100%
rename from headlamp/tests/test.sh
rename to charts/headlamp/tests/test.sh
diff --git a/headlamp/tests/test_cases/azure-oidc-with-validators.yaml b/charts/headlamp/tests/test_cases/azure-oidc-with-validators.yaml
similarity index 100%
rename from headlamp/tests/test_cases/azure-oidc-with-validators.yaml
rename to charts/headlamp/tests/test_cases/azure-oidc-with-validators.yaml
diff --git a/headlamp/tests/test_cases/extra-args.yaml b/charts/headlamp/tests/test_cases/extra-args.yaml
similarity index 100%
rename from headlamp/tests/test_cases/extra-args.yaml
rename to charts/headlamp/tests/test_cases/extra-args.yaml
diff --git a/headlamp/tests/test_cases/extra-manifests.yaml b/charts/headlamp/tests/test_cases/extra-manifests.yaml
similarity index 100%
rename from headlamp/tests/test_cases/extra-manifests.yaml
rename to charts/headlamp/tests/test_cases/extra-manifests.yaml
diff --git a/headlamp/tests/test_cases/host-users-override.yaml b/charts/headlamp/tests/test_cases/host-users-override.yaml
similarity index 100%
rename from headlamp/tests/test_cases/host-users-override.yaml
rename to charts/headlamp/tests/test_cases/host-users-override.yaml
diff --git a/headlamp/tests/test_cases/httproute-enabled.yaml b/charts/headlamp/tests/test_cases/httproute-enabled.yaml
similarity index 100%
rename from headlamp/tests/test_cases/httproute-enabled.yaml
rename to charts/headlamp/tests/test_cases/httproute-enabled.yaml
diff --git a/headlamp/tests/test_cases/me-user-info-url-directly.yaml b/charts/headlamp/tests/test_cases/me-user-info-url-directly.yaml
similarity index 100%
rename from headlamp/tests/test_cases/me-user-info-url-directly.yaml
rename to charts/headlamp/tests/test_cases/me-user-info-url-directly.yaml
diff --git a/headlamp/tests/test_cases/me-user-info-url.yaml b/charts/headlamp/tests/test_cases/me-user-info-url.yaml
similarity index 100%
rename from headlamp/tests/test_cases/me-user-info-url.yaml
rename to charts/headlamp/tests/test_cases/me-user-info-url.yaml
diff --git a/headlamp/tests/test_cases/namespace-override-oidc-create-secret.yaml b/charts/headlamp/tests/test_cases/namespace-override-oidc-create-secret.yaml
similarity index 100%
rename from headlamp/tests/test_cases/namespace-override-oidc-create-secret.yaml
rename to charts/headlamp/tests/test_cases/namespace-override-oidc-create-secret.yaml
diff --git a/headlamp/tests/test_cases/namespace-override.yaml b/charts/headlamp/tests/test_cases/namespace-override.yaml
similarity index 100%
rename from headlamp/tests/test_cases/namespace-override.yaml
rename to charts/headlamp/tests/test_cases/namespace-override.yaml
diff --git a/headlamp/tests/test_cases/non-azure-oidc.yaml b/charts/headlamp/tests/test_cases/non-azure-oidc.yaml
similarity index 100%
rename from headlamp/tests/test_cases/non-azure-oidc.yaml
rename to charts/headlamp/tests/test_cases/non-azure-oidc.yaml
diff --git a/headlamp/tests/test_cases/oidc-create-secret.yaml b/charts/headlamp/tests/test_cases/oidc-create-secret.yaml
similarity index 100%
rename from headlamp/tests/test_cases/oidc-create-secret.yaml
rename to charts/headlamp/tests/test_cases/oidc-create-secret.yaml
diff --git a/headlamp/tests/test_cases/oidc-directly-env.yaml b/charts/headlamp/tests/test_cases/oidc-directly-env.yaml
similarity index 100%
rename from headlamp/tests/test_cases/oidc-directly-env.yaml
rename to charts/headlamp/tests/test_cases/oidc-directly-env.yaml
diff --git a/headlamp/tests/test_cases/oidc-directly.yaml b/charts/headlamp/tests/test_cases/oidc-directly.yaml
similarity index 100%
rename from headlamp/tests/test_cases/oidc-directly.yaml
rename to charts/headlamp/tests/test_cases/oidc-directly.yaml
diff --git a/headlamp/tests/test_cases/oidc-external-secret.yaml b/charts/headlamp/tests/test_cases/oidc-external-secret.yaml
similarity index 100%
rename from headlamp/tests/test_cases/oidc-external-secret.yaml
rename to charts/headlamp/tests/test_cases/oidc-external-secret.yaml
diff --git a/headlamp/tests/test_cases/oidc-pkce.yaml b/charts/headlamp/tests/test_cases/oidc-pkce.yaml
similarity index 100%
rename from headlamp/tests/test_cases/oidc-pkce.yaml
rename to charts/headlamp/tests/test_cases/oidc-pkce.yaml
diff --git a/headlamp/tests/test_cases/oidc-validator-overrides.yaml b/charts/headlamp/tests/test_cases/oidc-validator-overrides.yaml
similarity index 100%
rename from headlamp/tests/test_cases/oidc-validator-overrides.yaml
rename to charts/headlamp/tests/test_cases/oidc-validator-overrides.yaml
diff --git a/headlamp/tests/test_cases/pod-disruption.yaml b/charts/headlamp/tests/test_cases/pod-disruption.yaml
similarity index 100%
rename from headlamp/tests/test_cases/pod-disruption.yaml
rename to charts/headlamp/tests/test_cases/pod-disruption.yaml
diff --git a/headlamp/tests/test_cases/security-context.yaml b/charts/headlamp/tests/test_cases/security-context.yaml
similarity index 100%
rename from headlamp/tests/test_cases/security-context.yaml
rename to charts/headlamp/tests/test_cases/security-context.yaml
diff --git a/headlamp/tests/test_cases/tls-added.yaml b/charts/headlamp/tests/test_cases/tls-added.yaml
similarity index 100%
rename from headlamp/tests/test_cases/tls-added.yaml
rename to charts/headlamp/tests/test_cases/tls-added.yaml
diff --git a/headlamp/tests/test_cases/topology-spread-constraints-custom-selector.yaml b/charts/headlamp/tests/test_cases/topology-spread-constraints-custom-selector.yaml
similarity index 100%
rename from headlamp/tests/test_cases/topology-spread-constraints-custom-selector.yaml
rename to charts/headlamp/tests/test_cases/topology-spread-constraints-custom-selector.yaml
diff --git a/headlamp/tests/test_cases/topology-spread-constraints.yaml b/charts/headlamp/tests/test_cases/topology-spread-constraints.yaml
similarity index 100%
rename from headlamp/tests/test_cases/topology-spread-constraints.yaml
rename to charts/headlamp/tests/test_cases/topology-spread-constraints.yaml
diff --git a/headlamp/tests/test_cases/volumes-added.yaml b/charts/headlamp/tests/test_cases/volumes-added.yaml
similarity index 100%
rename from headlamp/tests/test_cases/volumes-added.yaml
rename to charts/headlamp/tests/test_cases/volumes-added.yaml
diff --git a/headlamp/tests/update-version.sh b/charts/headlamp/tests/update-version.sh
similarity index 100%
rename from headlamp/tests/update-version.sh
rename to charts/headlamp/tests/update-version.sh
diff --git a/headlamp/values.schema.json b/charts/headlamp/values.schema.json
similarity index 100%
rename from headlamp/values.schema.json
rename to charts/headlamp/values.schema.json
diff --git a/headlamp/values.yaml b/charts/headlamp/values.yaml
similarity index 100%
rename from headlamp/values.yaml
rename to charts/headlamp/values.yaml