diff --git a/app/templates/components/autofocusable-element.hbs b/app/components/autofocusable-element.hbs
similarity index 100%
rename from app/templates/components/autofocusable-element.hbs
rename to app/components/autofocusable-element.hbs
diff --git a/app/templates/components/back-button.hbs b/app/components/back-button.hbs
similarity index 100%
rename from app/templates/components/back-button.hbs
rename to app/components/back-button.hbs
diff --git a/app/templates/components/create-options-dates.hbs b/app/components/create-options-dates.hbs
similarity index 100%
rename from app/templates/components/create-options-dates.hbs
rename to app/components/create-options-dates.hbs
diff --git a/app/templates/components/create-options-datetime.hbs b/app/components/create-options-datetime.hbs
similarity index 100%
rename from app/templates/components/create-options-datetime.hbs
rename to app/components/create-options-datetime.hbs
diff --git a/app/templates/components/create-options-text.hbs b/app/components/create-options-text.hbs
similarity index 100%
rename from app/templates/components/create-options-text.hbs
rename to app/components/create-options-text.hbs
diff --git a/app/templates/components/create-options.hbs b/app/components/create-options.hbs
similarity index 100%
rename from app/templates/components/create-options.hbs
rename to app/components/create-options.hbs
diff --git a/app/templates/components/inline-datepicker.hbs b/app/components/inline-datepicker.hbs
similarity index 100%
rename from app/templates/components/inline-datepicker.hbs
rename to app/components/inline-datepicker.hbs
diff --git a/app/templates/components/language-select.hbs b/app/components/language-select.hbs
similarity index 100%
rename from app/templates/components/language-select.hbs
rename to app/components/language-select.hbs
diff --git a/app/templates/components/loading-spinner.hbs b/app/components/loading-spinner.hbs
similarity index 100%
rename from app/templates/components/loading-spinner.hbs
rename to app/components/loading-spinner.hbs
diff --git a/app/templates/components/next-button.hbs b/app/components/next-button.hbs
similarity index 100%
rename from app/templates/components/next-button.hbs
rename to app/components/next-button.hbs
diff --git a/app/templates/components/poll-evaluation-participants-table.hbs b/app/components/poll-evaluation-participants-table.hbs
similarity index 100%
rename from app/templates/components/poll-evaluation-participants-table.hbs
rename to app/components/poll-evaluation-participants-table.hbs
diff --git a/app/templates/components/poll-evaluation-summary-option.hbs b/app/components/poll-evaluation-summary-option.hbs
similarity index 100%
rename from app/templates/components/poll-evaluation-summary-option.hbs
rename to app/components/poll-evaluation-summary-option.hbs
diff --git a/app/templates/components/poll-evaluation-summary.hbs b/app/components/poll-evaluation-summary.hbs
similarity index 100%
rename from app/templates/components/poll-evaluation-summary.hbs
rename to app/components/poll-evaluation-summary.hbs
diff --git a/app/templates/components/save-button.hbs b/app/components/save-button.hbs
similarity index 100%
rename from app/templates/components/save-button.hbs
rename to app/components/save-button.hbs