diff --git a/Makefile b/clusters/bee/Makefile
similarity index 100%
rename from Makefile
rename to clusters/bee/Makefile
diff --git a/_argocd/Chart.lock b/clusters/bee/_argocd/Chart.lock
similarity index 100%
rename from _argocd/Chart.lock
rename to clusters/bee/_argocd/Chart.lock
diff --git a/_argocd/Chart.yaml b/clusters/bee/_argocd/Chart.yaml
similarity index 100%
rename from _argocd/Chart.yaml
rename to clusters/bee/_argocd/Chart.yaml
diff --git a/_argocd/app-of-apps.yaml b/clusters/bee/_argocd/app-of-apps.yaml
similarity index 100%
rename from _argocd/app-of-apps.yaml
rename to clusters/bee/_argocd/app-of-apps.yaml
diff --git a/_argocd/apps/cert-manager.yaml b/clusters/bee/_argocd/apps/cert-manager.yaml
similarity index 100%
rename from _argocd/apps/cert-manager.yaml
rename to clusters/bee/_argocd/apps/cert-manager.yaml
diff --git a/_argocd/apps/hcloud-cloud-controller-manager.yaml b/clusters/bee/_argocd/apps/hcloud-cloud-controller-manager.yaml
similarity index 100%
rename from _argocd/apps/hcloud-cloud-controller-manager.yaml
rename to clusters/bee/_argocd/apps/hcloud-cloud-controller-manager.yaml
diff --git a/_argocd/apps/hcloud-csi-driver.yaml b/clusters/bee/_argocd/apps/hcloud-csi-driver.yaml
similarity index 100%
rename from _argocd/apps/hcloud-csi-driver.yaml
rename to clusters/bee/_argocd/apps/hcloud-csi-driver.yaml
diff --git a/_argocd/apps/hcloud-token.yaml b/clusters/bee/_argocd/apps/hcloud-token.yaml
similarity index 100%
rename from _argocd/apps/hcloud-token.yaml
rename to clusters/bee/_argocd/apps/hcloud-token.yaml
diff --git a/_argocd/apps/ingress-nginx.yaml b/clusters/bee/_argocd/apps/ingress-nginx.yaml
similarity index 100%
rename from _argocd/apps/ingress-nginx.yaml
rename to clusters/bee/_argocd/apps/ingress-nginx.yaml
diff --git a/_argocd/apps/logging.yaml b/clusters/bee/_argocd/apps/logging.yaml
similarity index 100%
rename from _argocd/apps/logging.yaml
rename to clusters/bee/_argocd/apps/logging.yaml
diff --git a/_argocd/apps/longhorn.yaml b/clusters/bee/_argocd/apps/longhorn.yaml
similarity index 100%
rename from _argocd/apps/longhorn.yaml
rename to clusters/bee/_argocd/apps/longhorn.yaml
diff --git a/_argocd/apps/monitoring.yaml b/clusters/bee/_argocd/apps/monitoring.yaml
similarity index 100%
rename from _argocd/apps/monitoring.yaml
rename to clusters/bee/_argocd/apps/monitoring.yaml
diff --git a/_argocd/apps/prometheus-operator-crds.yaml b/clusters/bee/_argocd/apps/prometheus-operator-crds.yaml
similarity index 100%
rename from _argocd/apps/prometheus-operator-crds.yaml
rename to clusters/bee/_argocd/apps/prometheus-operator-crds.yaml
diff --git a/_argocd/apps/registry.yaml b/clusters/bee/_argocd/apps/registry.yaml
similarity index 100%
rename from _argocd/apps/registry.yaml
rename to clusters/bee/_argocd/apps/registry.yaml
diff --git a/_argocd/apps/sealed-secrets.yaml b/clusters/bee/_argocd/apps/sealed-secrets.yaml
similarity index 100%
rename from _argocd/apps/sealed-secrets.yaml
rename to clusters/bee/_argocd/apps/sealed-secrets.yaml
diff --git a/_argocd/apps/system-upgrade-controller.yaml b/clusters/bee/_argocd/apps/system-upgrade-controller.yaml
similarity index 100%
rename from _argocd/apps/system-upgrade-controller.yaml
rename to clusters/bee/_argocd/apps/system-upgrade-controller.yaml
diff --git a/_argocd/apps/upgrade-plans.yaml b/clusters/bee/_argocd/apps/upgrade-plans.yaml
similarity index 100%
rename from _argocd/apps/upgrade-plans.yaml
rename to clusters/bee/_argocd/apps/upgrade-plans.yaml
diff --git a/_argocd/apps/vault.yaml b/clusters/bee/_argocd/apps/vault.yaml
similarity index 100%
rename from _argocd/apps/vault.yaml
rename to clusters/bee/_argocd/apps/vault.yaml
diff --git a/_argocd/values.yaml b/clusters/bee/_argocd/values.yaml
similarity index 100%
rename from _argocd/values.yaml
rename to clusters/bee/_argocd/values.yaml
diff --git a/apps/registry/Chart.yaml b/clusters/bee/apps/registry/Chart.yaml
similarity index 100%
rename from apps/registry/Chart.yaml
rename to clusters/bee/apps/registry/Chart.yaml
diff --git a/apps/registry/values.yaml b/clusters/bee/apps/registry/values.yaml
similarity index 100%
rename from apps/registry/values.yaml
rename to clusters/bee/apps/registry/values.yaml
diff --git a/apps/vault/Chart.yaml b/clusters/bee/apps/vault/Chart.yaml
similarity index 100%
rename from apps/vault/Chart.yaml
rename to clusters/bee/apps/vault/Chart.yaml
diff --git a/apps/vault/values.yaml b/clusters/bee/apps/vault/values.yaml
similarity index 100%
rename from apps/vault/values.yaml
rename to clusters/bee/apps/vault/values.yaml
diff --git a/cluster-components/cert-manager/Chart.lock b/clusters/bee/infrastructure/cert-manager/Chart.lock
similarity index 100%
rename from cluster-components/cert-manager/Chart.lock
rename to clusters/bee/infrastructure/cert-manager/Chart.lock
diff --git a/cluster-components/cert-manager/Chart.yaml b/clusters/bee/infrastructure/cert-manager/Chart.yaml
similarity index 100%
rename from cluster-components/cert-manager/Chart.yaml
rename to clusters/bee/infrastructure/cert-manager/Chart.yaml
diff --git a/cluster-components/cert-manager/templates/cloudflare-api-key-secret.sealed.yaml b/clusters/bee/infrastructure/cert-manager/templates/cloudflare-api-key-secret.sealed.yaml
similarity index 100%
rename from cluster-components/cert-manager/templates/cloudflare-api-key-secret.sealed.yaml
rename to clusters/bee/infrastructure/cert-manager/templates/cloudflare-api-key-secret.sealed.yaml
diff --git a/cluster-components/cert-manager/templates/clusterissuer-letsencrypt-mareshq.yaml b/clusters/bee/infrastructure/cert-manager/templates/clusterissuer-letsencrypt-mareshq.yaml
similarity index 100%
rename from cluster-components/cert-manager/templates/clusterissuer-letsencrypt-mareshq.yaml
rename to clusters/bee/infrastructure/cert-manager/templates/clusterissuer-letsencrypt-mareshq.yaml
diff --git a/cluster-components/cert-manager/templates/clusterissuer-letsencrypt-prod.yaml b/clusters/bee/infrastructure/cert-manager/templates/clusterissuer-letsencrypt-prod.yaml
similarity index 100%
rename from cluster-components/cert-manager/templates/clusterissuer-letsencrypt-prod.yaml
rename to clusters/bee/infrastructure/cert-manager/templates/clusterissuer-letsencrypt-prod.yaml
diff --git a/cluster-components/cert-manager/values.yaml b/clusters/bee/infrastructure/cert-manager/values.yaml
similarity index 100%
rename from cluster-components/cert-manager/values.yaml
rename to clusters/bee/infrastructure/cert-manager/values.yaml
diff --git a/cluster-components/hcloud-cloud-controller-manager/ccm.yaml b/clusters/bee/infrastructure/hcloud-cloud-controller-manager/ccm.yaml
similarity index 100%
rename from cluster-components/hcloud-cloud-controller-manager/ccm.yaml
rename to clusters/bee/infrastructure/hcloud-cloud-controller-manager/ccm.yaml
diff --git a/cluster-components/hcloud-token/hcloud-secret.sealed.yaml b/clusters/bee/infrastructure/hcloud-token/hcloud-secret.sealed.yaml
similarity index 100%
rename from cluster-components/hcloud-token/hcloud-secret.sealed.yaml
rename to clusters/bee/infrastructure/hcloud-token/hcloud-secret.sealed.yaml
diff --git a/cluster-components/ingress-nginx/Chart.lock b/clusters/bee/infrastructure/ingress-nginx/Chart.lock
similarity index 100%
rename from cluster-components/ingress-nginx/Chart.lock
rename to clusters/bee/infrastructure/ingress-nginx/Chart.lock
diff --git a/cluster-components/ingress-nginx/Chart.yaml b/clusters/bee/infrastructure/ingress-nginx/Chart.yaml
similarity index 100%
rename from cluster-components/ingress-nginx/Chart.yaml
rename to clusters/bee/infrastructure/ingress-nginx/Chart.yaml
diff --git a/cluster-components/ingress-nginx/values.yaml b/clusters/bee/infrastructure/ingress-nginx/values.yaml
similarity index 100%
rename from cluster-components/ingress-nginx/values.yaml
rename to clusters/bee/infrastructure/ingress-nginx/values.yaml
diff --git a/cluster-components/logging/Chart.lock b/clusters/bee/infrastructure/logging/Chart.lock
similarity index 100%
rename from cluster-components/logging/Chart.lock
rename to clusters/bee/infrastructure/logging/Chart.lock
diff --git a/cluster-components/logging/Chart.yaml b/clusters/bee/infrastructure/logging/Chart.yaml
similarity index 100%
rename from cluster-components/logging/Chart.yaml
rename to clusters/bee/infrastructure/logging/Chart.yaml
diff --git a/cluster-components/logging/values.yaml b/clusters/bee/infrastructure/logging/values.yaml
similarity index 100%
rename from cluster-components/logging/values.yaml
rename to clusters/bee/infrastructure/logging/values.yaml
diff --git a/cluster-components/monitoring/Chart.lock b/clusters/bee/infrastructure/monitoring/Chart.lock
similarity index 100%
rename from cluster-components/monitoring/Chart.lock
rename to clusters/bee/infrastructure/monitoring/Chart.lock
diff --git a/cluster-components/monitoring/Chart.yaml b/clusters/bee/infrastructure/monitoring/Chart.yaml
similarity index 100%
rename from cluster-components/monitoring/Chart.yaml
rename to clusters/bee/infrastructure/monitoring/Chart.yaml
diff --git a/cluster-components/monitoring/values.yaml b/clusters/bee/infrastructure/monitoring/values.yaml
similarity index 100%
rename from cluster-components/monitoring/values.yaml
rename to clusters/bee/infrastructure/monitoring/values.yaml
diff --git a/cluster-components/sealed-secrets/Chart.lock b/clusters/bee/infrastructure/sealed-secrets/Chart.lock
similarity index 100%
rename from cluster-components/sealed-secrets/Chart.lock
rename to clusters/bee/infrastructure/sealed-secrets/Chart.lock
diff --git a/cluster-components/sealed-secrets/Chart.yaml b/clusters/bee/infrastructure/sealed-secrets/Chart.yaml
similarity index 100%
rename from cluster-components/sealed-secrets/Chart.yaml
rename to clusters/bee/infrastructure/sealed-secrets/Chart.yaml
diff --git a/cluster-components/sealed-secrets/values.yaml b/clusters/bee/infrastructure/sealed-secrets/values.yaml
similarity index 100%
rename from cluster-components/sealed-secrets/values.yaml
rename to clusters/bee/infrastructure/sealed-secrets/values.yaml
diff --git a/cluster-components/upgrade-plans/k3s.yaml b/clusters/bee/infrastructure/upgrade-plans/k3s.yaml
similarity index 100%
rename from cluster-components/upgrade-plans/k3s.yaml
rename to clusters/bee/infrastructure/upgrade-plans/k3s.yaml