diff --git a/charts/shuffle/.gitignore b/functions/kubernetes/charts/shuffle/.gitignore
similarity index 100%
rename from charts/shuffle/.gitignore
rename to functions/kubernetes/charts/shuffle/.gitignore
diff --git a/charts/shuffle/.helmignore b/functions/kubernetes/charts/shuffle/.helmignore
similarity index 100%
rename from charts/shuffle/.helmignore
rename to functions/kubernetes/charts/shuffle/.helmignore
diff --git a/charts/shuffle/.yamllint b/functions/kubernetes/charts/shuffle/.yamllint
similarity index 100%
rename from charts/shuffle/.yamllint
rename to functions/kubernetes/charts/shuffle/.yamllint
diff --git a/charts/shuffle/Chart.yaml b/functions/kubernetes/charts/shuffle/Chart.yaml
similarity index 100%
rename from charts/shuffle/Chart.yaml
rename to functions/kubernetes/charts/shuffle/Chart.yaml
diff --git a/charts/shuffle/README.md b/functions/kubernetes/charts/shuffle/README.md
similarity index 100%
rename from charts/shuffle/README.md
rename to functions/kubernetes/charts/shuffle/README.md
diff --git a/charts/shuffle/templates/NOTES.txt b/functions/kubernetes/charts/shuffle/templates/NOTES.txt
similarity index 100%
rename from charts/shuffle/templates/NOTES.txt
rename to functions/kubernetes/charts/shuffle/templates/NOTES.txt
diff --git a/charts/shuffle/templates/_helpers.tpl b/functions/kubernetes/charts/shuffle/templates/_helpers.tpl
similarity index 100%
rename from charts/shuffle/templates/_helpers.tpl
rename to functions/kubernetes/charts/shuffle/templates/_helpers.tpl
diff --git a/charts/shuffle/templates/backend/backend-apps-claim-pvc.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-apps-claim-pvc.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-apps-claim-pvc.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-apps-claim-pvc.yaml
diff --git a/charts/shuffle/templates/backend/backend-apps-pvc.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-apps-pvc.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-apps-pvc.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-apps-pvc.yaml
diff --git a/charts/shuffle/templates/backend/backend-cm-env.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-cm-env.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-cm-env.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-cm-env.yaml
diff --git a/charts/shuffle/templates/backend/backend-dpl.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-dpl.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-dpl.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-dpl.yaml
diff --git a/charts/shuffle/templates/backend/backend-files-pvc.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-files-pvc.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-files-pvc.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-files-pvc.yaml
diff --git a/charts/shuffle/templates/backend/backend-hpa.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-hpa.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-hpa.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-hpa.yaml
diff --git a/charts/shuffle/templates/backend/backend-network-policy.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-network-policy.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-network-policy.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-network-policy.yaml
diff --git a/charts/shuffle/templates/backend/backend-pdb.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-pdb.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-pdb.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-pdb.yaml
diff --git a/charts/shuffle/templates/backend/backend-role-binding.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-role-binding.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-role-binding.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-role-binding.yaml
diff --git a/charts/shuffle/templates/backend/backend-role.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-role.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-role.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-role.yaml
diff --git a/charts/shuffle/templates/backend/backend-service-account.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-service-account.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-service-account.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-service-account.yaml
diff --git a/charts/shuffle/templates/backend/backend-svc.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-svc.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-svc.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-svc.yaml
diff --git a/charts/shuffle/templates/backend/backend-vpa.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-vpa.yaml
similarity index 100%
rename from charts/shuffle/templates/backend/backend-vpa.yaml
rename to functions/kubernetes/charts/shuffle/templates/backend/backend-vpa.yaml
diff --git a/charts/shuffle/templates/extra-list.yaml b/functions/kubernetes/charts/shuffle/templates/extra-list.yaml
similarity index 100%
rename from charts/shuffle/templates/extra-list.yaml
rename to functions/kubernetes/charts/shuffle/templates/extra-list.yaml
diff --git a/charts/shuffle/templates/frontend/frontend-cm-env.yaml b/functions/kubernetes/charts/shuffle/templates/frontend/frontend-cm-env.yaml
similarity index 100%
rename from charts/shuffle/templates/frontend/frontend-cm-env.yaml
rename to functions/kubernetes/charts/shuffle/templates/frontend/frontend-cm-env.yaml
diff --git a/charts/shuffle/templates/frontend/frontend-dpl.yaml b/functions/kubernetes/charts/shuffle/templates/frontend/frontend-dpl.yaml
similarity index 100%
rename from charts/shuffle/templates/frontend/frontend-dpl.yaml
rename to functions/kubernetes/charts/shuffle/templates/frontend/frontend-dpl.yaml
diff --git a/charts/shuffle/templates/frontend/frontend-hpa.yaml b/functions/kubernetes/charts/shuffle/templates/frontend/frontend-hpa.yaml
similarity index 100%
rename from charts/shuffle/templates/frontend/frontend-hpa.yaml
rename to functions/kubernetes/charts/shuffle/templates/frontend/frontend-hpa.yaml
diff --git a/charts/shuffle/templates/frontend/frontend-network-policy.yaml b/functions/kubernetes/charts/shuffle/templates/frontend/frontend-network-policy.yaml
similarity index 100%
rename from charts/shuffle/templates/frontend/frontend-network-policy.yaml
rename to functions/kubernetes/charts/shuffle/templates/frontend/frontend-network-policy.yaml
diff --git a/charts/shuffle/templates/frontend/frontend-pdb.yaml b/functions/kubernetes/charts/shuffle/templates/frontend/frontend-pdb.yaml
similarity index 100%
rename from charts/shuffle/templates/frontend/frontend-pdb.yaml
rename to functions/kubernetes/charts/shuffle/templates/frontend/frontend-pdb.yaml
diff --git a/charts/shuffle/templates/frontend/frontend-service-account.yaml b/functions/kubernetes/charts/shuffle/templates/frontend/frontend-service-account.yaml
similarity index 100%
rename from charts/shuffle/templates/frontend/frontend-service-account.yaml
rename to functions/kubernetes/charts/shuffle/templates/frontend/frontend-service-account.yaml
diff --git a/charts/shuffle/templates/frontend/frontend-svc.yaml b/functions/kubernetes/charts/shuffle/templates/frontend/frontend-svc.yaml
similarity index 100%
rename from charts/shuffle/templates/frontend/frontend-svc.yaml
rename to functions/kubernetes/charts/shuffle/templates/frontend/frontend-svc.yaml
diff --git a/charts/shuffle/templates/frontend/frontend-vpa.yaml b/functions/kubernetes/charts/shuffle/templates/frontend/frontend-vpa.yaml
similarity index 100%
rename from charts/shuffle/templates/frontend/frontend-vpa.yaml
rename to functions/kubernetes/charts/shuffle/templates/frontend/frontend-vpa.yaml
diff --git a/charts/shuffle/templates/ingress/ingress.yaml b/functions/kubernetes/charts/shuffle/templates/ingress/ingress.yaml
similarity index 100%
rename from charts/shuffle/templates/ingress/ingress.yaml
rename to functions/kubernetes/charts/shuffle/templates/ingress/ingress.yaml
diff --git a/charts/shuffle/templates/ingress/tls-secret.yaml b/functions/kubernetes/charts/shuffle/templates/ingress/tls-secret.yaml
similarity index 100%
rename from charts/shuffle/templates/ingress/tls-secret.yaml
rename to functions/kubernetes/charts/shuffle/templates/ingress/tls-secret.yaml
diff --git a/charts/shuffle/templates/istio/gateway.yaml b/functions/kubernetes/charts/shuffle/templates/istio/gateway.yaml
similarity index 100%
rename from charts/shuffle/templates/istio/gateway.yaml
rename to functions/kubernetes/charts/shuffle/templates/istio/gateway.yaml
diff --git a/charts/shuffle/templates/istio/virtual-service.yaml b/functions/kubernetes/charts/shuffle/templates/istio/virtual-service.yaml
similarity index 100%
rename from charts/shuffle/templates/istio/virtual-service.yaml
rename to functions/kubernetes/charts/shuffle/templates/istio/virtual-service.yaml
diff --git a/charts/shuffle/templates/orborus/orborus-cm-env.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-cm-env.yaml
similarity index 100%
rename from charts/shuffle/templates/orborus/orborus-cm-env.yaml
rename to functions/kubernetes/charts/shuffle/templates/orborus/orborus-cm-env.yaml
diff --git a/charts/shuffle/templates/orborus/orborus-dpl.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml
similarity index 100%
rename from charts/shuffle/templates/orborus/orborus-dpl.yaml
rename to functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml
diff --git a/charts/shuffle/templates/orborus/orborus-hpa.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-hpa.yaml
similarity index 100%
rename from charts/shuffle/templates/orborus/orborus-hpa.yaml
rename to functions/kubernetes/charts/shuffle/templates/orborus/orborus-hpa.yaml
diff --git a/charts/shuffle/templates/orborus/orborus-network-policy.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-network-policy.yaml
similarity index 100%
rename from charts/shuffle/templates/orborus/orborus-network-policy.yaml
rename to functions/kubernetes/charts/shuffle/templates/orborus/orborus-network-policy.yaml
diff --git a/charts/shuffle/templates/orborus/orborus-pdb.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-pdb.yaml
similarity index 100%
rename from charts/shuffle/templates/orborus/orborus-pdb.yaml
rename to functions/kubernetes/charts/shuffle/templates/orborus/orborus-pdb.yaml
diff --git a/charts/shuffle/templates/orborus/orborus-role-binding.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-role-binding.yaml
similarity index 100%
rename from charts/shuffle/templates/orborus/orborus-role-binding.yaml
rename to functions/kubernetes/charts/shuffle/templates/orborus/orborus-role-binding.yaml
diff --git a/charts/shuffle/templates/orborus/orborus-role.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-role.yaml
similarity index 100%
rename from charts/shuffle/templates/orborus/orborus-role.yaml
rename to functions/kubernetes/charts/shuffle/templates/orborus/orborus-role.yaml
diff --git a/charts/shuffle/templates/orborus/orborus-service-account.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-service-account.yaml
similarity index 100%
rename from charts/shuffle/templates/orborus/orborus-service-account.yaml
rename to functions/kubernetes/charts/shuffle/templates/orborus/orborus-service-account.yaml
diff --git a/charts/shuffle/templates/orborus/orborus-vpa.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-vpa.yaml
similarity index 100%
rename from charts/shuffle/templates/orborus/orborus-vpa.yaml
rename to functions/kubernetes/charts/shuffle/templates/orborus/orborus-vpa.yaml
diff --git a/charts/shuffle/templates/shuffle-app/shuffle-app-network-policy.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-network-policy.yaml
similarity index 100%
rename from charts/shuffle/templates/shuffle-app/shuffle-app-network-policy.yaml
rename to functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-network-policy.yaml
diff --git a/charts/shuffle/templates/shuffle-app/shuffle-app-role-binding.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-role-binding.yaml
similarity index 100%
rename from charts/shuffle/templates/shuffle-app/shuffle-app-role-binding.yaml
rename to functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-role-binding.yaml
diff --git a/charts/shuffle/templates/shuffle-app/shuffle-app-role.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-role.yaml
similarity index 100%
rename from charts/shuffle/templates/shuffle-app/shuffle-app-role.yaml
rename to functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-role.yaml
diff --git a/charts/shuffle/templates/shuffle-app/shuffle-app-service-account.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-service-account.yaml
similarity index 100%
rename from charts/shuffle/templates/shuffle-app/shuffle-app-service-account.yaml
rename to functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-service-account.yaml
diff --git a/charts/shuffle/templates/shuffle-worker/shuffle-worker-network-policy.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-network-policy.yaml
similarity index 100%
rename from charts/shuffle/templates/shuffle-worker/shuffle-worker-network-policy.yaml
rename to functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-network-policy.yaml
diff --git a/charts/shuffle/templates/shuffle-worker/shuffle-worker-role-binding.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-role-binding.yaml
similarity index 100%
rename from charts/shuffle/templates/shuffle-worker/shuffle-worker-role-binding.yaml
rename to functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-role-binding.yaml
diff --git a/charts/shuffle/templates/shuffle-worker/shuffle-worker-role.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-role.yaml
similarity index 100%
rename from charts/shuffle/templates/shuffle-worker/shuffle-worker-role.yaml
rename to functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-role.yaml
diff --git a/charts/shuffle/templates/shuffle-worker/shuffle-worker-service-account.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-service-account.yaml
similarity index 100%
rename from charts/shuffle/templates/shuffle-worker/shuffle-worker-service-account.yaml
rename to functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-service-account.yaml
diff --git a/charts/shuffle/templates/vault-secrets.yaml b/functions/kubernetes/charts/shuffle/templates/vault-secrets.yaml
similarity index 100%
rename from charts/shuffle/templates/vault-secrets.yaml
rename to functions/kubernetes/charts/shuffle/templates/vault-secrets.yaml
diff --git a/charts/shuffle/values.schema.json b/functions/kubernetes/charts/shuffle/values.schema.json
similarity index 100%
rename from charts/shuffle/values.schema.json
rename to functions/kubernetes/charts/shuffle/values.schema.json
diff --git a/charts/shuffle/values.yaml b/functions/kubernetes/charts/shuffle/values.yaml
similarity index 100%
rename from charts/shuffle/values.yaml
rename to functions/kubernetes/charts/shuffle/values.yaml