From cadd75bd0198be4bbcef0d6549d50b1278ed66c2 Mon Sep 17 00:00:00 2001
From: Robert Wagner <rwwagner90@gmail.com>
Date: Thu, 26 Jan 2023 09:33:07 -0500
Subject: [PATCH] Use component template colocation instead of pods

---
 README.md                                                 | 2 +-
 addon-test-support/index.js                               | 6 +++---
 .../scroll-indicators/{template.hbs => index.hbs}         | 0
 .../-private/scroll-indicators/{component.js => index.js} | 2 --
 .../component.js => ember-table-loading-more.js}          | 0
 addon/components/ember-table/{template.hbs => index.hbs}  | 0
 addon/components/ember-table/{component.js => index.js}   | 3 ---
 addon/components/ember-tbody/{template.hbs => index.hbs}  | 0
 addon/components/ember-tbody/{component.js => index.js}   | 2 --
 addon/components/ember-td/{template.hbs => index.hbs}     | 0
 addon/components/ember-td/{component.js => index.js}      | 2 --
 addon/components/ember-tfoot/{template.hbs => index.hbs}  | 0
 addon/components/ember-tfoot/{component.js => index.js}   | 5 +----
 addon/components/ember-th/{template.hbs => index.hbs}     | 0
 addon/components/ember-th/{component.js => index.js}      | 2 --
 .../ember-th/resize-handle/{template.hbs => index.hbs}    | 0
 .../ember-th/resize-handle/{component.js => index.js}     | 2 --
 .../ember-th/sort-indicator/{template.hbs => index.hbs}   | 0
 .../ember-th/sort-indicator/{component.js => index.js}    | 2 --
 addon/components/ember-thead/{template.hbs => index.hbs}  | 0
 addon/components/ember-thead/{component.js => index.js}   | 3 ---
 addon/components/ember-tr/{template.hbs => index.hbs}     | 0
 addon/components/ember-tr/{component.js => index.js}      | 2 --
 app/components/ember-table-loading-more.js                | 2 +-
 app/components/ember-table-private/scroll-indicators.js   | 2 +-
 app/components/ember-table.js                             | 2 +-
 app/components/ember-tbody.js                             | 2 +-
 app/components/ember-td.js                                | 2 +-
 app/components/ember-tfoot.js                             | 2 +-
 app/components/ember-th.js                                | 2 +-
 app/components/ember-th/resize-handle.js                  | 2 +-
 app/components/ember-th/sort-indicator.js                 | 2 +-
 app/components/ember-thead.js                             | 2 +-
 app/components/ember-tr.js                                | 2 +-
 .../component.d.ts => ember-table-loading-more.d.ts}      | 0
 .../{ember-table/component.d.ts => ember-table.d.ts}      | 8 ++++----
 .../{ember-tbody/component.d.ts => ember-tbody.d.ts}      | 2 +-
 .../components/{ember-td/component.d.ts => ember-td.d.ts} | 0
 .../{ember-tfoot/component.d.ts => ember-tfoot.d.ts}      | 2 +-
 .../components/{ember-th/component.d.ts => ember-th.d.ts} | 0
 .../{resize-handle/component.d.ts => resize-handle.d.ts}  | 0
 .../component.d.ts => sort-indicator.d.ts}                | 0
 .../{ember-thead/component.d.ts => ember-thead.d.ts}      | 4 ++--
 .../components/{ember-tr/component.d.ts => ember-tr.d.ts} | 2 +-
 types/template-registry.d.ts                              | 6 +++---
 45 files changed, 28 insertions(+), 51 deletions(-)
 rename addon/components/-private/scroll-indicators/{template.hbs => index.hbs} (100%)
 rename addon/components/-private/scroll-indicators/{component.js => index.js} (99%)
 rename addon/components/{ember-table-loading-more/component.js => ember-table-loading-more.js} (100%)
 rename addon/components/ember-table/{template.hbs => index.hbs} (100%)
 rename addon/components/ember-table/{component.js => index.js} (98%)
 rename addon/components/ember-tbody/{template.hbs => index.hbs} (100%)
 rename addon/components/ember-tbody/{component.js => index.js} (99%)
 rename addon/components/ember-td/{template.hbs => index.hbs} (100%)
 rename addon/components/ember-td/{component.js => index.js} (99%)
 rename addon/components/ember-tfoot/{template.hbs => index.hbs} (100%)
 rename addon/components/ember-tfoot/{component.js => index.js} (92%)
 rename addon/components/ember-th/{template.hbs => index.hbs} (100%)
 rename addon/components/ember-th/{component.js => index.js} (99%)
 rename addon/components/ember-th/resize-handle/{template.hbs => index.hbs} (100%)
 rename addon/components/ember-th/resize-handle/{component.js => index.js} (95%)
 rename addon/components/ember-th/sort-indicator/{template.hbs => index.hbs} (100%)
 rename addon/components/ember-th/sort-indicator/{component.js => index.js} (96%)
 rename addon/components/ember-thead/{template.hbs => index.hbs} (100%)
 rename addon/components/ember-thead/{component.js => index.js} (99%)
 rename addon/components/ember-tr/{template.hbs => index.hbs} (100%)
 rename addon/components/ember-tr/{component.js => index.js} (98%)
 rename types/components/{ember-table-loading-more/component.d.ts => ember-table-loading-more.d.ts} (100%)
 rename types/components/{ember-table/component.d.ts => ember-table.d.ts} (92%)
 rename types/components/{ember-tbody/component.d.ts => ember-tbody.d.ts} (98%)
 rename types/components/{ember-td/component.d.ts => ember-td.d.ts} (100%)
 rename types/components/{ember-tfoot/component.d.ts => ember-tfoot.d.ts} (90%)
 rename types/components/{ember-th/component.d.ts => ember-th.d.ts} (100%)
 rename types/components/ember-th/{resize-handle/component.d.ts => resize-handle.d.ts} (100%)
 rename types/components/ember-th/{sort-indicator/component.d.ts => sort-indicator.d.ts} (100%)
 rename types/components/{ember-thead/component.d.ts => ember-thead.d.ts} (96%)
 rename types/components/{ember-tr/component.d.ts => ember-tr.d.ts} (94%)

