diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index f6e11c37..693a3e16 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.1.3
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.25.1
+version: 3.25.2
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -21,4 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: Use correct chart icon url"
+    - "[Changed]: Reorganize some files in repo, move applications.yaml and projects.yaml into argocd-configs."
diff --git a/charts/argo-cd/templates/argocd-server/applications.yaml b/charts/argo-cd/templates/argocd-configs/applications.yaml
similarity index 100%
rename from charts/argo-cd/templates/argocd-server/applications.yaml
rename to charts/argo-cd/templates/argocd-configs/applications.yaml
diff --git a/charts/argo-cd/templates/argocd-server/projects.yaml b/charts/argo-cd/templates/argocd-configs/projects.yaml
similarity index 100%
rename from charts/argo-cd/templates/argocd-server/projects.yaml
rename to charts/argo-cd/templates/argocd-configs/projects.yaml
diff --git a/charts/argo-rollouts/templates/argo-rollouts-aggregate-roles.yaml b/charts/argo-rollouts/templates/aggregate-roles.yaml
similarity index 100%
rename from charts/argo-rollouts/templates/argo-rollouts-aggregate-roles.yaml
rename to charts/argo-rollouts/templates/aggregate-roles.yaml
diff --git a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml b/charts/argo-rollouts/templates/controller/clusterrole.yaml
similarity index 100%
rename from charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml
rename to charts/argo-rollouts/templates/controller/clusterrole.yaml
diff --git a/charts/argo-rollouts/templates/argo-rollouts-clusterrolebinding.yaml b/charts/argo-rollouts/templates/controller/clusterrolebinding.yaml
similarity index 100%
rename from charts/argo-rollouts/templates/argo-rollouts-clusterrolebinding.yaml
rename to charts/argo-rollouts/templates/controller/clusterrolebinding.yaml
diff --git a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml b/charts/argo-rollouts/templates/controller/deployment.yaml
similarity index 100%
rename from charts/argo-rollouts/templates/argo-rollouts-deployment.yaml
rename to charts/argo-rollouts/templates/controller/deployment.yaml
diff --git a/charts/argo-rollouts/templates/argo-rollouts-metrics-service.yaml b/charts/argo-rollouts/templates/controller/metrics-service.yaml
similarity index 100%
rename from charts/argo-rollouts/templates/argo-rollouts-metrics-service.yaml
rename to charts/argo-rollouts/templates/controller/metrics-service.yaml
diff --git a/charts/argo-rollouts/templates/argo-rollouts-role.yaml b/charts/argo-rollouts/templates/controller/role.yaml
similarity index 100%
rename from charts/argo-rollouts/templates/argo-rollouts-role.yaml
rename to charts/argo-rollouts/templates/controller/role.yaml
diff --git a/charts/argo-rollouts/templates/argo-rollouts-rolebinding.yaml b/charts/argo-rollouts/templates/controller/rolebinding.yaml
similarity index 100%
rename from charts/argo-rollouts/templates/argo-rollouts-rolebinding.yaml
rename to charts/argo-rollouts/templates/controller/rolebinding.yaml
diff --git a/charts/argo-rollouts/templates/argo-rollouts-sa.yaml b/charts/argo-rollouts/templates/controller/serviceaccount.yaml
similarity index 100%
rename from charts/argo-rollouts/templates/argo-rollouts-sa.yaml
rename to charts/argo-rollouts/templates/controller/serviceaccount.yaml
diff --git a/charts/argo-rollouts/templates/argo-rollouts-service-monitor.yaml b/charts/argo-rollouts/templates/controller/servicemonitor.yaml
similarity index 100%
rename from charts/argo-rollouts/templates/argo-rollouts-service-monitor.yaml
rename to charts/argo-rollouts/templates/controller/servicemonitor.yaml
diff --git a/charts/argo-rollouts/templates/dashboard/sa.yaml b/charts/argo-rollouts/templates/dashboard/serviceaccount.yaml
similarity index 100%
rename from charts/argo-rollouts/templates/dashboard/sa.yaml
rename to charts/argo-rollouts/templates/dashboard/serviceaccount.yaml