diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml
index 7304f35b..dae0dcbd 100644
--- a/charts/argo-rollouts/Chart.yaml
+++ b/charts/argo-rollouts/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "v1.1.0"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 2.2.0
+version: 2.2.1
 icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
@@ -11,4 +11,4 @@ maintainers:
   - name: jessesuen
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: updated rollouts version to 1.1.0 and updated CRDs to reflect the version bump"
+    - "[Changed]: Reorganize files in repo, move controller-specific things into subfolder."
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