diff --git a/charts/shogun/charts/shogun-admin/.helmignore b/charts/shogun-admin/.helmignore
similarity index 100%
rename from charts/shogun/charts/shogun-admin/.helmignore
rename to charts/shogun-admin/.helmignore
diff --git a/charts/shogun/charts/shogun-admin/Chart.yaml b/charts/shogun-admin/Chart.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-admin/Chart.yaml
rename to charts/shogun-admin/Chart.yaml
diff --git a/charts/shogun/charts/shogun-admin/README.md b/charts/shogun-admin/README.md
similarity index 100%
rename from charts/shogun/charts/shogun-admin/README.md
rename to charts/shogun-admin/README.md
diff --git a/charts/shogun/charts/shogun-admin/templates/_helpers.tpl b/charts/shogun-admin/templates/_helpers.tpl
similarity index 100%
rename from charts/shogun/charts/shogun-admin/templates/_helpers.tpl
rename to charts/shogun-admin/templates/_helpers.tpl
diff --git a/charts/shogun/charts/shogun-admin/templates/configmap.yaml b/charts/shogun-admin/templates/configmap.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-admin/templates/configmap.yaml
rename to charts/shogun-admin/templates/configmap.yaml
diff --git a/charts/shogun/charts/shogun-admin/templates/deployment.yaml b/charts/shogun-admin/templates/deployment.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-admin/templates/deployment.yaml
rename to charts/shogun-admin/templates/deployment.yaml
diff --git a/charts/shogun/charts/shogun-admin/templates/hpa.yaml b/charts/shogun-admin/templates/hpa.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-admin/templates/hpa.yaml
rename to charts/shogun-admin/templates/hpa.yaml
diff --git a/charts/shogun/charts/shogun-admin/templates/ingress.yaml b/charts/shogun-admin/templates/ingress.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-admin/templates/ingress.yaml
rename to charts/shogun-admin/templates/ingress.yaml
diff --git a/charts/shogun/charts/shogun-admin/templates/service.yaml b/charts/shogun-admin/templates/service.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-admin/templates/service.yaml
rename to charts/shogun-admin/templates/service.yaml
diff --git a/charts/shogun/charts/shogun-admin/templates/serviceaccount.yaml b/charts/shogun-admin/templates/serviceaccount.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-admin/templates/serviceaccount.yaml
rename to charts/shogun-admin/templates/serviceaccount.yaml
diff --git a/charts/shogun/charts/shogun-admin/values.yaml b/charts/shogun-admin/values.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-admin/values.yaml
rename to charts/shogun-admin/values.yaml
diff --git a/charts/shogun/charts/shogun-boot/.helmignore b/charts/shogun-boot/.helmignore
similarity index 100%
rename from charts/shogun/charts/shogun-boot/.helmignore
rename to charts/shogun-boot/.helmignore
diff --git a/charts/shogun/charts/shogun-boot/Chart.yaml b/charts/shogun-boot/Chart.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-boot/Chart.yaml
rename to charts/shogun-boot/Chart.yaml
diff --git a/charts/shogun/charts/shogun-boot/README.md b/charts/shogun-boot/README.md
similarity index 100%
rename from charts/shogun/charts/shogun-boot/README.md
rename to charts/shogun-boot/README.md
diff --git a/charts/shogun/charts/shogun-boot/templates/_helpers.tpl b/charts/shogun-boot/templates/_helpers.tpl
similarity index 100%
rename from charts/shogun/charts/shogun-boot/templates/_helpers.tpl
rename to charts/shogun-boot/templates/_helpers.tpl
diff --git a/charts/shogun/charts/shogun-boot/templates/configmap.yaml b/charts/shogun-boot/templates/configmap.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-boot/templates/configmap.yaml
rename to charts/shogun-boot/templates/configmap.yaml
diff --git a/charts/shogun/charts/shogun-boot/templates/ingress.yaml b/charts/shogun-boot/templates/ingress.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-boot/templates/ingress.yaml
rename to charts/shogun-boot/templates/ingress.yaml
diff --git a/charts/shogun/charts/shogun-boot/templates/pvc.yaml b/charts/shogun-boot/templates/pvc.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-boot/templates/pvc.yaml
rename to charts/shogun-boot/templates/pvc.yaml
diff --git a/charts/shogun/charts/shogun-boot/templates/service.yaml b/charts/shogun-boot/templates/service.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-boot/templates/service.yaml
rename to charts/shogun-boot/templates/service.yaml
diff --git a/charts/shogun/charts/shogun-boot/templates/serviceaccount.yaml b/charts/shogun-boot/templates/serviceaccount.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-boot/templates/serviceaccount.yaml
rename to charts/shogun-boot/templates/serviceaccount.yaml
diff --git a/charts/shogun/charts/shogun-boot/templates/statefulset.yaml b/charts/shogun-boot/templates/statefulset.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-boot/templates/statefulset.yaml
rename to charts/shogun-boot/templates/statefulset.yaml
diff --git a/charts/shogun/charts/shogun-boot/values.yaml b/charts/shogun-boot/values.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-boot/values.yaml
rename to charts/shogun-boot/values.yaml
diff --git a/charts/shogun/charts/shogun-common/.helmignore b/charts/shogun-common/.helmignore
similarity index 100%
rename from charts/shogun/charts/shogun-common/.helmignore
rename to charts/shogun-common/.helmignore
diff --git a/charts/shogun/charts/shogun-common/Chart.yaml b/charts/shogun-common/Chart.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-common/Chart.yaml
rename to charts/shogun-common/Chart.yaml
diff --git a/charts/shogun/charts/shogun-common/templates/_db.tpl b/charts/shogun-common/templates/_db.tpl
similarity index 100%
rename from charts/shogun/charts/shogun-common/templates/_db.tpl
rename to charts/shogun-common/templates/_db.tpl
diff --git a/charts/shogun/charts/shogun-common/templates/_keycloak.tpl b/charts/shogun-common/templates/_keycloak.tpl
similarity index 100%
rename from charts/shogun/charts/shogun-common/templates/_keycloak.tpl
rename to charts/shogun-common/templates/_keycloak.tpl
diff --git a/charts/shogun/charts/shogun-common/values.yaml b/charts/shogun-common/values.yaml
similarity index 100%
rename from charts/shogun/charts/shogun-common/values.yaml
rename to charts/shogun-common/values.yaml