diff --git a/addons/rose/addon/components/rose/nav/breadcrumbs.js b/addons/rose/addon/components/rose/nav/breadcrumbs.js
deleted file mode 100644
index 0f915d890..000000000
--- a/addons/rose/addon/components/rose/nav/breadcrumbs.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/nav/breadcrumbs';
-
-/**
- * A navigation component with links.
- */
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/nav/breadcrumbs.hbs b/addons/rose/addon/components/rose/nav/breadcrumbs/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/nav/breadcrumbs.hbs
rename to addons/rose/addon/components/rose/nav/breadcrumbs/index.hbs
diff --git a/addons/rose/addon/components/rose/nav/breadcrumbs.stories.mdx b/addons/rose/addon/components/rose/nav/breadcrumbs/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/nav/breadcrumbs.stories.mdx
rename to addons/rose/addon/components/rose/nav/breadcrumbs/index.stories.mdx
diff --git a/addons/rose/addon/components/rose/nav/sidebar.js b/addons/rose/addon/components/rose/nav/sidebar.js
deleted file mode 100644
index 40b8900e4..000000000
--- a/addons/rose/addon/components/rose/nav/sidebar.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/nav/sidebar';
-import ComponentAutoId from '../../../mixins/component-auto-id';
-
-/**
- * A simple navigation component intended for the sidebar layout region.
- */
-export default Component.extend(ComponentAutoId, {
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/nav/sidebar.hbs b/addons/rose/addon/components/rose/nav/sidebar/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/nav/sidebar.hbs
rename to addons/rose/addon/components/rose/nav/sidebar/index.hbs
diff --git a/addons/rose/addon/components/rose/nav/sidebar/index.js b/addons/rose/addon/components/rose/nav/sidebar/index.js
new file mode 100644
index 000000000..1d3b63115
--- /dev/null
+++ b/addons/rose/addon/components/rose/nav/sidebar/index.js
@@ -0,0 +1,10 @@
+import Component from '@glimmer/component';
+import { generateComponentID } from '../../../../utilities/component-auto-id';
+
+export default class RoseNavSidebarComponent extends Component {
+
+  // =attributes
+
+  id = generateComponentID();
+
+}
diff --git a/addons/rose/addon/components/rose/nav/sidebar.stories.mdx b/addons/rose/addon/components/rose/nav/sidebar/sidebar.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/nav/sidebar.stories.mdx
rename to addons/rose/addon/components/rose/nav/sidebar/sidebar.stories.mdx
diff --git a/addons/rose/addon/components/rose/nav/tabs.js b/addons/rose/addon/components/rose/nav/tabs.js
deleted file mode 100644
index 5ee542903..000000000
--- a/addons/rose/addon/components/rose/nav/tabs.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/nav/tabs';
-
-export default Component.extend({
-  layout,
-});
diff --git a/addons/rose/addon/templates/components/rose/nav/tabs.hbs b/addons/rose/addon/components/rose/nav/tabs/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/nav/tabs.hbs
rename to addons/rose/addon/components/rose/nav/tabs/index.hbs
diff --git a/addons/rose/addon/components/rose/nav/tabs.stories.mdx b/addons/rose/addon/components/rose/nav/tabs/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/nav/tabs.stories.mdx
rename to addons/rose/addon/components/rose/nav/tabs/index.stories.mdx