diff --git a/addons/rose/addon/components/rose/list/key-value.js b/addons/rose/addon/components/rose/list/key-value.js
deleted file mode 100644
index 279a84e82..000000000
--- a/addons/rose/addon/components/rose/list/key-value.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/list/key-value';
-
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/list/key-value.hbs b/addons/rose/addon/components/rose/list/key-value/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/list/key-value.hbs
rename to addons/rose/addon/components/rose/list/key-value/index.hbs
diff --git a/addons/rose/addon/components/rose/list/key-value.stories.mdx b/addons/rose/addon/components/rose/list/key-value/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/list/key-value.stories.mdx
rename to addons/rose/addon/components/rose/list/key-value/index.stories.mdx
diff --git a/addons/rose/addon/components/rose/list/key-value/item.js b/addons/rose/addon/components/rose/list/key-value/item.js
deleted file mode 100644
index 37c30217d..000000000
--- a/addons/rose/addon/components/rose/list/key-value/item.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../../templates/components/rose/list/key-value/item';
-import ComponentAutoId from '../../../../mixins/component-auto-id';
-
-export default Component.extend(ComponentAutoId, {
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/list/key-value/item.hbs b/addons/rose/addon/components/rose/list/key-value/item/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/list/key-value/item.hbs
rename to addons/rose/addon/components/rose/list/key-value/item/index.hbs
diff --git a/addons/rose/addon/components/rose/list/key-value/item/index.js b/addons/rose/addon/components/rose/list/key-value/item/index.js
new file mode 100644
index 000000000..a166c7897
--- /dev/null
+++ b/addons/rose/addon/components/rose/list/key-value/item/index.js
@@ -0,0 +1,10 @@
+import Component from '@glimmer/component';
+import { generateComponentID } from '../../../../../utilities/component-auto-id';
+
+export default class RoseListKeyValueItemComponent extends Component {
+
+  // =attributes
+
+  id = generateComponentID();
+
+}