diff --git a/k8s/charts/seaweedfs/templates/all-in-one-deployment.yaml b/k8s/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/all-in-one-deployment.yaml
rename to k8s/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml
diff --git a/k8s/charts/seaweedfs/templates/all-in-one-pvc.yaml b/k8s/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/all-in-one-pvc.yaml
rename to k8s/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml
diff --git a/k8s/charts/seaweedfs/templates/all-in-one-service.yml b/k8s/charts/seaweedfs/templates/all-in-one/all-in-one-service.yml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/all-in-one-service.yml
rename to k8s/charts/seaweedfs/templates/all-in-one/all-in-one-service.yml
diff --git a/k8s/charts/seaweedfs/templates/all-in-one-servicemonitor.yaml b/k8s/charts/seaweedfs/templates/all-in-one/all-in-one-servicemonitor.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/all-in-one-servicemonitor.yaml
rename to k8s/charts/seaweedfs/templates/all-in-one/all-in-one-servicemonitor.yaml
diff --git a/k8s/charts/seaweedfs/templates/ca-cert.yaml b/k8s/charts/seaweedfs/templates/cert/ca-cert.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/ca-cert.yaml
rename to k8s/charts/seaweedfs/templates/cert/ca-cert.yaml
diff --git a/k8s/charts/seaweedfs/templates/cert-caissuer.yaml b/k8s/charts/seaweedfs/templates/cert/cert-caissuer.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/cert-caissuer.yaml
rename to k8s/charts/seaweedfs/templates/cert/cert-caissuer.yaml
diff --git a/k8s/charts/seaweedfs/templates/cert-issuer.yaml b/k8s/charts/seaweedfs/templates/cert/cert-issuer.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/cert-issuer.yaml
rename to k8s/charts/seaweedfs/templates/cert/cert-issuer.yaml
diff --git a/k8s/charts/seaweedfs/templates/client-cert.yaml b/k8s/charts/seaweedfs/templates/cert/client-cert.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/client-cert.yaml
rename to k8s/charts/seaweedfs/templates/cert/client-cert.yaml
diff --git a/k8s/charts/seaweedfs/templates/filer-cert.yaml b/k8s/charts/seaweedfs/templates/cert/filer-cert.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/filer-cert.yaml
rename to k8s/charts/seaweedfs/templates/cert/filer-cert.yaml
diff --git a/k8s/charts/seaweedfs/templates/master-cert.yaml b/k8s/charts/seaweedfs/templates/cert/master-cert.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/master-cert.yaml
rename to k8s/charts/seaweedfs/templates/cert/master-cert.yaml
diff --git a/k8s/charts/seaweedfs/templates/volume-cert.yaml b/k8s/charts/seaweedfs/templates/cert/volume-cert.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/volume-cert.yaml
rename to k8s/charts/seaweedfs/templates/cert/volume-cert.yaml
diff --git a/k8s/charts/seaweedfs/templates/cosi-bucket-class.yaml b/k8s/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/cosi-bucket-class.yaml
rename to k8s/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml
diff --git a/k8s/charts/seaweedfs/templates/cosi-cluster-role.yaml b/k8s/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/cosi-cluster-role.yaml
rename to k8s/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
diff --git a/k8s/charts/seaweedfs/templates/cosi-deployment.yaml b/k8s/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/cosi-deployment.yaml
rename to k8s/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
diff --git a/k8s/charts/seaweedfs/templates/cosi-service-account.yaml b/k8s/charts/seaweedfs/templates/cosi/cosi-service-account.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/cosi-service-account.yaml
rename to k8s/charts/seaweedfs/templates/cosi/cosi-service-account.yaml
diff --git a/k8s/charts/seaweedfs/templates/filer-ingress.yaml b/k8s/charts/seaweedfs/templates/filer/filer-ingress.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/filer-ingress.yaml
rename to k8s/charts/seaweedfs/templates/filer/filer-ingress.yaml
diff --git a/k8s/charts/seaweedfs/templates/filer-service-client.yaml b/k8s/charts/seaweedfs/templates/filer/filer-service-client.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/filer-service-client.yaml
rename to k8s/charts/seaweedfs/templates/filer/filer-service-client.yaml
diff --git a/k8s/charts/seaweedfs/templates/filer-service.yaml b/k8s/charts/seaweedfs/templates/filer/filer-service.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/filer-service.yaml
rename to k8s/charts/seaweedfs/templates/filer/filer-service.yaml
diff --git a/k8s/charts/seaweedfs/templates/filer-servicemonitor.yaml b/k8s/charts/seaweedfs/templates/filer/filer-servicemonitor.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/filer-servicemonitor.yaml
rename to k8s/charts/seaweedfs/templates/filer/filer-servicemonitor.yaml
diff --git a/k8s/charts/seaweedfs/templates/filer-statefulset.yaml b/k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml
similarity index 99%
rename from k8s/charts/seaweedfs/templates/filer-statefulset.yaml
rename to k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml
index d2dad0097..5c1a0950b 100644
--- a/k8s/charts/seaweedfs/templates/filer-statefulset.yaml
+++ b/k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml
@@ -53,7 +53,7 @@ spec:
         {{- $configSecret := (lookup "v1" "Secret" .Release.Namespace .Values.filer.s3.existingConfigSecret) | default dict }}
         checksum/s3config: {{ $configSecret | toYaml | sha256sum }}
       {{- else }}
