diff --git a/helm-chart/.gitignore b/helm-chart/.gitignore
new file mode 100644
index 00000000..b5ec6e00
--- /dev/null
+++ b/helm-chart/.gitignore
@@ -0,0 +1 @@
+!napcat
diff --git a/helm-chart/templates/adapter-pvc.yaml b/helm-chart/templates/adapter/pvc.yaml
similarity index 100%
rename from helm-chart/templates/adapter-pvc.yaml
rename to helm-chart/templates/adapter/pvc.yaml
diff --git a/helm-chart/templates/adapter-service.yaml b/helm-chart/templates/adapter/service.yaml
similarity index 100%
rename from helm-chart/templates/adapter-service.yaml
rename to helm-chart/templates/adapter/service.yaml
diff --git a/helm-chart/templates/adapter-statefulset.yaml b/helm-chart/templates/adapter/statefulset.yaml
similarity index 100%
rename from helm-chart/templates/adapter-statefulset.yaml
rename to helm-chart/templates/adapter/statefulset.yaml
diff --git a/helm-chart/templates/core-configmap.yaml b/helm-chart/templates/core/configmap.yaml
similarity index 100%
rename from helm-chart/templates/core-configmap.yaml
rename to helm-chart/templates/core/configmap.yaml
diff --git a/helm-chart/templates/core-pvc.yaml b/helm-chart/templates/core/pvc.yaml
similarity index 100%
rename from helm-chart/templates/core-pvc.yaml
rename to helm-chart/templates/core/pvc.yaml
diff --git a/helm-chart/templates/core-service.yaml b/helm-chart/templates/core/service.yaml
similarity index 100%
rename from helm-chart/templates/core-service.yaml
rename to helm-chart/templates/core/service.yaml
diff --git a/helm-chart/templates/core-statefulset.yaml b/helm-chart/templates/core/statefulset.yaml
similarity index 100%
rename from helm-chart/templates/core-statefulset.yaml
rename to helm-chart/templates/core/statefulset.yaml
diff --git a/helm-chart/templates/pre-adapter-cm-gen-job.yaml b/helm-chart/templates/job-post-install/job-gen-adapter-cm.yaml
similarity index 100%
rename from helm-chart/templates/pre-adapter-cm-gen-job.yaml
rename to helm-chart/templates/job-post-install/job-gen-adapter-cm.yaml
diff --git a/helm-chart/templates/pre-adapter-cm-gen-rbac.yaml b/helm-chart/templates/job-post-install/rbac-gen-adapter-cm.yaml
similarity index 100%
rename from helm-chart/templates/pre-adapter-cm-gen-rbac.yaml
rename to helm-chart/templates/job-post-install/rbac-gen-adapter-cm.yaml
diff --git a/helm-chart/templates/napcat-ingress.yaml b/helm-chart/templates/napcat/ingress.yaml
similarity index 100%
rename from helm-chart/templates/napcat-ingress.yaml
rename to helm-chart/templates/napcat/ingress.yaml
diff --git a/helm-chart/templates/napcat-pvc.yaml b/helm-chart/templates/napcat/pvc.yaml
similarity index 100%
rename from helm-chart/templates/napcat-pvc.yaml
rename to helm-chart/templates/napcat/pvc.yaml
diff --git a/helm-chart/templates/napcat-service.yaml b/helm-chart/templates/napcat/service.yaml
similarity index 100%
rename from helm-chart/templates/napcat-service.yaml
rename to helm-chart/templates/napcat/service.yaml
diff --git a/helm-chart/templates/napcat-statefulset.yaml b/helm-chart/templates/napcat/statefulset.yaml
similarity index 100%
rename from helm-chart/templates/napcat-statefulset.yaml
rename to helm-chart/templates/napcat/statefulset.yaml
diff --git a/helm-chart/templates/pre-check.yaml b/helm-chart/templates/other/check-eula-privacy.yaml
similarity index 100%
rename from helm-chart/templates/pre-check.yaml
rename to helm-chart/templates/other/check-eula-privacy.yaml
diff --git a/helm-chart/templates/scripts-configmap.yaml b/helm-chart/templates/other/configmap-scripts.yaml
similarity index 100%
rename from helm-chart/templates/scripts-configmap.yaml
rename to helm-chart/templates/other/configmap-scripts.yaml
diff --git a/helm-chart/templates/sqlite-web-ingress.yaml b/helm-chart/templates/sqlite-web/ingress.yaml
similarity index 100%
rename from helm-chart/templates/sqlite-web-ingress.yaml
rename to helm-chart/templates/sqlite-web/ingress.yaml
diff --git a/helm-chart/templates/sqlite-web-service.yaml b/helm-chart/templates/sqlite-web/service.yaml
similarity index 100%
rename from helm-chart/templates/sqlite-web-service.yaml
rename to helm-chart/templates/sqlite-web/service.yaml
diff --git a/helm-chart/templates/sqlite-web-statefulset.yaml b/helm-chart/templates/sqlite-web/statefulset.yaml
similarity index 100%
rename from helm-chart/templates/sqlite-web-statefulset.yaml
rename to helm-chart/templates/sqlite-web/statefulset.yaml
diff --git a/helm-chart/templates/statistics-deployment.yaml b/helm-chart/templates/statistics/deployment.yaml
similarity index 100%
rename from helm-chart/templates/statistics-deployment.yaml
rename to helm-chart/templates/statistics/deployment.yaml
diff --git a/helm-chart/templates/statistics-ingress.yaml b/helm-chart/templates/statistics/ingress.yaml
similarity index 100%
rename from helm-chart/templates/statistics-ingress.yaml
rename to helm-chart/templates/statistics/ingress.yaml
diff --git a/helm-chart/templates/statistics-pvc.yaml b/helm-chart/templates/statistics/pvc.yaml
similarity index 100%
rename from helm-chart/templates/statistics-pvc.yaml
rename to helm-chart/templates/statistics/pvc.yaml
diff --git a/helm-chart/templates/statistics-service.yaml b/helm-chart/templates/statistics/service.yaml
similarity index 100%
rename from helm-chart/templates/statistics-service.yaml
rename to helm-chart/templates/statistics/service.yaml