diff --git a/frontend/app/components/async-list/template.hbs b/frontend/app/components/async-list.hbs
similarity index 100%
rename from frontend/app/components/async-list/template.hbs
rename to frontend/app/components/async-list.hbs
diff --git a/frontend/app/components/attendance-slider/template.hbs b/frontend/app/components/attendance-slider.hbs
similarity index 100%
rename from frontend/app/components/attendance-slider/template.hbs
rename to frontend/app/components/attendance-slider.hbs
diff --git a/frontend/app/components/attendance-slider/component.js b/frontend/app/components/attendance-slider.js
similarity index 100%
rename from frontend/app/components/attendance-slider/component.js
rename to frontend/app/components/attendance-slider.js
diff --git a/frontend/app/components/balance-donut/template.hbs b/frontend/app/components/balance-donut.hbs
similarity index 100%
rename from frontend/app/components/balance-donut/template.hbs
rename to frontend/app/components/balance-donut.hbs
diff --git a/frontend/app/components/balance-donut/component.js b/frontend/app/components/balance-donut.js
similarity index 100%
rename from frontend/app/components/balance-donut/component.js
rename to frontend/app/components/balance-donut.js
diff --git a/frontend/app/components/changed-warning/template.hbs b/frontend/app/components/changed-warning.hbs
similarity index 100%
rename from frontend/app/components/changed-warning/template.hbs
rename to frontend/app/components/changed-warning.hbs
diff --git a/frontend/app/components/customer-visible-icon/template.hbs b/frontend/app/components/customer-visible-icon.hbs
similarity index 100%
rename from frontend/app/components/customer-visible-icon/template.hbs
rename to frontend/app/components/customer-visible-icon.hbs
diff --git a/frontend/app/components/date-buttons/template.hbs b/frontend/app/components/date-buttons.hbs
similarity index 100%
rename from frontend/app/components/date-buttons/template.hbs
rename to frontend/app/components/date-buttons.hbs
diff --git a/frontend/app/components/date-buttons/component.js b/frontend/app/components/date-buttons.js
similarity index 100%
rename from frontend/app/components/date-buttons/component.js
rename to frontend/app/components/date-buttons.js
diff --git a/frontend/app/components/date-navigation/template.hbs b/frontend/app/components/date-navigation.hbs
similarity index 100%
rename from frontend/app/components/date-navigation/template.hbs
rename to frontend/app/components/date-navigation.hbs
diff --git a/frontend/app/components/date-navigation/component.js b/frontend/app/components/date-navigation.js
similarity index 100%
rename from frontend/app/components/date-navigation/component.js
rename to frontend/app/components/date-navigation.js
diff --git a/frontend/app/components/duration-since/template.hbs b/frontend/app/components/duration-since.hbs
similarity index 100%
rename from frontend/app/components/duration-since/template.hbs
rename to frontend/app/components/duration-since.hbs
diff --git a/frontend/app/components/duration-since/component.js b/frontend/app/components/duration-since.js
similarity index 100%
rename from frontend/app/components/duration-since/component.js
rename to frontend/app/components/duration-since.js
diff --git a/frontend/app/components/filter-sidebar/template.hbs b/frontend/app/components/filter-sidebar.hbs
similarity index 100%
rename from frontend/app/components/filter-sidebar/template.hbs
rename to frontend/app/components/filter-sidebar.hbs
diff --git a/frontend/app/components/filter-sidebar/component.js b/frontend/app/components/filter-sidebar.js
similarity index 100%
rename from frontend/app/components/filter-sidebar/component.js
rename to frontend/app/components/filter-sidebar.js
diff --git a/frontend/app/components/filter-sidebar/filter/template.hbs b/frontend/app/components/filter-sidebar/filter.hbs
similarity index 100%
rename from frontend/app/components/filter-sidebar/filter/template.hbs
rename to frontend/app/components/filter-sidebar/filter.hbs
diff --git a/frontend/app/components/filter-sidebar/group/template.hbs b/frontend/app/components/filter-sidebar/group.hbs
similarity index 100%
rename from frontend/app/components/filter-sidebar/group/template.hbs
rename to frontend/app/components/filter-sidebar/group.hbs
diff --git a/frontend/app/components/filter-sidebar/group/component.js b/frontend/app/components/filter-sidebar/group.js
similarity index 100%
rename from frontend/app/components/filter-sidebar/group/component.js
rename to frontend/app/components/filter-sidebar/group.js
diff --git a/frontend/app/components/filter-sidebar/label/template.hbs b/frontend/app/components/filter-sidebar/label.hbs
similarity index 100%
rename from frontend/app/components/filter-sidebar/label/template.hbs
rename to frontend/app/components/filter-sidebar/label.hbs
diff --git a/frontend/app/components/loading-icon/template.hbs b/frontend/app/components/loading-icon.hbs
similarity index 100%
rename from frontend/app/components/loading-icon/template.hbs
rename to frontend/app/components/loading-icon.hbs
diff --git a/frontend/app/components/magic-link-btn/template.hbs b/frontend/app/components/magic-link-btn.hbs
similarity index 100%
rename from frontend/app/components/magic-link-btn/template.hbs
rename to frontend/app/components/magic-link-btn.hbs
diff --git a/frontend/app/components/magic-link-btn/component.js b/frontend/app/components/magic-link-btn.js
similarity index 100%
rename from frontend/app/components/magic-link-btn/component.js
rename to frontend/app/components/magic-link-btn.js
diff --git a/frontend/app/components/magic-link-modal/template.hbs b/frontend/app/components/magic-link-modal.hbs
similarity index 100%
rename from frontend/app/components/magic-link-modal/template.hbs
rename to frontend/app/components/magic-link-modal.hbs
diff --git a/frontend/app/components/magic-link-modal/component.js b/frontend/app/components/magic-link-modal.js
similarity index 100%
rename from frontend/app/components/magic-link-modal/component.js
rename to frontend/app/components/magic-link-modal.js
diff --git a/frontend/app/components/no-mobile-message/template.hbs b/frontend/app/components/no-mobile-message.hbs
similarity index 100%
rename from frontend/app/components/no-mobile-message/template.hbs
rename to frontend/app/components/no-mobile-message.hbs
diff --git a/frontend/app/components/no-permission/template.hbs b/frontend/app/components/no-permission.hbs
similarity index 100%
rename from frontend/app/components/no-permission/template.hbs
rename to frontend/app/components/no-permission.hbs
diff --git a/frontend/app/components/not-identical-warning/template.hbs b/frontend/app/components/not-identical-warning.hbs
similarity index 100%
rename from frontend/app/components/not-identical-warning/template.hbs
rename to frontend/app/components/not-identical-warning.hbs
diff --git a/frontend/app/components/optimized-power-select/template.hbs b/frontend/app/components/optimized-power-select.hbs
similarity index 100%
rename from frontend/app/components/optimized-power-select/template.hbs
rename to frontend/app/components/optimized-power-select.hbs
diff --git a/frontend/app/components/optimized-power-select/component.js b/frontend/app/components/optimized-power-select.js
similarity index 100%
rename from frontend/app/components/optimized-power-select/component.js
rename to frontend/app/components/optimized-power-select.js
diff --git a/frontend/app/components/optimized-power-select/options/template.hbs b/frontend/app/components/optimized-power-select/options.hbs
similarity index 100%
rename from frontend/app/components/optimized-power-select/options/template.hbs
rename to frontend/app/components/optimized-power-select/options.hbs
diff --git a/frontend/app/components/optimized-power-select/options/component.js b/frontend/app/components/optimized-power-select/options.js
similarity index 100%
rename from frontend/app/components/optimized-power-select/options/component.js
rename to frontend/app/components/optimized-power-select/options.js
diff --git a/frontend/app/components/optimized-power-select/trigger/template.hbs b/frontend/app/components/optimized-power-select/trigger.hbs
similarity index 100%
rename from frontend/app/components/optimized-power-select/trigger/template.hbs
rename to frontend/app/components/optimized-power-select/trigger.hbs
diff --git a/frontend/app/components/optimized-power-select/trigger/component.js b/frontend/app/components/optimized-power-select/trigger.js
similarity index 100%
rename from frontend/app/components/optimized-power-select/trigger/component.js
rename to frontend/app/components/optimized-power-select/trigger.js
diff --git a/frontend/app/components/page-permission/template.hbs b/frontend/app/components/page-permission.hbs
similarity index 100%
rename from frontend/app/components/page-permission/template.hbs
rename to frontend/app/components/page-permission.hbs
diff --git a/frontend/app/components/progress-tooltip/template.hbs b/frontend/app/components/progress-tooltip.hbs
similarity index 100%
rename from frontend/app/components/progress-tooltip/template.hbs
rename to frontend/app/components/progress-tooltip.hbs
diff --git a/frontend/app/components/progress-tooltip/component.js b/frontend/app/components/progress-tooltip.js
similarity index 100%
rename from frontend/app/components/progress-tooltip/component.js
rename to frontend/app/components/progress-tooltip.js
diff --git a/frontend/app/components/record-button/template.hbs b/frontend/app/components/record-button.hbs
similarity index 100%
rename from frontend/app/components/record-button/template.hbs
rename to frontend/app/components/record-button.hbs
diff --git a/frontend/app/components/record-button/component.js b/frontend/app/components/record-button.js
similarity index 100%
rename from frontend/app/components/record-button/component.js
rename to frontend/app/components/record-button.js
diff --git a/frontend/app/components/report-review-warning/template.hbs b/frontend/app/components/report-review-warning.hbs
similarity index 100%
rename from frontend/app/components/report-review-warning/template.hbs
rename to frontend/app/components/report-review-warning.hbs
diff --git a/frontend/app/components/report-review-warning/component.js b/frontend/app/components/report-review-warning.js
similarity index 100%
rename from frontend/app/components/report-review-warning/component.js
rename to frontend/app/components/report-review-warning.js
diff --git a/frontend/app/components/report-row/template.hbs b/frontend/app/components/report-row.hbs
similarity index 100%
rename from frontend/app/components/report-row/template.hbs
rename to frontend/app/components/report-row.hbs
diff --git a/frontend/app/components/report-row/component.js b/frontend/app/components/report-row.js
similarity index 100%
rename from frontend/app/components/report-row/component.js
rename to frontend/app/components/report-row.js
diff --git a/frontend/app/components/sort-header/template.hbs b/frontend/app/components/sort-header.hbs
similarity index 100%
rename from frontend/app/components/sort-header/template.hbs
rename to frontend/app/components/sort-header.hbs
diff --git a/frontend/app/components/sort-header/component.js b/frontend/app/components/sort-header.js
similarity index 100%
rename from frontend/app/components/sort-header/component.js
rename to frontend/app/components/sort-header.js
diff --git a/frontend/app/components/statistic-list/template.hbs b/frontend/app/components/statistic-list.hbs
similarity index 100%
rename from frontend/app/components/statistic-list/template.hbs
rename to frontend/app/components/statistic-list.hbs
diff --git a/frontend/app/components/statistic-list/component.js b/frontend/app/components/statistic-list.js
similarity index 100%
rename from frontend/app/components/statistic-list/component.js
rename to frontend/app/components/statistic-list.js
diff --git a/frontend/app/components/statistic-list/bar/template.hbs b/frontend/app/components/statistic-list/bar.hbs
similarity index 100%
rename from frontend/app/components/statistic-list/bar/template.hbs
rename to frontend/app/components/statistic-list/bar.hbs
diff --git a/frontend/app/components/statistic-list/bar/component.js b/frontend/app/components/statistic-list/bar.js
similarity index 100%
rename from frontend/app/components/statistic-list/bar/component.js
rename to frontend/app/components/statistic-list/bar.js
diff --git a/frontend/app/components/statistic-list/column/template.hbs b/frontend/app/components/statistic-list/column.hbs
similarity index 100%
rename from frontend/app/components/statistic-list/column/template.hbs
rename to frontend/app/components/statistic-list/column.hbs
diff --git a/frontend/app/components/task-selection/template.hbs b/frontend/app/components/task-selection.hbs
similarity index 100%
rename from frontend/app/components/task-selection/template.hbs
rename to frontend/app/components/task-selection.hbs
diff --git a/frontend/app/components/task-selection/component.js b/frontend/app/components/task-selection.js
similarity index 100%
rename from frontend/app/components/task-selection/component.js
rename to frontend/app/components/task-selection.js
diff --git a/frontend/app/components/timed-clock/template.hbs b/frontend/app/components/timed-clock.hbs
similarity index 100%
rename from frontend/app/components/timed-clock/template.hbs
rename to frontend/app/components/timed-clock.hbs
diff --git a/frontend/app/components/timed-clock/component.js b/frontend/app/components/timed-clock.js
similarity index 100%
rename from frontend/app/components/timed-clock/component.js
rename to frontend/app/components/timed-clock.js
diff --git a/frontend/app/components/tracking-bar/template.hbs b/frontend/app/components/tracking-bar.hbs
similarity index 100%
rename from frontend/app/components/tracking-bar/template.hbs
rename to frontend/app/components/tracking-bar.hbs
diff --git a/frontend/app/components/tracking-bar/component.js b/frontend/app/components/tracking-bar.js
similarity index 100%
rename from frontend/app/components/tracking-bar/component.js
rename to frontend/app/components/tracking-bar.js
diff --git a/frontend/app/components/user-selection/template.hbs b/frontend/app/components/user-selection.hbs
similarity index 100%
rename from frontend/app/components/user-selection/template.hbs
rename to frontend/app/components/user-selection.hbs
diff --git a/frontend/app/components/user-selection/component.js b/frontend/app/components/user-selection.js
similarity index 100%
rename from frontend/app/components/user-selection/component.js
rename to frontend/app/components/user-selection.js
diff --git a/frontend/app/components/weekly-overview-benchmark/template.hbs b/frontend/app/components/weekly-overview-benchmark.hbs
similarity index 100%
rename from frontend/app/components/weekly-overview-benchmark/template.hbs
rename to frontend/app/components/weekly-overview-benchmark.hbs
diff --git a/frontend/app/components/weekly-overview-benchmark/component.js b/frontend/app/components/weekly-overview-benchmark.js
similarity index 100%
rename from frontend/app/components/weekly-overview-benchmark/component.js
rename to frontend/app/components/weekly-overview-benchmark.js
diff --git a/frontend/app/components/weekly-overview-day/template.hbs b/frontend/app/components/weekly-overview-day.hbs
similarity index 100%
rename from frontend/app/components/weekly-overview-day/template.hbs
rename to frontend/app/components/weekly-overview-day.hbs
diff --git a/frontend/app/components/weekly-overview-day/component.js b/frontend/app/components/weekly-overview-day.js
similarity index 100%
rename from frontend/app/components/weekly-overview-day/component.js
rename to frontend/app/components/weekly-overview-day.js
diff --git a/frontend/app/components/weekly-overview/template.hbs b/frontend/app/components/weekly-overview.hbs
similarity index 100%
rename from frontend/app/components/weekly-overview/template.hbs
rename to frontend/app/components/weekly-overview.hbs
diff --git a/frontend/app/components/weekly-overview/component.js b/frontend/app/components/weekly-overview.js
similarity index 100%
rename from frontend/app/components/weekly-overview/component.js
rename to frontend/app/components/weekly-overview.js
diff --git a/frontend/app/components/welcome-modal/template.hbs b/frontend/app/components/welcome-modal.hbs
similarity index 100%
rename from frontend/app/components/welcome-modal/template.hbs
rename to frontend/app/components/welcome-modal.hbs
diff --git a/frontend/app/components/worktime-balance-chart/template.hbs b/frontend/app/components/worktime-balance-chart.hbs
similarity index 100%
rename from frontend/app/components/worktime-balance-chart/template.hbs
rename to frontend/app/components/worktime-balance-chart.hbs
diff --git a/frontend/app/components/worktime-balance-chart/component.js b/frontend/app/components/worktime-balance-chart.js
similarity index 100%
rename from frontend/app/components/worktime-balance-chart/component.js
rename to frontend/app/components/worktime-balance-chart.js
diff --git a/frontend/tests/integration/components/worktime-balance-chart/component-test.js b/frontend/tests/integration/components/worktime-balance-chart/component-test.js
index b914d9271..813d1f0cc 100644
--- a/frontend/tests/integration/components/worktime-balance-chart/component-test.js
+++ b/frontend/tests/integration/components/worktime-balance-chart/component-test.js
@@ -3,7 +3,7 @@ import { hbs } from "ember-cli-htmlbars";
 import { setupRenderingTest } from "ember-qunit";
 import moment from "moment";
 import { module, test } from "qunit";
-import WorktimeBalanceChart from "timed/components/worktime-balance-chart/component";
+import WorktimeBalanceChart from "timed/components/worktime-balance-chart";
 
 module("Integration | Component | worktime balance chart", function (hooks) {
   setupRenderingTest(hooks);