diff --git a/httpd/v0.1.0/.helmignore b/charts/httpd/v0.1.0/.helmignore
similarity index 100%
rename from httpd/v0.1.0/.helmignore
rename to charts/httpd/v0.1.0/.helmignore
diff --git a/httpd/v0.1.0/Chart.yaml b/charts/httpd/v0.1.0/Chart.yaml
similarity index 100%
rename from httpd/v0.1.0/Chart.yaml
rename to charts/httpd/v0.1.0/Chart.yaml
diff --git a/httpd/v0.1.0/questions.yml b/charts/httpd/v0.1.0/questions.yml
similarity index 100%
rename from httpd/v0.1.0/questions.yml
rename to charts/httpd/v0.1.0/questions.yml
diff --git a/httpd/v0.1.0/templates/NOTES.txt b/charts/httpd/v0.1.0/templates/NOTES.txt
similarity index 100%
rename from httpd/v0.1.0/templates/NOTES.txt
rename to charts/httpd/v0.1.0/templates/NOTES.txt
diff --git a/httpd/v0.1.0/templates/_helpers.tpl b/charts/httpd/v0.1.0/templates/_helpers.tpl
similarity index 100%
rename from httpd/v0.1.0/templates/_helpers.tpl
rename to charts/httpd/v0.1.0/templates/_helpers.tpl
diff --git a/httpd/v0.1.0/templates/deployment.yaml b/charts/httpd/v0.1.0/templates/deployment.yaml
similarity index 100%
rename from httpd/v0.1.0/templates/deployment.yaml
rename to charts/httpd/v0.1.0/templates/deployment.yaml
diff --git a/httpd/v0.1.0/templates/ingress.yaml b/charts/httpd/v0.1.0/templates/ingress.yaml
similarity index 100%
rename from httpd/v0.1.0/templates/ingress.yaml
rename to charts/httpd/v0.1.0/templates/ingress.yaml
diff --git a/httpd/v0.1.0/templates/service.yaml b/charts/httpd/v0.1.0/templates/service.yaml
similarity index 100%
rename from httpd/v0.1.0/templates/service.yaml
rename to charts/httpd/v0.1.0/templates/service.yaml
diff --git a/httpd/v0.1.0/values.yaml b/charts/httpd/v0.1.0/values.yaml
similarity index 100%
rename from httpd/v0.1.0/values.yaml
rename to charts/httpd/v0.1.0/values.yaml
diff --git a/jenkins/v1.0.0/.helmignore b/charts/jenkins/v1.0.0/.helmignore
similarity index 100%
rename from jenkins/v1.0.0/.helmignore
rename to charts/jenkins/v1.0.0/.helmignore
diff --git a/jenkins/v1.0.0/Chart.yaml b/charts/jenkins/v1.0.0/Chart.yaml
similarity index 100%
rename from jenkins/v1.0.0/Chart.yaml
rename to charts/jenkins/v1.0.0/Chart.yaml
diff --git a/jenkins/v1.0.0/catalogIcon-molgenis-jenkins.svg b/charts/jenkins/v1.0.0/catalogIcon-molgenis-jenkins.svg
similarity index 100%
rename from jenkins/v1.0.0/catalogIcon-molgenis-jenkins.svg
rename to charts/jenkins/v1.0.0/catalogIcon-molgenis-jenkins.svg
diff --git a/jenkins/v1.0.0/templates/deployment/jenkins-agent-deployment.yaml b/charts/jenkins/v1.0.0/templates/deployment/jenkins-agent-deployment.yaml
similarity index 100%
rename from jenkins/v1.0.0/templates/deployment/jenkins-agent-deployment.yaml
rename to charts/jenkins/v1.0.0/templates/deployment/jenkins-agent-deployment.yaml
diff --git a/jenkins/v1.0.0/templates/deployment/jenkins-master-deployment.yaml b/charts/jenkins/v1.0.0/templates/deployment/jenkins-master-deployment.yaml
similarity index 100%
rename from jenkins/v1.0.0/templates/deployment/jenkins-master-deployment.yaml
rename to charts/jenkins/v1.0.0/templates/deployment/jenkins-master-deployment.yaml
diff --git a/jenkins/v1.0.0/templates/ingress.yaml b/charts/jenkins/v1.0.0/templates/ingress.yaml
similarity index 100%
rename from jenkins/v1.0.0/templates/ingress.yaml
rename to charts/jenkins/v1.0.0/templates/ingress.yaml
diff --git a/jenkins/v1.0.0/templates/services/jenkins-agent-service.yaml b/charts/jenkins/v1.0.0/templates/services/jenkins-agent-service.yaml
similarity index 100%
rename from jenkins/v1.0.0/templates/services/jenkins-agent-service.yaml
rename to charts/jenkins/v1.0.0/templates/services/jenkins-agent-service.yaml
diff --git a/jenkins/v1.0.0/templates/services/jenkins-master-service.yaml b/charts/jenkins/v1.0.0/templates/services/jenkins-master-service.yaml
similarity index 100%
rename from jenkins/v1.0.0/templates/services/jenkins-master-service.yaml
rename to charts/jenkins/v1.0.0/templates/services/jenkins-master-service.yaml
diff --git a/jenkins/v1.0.0/templates/volumes/jenkins-agent-pvc.yaml b/charts/jenkins/v1.0.0/templates/volumes/jenkins-agent-pvc.yaml
similarity index 100%
rename from jenkins/v1.0.0/templates/volumes/jenkins-agent-pvc.yaml
rename to charts/jenkins/v1.0.0/templates/volumes/jenkins-agent-pvc.yaml
diff --git a/jenkins/v1.0.0/templates/volumes/jenkins-master-pvc.yaml b/charts/jenkins/v1.0.0/templates/volumes/jenkins-master-pvc.yaml
similarity index 100%
rename from jenkins/v1.0.0/templates/volumes/jenkins-master-pvc.yaml
rename to charts/jenkins/v1.0.0/templates/volumes/jenkins-master-pvc.yaml
diff --git a/jenkins/v1.0.0/values.yaml b/charts/jenkins/v1.0.0/values.yaml
similarity index 100%
rename from jenkins/v1.0.0/values.yaml
rename to charts/jenkins/v1.0.0/values.yaml
diff --git a/nexus/v1.0.0/.helmignore b/charts/nexus/v1.0.0/.helmignore
similarity index 100%
rename from nexus/v1.0.0/.helmignore
rename to charts/nexus/v1.0.0/.helmignore
diff --git a/nexus/v1.0.0/Chart.yaml b/charts/nexus/v1.0.0/Chart.yaml
similarity index 100%
rename from nexus/v1.0.0/Chart.yaml
rename to charts/nexus/v1.0.0/Chart.yaml
diff --git a/nexus/v1.0.0/catalogIcon-molgenis-nexus.svg b/charts/nexus/v1.0.0/catalogIcon-molgenis-nexus.svg
similarity index 100%
rename from nexus/v1.0.0/catalogIcon-molgenis-nexus.svg
rename to charts/nexus/v1.0.0/catalogIcon-molgenis-nexus.svg
diff --git a/nexus/v1.0.0/templates/deployment/httpd-deployment.yaml b/charts/nexus/v1.0.0/templates/deployment/httpd-deployment.yaml
similarity index 100%
rename from nexus/v1.0.0/templates/deployment/httpd-deployment.yaml
rename to charts/nexus/v1.0.0/templates/deployment/httpd-deployment.yaml
diff --git a/nexus/v1.0.0/templates/deployment/nexus-deployment.yaml b/charts/nexus/v1.0.0/templates/deployment/nexus-deployment.yaml
similarity index 100%
rename from nexus/v1.0.0/templates/deployment/nexus-deployment.yaml
rename to charts/nexus/v1.0.0/templates/deployment/nexus-deployment.yaml
diff --git a/nexus/v1.0.0/templates/ingress.yaml b/charts/nexus/v1.0.0/templates/ingress.yaml
similarity index 100%
rename from nexus/v1.0.0/templates/ingress.yaml
rename to charts/nexus/v1.0.0/templates/ingress.yaml
diff --git a/nexus/v1.0.0/templates/services/httpd-service.yaml b/charts/nexus/v1.0.0/templates/services/httpd-service.yaml
similarity index 100%
rename from nexus/v1.0.0/templates/services/httpd-service.yaml
rename to charts/nexus/v1.0.0/templates/services/httpd-service.yaml
diff --git a/nexus/v1.0.0/templates/services/nexus-service.yaml b/charts/nexus/v1.0.0/templates/services/nexus-service.yaml
similarity index 100%
rename from nexus/v1.0.0/templates/services/nexus-service.yaml
rename to charts/nexus/v1.0.0/templates/services/nexus-service.yaml
diff --git a/nexus/v1.0.0/templates/volumes/nexus-pv.yaml b/charts/nexus/v1.0.0/templates/volumes/nexus-pv.yaml
similarity index 100%
rename from nexus/v1.0.0/templates/volumes/nexus-pv.yaml
rename to charts/nexus/v1.0.0/templates/volumes/nexus-pv.yaml
diff --git a/nexus/v1.0.0/templates/volumes/nexus-pvc.yaml b/charts/nexus/v1.0.0/templates/volumes/nexus-pvc.yaml
similarity index 100%
rename from nexus/v1.0.0/templates/volumes/nexus-pvc.yaml
rename to charts/nexus/v1.0.0/templates/volumes/nexus-pvc.yaml
diff --git a/nexus/v1.0.0/values.yaml b/charts/nexus/v1.0.0/values.yaml
similarity index 100%
rename from nexus/v1.0.0/values.yaml
rename to charts/nexus/v1.0.0/values.yaml