diff --git a/helm-chart/.helmignore b/goofy-server/src/main/helm/.helmignore
similarity index 100%
rename from helm-chart/.helmignore
rename to goofy-server/src/main/helm/.helmignore
diff --git a/helm-chart/CHANGELOG.md b/goofy-server/src/main/helm/CHANGELOG.md
similarity index 100%
rename from helm-chart/CHANGELOG.md
rename to goofy-server/src/main/helm/CHANGELOG.md
diff --git a/helm-chart/Chart.yaml b/goofy-server/src/main/helm/Chart.yaml
similarity index 100%
rename from helm-chart/Chart.yaml
rename to goofy-server/src/main/helm/Chart.yaml
diff --git a/helm-chart/app-readme.md b/goofy-server/src/main/helm/app-readme.md
similarity index 100%
rename from helm-chart/app-readme.md
rename to goofy-server/src/main/helm/app-readme.md
diff --git a/helm-chart/questions.yml b/goofy-server/src/main/helm/questions.yml
similarity index 100%
rename from helm-chart/questions.yml
rename to goofy-server/src/main/helm/questions.yml
diff --git a/helm-chart/templates/NOTES.txt b/goofy-server/src/main/helm/templates/NOTES.txt
similarity index 100%
rename from helm-chart/templates/NOTES.txt
rename to goofy-server/src/main/helm/templates/NOTES.txt
diff --git a/helm-chart/templates/_helpers.tpl b/goofy-server/src/main/helm/templates/_helpers.tpl
similarity index 100%
rename from helm-chart/templates/_helpers.tpl
rename to goofy-server/src/main/helm/templates/_helpers.tpl
diff --git a/helm-chart/templates/deployment.yaml b/goofy-server/src/main/helm/templates/deployment.yaml
similarity index 100%
rename from helm-chart/templates/deployment.yaml
rename to goofy-server/src/main/helm/templates/deployment.yaml
diff --git a/helm-chart/templates/image-pull-secret.yaml b/goofy-server/src/main/helm/templates/image-pull-secret.yaml
similarity index 100%
rename from helm-chart/templates/image-pull-secret.yaml
rename to goofy-server/src/main/helm/templates/image-pull-secret.yaml
diff --git a/helm-chart/templates/ingress.yaml b/goofy-server/src/main/helm/templates/ingress.yaml
similarity index 100%
rename from helm-chart/templates/ingress.yaml
rename to goofy-server/src/main/helm/templates/ingress.yaml
diff --git a/helm-chart/templates/service.yaml b/goofy-server/src/main/helm/templates/service.yaml
similarity index 100%
rename from helm-chart/templates/service.yaml
rename to goofy-server/src/main/helm/templates/service.yaml
diff --git a/helm-chart/templates/service_monitor.yaml b/goofy-server/src/main/helm/templates/service_monitor.yaml
similarity index 100%
rename from helm-chart/templates/service_monitor.yaml
rename to goofy-server/src/main/helm/templates/service_monitor.yaml
diff --git a/helm-chart/templates/tests/test-ingress-connection.yaml b/goofy-server/src/main/helm/templates/tests/test-ingress-connection.yaml
similarity index 100%
rename from helm-chart/templates/tests/test-ingress-connection.yaml
rename to goofy-server/src/main/helm/templates/tests/test-ingress-connection.yaml
diff --git a/helm-chart/templates/tests/test-service-connection.yaml b/goofy-server/src/main/helm/templates/tests/test-service-connection.yaml
similarity index 100%
rename from helm-chart/templates/tests/test-service-connection.yaml
rename to goofy-server/src/main/helm/templates/tests/test-service-connection.yaml
diff --git a/helm-chart/test-values.yaml b/goofy-server/src/main/helm/test-values.yaml
similarity index 100%
rename from helm-chart/test-values.yaml
rename to goofy-server/src/main/helm/test-values.yaml
diff --git a/helm-chart/values.yaml b/goofy-server/src/main/helm/values.yaml
similarity index 100%
rename from helm-chart/values.yaml
rename to goofy-server/src/main/helm/values.yaml
diff --git a/helm-chart/unit-tests/deployment_defaults_affinity_test.yaml b/goofy-server/src/test/helm/deployment_defaults_affinity_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_defaults_affinity_test.yaml
rename to goofy-server/src/test/helm/deployment_defaults_affinity_test.yaml
diff --git a/helm-chart/unit-tests/deployment_defaults_annotaion_test.yaml b/goofy-server/src/test/helm/deployment_defaults_annotaion_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_defaults_annotaion_test.yaml
rename to goofy-server/src/test/helm/deployment_defaults_annotaion_test.yaml
diff --git a/helm-chart/unit-tests/deployment_defaults_env_test.yaml b/goofy-server/src/test/helm/deployment_defaults_env_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_defaults_env_test.yaml
rename to goofy-server/src/test/helm/deployment_defaults_env_test.yaml
diff --git a/helm-chart/unit-tests/deployment_defaults_labels_test.yaml b/goofy-server/src/test/helm/deployment_defaults_labels_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_defaults_labels_test.yaml
rename to goofy-server/src/test/helm/deployment_defaults_labels_test.yaml
diff --git a/helm-chart/unit-tests/deployment_defaults_spec_containers_health_test.yaml b/goofy-server/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_defaults_spec_containers_health_test.yaml
rename to goofy-server/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
diff --git a/helm-chart/unit-tests/deployment_defaults_spec_containers_securityContext_test.yaml b/goofy-server/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_defaults_spec_containers_securityContext_test.yaml
rename to goofy-server/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
diff --git a/helm-chart/unit-tests/deployment_defaults_spec_containers_test.yaml b/goofy-server/src/test/helm/deployment_defaults_spec_containers_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_defaults_spec_containers_test.yaml
rename to goofy-server/src/test/helm/deployment_defaults_spec_containers_test.yaml
diff --git a/helm-chart/unit-tests/deployment_defaults_spec_test.yaml b/goofy-server/src/test/helm/deployment_defaults_spec_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_defaults_spec_test.yaml
rename to goofy-server/src/test/helm/deployment_defaults_spec_test.yaml
diff --git a/helm-chart/unit-tests/deployment_defaults_sso_test.yaml b/goofy-server/src/test/helm/deployment_defaults_sso_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_defaults_sso_test.yaml
rename to goofy-server/src/test/helm/deployment_defaults_sso_test.yaml
diff --git a/helm-chart/unit-tests/deployment_defaults_topologySpreadConstraints_test.yaml b/goofy-server/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_defaults_topologySpreadConstraints_test.yaml
rename to goofy-server/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
diff --git a/helm-chart/unit-tests/deployment_env_test.yaml b/goofy-server/src/test/helm/deployment_env_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_env_test.yaml
rename to goofy-server/src/test/helm/deployment_env_test.yaml
diff --git a/helm-chart/unit-tests/deployment_imageTag_test.yaml b/goofy-server/src/test/helm/deployment_imageTag_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_imageTag_test.yaml
rename to goofy-server/src/test/helm/deployment_imageTag_test.yaml
diff --git a/helm-chart/unit-tests/deployment_pluto_address_test.yaml b/goofy-server/src/test/helm/deployment_pluto_address_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_pluto_address_test.yaml
rename to goofy-server/src/test/helm/deployment_pluto_address_test.yaml
diff --git a/helm-chart/unit-tests/deployment_replicas_test.yaml b/goofy-server/src/test/helm/deployment_replicas_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_replicas_test.yaml
rename to goofy-server/src/test/helm/deployment_replicas_test.yaml
diff --git a/helm-chart/unit-tests/deployment_resources_test.yaml b/goofy-server/src/test/helm/deployment_resources_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_resources_test.yaml
rename to goofy-server/src/test/helm/deployment_resources_test.yaml
diff --git a/helm-chart/unit-tests/deployment_springProfile_test.yaml b/goofy-server/src/test/helm/deployment_springProfile_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_springProfile_test.yaml
rename to goofy-server/src/test/helm/deployment_springProfile_test.yaml
diff --git a/helm-chart/unit-tests/deployment_usermanager_address_test.yaml b/goofy-server/src/test/helm/deployment_usermanager_address_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/deployment_usermanager_address_test.yaml
rename to goofy-server/src/test/helm/deployment_usermanager_address_test.yaml
diff --git a/helm-chart/unit-tests/service_monitor_test.yaml b/goofy-server/src/test/helm/service_monitor_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/service_monitor_test.yaml
rename to goofy-server/src/test/helm/service_monitor_test.yaml
diff --git a/helm-chart/unit-tests/service_test.yaml b/goofy-server/src/test/helm/service_test.yaml
similarity index 100%
rename from helm-chart/unit-tests/service_test.yaml
rename to goofy-server/src/test/helm/service_test.yaml