diff --git a/applications/web-test/kustomization.yaml b/applications/web-test/kustomization.yaml
new file mode 100644
index 0000000..13e6299
--- /dev/null
+++ b/applications/web-test/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - pvc.yaml
+  - pod.yaml
+  - web-ingress.yaml
diff --git a/bootstrap/argocd/values.yaml b/bootstrap/argocd/helm/values.yaml
similarity index 100%
rename from bootstrap/argocd/values.yaml
rename to bootstrap/argocd/helm/values.yaml
diff --git a/infrastructure/cert-manager/values.yaml b/infrastructure/cert-manager/helm/values.yaml
similarity index 100%
rename from infrastructure/cert-manager/values.yaml
rename to infrastructure/cert-manager/helm/values.yaml
diff --git a/infrastructure/cloudnative-pg/values.yaml b/infrastructure/cloudnative-pg/helm/values.yaml
similarity index 100%
rename from infrastructure/cloudnative-pg/values.yaml
rename to infrastructure/cloudnative-pg/helm/values.yaml
diff --git a/infrastructure/ingress-nginx/values.yaml b/infrastructure/ingress-nginx/helm/values.yaml
similarity index 100%
rename from infrastructure/ingress-nginx/values.yaml
rename to infrastructure/ingress-nginx/helm/values.yaml
diff --git a/infrastructure/monitoring/kube-prometheus-stack/values.yaml b/infrastructure/longhorn/helm/values.yaml
similarity index 100%
rename from infrastructure/monitoring/kube-prometheus-stack/values.yaml
rename to infrastructure/longhorn/helm/values.yaml
diff --git a/infrastructure/storage/longhorn/longhorn-ingress.yaml b/infrastructure/longhorn/ingress.yaml
similarity index 100%
rename from infrastructure/storage/longhorn/longhorn-ingress.yaml
rename to infrastructure/longhorn/ingress.yaml
diff --git a/infrastructure/metallb/kustomization.yaml b/infrastructure/metallb/kustomization.yaml
new file mode 100644
index 0000000..142b01b
--- /dev/null
+++ b/infrastructure/metallb/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - manifests/ip-pool.yaml
+  - manifests/bgp.yaml
diff --git a/infrastructure/metallb/metallb-bgp.yaml b/infrastructure/metallb/manifests/bgp.yaml
similarity index 100%
rename from infrastructure/metallb/metallb-bgp.yaml
rename to infrastructure/metallb/manifests/bgp.yaml
diff --git a/infrastructure/metallb/metallb-config.yaml b/infrastructure/metallb/manifests/ip-pool.yaml
similarity index 100%
rename from infrastructure/metallb/metallb-config.yaml
rename to infrastructure/metallb/manifests/ip-pool.yaml
diff --git a/infrastructure/storage/longhorn/values.yaml b/infrastructure/monitoring/kube-prometheus-stack/helm/values.yaml
similarity index 100%
rename from infrastructure/storage/longhorn/values.yaml
rename to infrastructure/monitoring/kube-prometheus-stack/helm/values.yaml
diff --git a/infrastructure/database/postgres-cluster.yaml b/infrastructure/postgres/cluster.yaml
similarity index 100%
rename from infrastructure/database/postgres-cluster.yaml
rename to infrastructure/postgres/cluster.yaml