diff --git a/app/templates/components/api-token-row.hbs b/app/components/api-token-row.hbs
similarity index 100%
rename from app/templates/components/api-token-row.hbs
rename to app/components/api-token-row.hbs
diff --git a/app/templates/components/badge-appveyor.hbs b/app/components/badge-appveyor.hbs
similarity index 100%
rename from app/templates/components/badge-appveyor.hbs
rename to app/components/badge-appveyor.hbs
diff --git a/app/templates/components/badge-azure-devops.hbs b/app/components/badge-azure-devops.hbs
similarity index 100%
rename from app/templates/components/badge-azure-devops.hbs
rename to app/components/badge-azure-devops.hbs
diff --git a/app/templates/components/badge-bitbucket-pipelines.hbs b/app/components/badge-bitbucket-pipelines.hbs
similarity index 100%
rename from app/templates/components/badge-bitbucket-pipelines.hbs
rename to app/components/badge-bitbucket-pipelines.hbs
diff --git a/app/templates/components/badge-circle-ci.hbs b/app/components/badge-circle-ci.hbs
similarity index 100%
rename from app/templates/components/badge-circle-ci.hbs
rename to app/components/badge-circle-ci.hbs
diff --git a/app/templates/components/badge-cirrus-ci.hbs b/app/components/badge-cirrus-ci.hbs
similarity index 100%
rename from app/templates/components/badge-cirrus-ci.hbs
rename to app/components/badge-cirrus-ci.hbs
diff --git a/app/templates/components/badge-codecov.hbs b/app/components/badge-codecov.hbs
similarity index 100%
rename from app/templates/components/badge-codecov.hbs
rename to app/components/badge-codecov.hbs
diff --git a/app/templates/components/badge-coveralls.hbs b/app/components/badge-coveralls.hbs
similarity index 100%
rename from app/templates/components/badge-coveralls.hbs
rename to app/components/badge-coveralls.hbs
diff --git a/app/templates/components/badge-gitlab.hbs b/app/components/badge-gitlab.hbs
similarity index 100%
rename from app/templates/components/badge-gitlab.hbs
rename to app/components/badge-gitlab.hbs
diff --git a/app/templates/components/badge-is-it-maintained-issue-resolution.hbs b/app/components/badge-is-it-maintained-issue-resolution.hbs
similarity index 100%
rename from app/templates/components/badge-is-it-maintained-issue-resolution.hbs
rename to app/components/badge-is-it-maintained-issue-resolution.hbs
diff --git a/app/templates/components/badge-is-it-maintained-open-issues.hbs b/app/components/badge-is-it-maintained-open-issues.hbs
similarity index 100%
rename from app/templates/components/badge-is-it-maintained-open-issues.hbs
rename to app/components/badge-is-it-maintained-open-issues.hbs
diff --git a/app/templates/components/badge-maintenance.hbs b/app/components/badge-maintenance.hbs
similarity index 100%
rename from app/templates/components/badge-maintenance.hbs
rename to app/components/badge-maintenance.hbs
diff --git a/app/templates/components/badge-travis-ci.hbs b/app/components/badge-travis-ci.hbs
similarity index 100%
rename from app/templates/components/badge-travis-ci.hbs
rename to app/components/badge-travis-ci.hbs
diff --git a/app/templates/components/category-list.hbs b/app/components/category-list.hbs
similarity index 100%
rename from app/templates/components/category-list.hbs
rename to app/components/category-list.hbs
diff --git a/app/templates/components/crate-badge.hbs b/app/components/crate-badge.hbs
similarity index 100%
rename from app/templates/components/crate-badge.hbs
rename to app/components/crate-badge.hbs
diff --git a/app/templates/components/crate-downloads-list.hbs b/app/components/crate-downloads-list.hbs
similarity index 100%
rename from app/templates/components/crate-downloads-list.hbs
rename to app/components/crate-downloads-list.hbs
diff --git a/app/templates/components/crate-list-name-only.hbs b/app/components/crate-list-name-only.hbs
similarity index 100%
rename from app/templates/components/crate-list-name-only.hbs
rename to app/components/crate-list-name-only.hbs
diff --git a/app/templates/components/crate-list-newest.hbs b/app/components/crate-list-newest.hbs
similarity index 100%
rename from app/templates/components/crate-list-newest.hbs
rename to app/components/crate-list-newest.hbs
diff --git a/app/templates/components/crate-row.hbs b/app/components/crate-row.hbs
similarity index 100%
rename from app/templates/components/crate-row.hbs
rename to app/components/crate-row.hbs
diff --git a/app/templates/components/crate-toml-copy.hbs b/app/components/crate-toml-copy.hbs
similarity index 100%
rename from app/templates/components/crate-toml-copy.hbs
rename to app/components/crate-toml-copy.hbs
diff --git a/app/templates/components/download-graph.hbs b/app/components/download-graph.hbs
similarity index 100%
rename from app/templates/components/download-graph.hbs
rename to app/components/download-graph.hbs
diff --git a/app/templates/components/email-input.hbs b/app/components/email-input.hbs
similarity index 100%
rename from app/templates/components/email-input.hbs
rename to app/components/email-input.hbs
diff --git a/app/templates/components/flash-message.hbs b/app/components/flash-message.hbs
similarity index 100%
rename from app/templates/components/flash-message.hbs
rename to app/components/flash-message.hbs
diff --git a/app/templates/components/keyword-list.hbs b/app/components/keyword-list.hbs
similarity index 100%
rename from app/templates/components/keyword-list.hbs
rename to app/components/keyword-list.hbs
diff --git a/app/templates/components/link-to-dep.hbs b/app/components/link-to-dep.hbs
similarity index 100%
rename from app/templates/components/link-to-dep.hbs
rename to app/components/link-to-dep.hbs
diff --git a/app/templates/components/owned-crate-row.hbs b/app/components/owned-crate-row.hbs
similarity index 100%
rename from app/templates/components/owned-crate-row.hbs
rename to app/components/owned-crate-row.hbs
diff --git a/app/templates/components/pending-owner-invite-row.hbs b/app/components/pending-owner-invite-row.hbs
similarity index 100%
rename from app/templates/components/pending-owner-invite-row.hbs
rename to app/components/pending-owner-invite-row.hbs
diff --git a/app/templates/components/rl-dropdown-container.hbs b/app/components/rl-dropdown-container.hbs
similarity index 100%
rename from app/templates/components/rl-dropdown-container.hbs
rename to app/components/rl-dropdown-container.hbs
diff --git a/app/templates/components/validated-input.hbs b/app/components/validated-input.hbs
similarity index 100%
rename from app/templates/components/validated-input.hbs
rename to app/components/validated-input.hbs
diff --git a/app/templates/components/.gitkeep b/app/templates/components/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000