diff --git a/addons/rose/addon/components/rose/form/select.js b/addons/rose/addon/components/rose/form/select.js
deleted file mode 100644
index c71537542..000000000
--- a/addons/rose/addon/components/rose/form/select.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/form/select';
-import ComponentAutoId from '../../../mixins/component-auto-id';
-
-/**
- * A `<select>` element context component which yields option components.
- */
-export default Component.extend(ComponentAutoId, {
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/form/select.hbs b/addons/rose/addon/components/rose/form/select/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/form/select.hbs
rename to addons/rose/addon/components/rose/form/select/index.hbs
diff --git a/addons/rose/addon/components/rose/form/select/index.js b/addons/rose/addon/components/rose/form/select/index.js
new file mode 100644
index 000000000..9690ea00f
--- /dev/null
+++ b/addons/rose/addon/components/rose/form/select/index.js
@@ -0,0 +1,10 @@
+import Component from '@glimmer/component';
+import { generateComponentID } from '../../../../utilities/component-auto-id';
+
+export default class RoseFormSelectComponent extends Component {
+
+  // =attributes
+
+  id = generateComponentID();
+
+}
diff --git a/addons/rose/addon/components/rose/form/select.stories.mdx b/addons/rose/addon/components/rose/form/select/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/form/select.stories.mdx
rename to addons/rose/addon/components/rose/form/select/index.stories.mdx
diff --git a/addons/rose/addon/components/rose/form/select/select.js b/addons/rose/addon/components/rose/form/select/select.js
deleted file mode 100644
index 7e55d8c55..000000000
--- a/addons/rose/addon/components/rose/form/select/select.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../../templates/components/rose/form/select/select';
-
-/**
- * This component is used internally by rose/form/select and should not be
- * instantiated directly.
- */
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/form/select/select.hbs b/addons/rose/addon/components/rose/form/select/select/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/form/select/select.hbs
rename to addons/rose/addon/components/rose/form/select/select/index.hbs