-        checksum/s3config: {{ include (print .Template.BasePath "/s3-secret.yaml") . | sha256sum }}
+        checksum/s3config: {{ include (print .Template.BasePath "/s3/s3-secret.yaml") . | sha256sum }}
       {{- end }}
     spec:
       restartPolicy: {{ default .Values.global.restartPolicy .Values.filer.restartPolicy }}
diff --git a/k8s/charts/seaweedfs/templates/master-configmap.yaml b/k8s/charts/seaweedfs/templates/master/master-configmap.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/master-configmap.yaml
rename to k8s/charts/seaweedfs/templates/master/master-configmap.yaml
diff --git a/k8s/charts/seaweedfs/templates/master-ingress.yaml b/k8s/charts/seaweedfs/templates/master/master-ingress.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/master-ingress.yaml
rename to k8s/charts/seaweedfs/templates/master/master-ingress.yaml
diff --git a/k8s/charts/seaweedfs/templates/master-service.yaml b/k8s/charts/seaweedfs/templates/master/master-service.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/master-service.yaml
rename to k8s/charts/seaweedfs/templates/master/master-service.yaml
diff --git a/k8s/charts/seaweedfs/templates/master-servicemonitor.yaml b/k8s/charts/seaweedfs/templates/master/master-servicemonitor.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/master-servicemonitor.yaml
rename to k8s/charts/seaweedfs/templates/master/master-servicemonitor.yaml
diff --git a/k8s/charts/seaweedfs/templates/master-statefulset.yaml b/k8s/charts/seaweedfs/templates/master/master-statefulset.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/master-statefulset.yaml
rename to k8s/charts/seaweedfs/templates/master/master-statefulset.yaml
diff --git a/k8s/charts/seaweedfs/templates/s3-deployment.yaml b/k8s/charts/seaweedfs/templates/s3/s3-deployment.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/s3-deployment.yaml
rename to k8s/charts/seaweedfs/templates/s3/s3-deployment.yaml
diff --git a/k8s/charts/seaweedfs/templates/s3-ingress.yaml b/k8s/charts/seaweedfs/templates/s3/s3-ingress.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/s3-ingress.yaml
rename to k8s/charts/seaweedfs/templates/s3/s3-ingress.yaml
diff --git a/k8s/charts/seaweedfs/templates/s3-secret.yaml b/k8s/charts/seaweedfs/templates/s3/s3-secret.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/s3-secret.yaml
rename to k8s/charts/seaweedfs/templates/s3/s3-secret.yaml
diff --git a/k8s/charts/seaweedfs/templates/s3-service.yaml b/k8s/charts/seaweedfs/templates/s3/s3-service.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/s3-service.yaml
rename to k8s/charts/seaweedfs/templates/s3/s3-service.yaml
diff --git a/k8s/charts/seaweedfs/templates/s3-servicemonitor.yaml b/k8s/charts/seaweedfs/templates/s3/s3-servicemonitor.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/s3-servicemonitor.yaml
rename to k8s/charts/seaweedfs/templates/s3/s3-servicemonitor.yaml
diff --git a/k8s/charts/seaweedfs/templates/sftp-deployment.yaml b/k8s/charts/seaweedfs/templates/sftp/sftp-deployment.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/sftp-deployment.yaml
rename to k8s/charts/seaweedfs/templates/sftp/sftp-deployment.yaml
diff --git a/k8s/charts/seaweedfs/templates/sftp-secret.yaml b/k8s/charts/seaweedfs/templates/sftp/sftp-secret.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/sftp-secret.yaml
rename to k8s/charts/seaweedfs/templates/sftp/sftp-secret.yaml
diff --git a/k8s/charts/seaweedfs/templates/sftp-service.yaml b/k8s/charts/seaweedfs/templates/sftp/sftp-service.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/sftp-service.yaml
rename to k8s/charts/seaweedfs/templates/sftp/sftp-service.yaml
diff --git a/k8s/charts/seaweedfs/templates/sftp-servicemonitor.yaml b/k8s/charts/seaweedfs/templates/sftp/sftp-servicemonitor.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/sftp-servicemonitor.yaml
rename to k8s/charts/seaweedfs/templates/sftp/sftp-servicemonitor.yaml
diff --git a/k8s/charts/seaweedfs/templates/_helpers.tpl b/k8s/charts/seaweedfs/templates/shared/_helpers.tpl
similarity index 100%
rename from k8s/charts/seaweedfs/templates/_helpers.tpl
rename to k8s/charts/seaweedfs/templates/shared/_helpers.tpl
diff --git a/k8s/charts/seaweedfs/templates/cluster-role.yaml b/k8s/charts/seaweedfs/templates/shared/cluster-role.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/cluster-role.yaml
rename to k8s/charts/seaweedfs/templates/shared/cluster-role.yaml
diff --git a/k8s/charts/seaweedfs/templates/notification-configmap.yaml b/k8s/charts/seaweedfs/templates/shared/notification-configmap.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/notification-configmap.yaml
rename to k8s/charts/seaweedfs/templates/shared/notification-configmap.yaml
diff --git a/k8s/charts/seaweedfs/templates/post-install-bucket-hook.yaml b/k8s/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/post-install-bucket-hook.yaml
rename to k8s/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml
diff --git a/k8s/charts/seaweedfs/templates/seaweedfs-grafana-dashboard.yaml b/k8s/charts/seaweedfs/templates/shared/seaweedfs-grafana-dashboard.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/seaweedfs-grafana-dashboard.yaml
rename to k8s/charts/seaweedfs/templates/shared/seaweedfs-grafana-dashboard.yaml
diff --git a/k8s/charts/seaweedfs/templates/secret-seaweedfs-db.yaml b/k8s/charts/seaweedfs/templates/shared/secret-seaweedfs-db.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/secret-seaweedfs-db.yaml
rename to k8s/charts/seaweedfs/templates/shared/secret-seaweedfs-db.yaml
diff --git a/k8s/charts/seaweedfs/templates/security-configmap.yaml b/k8s/charts/seaweedfs/templates/shared/security-configmap.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/security-configmap.yaml
rename to k8s/charts/seaweedfs/templates/shared/security-configmap.yaml
diff --git a/k8s/charts/seaweedfs/templates/service-account.yaml b/k8s/charts/seaweedfs/templates/shared/service-account.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/service-account.yaml
rename to k8s/charts/seaweedfs/templates/shared/service-account.yaml
diff --git a/k8s/charts/seaweedfs/templates/volume-resize-hook.yaml b/k8s/charts/seaweedfs/templates/volume/volume-resize-hook.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/volume-resize-hook.yaml
rename to k8s/charts/seaweedfs/templates/volume/volume-resize-hook.yaml
diff --git a/k8s/charts/seaweedfs/templates/volume-service.yaml b/k8s/charts/seaweedfs/templates/volume/volume-service.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/volume-service.yaml
rename to k8s/charts/seaweedfs/templates/volume/volume-service.yaml
diff --git a/k8s/charts/seaweedfs/templates/volume-servicemonitor.yaml b/k8s/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/volume-servicemonitor.yaml
rename to k8s/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml
diff --git a/k8s/charts/seaweedfs/templates/volume-statefulset.yaml b/k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml
similarity index 100%
rename from k8s/charts/seaweedfs/templates/volume-statefulset.yaml
rename to k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml