diff --git a/basic/clusters/production/gitea-kustomization.yaml b/basic/infrastructure/kustomizations/gitea-kustomization.yaml
similarity index 100%
rename from basic/clusters/production/gitea-kustomization.yaml
rename to basic/infrastructure/kustomizations/gitea-kustomization.yaml
diff --git a/basic/clusters/production/namespace-kustomization.yaml b/basic/infrastructure/kustomizations/namespace-kustomization.yaml
similarity index 100%
rename from basic/clusters/production/namespace-kustomization.yaml
rename to basic/infrastructure/kustomizations/namespace-kustomization.yaml
diff --git a/basic/clusters/production/overrides-kustomization.yaml b/basic/infrastructure/kustomizations/overrides-kustomization.yaml
similarity index 100%
rename from basic/clusters/production/overrides-kustomization.yaml
rename to basic/infrastructure/kustomizations/overrides-kustomization.yaml
diff --git a/basic/clusters/production/sources-kustomization.yaml b/basic/infrastructure/kustomizations/sources-kustomization.yaml
similarity index 100%
rename from basic/clusters/production/sources-kustomization.yaml
rename to basic/infrastructure/kustomizations/sources-kustomization.yaml
diff --git a/basic/clusters/production/suitecrm-kustomization.yaml b/basic/infrastructure/kustomizations/suitecrm-kustomization.yaml
similarity index 100%
rename from basic/clusters/production/suitecrm-kustomization.yaml
rename to basic/infrastructure/kustomizations/suitecrm-kustomization.yaml
diff --git a/basic/clusters/production/vikunja-kustomization.yaml b/basic/infrastructure/kustomizations/vikunja-kustomization.yaml
similarity index 100%
rename from basic/clusters/production/vikunja-kustomization.yaml
rename to basic/infrastructure/kustomizations/vikunja-kustomization.yaml
diff --git a/basic/install.sh b/basic/install.sh
index e591c13bfd49cb5870d9ff4e56687a48049d8867..c9744f5594a58ef1ff8db30ab0f77b6298427681 100755
--- a/basic/install.sh
+++ b/basic/install.sh
@@ -2,19 +2,19 @@
 
 kubectl get namespace stackspout 2>/dev/null || kubectl create namespace stackspout
 
-echo "Creating / updating gitRepository stackspout in namespace stackspout"
+echo "Creating / Updating gitRepository stackspout"
 flux create source git stackspout \
   --url=https://open.greenhost.net/xeruf/stackspout.git \
   --branch=main \
   --interval=5m
 
-echo "Creating / updating kustomization stackspout in namespace stackspout"
+echo "Creating / Updating kustomization stackspout"
 flux create kustomization stackspout \
   --source=GitRepository/stackspout \
-  --path="./basic/clusters/production/" \
+  --path="./basic/infrastructure/kustomizations/" \
   --prune=true \
   --interval=30m
 
 python $STACKSPIN/install/generate_secrets.py vikunja
 python $STACKSPIN/install/generate_secrets.py gitea
-python $STACKSPIN/install/generate_secrets.py suitecrm
+python $(dirname "$0")/../generate_secrets.py suitecrm