diff --git a/charts/premium/custom-app/.helmignore b/archive/charts/system/cloudnative-pg/.helmignore
similarity index 100%
rename from charts/premium/custom-app/.helmignore
rename to archive/charts/system/cloudnative-pg/.helmignore
diff --git a/charts/system/cloudnative-pg/Chart.yaml b/archive/charts/system/cloudnative-pg/Chart.yaml
similarity index 100%
rename from charts/system/cloudnative-pg/Chart.yaml
rename to archive/charts/system/cloudnative-pg/Chart.yaml
diff --git a/charts/system/cloudnative-pg/README.md b/archive/charts/system/cloudnative-pg/README.md
similarity index 100%
rename from charts/system/cloudnative-pg/README.md
rename to archive/charts/system/cloudnative-pg/README.md
diff --git a/charts/system/cloudnative-pg/icon-small.webp b/archive/charts/system/cloudnative-pg/icon-small.webp
similarity index 100%
rename from charts/system/cloudnative-pg/icon-small.webp
rename to archive/charts/system/cloudnative-pg/icon-small.webp
diff --git a/charts/system/cloudnative-pg/icon.webp b/archive/charts/system/cloudnative-pg/icon.webp
similarity index 100%
rename from charts/system/cloudnative-pg/icon.webp
rename to archive/charts/system/cloudnative-pg/icon.webp
diff --git a/charts/premium/custom-app/templates/NOTES.txt b/archive/charts/system/cloudnative-pg/templates/NOTES.txt
similarity index 100%
rename from charts/premium/custom-app/templates/NOTES.txt
rename to archive/charts/system/cloudnative-pg/templates/NOTES.txt
diff --git a/charts/system/cloudnative-pg/templates/common.yaml b/archive/charts/system/cloudnative-pg/templates/common.yaml
similarity index 100%
rename from charts/system/cloudnative-pg/templates/common.yaml
rename to archive/charts/system/cloudnative-pg/templates/common.yaml
diff --git a/charts/system/cloudnative-pg/values.yaml b/archive/charts/system/cloudnative-pg/values.yaml
similarity index 100%
rename from charts/system/cloudnative-pg/values.yaml
rename to archive/charts/system/cloudnative-pg/values.yaml
diff --git a/charts/system/cloudnative-pg/.helmignore b/archive/charts/system/csi-driver-nfs/.helmignore
similarity index 100%
rename from charts/system/cloudnative-pg/.helmignore
rename to archive/charts/system/csi-driver-nfs/.helmignore
diff --git a/charts/system/csi-driver-nfs/Chart.yaml b/archive/charts/system/csi-driver-nfs/Chart.yaml
similarity index 100%
rename from charts/system/csi-driver-nfs/Chart.yaml
rename to archive/charts/system/csi-driver-nfs/Chart.yaml
diff --git a/charts/system/csi-driver-nfs/README.md b/archive/charts/system/csi-driver-nfs/README.md
similarity index 100%
rename from charts/system/csi-driver-nfs/README.md
rename to archive/charts/system/csi-driver-nfs/README.md
diff --git a/charts/system/csi-driver-nfs/icon-small.webp b/archive/charts/system/csi-driver-nfs/icon-small.webp
similarity index 100%
rename from charts/system/csi-driver-nfs/icon-small.webp
rename to archive/charts/system/csi-driver-nfs/icon-small.webp
diff --git a/charts/system/csi-driver-nfs/icon.webp b/archive/charts/system/csi-driver-nfs/icon.webp
similarity index 100%
rename from charts/system/csi-driver-nfs/icon.webp
rename to archive/charts/system/csi-driver-nfs/icon.webp
diff --git a/charts/system/cloudnative-pg/templates/NOTES.txt b/archive/charts/system/csi-driver-nfs/templates/NOTES.txt
similarity index 100%
rename from charts/system/cloudnative-pg/templates/NOTES.txt
rename to archive/charts/system/csi-driver-nfs/templates/NOTES.txt
diff --git a/charts/system/csi-driver-nfs/templates/common.yaml b/archive/charts/system/csi-driver-nfs/templates/common.yaml
similarity index 100%
rename from charts/system/csi-driver-nfs/templates/common.yaml
rename to archive/charts/system/csi-driver-nfs/templates/common.yaml
diff --git a/charts/system/csi-driver-nfs/values.yaml b/archive/charts/system/csi-driver-nfs/values.yaml
similarity index 100%
rename from charts/system/csi-driver-nfs/values.yaml
rename to archive/charts/system/csi-driver-nfs/values.yaml
diff --git a/charts/system/csi-driver-nfs/.helmignore b/archive/charts/system/csi-driver-smb/.helmignore
similarity index 100%
rename from charts/system/csi-driver-nfs/.helmignore
rename to archive/charts/system/csi-driver-smb/.helmignore
diff --git a/charts/system/csi-driver-smb/Chart.yaml b/archive/charts/system/csi-driver-smb/Chart.yaml
similarity index 100%
rename from charts/system/csi-driver-smb/Chart.yaml
rename to archive/charts/system/csi-driver-smb/Chart.yaml
diff --git a/charts/system/csi-driver-smb/README.md b/archive/charts/system/csi-driver-smb/README.md
similarity index 100%
rename from charts/system/csi-driver-smb/README.md
rename to archive/charts/system/csi-driver-smb/README.md
diff --git a/charts/system/csi-driver-smb/icon-small.webp b/archive/charts/system/csi-driver-smb/icon-small.webp
similarity index 100%
rename from charts/system/csi-driver-smb/icon-small.webp
rename to archive/charts/system/csi-driver-smb/icon-small.webp
diff --git a/charts/system/csi-driver-smb/icon.webp b/archive/charts/system/csi-driver-smb/icon.webp
similarity index 100%
rename from charts/system/csi-driver-smb/icon.webp
rename to archive/charts/system/csi-driver-smb/icon.webp
diff --git a/charts/system/csi-driver-nfs/templates/NOTES.txt b/archive/charts/system/csi-driver-smb/templates/NOTES.txt
similarity index 100%
rename from charts/system/csi-driver-nfs/templates/NOTES.txt
rename to archive/charts/system/csi-driver-smb/templates/NOTES.txt
diff --git a/charts/system/csi-driver-smb/templates/common.yaml b/archive/charts/system/csi-driver-smb/templates/common.yaml
similarity index 100%
rename from charts/system/csi-driver-smb/templates/common.yaml
rename to archive/charts/system/csi-driver-smb/templates/common.yaml
diff --git a/charts/system/csi-driver-smb/values.yaml b/archive/charts/system/csi-driver-smb/values.yaml
similarity index 100%
rename from charts/system/csi-driver-smb/values.yaml
rename to archive/charts/system/csi-driver-smb/values.yaml
diff --git a/charts/system/csi-driver-smb/.helmignore b/archive/charts/system/descheduler/.helmignore
similarity index 100%
rename from charts/system/csi-driver-smb/.helmignore
rename to archive/charts/system/descheduler/.helmignore
diff --git a/charts/system/descheduler/Chart.yaml b/archive/charts/system/descheduler/Chart.yaml
similarity index 100%
rename from charts/system/descheduler/Chart.yaml
rename to archive/charts/system/descheduler/Chart.yaml
diff --git a/charts/system/descheduler/README.md b/archive/charts/system/descheduler/README.md
similarity index 100%
rename from charts/system/descheduler/README.md
rename to archive/charts/system/descheduler/README.md
diff --git a/charts/system/descheduler/icon-small.webp b/archive/charts/system/descheduler/icon-small.webp
similarity index 100%
rename from charts/system/descheduler/icon-small.webp
rename to archive/charts/system/descheduler/icon-small.webp
diff --git a/charts/system/descheduler/icon.webp b/archive/charts/system/descheduler/icon.webp
similarity index 100%
rename from charts/system/descheduler/icon.webp
rename to archive/charts/system/descheduler/icon.webp
diff --git a/charts/system/csi-driver-smb/templates/NOTES.txt b/archive/charts/system/descheduler/templates/NOTES.txt
similarity index 100%
rename from charts/system/csi-driver-smb/templates/NOTES.txt
rename to archive/charts/system/descheduler/templates/NOTES.txt
diff --git a/charts/system/descheduler/templates/common.yaml b/archive/charts/system/descheduler/templates/common.yaml
similarity index 100%
rename from charts/system/descheduler/templates/common.yaml
rename to archive/charts/system/descheduler/templates/common.yaml
diff --git a/charts/system/descheduler/values.yaml b/archive/charts/system/descheduler/values.yaml
similarity index 100%
rename from charts/system/descheduler/values.yaml
rename to archive/charts/system/descheduler/values.yaml
diff --git a/charts/system/descheduler/.helmignore b/archive/charts/system/intel-device-plugins-operator/.helmignore
similarity index 100%
rename from charts/system/descheduler/.helmignore
rename to archive/charts/system/intel-device-plugins-operator/.helmignore
diff --git a/charts/system/intel-device-plugins-operator/Chart.yaml b/archive/charts/system/intel-device-plugins-operator/Chart.yaml
similarity index 100%
rename from charts/system/intel-device-plugins-operator/Chart.yaml
rename to archive/charts/system/intel-device-plugins-operator/Chart.yaml
diff --git a/charts/system/intel-device-plugins-operator/README.md b/archive/charts/system/intel-device-plugins-operator/README.md
similarity index 100%
rename from charts/system/intel-device-plugins-operator/README.md
rename to archive/charts/system/intel-device-plugins-operator/README.md
diff --git a/charts/system/intel-device-plugins-operator/icon-small.webp b/archive/charts/system/intel-device-plugins-operator/icon-small.webp
similarity index 100%
rename from charts/system/intel-device-plugins-operator/icon-small.webp
rename to archive/charts/system/intel-device-plugins-operator/icon-small.webp
diff --git a/charts/system/intel-device-plugins-operator/icon.webp b/archive/charts/system/intel-device-plugins-operator/icon.webp
similarity index 100%
rename from charts/system/intel-device-plugins-operator/icon.webp
rename to archive/charts/system/intel-device-plugins-operator/icon.webp
diff --git a/charts/system/descheduler/templates/NOTES.txt b/archive/charts/system/intel-device-plugins-operator/templates/NOTES.txt
similarity index 100%
rename from charts/system/descheduler/templates/NOTES.txt
rename to archive/charts/system/intel-device-plugins-operator/templates/NOTES.txt
diff --git a/charts/system/intel-device-plugins-operator/templates/common.yaml b/archive/charts/system/intel-device-plugins-operator/templates/common.yaml
similarity index 100%
rename from charts/system/intel-device-plugins-operator/templates/common.yaml
rename to archive/charts/system/intel-device-plugins-operator/templates/common.yaml
diff --git a/charts/system/intel-device-plugins-operator/values.yaml b/archive/charts/system/intel-device-plugins-operator/values.yaml
similarity index 100%
rename from charts/system/intel-device-plugins-operator/values.yaml
rename to archive/charts/system/intel-device-plugins-operator/values.yaml
diff --git a/charts/system/intel-device-plugins-operator/.helmignore b/archive/charts/system/kubeapps/.helmignore
similarity index 100%
rename from charts/system/intel-device-plugins-operator/.helmignore
rename to archive/charts/system/kubeapps/.helmignore
diff --git a/charts/system/kubeapps/Chart.yaml b/archive/charts/system/kubeapps/Chart.yaml
similarity index 100%
rename from charts/system/kubeapps/Chart.yaml
rename to archive/charts/system/kubeapps/Chart.yaml
diff --git a/charts/system/kubeapps/README.md b/archive/charts/system/kubeapps/README.md
similarity index 100%
rename from charts/system/kubeapps/README.md
rename to archive/charts/system/kubeapps/README.md
diff --git a/charts/system/kubeapps/docs/token.md b/archive/charts/system/kubeapps/docs/token.md
similarity index 100%
rename from charts/system/kubeapps/docs/token.md
rename to archive/charts/system/kubeapps/docs/token.md
diff --git a/charts/system/kubeapps/icon-small.webp b/archive/charts/system/kubeapps/icon-small.webp
similarity index 100%
rename from charts/system/kubeapps/icon-small.webp
rename to archive/charts/system/kubeapps/icon-small.webp
diff --git a/charts/system/kubeapps/icon.webp b/archive/charts/system/kubeapps/icon.webp
similarity index 100%
rename from charts/system/kubeapps/icon.webp
rename to archive/charts/system/kubeapps/icon.webp
diff --git a/charts/system/kubeapps/templates/NOTES.txt b/archive/charts/system/kubeapps/templates/NOTES.txt
similarity index 100%
rename from charts/system/kubeapps/templates/NOTES.txt
rename to archive/charts/system/kubeapps/templates/NOTES.txt
diff --git a/charts/system/kubeapps/templates/common.yaml b/archive/charts/system/kubeapps/templates/common.yaml
similarity index 100%
rename from charts/system/kubeapps/templates/common.yaml
rename to archive/charts/system/kubeapps/templates/common.yaml
diff --git a/charts/system/kubeapps/values.yaml b/archive/charts/system/kubeapps/values.yaml
similarity index 100%
rename from charts/system/kubeapps/values.yaml
rename to archive/charts/system/kubeapps/values.yaml
diff --git a/charts/system/kubeapps/.helmignore b/archive/charts/system/metallb/.helmignore
similarity index 100%
rename from charts/system/kubeapps/.helmignore
rename to archive/charts/system/metallb/.helmignore
diff --git a/charts/system/metallb/Chart.yaml b/archive/charts/system/metallb/Chart.yaml
similarity index 100%
rename from charts/system/metallb/Chart.yaml
rename to archive/charts/system/metallb/Chart.yaml
diff --git a/charts/system/metallb/README.md b/archive/charts/system/metallb/README.md
similarity index 100%
rename from charts/system/metallb/README.md
rename to archive/charts/system/metallb/README.md
diff --git a/charts/system/metallb/icon-small.webp b/archive/charts/system/metallb/icon-small.webp
similarity index 100%
rename from charts/system/metallb/icon-small.webp
rename to archive/charts/system/metallb/icon-small.webp
diff --git a/charts/system/metallb/icon.webp b/archive/charts/system/metallb/icon.webp
similarity index 100%
rename from charts/system/metallb/icon.webp
rename to archive/charts/system/metallb/icon.webp
diff --git a/charts/system/intel-device-plugins-operator/templates/NOTES.txt b/archive/charts/system/metallb/templates/NOTES.txt
similarity index 100%
rename from charts/system/intel-device-plugins-operator/templates/NOTES.txt
rename to archive/charts/system/metallb/templates/NOTES.txt
diff --git a/charts/system/metallb/templates/common.yaml b/archive/charts/system/metallb/templates/common.yaml
similarity index 100%
rename from charts/system/metallb/templates/common.yaml
rename to archive/charts/system/metallb/templates/common.yaml
diff --git a/charts/system/metallb/values.yaml b/archive/charts/system/metallb/values.yaml
similarity index 100%
rename from charts/system/metallb/values.yaml
rename to archive/charts/system/metallb/values.yaml
diff --git a/charts/system/metallb/.helmignore b/archive/charts/system/metrics-server/.helmignore
similarity index 100%
rename from charts/system/metallb/.helmignore
rename to archive/charts/system/metrics-server/.helmignore
diff --git a/charts/system/metrics-server/Chart.yaml b/archive/charts/system/metrics-server/Chart.yaml
similarity index 100%
rename from charts/system/metrics-server/Chart.yaml
rename to archive/charts/system/metrics-server/Chart.yaml
diff --git a/charts/system/metrics-server/README.md b/archive/charts/system/metrics-server/README.md
similarity index 100%
rename from charts/system/metrics-server/README.md
rename to archive/charts/system/metrics-server/README.md
diff --git a/charts/system/metrics-server/icon-small.webp b/archive/charts/system/metrics-server/icon-small.webp
similarity index 100%
rename from charts/system/metrics-server/icon-small.webp
rename to archive/charts/system/metrics-server/icon-small.webp
diff --git a/charts/system/metrics-server/icon.webp b/archive/charts/system/metrics-server/icon.webp
similarity index 100%
rename from charts/system/metrics-server/icon.webp
rename to archive/charts/system/metrics-server/icon.webp
diff --git a/charts/system/metallb/templates/NOTES.txt b/archive/charts/system/metrics-server/templates/NOTES.txt
similarity index 100%
rename from charts/system/metallb/templates/NOTES.txt
rename to archive/charts/system/metrics-server/templates/NOTES.txt
diff --git a/charts/system/metrics-server/templates/common.yaml b/archive/charts/system/metrics-server/templates/common.yaml
similarity index 100%
rename from charts/system/metrics-server/templates/common.yaml
rename to archive/charts/system/metrics-server/templates/common.yaml
diff --git a/charts/system/metrics-server/values.yaml b/archive/charts/system/metrics-server/values.yaml
similarity index 100%
rename from charts/system/metrics-server/values.yaml
rename to archive/charts/system/metrics-server/values.yaml
diff --git a/charts/system/metrics-server/.helmignore b/archive/charts/system/node-feature-discovery/.helmignore
similarity index 100%
rename from charts/system/metrics-server/.helmignore
rename to archive/charts/system/node-feature-discovery/.helmignore
diff --git a/charts/system/node-feature-discovery/Chart.yaml b/archive/charts/system/node-feature-discovery/Chart.yaml
similarity index 100%
rename from charts/system/node-feature-discovery/Chart.yaml
rename to archive/charts/system/node-feature-discovery/Chart.yaml
diff --git a/charts/system/node-feature-discovery/README.md b/archive/charts/system/node-feature-discovery/README.md
similarity index 100%
rename from charts/system/node-feature-discovery/README.md
rename to archive/charts/system/node-feature-discovery/README.md
diff --git a/charts/system/node-feature-discovery/icon-small.webp b/archive/charts/system/node-feature-discovery/icon-small.webp
similarity index 100%
rename from charts/system/node-feature-discovery/icon-small.webp
rename to archive/charts/system/node-feature-discovery/icon-small.webp
diff --git a/charts/system/node-feature-discovery/icon.webp b/archive/charts/system/node-feature-discovery/icon.webp
similarity index 100%
rename from charts/system/node-feature-discovery/icon.webp
rename to archive/charts/system/node-feature-discovery/icon.webp
diff --git a/charts/system/metrics-server/templates/NOTES.txt b/archive/charts/system/node-feature-discovery/templates/NOTES.txt
similarity index 100%
rename from charts/system/metrics-server/templates/NOTES.txt
rename to archive/charts/system/node-feature-discovery/templates/NOTES.txt
diff --git a/charts/system/node-feature-discovery/templates/common.yaml b/archive/charts/system/node-feature-discovery/templates/common.yaml
similarity index 100%
rename from charts/system/node-feature-discovery/templates/common.yaml
rename to archive/charts/system/node-feature-discovery/templates/common.yaml
diff --git a/charts/system/node-feature-discovery/values.yaml b/archive/charts/system/node-feature-discovery/values.yaml
similarity index 100%
rename from charts/system/node-feature-discovery/values.yaml
rename to archive/charts/system/node-feature-discovery/values.yaml
diff --git a/charts/system/node-feature-discovery/.helmignore b/archive/charts/system/nvidia-device-plugin/.helmignore
similarity index 100%
rename from charts/system/node-feature-discovery/.helmignore
rename to archive/charts/system/nvidia-device-plugin/.helmignore
diff --git a/charts/system/nvidia-device-plugin/Chart.yaml b/archive/charts/system/nvidia-device-plugin/Chart.yaml
similarity index 100%
rename from charts/system/nvidia-device-plugin/Chart.yaml
rename to archive/charts/system/nvidia-device-plugin/Chart.yaml
diff --git a/charts/system/nvidia-device-plugin/README.md b/archive/charts/system/nvidia-device-plugin/README.md
similarity index 100%
rename from charts/system/nvidia-device-plugin/README.md
rename to archive/charts/system/nvidia-device-plugin/README.md
diff --git a/charts/system/nvidia-device-plugin/docs/installation.md b/archive/charts/system/nvidia-device-plugin/docs/installation.md
similarity index 100%
rename from charts/system/nvidia-device-plugin/docs/installation.md
rename to archive/charts/system/nvidia-device-plugin/docs/installation.md
diff --git a/charts/system/nvidia-device-plugin/icon-small.webp b/archive/charts/system/nvidia-device-plugin/icon-small.webp
similarity index 100%
rename from charts/system/nvidia-device-plugin/icon-small.webp
rename to archive/charts/system/nvidia-device-plugin/icon-small.webp
diff --git a/charts/system/nvidia-device-plugin/icon.webp b/archive/charts/system/nvidia-device-plugin/icon.webp
similarity index 100%
rename from charts/system/nvidia-device-plugin/icon.webp
rename to archive/charts/system/nvidia-device-plugin/icon.webp
diff --git a/charts/system/node-feature-discovery/templates/NOTES.txt b/archive/charts/system/nvidia-device-plugin/templates/NOTES.txt
similarity index 100%
rename from charts/system/node-feature-discovery/templates/NOTES.txt
rename to archive/charts/system/nvidia-device-plugin/templates/NOTES.txt
diff --git a/charts/system/nvidia-device-plugin/templates/common.yaml b/archive/charts/system/nvidia-device-plugin/templates/common.yaml
similarity index 100%
rename from charts/system/nvidia-device-plugin/templates/common.yaml
rename to archive/charts/system/nvidia-device-plugin/templates/common.yaml
diff --git a/charts/system/nvidia-device-plugin/values.yaml b/archive/charts/system/nvidia-device-plugin/values.yaml
similarity index 100%
rename from charts/system/nvidia-device-plugin/values.yaml
rename to archive/charts/system/nvidia-device-plugin/values.yaml
diff --git a/charts/system/nvidia-device-plugin/.helmignore b/archive/charts/system/nvidia-gpu-operator/.helmignore
similarity index 100%
rename from charts/system/nvidia-device-plugin/.helmignore
rename to archive/charts/system/nvidia-gpu-operator/.helmignore
diff --git a/charts/system/nvidia-gpu-operator/Chart.yaml b/archive/charts/system/nvidia-gpu-operator/Chart.yaml
similarity index 100%
rename from charts/system/nvidia-gpu-operator/Chart.yaml
rename to archive/charts/system/nvidia-gpu-operator/Chart.yaml
diff --git a/charts/system/nvidia-gpu-operator/README.md b/archive/charts/system/nvidia-gpu-operator/README.md
similarity index 100%
rename from charts/system/nvidia-gpu-operator/README.md
rename to archive/charts/system/nvidia-gpu-operator/README.md
diff --git a/charts/system/nvidia-gpu-operator/icon-small.webp b/archive/charts/system/nvidia-gpu-operator/icon-small.webp
similarity index 100%
rename from charts/system/nvidia-gpu-operator/icon-small.webp
rename to archive/charts/system/nvidia-gpu-operator/icon-small.webp
diff --git a/charts/system/nvidia-gpu-operator/icon.webp b/archive/charts/system/nvidia-gpu-operator/icon.webp
similarity index 100%
rename from charts/system/nvidia-gpu-operator/icon.webp
rename to archive/charts/system/nvidia-gpu-operator/icon.webp
diff --git a/charts/system/nvidia-device-plugin/templates/NOTES.txt b/archive/charts/system/nvidia-gpu-operator/templates/NOTES.txt
similarity index 100%
rename from charts/system/nvidia-device-plugin/templates/NOTES.txt
rename to archive/charts/system/nvidia-gpu-operator/templates/NOTES.txt
diff --git a/charts/system/nvidia-gpu-operator/templates/common.yaml b/archive/charts/system/nvidia-gpu-operator/templates/common.yaml
similarity index 100%
rename from charts/system/nvidia-gpu-operator/templates/common.yaml
rename to archive/charts/system/nvidia-gpu-operator/templates/common.yaml
diff --git a/charts/system/nvidia-gpu-operator/values.yaml b/archive/charts/system/nvidia-gpu-operator/values.yaml
similarity index 100%
rename from charts/system/nvidia-gpu-operator/values.yaml
rename to archive/charts/system/nvidia-gpu-operator/values.yaml
diff --git a/charts/system/nvidia-gpu-operator/.helmignore b/archive/charts/system/openebs/.helmignore
similarity index 100%
rename from charts/system/nvidia-gpu-operator/.helmignore
rename to archive/charts/system/openebs/.helmignore
diff --git a/charts/system/openebs/Chart.yaml b/archive/charts/system/openebs/Chart.yaml
similarity index 100%
rename from charts/system/openebs/Chart.yaml
rename to archive/charts/system/openebs/Chart.yaml
diff --git a/charts/system/openebs/README.md b/archive/charts/system/openebs/README.md
similarity index 100%
rename from charts/system/openebs/README.md
rename to archive/charts/system/openebs/README.md
diff --git a/charts/system/openebs/icon-small.webp b/archive/charts/system/openebs/icon-small.webp
similarity index 100%
rename from charts/system/openebs/icon-small.webp
rename to archive/charts/system/openebs/icon-small.webp
diff --git a/charts/system/openebs/icon.webp b/archive/charts/system/openebs/icon.webp
similarity index 100%
rename from charts/system/openebs/icon.webp
rename to archive/charts/system/openebs/icon.webp
diff --git a/charts/system/nvidia-gpu-operator/templates/NOTES.txt b/archive/charts/system/openebs/templates/NOTES.txt
similarity index 100%
rename from charts/system/nvidia-gpu-operator/templates/NOTES.txt
rename to archive/charts/system/openebs/templates/NOTES.txt
diff --git a/charts/system/openebs/templates/common.yaml b/archive/charts/system/openebs/templates/common.yaml
similarity index 100%
rename from charts/system/openebs/templates/common.yaml
rename to archive/charts/system/openebs/templates/common.yaml
diff --git a/charts/system/openebs/values.yaml b/archive/charts/system/openebs/values.yaml
similarity index 100%
rename from charts/system/openebs/values.yaml
rename to archive/charts/system/openebs/values.yaml
diff --git a/charts/system/openebs/.helmignore b/archive/charts/system/spegel/.helmignore
similarity index 100%
rename from charts/system/openebs/.helmignore
rename to archive/charts/system/spegel/.helmignore
diff --git a/charts/system/spegel/Chart.yaml b/archive/charts/system/spegel/Chart.yaml
similarity index 100%
rename from charts/system/spegel/Chart.yaml
rename to archive/charts/system/spegel/Chart.yaml
diff --git a/charts/system/spegel/README.md b/archive/charts/system/spegel/README.md
similarity index 100%
rename from charts/system/spegel/README.md
rename to archive/charts/system/spegel/README.md
diff --git a/charts/system/spegel/icon-small.webp b/archive/charts/system/spegel/icon-small.webp
similarity index 100%
rename from charts/system/spegel/icon-small.webp
rename to archive/charts/system/spegel/icon-small.webp
diff --git a/charts/system/spegel/icon.webp b/archive/charts/system/spegel/icon.webp
similarity index 100%
rename from charts/system/spegel/icon.webp
rename to archive/charts/system/spegel/icon.webp
diff --git a/charts/system/openebs/templates/NOTES.txt b/archive/charts/system/spegel/templates/NOTES.txt
similarity index 100%
rename from charts/system/openebs/templates/NOTES.txt
rename to archive/charts/system/spegel/templates/NOTES.txt
diff --git a/charts/system/spegel/templates/common.yaml b/archive/charts/system/spegel/templates/common.yaml
similarity index 100%
rename from charts/system/spegel/templates/common.yaml
rename to archive/charts/system/spegel/templates/common.yaml
diff --git a/charts/system/spegel/values.yaml b/archive/charts/system/spegel/values.yaml
similarity index 100%
rename from charts/system/spegel/values.yaml
rename to archive/charts/system/spegel/values.yaml
diff --git a/charts/system/spegel/.helmignore b/charts/premium/app-template/.helmignore
similarity index 100%
rename from charts/system/spegel/.helmignore
rename to charts/premium/app-template/.helmignore
diff --git a/charts/premium/custom-app/CHANGELOG.md b/charts/premium/app-template/CHANGELOG.md
similarity index 100%
rename from charts/premium/custom-app/CHANGELOG.md
rename to charts/premium/app-template/CHANGELOG.md
diff --git a/charts/premium/custom-app/Chart.yaml b/charts/premium/app-template/Chart.yaml
similarity index 90%
rename from charts/premium/custom-app/Chart.yaml
rename to charts/premium/app-template/Chart.yaml
index 4c405380c9a..ecf87b5f198 100644
--- a/charts/premium/custom-app/Chart.yaml
+++ b/charts/premium/app-template/Chart.yaml
@@ -16,7 +16,7 @@ dependencies:
     tags: []
     import-values: []
 deprecated: false
