diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md b/eks-anywhere-vsphere/Addons/Core/storage-driver/README.md
similarity index 100%
rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md
rename to eks-anywhere-vsphere/Addons/Core/storage-driver/README.md
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml
new file mode 100644
index 00000000..8c3e791b
--- /dev/null
+++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: vmware-csi-namespace-kustomization
+  namespace: flux-system
+  labels:
+    app: vmware-csi-driver
+spec:
+  interval: 1m0s
+  path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: addons
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-namespace/namespace.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/namespace.yaml
similarity index 100%
rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-namespace/namespace.yaml
rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/namespace.yaml
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-kustomization.yaml
deleted file mode 100644
index f56d8040..00000000
--- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-kustomization.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: vmware-csi-namespace-kustomization
-  namespace: flux-system
-  labels:
-    app: vmware-csi-driver
-spec:
-  interval: 1m0s
-  path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-namespace
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: addons
-  healthChecks:
-    - apiVersion: v1
-      kind: Namespace
-      name: vmware-system-csi
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: vmware-csi-secrets-kustomization
-  namespace: flux-system
-  labels:
-    app: vmware-csi-driver
-spec:
-  dependsOn:
-    - name: vmware-csi-namespace-kustomization
-  interval: 1m0s
-  path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-secrets
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: addons
-  healthChecks:
-    - apiVersion: v1
-      kind: Secret
-      name: vsphere.conf
-      namespace: kube-system   
-    - apiVersion: v1
-      kind: Secret
-      name: vsphere-config-secret
-      namespace: vmware-system-csi
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: vmware-csi-driver-kustomization
-  namespace: flux-system
-  labels:
-    app: vmware-csi-driver
-spec:
-  dependsOn:
-    - name: vmware-csi-secrets-kustomization
-  interval: 1m0s
-  path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: addons
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vmware-sc.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-sc.yaml
similarity index 100%
rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vmware-sc.yaml
rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-sc.yaml
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml
similarity index 100%
rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml
rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-csi-driver.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml
similarity index 100%
rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-csi-driver.yaml
rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-secrets/vsphere-external-secrets.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-external-secrets.yaml
similarity index 100%
rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-secrets/vsphere-external-secrets.yaml
rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-external-secrets.yaml