diff --git a/README.md b/README.md
index 45b2f6dbf..96b3565f8 100644
--- a/README.md
+++ b/README.md
@@ -189,7 +189,7 @@ declare module '@glint/environment-ember-loose/registry' {
 ```ts
 // my-table-component.ts
 import type { EmberTableColumn, EmberTableRow } from 'ember-table';
-import EmberTableComponent from 'ember-table/components/ember-table/component';
+import EmberTableComponent from 'ember-table/components/ember-table';
 
 interface MyTableColumn extends EmberTableColumn {
   // Add any custom column attribute types here (optional)
diff --git a/addon-test-support/index.js b/addon-test-support/index.js
index 49e2e5b8e..819ba2ed4 100644
--- a/addon-test-support/index.js
+++ b/addon-test-support/index.js
@@ -1,8 +1,8 @@
 import TablePage from './pages/ember-table';
 import registerWaiter from 'ember-raf-scheduler/test-support/register-waiter';
-import { setSetupRowCountForTest } from 'ember-table/components/ember-tbody/component';
-import { setupTHeadForTest } from 'ember-table/components/ember-thead/component';
-import { setSimpleCheckboxForTest } from 'ember-table/components/ember-td/component';
+import { setSetupRowCountForTest } from 'ember-table/components/ember-tbody';
+import { setupTHeadForTest } from 'ember-table/components/ember-thead';
+import { setSimpleCheckboxForTest } from 'ember-table/components/ember-td';
 
 function setupForTest() {
   registerWaiter();
diff --git a/addon/components/-private/scroll-indicators/template.hbs b/addon/components/-private/scroll-indicators/index.hbs
similarity index 100%
rename from addon/components/-private/scroll-indicators/template.hbs
rename to addon/components/-private/scroll-indicators/index.hbs
diff --git a/addon/components/-private/scroll-indicators/component.js b/addon/components/-private/scroll-indicators/index.js
similarity index 99%
rename from addon/components/-private/scroll-indicators/component.js
rename to addon/components/-private/scroll-indicators/index.js
index dababfc3c..d564b3ab0 100644
--- a/addon/components/-private/scroll-indicators/component.js
+++ b/addon/components/-private/scroll-indicators/index.js
@@ -7,7 +7,6 @@ import { capitalize } from '@ember/string';
 import { htmlSafe } from '@ember/template';
 import { isEmpty, isNone } from '@ember/utils';
 import { addObserver } from 'ember-table/-private/utils/observer';
-import layout from './template';
 
 /**
    Computed property macro that builds the CSS styles (position, height)
@@ -122,7 +121,6 @@ const showIndicator = location => {
 };
 
 export default Component.extend({
-  layout,
   tagName: '',
 
   /**
diff --git a/addon/components/ember-table-loading-more/component.js b/addon/components/ember-table-loading-more.js
similarity index 100%
rename from addon/components/ember-table-loading-more/component.js
rename to addon/components/ember-table-loading-more.js
diff --git a/addon/components/ember-table/template.hbs b/addon/components/ember-table/index.hbs
similarity index 100%
rename from addon/components/ember-table/template.hbs
rename to addon/components/ember-table/index.hbs
diff --git a/addon/components/ember-table/component.js b/addon/components/ember-table/index.js
similarity index 98%
rename from addon/components/ember-table/component.js
rename to addon/components/ember-table/index.js
index 7846536a7..f69c530f9 100644
--- a/addon/components/ember-table/component.js
+++ b/addon/components/ember-table/index.js
@@ -6,8 +6,6 @@ import {
   teardownTableStickyPolyfill,
 } from '../../-private/sticky/table-sticky-polyfill';
 
-import layout from './template';
-
 /**
   The primary Ember Table component. This component represents the root of the
   table, and manages high level state of all of its subcomponents. It does not
@@ -30,7 +28,6 @@ import layout from './template';
   @public
 */
 export default Component.extend({
-  layout,
   classNames: ['ember-table'],
   attributeBindings: ['dataTestEmberTable:data-test-ember-table'],
   dataTestEmberTable: true,
diff --git a/addon/components/ember-tbody/template.hbs b/addon/components/ember-tbody/index.hbs
similarity index 100%
rename from addon/components/ember-tbody/template.hbs
rename to addon/components/ember-tbody/index.hbs
diff --git a/addon/components/ember-tbody/component.js b/addon/components/ember-tbody/index.js
similarity index 99%
rename from addon/components/ember-tbody/component.js
rename to addon/components/ember-tbody/index.js
index 889e6d802..ebab184a2 100644
--- a/addon/components/ember-tbody/component.js
+++ b/addon/components/ember-tbody/index.js
@@ -7,7 +7,6 @@ import { bool, readOnly, or } from '@ember/object/computed';
 import CollapseTree, { SELECT_MODE } from '../../-private/collapse-tree';
 import defaultTo from '../../-private/utils/default-to';
 
-import layout from './template';
 import { assert } from '@ember/debug';
 
 let setupRowCountForTest = false;
@@ -40,7 +39,6 @@ export function setSetupRowCountForTest(bool) {
   @public
 */
 export default Component.extend({
-  layout,
   tagName: 'tbody',
 
   /**
diff --git a/addon/components/ember-td/template.hbs b/addon/components/ember-td/index.hbs
similarity index 100%
rename from addon/components/ember-td/template.hbs
rename to addon/components/ember-td/index.hbs
diff --git a/addon/components/ember-td/component.js b/addon/components/ember-td/index.js
similarity index 99%
rename from addon/components/ember-td/component.js
rename to addon/components/ember-td/index.js
index 2b34bb8bb..9f4fc8362 100644
--- a/addon/components/ember-td/component.js
+++ b/addon/components/ember-td/index.js
@@ -3,7 +3,6 @@ import BaseTableCell from '../-private/base-table-cell';
 import { computed } from '@ember/object';
 import { alias, readOnly } from '@ember/object/computed';
 
-import layout from './template';
 import { SELECT_MODE } from '../../-private/collapse-tree';
 
 let setupSimpleCheckboxForTest = false;
@@ -41,7 +40,6 @@ export function setSimpleCheckboxForTest(bool) {
  @public
  */
 export default BaseTableCell.extend({
-  layout,
   tagName: 'td',
 
   init() {
diff --git a/addon/components/ember-tfoot/template.hbs b/addon/components/ember-tfoot/index.hbs
similarity index 100%
rename from addon/components/ember-tfoot/template.hbs
rename to addon/components/ember-tfoot/index.hbs
diff --git a/addon/components/ember-tfoot/component.js b/addon/components/ember-tfoot/index.js
similarity index 92%
rename from addon/components/ember-tfoot/component.js
rename to addon/components/ember-tfoot/index.js
index 01ed9dc2e..af21726cc 100644
--- a/addon/components/ember-tfoot/component.js
+++ b/addon/components/ember-tfoot/index.js
@@ -1,10 +1,8 @@
-import EmberTBody from '../ember-tbody/component';
+import EmberTBody from '../ember-tbody';
 import { A as emberA } from '@ember/array';
 
 import { computed } from '@ember/object';
 
-import layout from './template';
-
 /**
   The table footer component. This component manages any footer rows which may
   be attached to the table, and has the same API as EmberTBody. It does not
@@ -30,7 +28,6 @@ import layout from './template';
   @public
 */
 export default EmberTBody.extend({
-  layout,
   tagName: 'tfoot',
 
   wrappedRowArray: computed('wrappedRows.[]', function() {
diff --git a/addon/components/ember-th/template.hbs b/addon/components/ember-th/index.hbs
similarity index 100%
rename from addon/components/ember-th/template.hbs
rename to addon/components/ember-th/index.hbs
diff --git a/addon/components/ember-th/component.js b/addon/components/ember-th/index.js
similarity index 99%
rename from addon/components/ember-th/component.js
rename to addon/components/ember-th/index.js
index eaa400b51..a6e61be7f 100644
--- a/addon/components/ember-th/component.js
+++ b/addon/components/ember-th/index.js
@@ -5,7 +5,6 @@ import { next } from '@ember/runloop';
 import { readOnly } from '@ember/object/computed';
 import { closest } from '../../-private/utils/element';
 
-import layout from './template';
 import { get } from '@ember/object';
 
 const COLUMN_INACTIVE = 0;
@@ -35,7 +34,6 @@ const COLUMN_REORDERING = 2;
   @public
 */
 export default BaseTableCell.extend({
-  layout,
   tagName: 'th',
   attributeBindings: ['columnSpan:colspan', 'rowSpan:rowspan'],
   classNameBindings: ['isSortable', 'isResizable', 'isReorderable'],
diff --git a/addon/components/ember-th/resize-handle/template.hbs b/addon/components/ember-th/resize-handle/index.hbs
similarity index 100%
rename from addon/components/ember-th/resize-handle/template.hbs
rename to addon/components/ember-th/resize-handle/index.hbs
diff --git a/addon/components/ember-th/resize-handle/component.js b/addon/components/ember-th/resize-handle/index.js
similarity index 95%
rename from addon/components/ember-th/resize-handle/component.js
rename to addon/components/ember-th/resize-handle/index.js
index 298803a6f..f0096ed71 100644
--- a/addon/components/ember-th/resize-handle/component.js
+++ b/addon/components/ember-th/resize-handle/index.js
@@ -1,5 +1,4 @@
 import Component from '@ember/component';
-import layout from './template';
 
 import { readOnly } from '@ember/object/computed';
 
@@ -25,7 +24,6 @@ import { readOnly } from '@ember/object/computed';
   @public
 */
 export default Component.extend({
-  layout,
   tagName: '',
 
   /**
diff --git a/addon/components/ember-th/sort-indicator/template.hbs b/addon/components/ember-th/sort-indicator/index.hbs
similarity index 100%
rename from addon/components/ember-th/sort-indicator/template.hbs
rename to addon/components/ember-th/sort-indicator/index.hbs
diff --git a/addon/components/ember-th/sort-indicator/component.js b/addon/components/ember-th/sort-indicator/index.js
similarity index 96%
rename from addon/components/ember-th/sort-indicator/component.js
rename to addon/components/ember-th/sort-indicator/index.js
index 403b0c653..caba22d6b 100644
--- a/addon/components/ember-th/sort-indicator/component.js
+++ b/addon/components/ember-th/sort-indicator/index.js
@@ -1,5 +1,4 @@
 import Component from '@ember/component';
-import layout from './template';
 
 import { readOnly } from '@ember/object/computed';
 
@@ -26,7 +25,6 @@ import { readOnly } from '@ember/object/computed';
 */
 
 export default Component.extend({
-  layout,
   tagName: '',
 
   /**
diff --git a/addon/components/ember-thead/template.hbs b/addon/components/ember-thead/index.hbs
similarity index 100%
rename from addon/components/ember-thead/template.hbs
rename to addon/components/ember-thead/index.hbs
diff --git a/addon/components/ember-thead/component.js b/addon/components/ember-thead/index.js
similarity index 99%
rename from addon/components/ember-thead/component.js
rename to addon/components/ember-thead/index.js
index 077bde238..cc5e2423f 100644
--- a/addon/components/ember-thead/component.js
+++ b/addon/components/ember-thead/index.js
@@ -16,8 +16,6 @@ import { scheduleOnce } from '@ember/runloop';
 
 import ColumnTree, { RESIZE_MODE, FILL_MODE, WIDTH_CONSTRAINT } from '../../-private/column-tree';
 
-import layout from './template';
-
 let isTestingThead = false;
 export function setupTHeadForTest(bool) {
   isTestingThead = bool;
@@ -45,7 +43,6 @@ export function setupTHeadForTest(bool) {
 */
 
 export default Component.extend({
-  layout,
   tagName: 'thead',
 
   /**
diff --git a/addon/components/ember-tr/template.hbs b/addon/components/ember-tr/index.hbs
similarity index 100%
rename from addon/components/ember-tr/template.hbs
rename to addon/components/ember-tr/index.hbs
diff --git a/addon/components/ember-tr/component.js b/addon/components/ember-tr/index.js
similarity index 98%
rename from addon/components/ember-tr/component.js
rename to addon/components/ember-tr/index.js
index 4413d63e3..82e8ade52 100644
--- a/addon/components/ember-tr/component.js
+++ b/addon/components/ember-tr/index.js
@@ -4,7 +4,6 @@ import { readOnly } from '@ember/object/computed';
 
 import { closest } from '../../-private/utils/element';
 
-import layout from './template';
 import { SELECT_MODE } from '../../-private/collapse-tree';
 
 /**
@@ -45,7 +44,6 @@ import { SELECT_MODE } from '../../-private/collapse-tree';
   @public
 */
 export default Component.extend({
-  layout,
   tagName: 'tr',
   classNames: ['et-tr'],
   classNameBindings: ['isSelected', 'isGroupSelected', 'isSelectable'],
diff --git a/app/components/ember-table-loading-more.js b/app/components/ember-table-loading-more.js
index 0ba1945ee..1970ee2a2 100644
--- a/app/components/ember-table-loading-more.js
+++ b/app/components/ember-table-loading-more.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-table-loading-more/component';
+export { default } from 'ember-table/components/ember-table-loading-more';
diff --git a/app/components/ember-table-private/scroll-indicators.js b/app/components/ember-table-private/scroll-indicators.js
index 0b445d0e9..60665d374 100644
--- a/app/components/ember-table-private/scroll-indicators.js
+++ b/app/components/ember-table-private/scroll-indicators.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/-private/scroll-indicators/component';
+export { default } from 'ember-table/components/-private/scroll-indicators';
diff --git a/app/components/ember-table.js b/app/components/ember-table.js
index c490d98b3..5aa610e6c 100644
--- a/app/components/ember-table.js
+++ b/app/components/ember-table.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-table/component';
+export { default } from 'ember-table/components/ember-table';
diff --git a/app/components/ember-tbody.js b/app/components/ember-tbody.js
index de742f235..ad711895c 100644
--- a/app/components/ember-tbody.js
+++ b/app/components/ember-tbody.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-tbody/component';
+export { default } from 'ember-table/components/ember-tbody';
diff --git a/app/components/ember-td.js b/app/components/ember-td.js
index 859195016..76746fb37 100644
--- a/app/components/ember-td.js
+++ b/app/components/ember-td.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-td/component';
+export { default } from 'ember-table/components/ember-td';
diff --git a/app/components/ember-tfoot.js b/app/components/ember-tfoot.js
index 1c696615d..c1ffec9ae 100644
--- a/app/components/ember-tfoot.js
+++ b/app/components/ember-tfoot.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-tfoot/component';
+export { default } from 'ember-table/components/ember-tfoot';
diff --git a/app/components/ember-th.js b/app/components/ember-th.js
index 7359eb13a..b6cf9cda9 100644
--- a/app/components/ember-th.js
+++ b/app/components/ember-th.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-th/component';
+export { default } from 'ember-table/components/ember-th';
diff --git a/app/components/ember-th/resize-handle.js b/app/components/ember-th/resize-handle.js
index 151233512..15ba57b4f 100644
--- a/app/components/ember-th/resize-handle.js
+++ b/app/components/ember-th/resize-handle.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-th/resize-handle/component';
+export { default } from 'ember-table/components/ember-th/resize-handle';
diff --git a/app/components/ember-th/sort-indicator.js b/app/components/ember-th/sort-indicator.js
index 3f8e00b9d..a0352aea3 100644
--- a/app/components/ember-th/sort-indicator.js
+++ b/app/components/ember-th/sort-indicator.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-th/sort-indicator/component';
+export { default } from 'ember-table/components/ember-th/sort-indicator';
diff --git a/app/components/ember-thead.js b/app/components/ember-thead.js
index dd6765fc8..f9dd31aee 100644
--- a/app/components/ember-thead.js
+++ b/app/components/ember-thead.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-thead/component';
+export { default } from 'ember-table/components/ember-thead';
diff --git a/app/components/ember-tr.js b/app/components/ember-tr.js
index 9d03ddeff..51bca02ce 100644
--- a/app/components/ember-tr.js
+++ b/app/components/ember-tr.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-tr/component';
+export { default } from 'ember-table/components/ember-tr';
diff --git a/types/components/ember-table-loading-more/component.d.ts b/types/components/ember-table-loading-more.d.ts
similarity index 100%
rename from types/components/ember-table-loading-more/component.d.ts
rename to types/components/ember-table-loading-more.d.ts
diff --git a/types/components/ember-table/component.d.ts b/types/components/ember-table.d.ts
similarity index 92%
rename from types/components/ember-table/component.d.ts
rename to types/components/ember-table.d.ts
index 29a5313f9..e90806780 100644
--- a/types/components/ember-table/component.d.ts
+++ b/types/components/ember-table.d.ts
@@ -1,9 +1,9 @@
 import Component from '@ember/component';
 import { EmberTableColumn, EmberTableRow } from 'ember-table';
-import EmberTbodyComponent from 'ember-table/components/ember-tbody/component';
-import EmberTfootComponent from 'ember-table/components/ember-tfoot/component';
-import EmberTheadComponent from 'ember-table/components/ember-thead/component';
-import EmberTableLoadingMoreComponent from 'ember-table/components/ember-table-loading-more/component';
+import EmberTbodyComponent from 'ember-table/components/ember-tbody';
+import EmberTfootComponent from 'ember-table/components/ember-tfoot';
+import EmberTheadComponent from 'ember-table/components/ember-thead';
+import EmberTableLoadingMoreComponent from 'ember-table/components/ember-table-loading-more';
 
 export interface EmberTableSignature<
   RowType extends EmberTableRow,
diff --git a/types/components/ember-tbody/component.d.ts b/types/components/ember-tbody.d.ts
similarity index 98%
rename from types/components/ember-tbody/component.d.ts
rename to types/components/ember-tbody.d.ts
index 5045cfa57..cdb086dbd 100644
--- a/types/components/ember-tbody/component.d.ts
+++ b/types/components/ember-tbody.d.ts
@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import { EmberTableColumn, EmberTableRow } from 'ember-table';
-import EmberTrComponent from 'ember-table/components/ember-tr/component';
+import EmberTrComponent from 'ember-table/components/ember-tr';
 
 type SelectionMode =
   | 'multiple'
diff --git a/types/components/ember-td/component.d.ts b/types/components/ember-td.d.ts
similarity index 100%
rename from types/components/ember-td/component.d.ts
rename to types/components/ember-td.d.ts
diff --git a/types/components/ember-tfoot/component.d.ts b/types/components/ember-tfoot.d.ts
similarity index 90%
rename from types/components/ember-tfoot/component.d.ts
rename to types/components/ember-tfoot.d.ts
index cad76ace9..c701cd0bf 100644
--- a/types/components/ember-tfoot/component.d.ts
+++ b/types/components/ember-tfoot.d.ts
@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import { EmberTableColumn,  EmberTableRow } from 'ember-table';
-import EmberTrComponent from 'ember-table/components/ember-tr/component';
+import EmberTrComponent from 'ember-table/components/ember-tr';
 
 export interface EmberTfootSignature<
   RowType extends EmberTableRow,
diff --git a/types/components/ember-th/component.d.ts b/types/components/ember-th.d.ts
similarity index 100%
rename from types/components/ember-th/component.d.ts
rename to types/components/ember-th.d.ts
diff --git a/types/components/ember-th/resize-handle/component.d.ts b/types/components/ember-th/resize-handle.d.ts
similarity index 100%
rename from types/components/ember-th/resize-handle/component.d.ts
rename to types/components/ember-th/resize-handle.d.ts
diff --git a/types/components/ember-th/sort-indicator/component.d.ts b/types/components/ember-th/sort-indicator.d.ts
similarity index 100%
rename from types/components/ember-th/sort-indicator/component.d.ts
rename to types/components/ember-th/sort-indicator.d.ts
diff --git a/types/components/ember-thead/component.d.ts b/types/components/ember-thead.d.ts
similarity index 96%
rename from types/components/ember-thead/component.d.ts
rename to types/components/ember-thead.d.ts
index fc6500bb7..28347bb78 100644
--- a/types/components/ember-thead/component.d.ts
+++ b/types/components/ember-thead.d.ts
@@ -1,7 +1,7 @@
 import Component from '@ember/component';
 import { EmberTableColumn, EmberTableRow, EmberTableSort } from 'ember-table';
-import EmberThComponent from 'ember-table/components/ember-th/component';
-import EmberTrComponent from 'ember-table/components/ember-tr/component';
+import EmberThComponent from 'ember-table/components/ember-th';
+import EmberTrComponent from 'ember-table/components/ember-tr';
 
 type FillMode =
   | 'equal-column'
diff --git a/types/components/ember-tr/component.d.ts b/types/components/ember-tr.d.ts
similarity index 94%
rename from types/components/ember-tr/component.d.ts
rename to types/components/ember-tr.d.ts
index 5d725e538..a81737bdc 100644
--- a/types/components/ember-tr/component.d.ts
+++ b/types/components/ember-tr.d.ts
@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import { EmberTableColumn, EmberTableRow } from 'ember-table';
-import EmberTdComponent from 'ember-table/components/ember-td/component';
+import EmberTdComponent from 'ember-table/components/ember-td';
 
 export interface EmberTrSignature<
   RowType extends EmberTableRow,
diff --git a/types/template-registry.d.ts b/types/template-registry.d.ts
index e50b418c4..06c0ab458 100644
--- a/types/template-registry.d.ts
+++ b/types/template-registry.d.ts
@@ -1,6 +1,6 @@
-import EmberTableComponent from 'ember-table/components/ember-table/component';
-import ResizeHandleComponent from 'ember-table/components/ember-th/resize-handle/component';
-import SortIndicatorComponent from 'ember-table/components/ember-th/sort-indicator/component';
+import EmberTableComponent from 'ember-table/components/ember-table';
+import ResizeHandleComponent from 'ember-table/components/ember-th/resize-handle';
+import SortIndicatorComponent from 'ember-table/components/ember-th/sort-indicator';
 
 export default interface Registry {
   EmberTable: typeof EmberTableComponent;