diff --git a/addons/rose/addon/components/rose/header.js b/addons/rose/addon/components/rose/header.js
deleted file mode 100644
index 0eb922549..000000000
--- a/addons/rose/addon/components/rose/header.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../templates/components/rose/header';
-
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/components/rose/header/brand.js b/addons/rose/addon/components/rose/header/brand.js
deleted file mode 100644
index c1e63e6ab..000000000
--- a/addons/rose/addon/components/rose/header/brand.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/header/brand';
-
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/header/brand.hbs b/addons/rose/addon/components/rose/header/brand/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/header/brand.hbs
rename to addons/rose/addon/components/rose/header/brand/index.hbs
diff --git a/addons/rose/addon/templates/components/rose/header.hbs b/addons/rose/addon/components/rose/header/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/header.hbs
rename to addons/rose/addon/components/rose/header/index.hbs
diff --git a/addons/rose/addon/components/rose/header.stories.mdx b/addons/rose/addon/components/rose/header/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/header.stories.mdx
rename to addons/rose/addon/components/rose/header/index.stories.mdx
diff --git a/addons/rose/addon/components/rose/header/nav.js b/addons/rose/addon/components/rose/header/nav.js
deleted file mode 100644
index 387bd6be8..000000000
--- a/addons/rose/addon/components/rose/header/nav.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/header/nav';
-
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/header/nav.hbs b/addons/rose/addon/components/rose/header/nav/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/header/nav.hbs
rename to addons/rose/addon/components/rose/header/nav/index.hbs
diff --git a/addons/rose/addon/components/rose/header/utilities.js b/addons/rose/addon/components/rose/header/utilities.js
deleted file mode 100644
index ff615c434..000000000
--- a/addons/rose/addon/components/rose/header/utilities.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/header/utilities';
-
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/header/utilities.hbs b/addons/rose/addon/components/rose/header/utilities/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/header/utilities.hbs
rename to addons/rose/addon/components/rose/header/utilities/index.hbs