diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ee3892e..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-charts/
diff --git a/.helmignore b/charts/mastodon/.helmignore
similarity index 100%
rename from .helmignore
rename to charts/mastodon/.helmignore
diff --git a/Chart.lock b/charts/mastodon/Chart.lock
similarity index 100%
rename from Chart.lock
rename to charts/mastodon/Chart.lock
diff --git a/Chart.yaml b/charts/mastodon/Chart.yaml
similarity index 100%
rename from Chart.yaml
rename to charts/mastodon/Chart.yaml
diff --git a/dev-values.yaml b/charts/mastodon/dev-values.yaml
similarity index 100%
rename from dev-values.yaml
rename to charts/mastodon/dev-values.yaml
diff --git a/templates/NOTES.txt b/charts/mastodon/templates/NOTES.txt
similarity index 100%
rename from templates/NOTES.txt
rename to charts/mastodon/templates/NOTES.txt
diff --git a/templates/_helpers.tpl b/charts/mastodon/templates/_helpers.tpl
similarity index 100%
rename from templates/_helpers.tpl
rename to charts/mastodon/templates/_helpers.tpl
diff --git a/templates/configmap-env.yaml b/charts/mastodon/templates/configmap-env.yaml
similarity index 100%
rename from templates/configmap-env.yaml
rename to charts/mastodon/templates/configmap-env.yaml
diff --git a/templates/cronjob-media-remove.yaml b/charts/mastodon/templates/cronjob-media-remove.yaml
similarity index 100%
rename from templates/cronjob-media-remove.yaml
rename to charts/mastodon/templates/cronjob-media-remove.yaml
diff --git a/templates/deployment-sidekiq.yaml b/charts/mastodon/templates/deployment-sidekiq.yaml
similarity index 100%
rename from templates/deployment-sidekiq.yaml
rename to charts/mastodon/templates/deployment-sidekiq.yaml
diff --git a/templates/deployment-streaming.yaml b/charts/mastodon/templates/deployment-streaming.yaml
similarity index 100%
rename from templates/deployment-streaming.yaml
rename to charts/mastodon/templates/deployment-streaming.yaml
diff --git a/templates/deployment-web.yaml b/charts/mastodon/templates/deployment-web.yaml
similarity index 100%
rename from templates/deployment-web.yaml
rename to charts/mastodon/templates/deployment-web.yaml
diff --git a/templates/ingress.yaml b/charts/mastodon/templates/ingress.yaml
similarity index 100%
rename from templates/ingress.yaml
rename to charts/mastodon/templates/ingress.yaml
diff --git a/templates/job-assets-precompile.yaml b/charts/mastodon/templates/job-assets-precompile.yaml
similarity index 100%
rename from templates/job-assets-precompile.yaml
rename to charts/mastodon/templates/job-assets-precompile.yaml
diff --git a/templates/job-chewy-upgrade.yaml b/charts/mastodon/templates/job-chewy-upgrade.yaml
similarity index 100%
rename from templates/job-chewy-upgrade.yaml
rename to charts/mastodon/templates/job-chewy-upgrade.yaml
diff --git a/templates/job-create-admin.yaml b/charts/mastodon/templates/job-create-admin.yaml
similarity index 100%
rename from templates/job-create-admin.yaml
rename to charts/mastodon/templates/job-create-admin.yaml
diff --git a/templates/job-db-migrate.yaml b/charts/mastodon/templates/job-db-migrate.yaml
similarity index 100%
rename from templates/job-db-migrate.yaml
rename to charts/mastodon/templates/job-db-migrate.yaml
diff --git a/templates/pvc-assets.yaml b/charts/mastodon/templates/pvc-assets.yaml
similarity index 100%
rename from templates/pvc-assets.yaml
rename to charts/mastodon/templates/pvc-assets.yaml
diff --git a/templates/pvc-system.yaml b/charts/mastodon/templates/pvc-system.yaml
similarity index 100%
rename from templates/pvc-system.yaml
rename to charts/mastodon/templates/pvc-system.yaml
diff --git a/templates/secret-smtp.yaml b/charts/mastodon/templates/secret-smtp.yaml
similarity index 100%
rename from templates/secret-smtp.yaml
rename to charts/mastodon/templates/secret-smtp.yaml
diff --git a/templates/secrets.yaml b/charts/mastodon/templates/secrets.yaml
similarity index 100%
rename from templates/secrets.yaml
rename to charts/mastodon/templates/secrets.yaml
diff --git a/templates/service-streaming.yaml b/charts/mastodon/templates/service-streaming.yaml
similarity index 100%
rename from templates/service-streaming.yaml
rename to charts/mastodon/templates/service-streaming.yaml
diff --git a/templates/service-web.yaml b/charts/mastodon/templates/service-web.yaml
similarity index 100%
rename from templates/service-web.yaml
rename to charts/mastodon/templates/service-web.yaml
diff --git a/templates/serviceaccount.yaml b/charts/mastodon/templates/serviceaccount.yaml
similarity index 100%
rename from templates/serviceaccount.yaml
rename to charts/mastodon/templates/serviceaccount.yaml
diff --git a/templates/tests/test-connection.yaml b/charts/mastodon/templates/tests/test-connection.yaml
similarity index 100%
rename from templates/tests/test-connection.yaml
rename to charts/mastodon/templates/tests/test-connection.yaml
diff --git a/values.yaml b/charts/mastodon/values.yaml
similarity index 100%
rename from values.yaml
rename to charts/mastodon/values.yaml