diff --git a/.gitignore b/.gitignore
index e69de29..496ee2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
diff --git a/charts/Chart.lock b/Chart.lock
similarity index 100%
rename from charts/Chart.lock
rename to Chart.lock
diff --git a/charts/Chart.yaml b/Chart.yaml
similarity index 100%
rename from charts/Chart.yaml
rename to Chart.yaml
diff --git a/charts/dependency-charts/datapusher/.helmignore b/charts/datapusher/.helmignore
similarity index 100%
rename from charts/dependency-charts/datapusher/.helmignore
rename to charts/datapusher/.helmignore
diff --git a/charts/dependency-charts/datapusher/Chart.yaml b/charts/datapusher/Chart.yaml
similarity index 100%
rename from charts/dependency-charts/datapusher/Chart.yaml
rename to charts/datapusher/Chart.yaml
diff --git a/charts/dependency-charts/datapusher/README.md b/charts/datapusher/README.md
similarity index 100%
rename from charts/dependency-charts/datapusher/README.md
rename to charts/datapusher/README.md
diff --git a/charts/dependency-charts/datapusher/templates/NOTES.txt b/charts/datapusher/templates/NOTES.txt
similarity index 100%
rename from charts/dependency-charts/datapusher/templates/NOTES.txt
rename to charts/datapusher/templates/NOTES.txt
diff --git a/charts/dependency-charts/datapusher/templates/_helpers.tpl b/charts/datapusher/templates/_helpers.tpl
similarity index 100%
rename from charts/dependency-charts/datapusher/templates/_helpers.tpl
rename to charts/datapusher/templates/_helpers.tpl
diff --git a/charts/dependency-charts/datapusher/templates/deployment.yaml b/charts/datapusher/templates/deployment.yaml
similarity index 100%
rename from charts/dependency-charts/datapusher/templates/deployment.yaml
rename to charts/datapusher/templates/deployment.yaml
diff --git a/charts/dependency-charts/datapusher/templates/service-headless.yaml b/charts/datapusher/templates/service-headless.yaml
similarity index 100%
rename from charts/dependency-charts/datapusher/templates/service-headless.yaml
rename to charts/datapusher/templates/service-headless.yaml
diff --git a/charts/dependency-charts/datapusher/templates/service.yaml b/charts/datapusher/templates/service.yaml
similarity index 100%
rename from charts/dependency-charts/datapusher/templates/service.yaml
rename to charts/datapusher/templates/service.yaml
diff --git a/charts/dependency-charts/datapusher/templates/serviceaccount.yaml b/charts/datapusher/templates/serviceaccount.yaml
similarity index 100%
rename from charts/dependency-charts/datapusher/templates/serviceaccount.yaml
rename to charts/datapusher/templates/serviceaccount.yaml
diff --git a/charts/dependency-charts/datapusher/values.yaml b/charts/datapusher/values.yaml
similarity index 100%
rename from charts/dependency-charts/datapusher/values.yaml
rename to charts/datapusher/values.yaml
diff --git a/charts/psql-init/psql-init.py b/psql-init/psql-init.py
similarity index 100%
rename from charts/psql-init/psql-init.py
rename to psql-init/psql-init.py
diff --git a/charts/solr-init/solr-configset/_rest_managed.json b/solr-init/solr-configset/_rest_managed.json
similarity index 100%
rename from charts/solr-init/solr-configset/_rest_managed.json
rename to solr-init/solr-configset/_rest_managed.json
diff --git a/charts/solr-init/solr-configset/currency.xml b/solr-init/solr-configset/currency.xml
similarity index 100%
rename from charts/solr-init/solr-configset/currency.xml
rename to solr-init/solr-configset/currency.xml
diff --git a/charts/solr-init/solr-configset/protwords.txt b/solr-init/solr-configset/protwords.txt
similarity index 100%
rename from charts/solr-init/solr-configset/protwords.txt
rename to solr-init/solr-configset/protwords.txt
diff --git a/charts/solr-init/solr-configset/solrconfig.xml b/solr-init/solr-configset/solrconfig.xml
similarity index 100%
rename from charts/solr-init/solr-configset/solrconfig.xml
rename to solr-init/solr-configset/solrconfig.xml
diff --git a/charts/solr-init/solr-configset/stopwords.txt b/solr-init/solr-configset/stopwords.txt
similarity index 100%
rename from charts/solr-init/solr-configset/stopwords.txt
rename to solr-init/solr-configset/stopwords.txt
diff --git a/charts/solr-init/solr-configset/synonyms.txt b/solr-init/solr-configset/synonyms.txt
similarity index 100%
rename from charts/solr-init/solr-configset/synonyms.txt
rename to solr-init/solr-configset/synonyms.txt
diff --git a/charts/solr-init/solr-init.py b/solr-init/solr-init.py
similarity index 100%
rename from charts/solr-init/solr-init.py
rename to solr-init/solr-init.py
diff --git a/charts/templates/NOTES.txt b/templates/NOTES.txt
similarity index 100%
rename from charts/templates/NOTES.txt
rename to templates/NOTES.txt
diff --git a/charts/templates/_helpers.tpl b/templates/_helpers.tpl
similarity index 100%
rename from charts/templates/_helpers.tpl
rename to templates/_helpers.tpl
diff --git a/charts/templates/ckancredentials.yaml b/templates/ckancredentials.yaml
similarity index 100%
rename from charts/templates/ckancredentials.yaml
rename to templates/ckancredentials.yaml
diff --git a/charts/templates/ckansysadminapitoken.yaml b/templates/ckansysadminapitoken.yaml
similarity index 100%
rename from charts/templates/ckansysadminapitoken.yaml
rename to templates/ckansysadminapitoken.yaml
diff --git a/charts/templates/cronjob-cli.yaml b/templates/cronjob-cli.yaml
similarity index 100%
rename from charts/templates/cronjob-cli.yaml
rename to templates/cronjob-cli.yaml
diff --git a/charts/templates/cronjob.yaml b/templates/cronjob.yaml
similarity index 100%
rename from charts/templates/cronjob.yaml
rename to templates/cronjob.yaml
diff --git a/charts/templates/deployment.yaml b/templates/deployment.yaml
similarity index 100%
rename from charts/templates/deployment.yaml
rename to templates/deployment.yaml
diff --git a/charts/templates/ingress.yaml b/templates/ingress.yaml
similarity index 100%
rename from charts/templates/ingress.yaml
rename to templates/ingress.yaml
diff --git a/charts/templates/ingressroute.yaml b/templates/ingressroute.yaml
similarity index 100%
rename from charts/templates/ingressroute.yaml
rename to templates/ingressroute.yaml
diff --git a/charts/templates/postgrescredentials.yaml b/templates/postgrescredentials.yaml
similarity index 100%
rename from charts/templates/postgrescredentials.yaml
rename to templates/postgrescredentials.yaml
diff --git a/charts/templates/psql-init-configmap.yaml b/templates/psql-init-configmap.yaml
similarity index 100%
rename from charts/templates/psql-init-configmap.yaml
rename to templates/psql-init-configmap.yaml
diff --git a/charts/templates/psql-init-job.yaml b/templates/psql-init-job.yaml
similarity index 100%
rename from charts/templates/psql-init-job.yaml
rename to templates/psql-init-job.yaml
diff --git a/charts/templates/pvc.yaml b/templates/pvc.yaml
similarity index 100%
rename from charts/templates/pvc.yaml
rename to templates/pvc.yaml
diff --git a/charts/templates/service.yaml b/templates/service.yaml
similarity index 100%
rename from charts/templates/service.yaml
rename to templates/service.yaml
diff --git a/charts/templates/serviceaccount.yaml b/templates/serviceaccount.yaml
similarity index 100%
rename from charts/templates/serviceaccount.yaml
rename to templates/serviceaccount.yaml
diff --git a/charts/templates/solr-configset-configmap.yaml b/templates/solr-configset-configmap.yaml
similarity index 100%
rename from charts/templates/solr-configset-configmap.yaml
rename to templates/solr-configset-configmap.yaml
diff --git a/charts/templates/solr-init-configmap.yaml b/templates/solr-init-configmap.yaml
similarity index 100%
rename from charts/templates/solr-init-configmap.yaml
rename to templates/solr-init-configmap.yaml
diff --git a/charts/templates/solr-init-job.yaml b/templates/solr-init-job.yaml
similarity index 100%
rename from charts/templates/solr-init-job.yaml
rename to templates/solr-init-job.yaml
diff --git a/charts/templates/tests/test-connection.yaml b/templates/tests/test-connection.yaml
similarity index 100%
rename from charts/templates/tests/test-connection.yaml
rename to templates/tests/test-connection.yaml
diff --git a/charts/values.yaml b/values.yaml
similarity index 100%
rename from charts/values.yaml
rename to values.yaml