-description: Advanced tool to create your own TrueCharts-based Charts
+description: Advanced Template to create your own TrueCharts-based Charts
 home: https://truecharts.org/charts/premium/custom-app
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/custom-app.webp
 keywords:
@@ -26,7 +26,7 @@ maintainers:
   - name: TrueCharts
     email: info@truecharts.org
     url: https://truecharts.org
-name: custom-app
+name: app-template
 sources:
   - https://ghcr.io/linuxserver/jackett
   - https://github.com/truecharts/charts/tree/master/charts/premium/custom-app
diff --git a/charts/premium/custom-app/LICENSE b/charts/premium/app-template/LICENSE
similarity index 100%
rename from charts/premium/custom-app/LICENSE
rename to charts/premium/app-template/LICENSE
diff --git a/charts/premium/custom-app/README.md b/charts/premium/app-template/README.md
similarity index 100%
rename from charts/premium/custom-app/README.md
rename to charts/premium/app-template/README.md
diff --git a/charts/premium/custom-app/ci/test-values.yaml b/charts/premium/app-template/ci/test-values.yaml
similarity index 100%
rename from charts/premium/custom-app/ci/test-values.yaml
rename to charts/premium/app-template/ci/test-values.yaml
diff --git a/charts/premium/custom-app/icon-small.webp b/charts/premium/app-template/icon-small.webp
similarity index 100%
rename from charts/premium/custom-app/icon-small.webp
rename to charts/premium/app-template/icon-small.webp
diff --git a/charts/premium/custom-app/icon.webp b/charts/premium/app-template/icon.webp
similarity index 100%
rename from charts/premium/custom-app/icon.webp
rename to charts/premium/app-template/icon.webp
diff --git a/charts/system/spegel/templates/NOTES.txt b/charts/premium/app-template/templates/NOTES.txt
similarity index 100%
rename from charts/system/spegel/templates/NOTES.txt
rename to charts/premium/app-template/templates/NOTES.txt
diff --git a/charts/premium/custom-app/templates/common.yaml b/charts/premium/app-template/templates/common.yaml
similarity index 100%
rename from charts/premium/custom-app/templates/common.yaml
rename to charts/premium/app-template/templates/common.yaml
diff --git a/charts/premium/custom-app/values.yaml b/charts/premium/app-template/values.yaml
similarity index 100%
rename from charts/premium/custom-app/values.yaml
rename to charts/premium/app-template/values.yaml