diff --git a/addons/rose/addon/templates/components/rose/table/row.hbs b/addons/rose/addon/components/rose/table/row/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/table/row.hbs
rename to addons/rose/addon/components/rose/table/row/index.hbs
diff --git a/addons/rose/addon/components/rose/table/row.js b/addons/rose/addon/components/rose/table/row/index.js
similarity index 75%
rename from addons/rose/addon/components/rose/table/row.js
rename to addons/rose/addon/components/rose/table/row/index.js
index e94f0cf28..042f937b8 100644
--- a/addons/rose/addon/components/rose/table/row.js
+++ b/addons/rose/addon/components/rose/table/row/index.js
@@ -1,5 +1,5 @@
 import Component from '@ember/component';
-import layout from '../../../templates/components/rose/table/row';
+import layout from './index';
 
 /**
  * A table row component that uses tr table element and
diff --git a/addons/rose/addon/templates/components/rose/table/section.hbs b/addons/rose/addon/components/rose/table/section/index.hbs
similarity index 92%
rename from addons/rose/addon/templates/components/rose/table/section.hbs
rename to addons/rose/addon/components/rose/table/section/index.hbs
index d39e97260..d14bfc6a4 100644
--- a/addons/rose/addon/templates/components/rose/table/section.hbs
+++ b/addons/rose/addon/components/rose/table/section/index.hbs
@@ -1,3 +1,3 @@
 {{yield (hash
   row=(component 'rose/table/row')
-)}}
\ No newline at end of file
+)}}
diff --git a/addons/rose/addon/components/rose/table/section.js b/addons/rose/addon/components/rose/table/section/index.js
similarity index 76%
rename from addons/rose/addon/components/rose/table/section.js
rename to addons/rose/addon/components/rose/table/section/index.js
index 503ed969b..03d0ab453 100644
--- a/addons/rose/addon/components/rose/table/section.js
+++ b/addons/rose/addon/components/rose/table/section/index.js
@@ -1,5 +1,5 @@
 import Component from '@ember/component';
-import layout from '../../../templates/components/rose/table/section';
+import layout from './index';
 
 /**
  * A table section component that configures a row component.