diff --git a/addons/rose/addon/components/rose/form/checkbox.js b/addons/rose/addon/components/rose/form/checkbox.js
deleted file mode 100644
index ad6ad3f38..000000000
--- a/addons/rose/addon/components/rose/form/checkbox.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/form/checkbox';
-import ComponentAutoId from '../../../mixins/component-auto-id';
-
-/**
- * A simple HTML `<input type="checkbox">` element.
- */
-export default Component.extend(ComponentAutoId, {
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/form/checkbox.hbs b/addons/rose/addon/components/rose/form/checkbox/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/form/checkbox.hbs
rename to addons/rose/addon/components/rose/form/checkbox/index.hbs
diff --git a/addons/rose/addon/components/rose/form/checkbox/index.js b/addons/rose/addon/components/rose/form/checkbox/index.js
new file mode 100644
index 000000000..b13f24e4f
--- /dev/null
+++ b/addons/rose/addon/components/rose/form/checkbox/index.js
@@ -0,0 +1,10 @@
+import Component from '@glimmer/component';
+import { generateComponentID } from '../../../../utilities/component-auto-id';
+
+export default class RoseFormCheckboxComponent extends Component {
+
+  // =attributes
+
+  id = generateComponentID();
+
+}
diff --git a/addons/rose/addon/components/rose/form/checkbox.stories.mdx b/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/form/checkbox.stories.mdx
rename to addons/rose/addon/components/rose/form/checkbox/index.stories.mdx
diff --git a/addons/rose/addon/components/rose/form/radio/group.js b/addons/rose/addon/components/rose/form/radio/group.js
deleted file mode 100644
index 80bba183e..000000000
--- a/addons/rose/addon/components/rose/form/radio/group.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../../templates/components/rose/form/radio/group';
-
-/**
- * A `<input type="radio" name="radio-group">` element.
- */
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/form/radio/group.hbs b/addons/rose/addon/components/rose/form/radio/group/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/form/radio/group.hbs
rename to addons/rose/addon/components/rose/form/radio/group/index.hbs
diff --git a/addons/rose/addon/components/rose/form/radio/group.stories.mdx b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/form/radio/group.stories.mdx
rename to addons/rose/addon/components/rose/form/radio/group/index.stories.mdx
diff --git a/addons/rose/addon/components/rose/form/radio/radio.js b/addons/rose/addon/components/rose/form/radio/radio.js
deleted file mode 100644
index 196e47951..000000000
--- a/addons/rose/addon/components/rose/form/radio/radio.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../../templates/components/rose/form/radio/radio';
-import ComponentAutoId from '../../../../mixins/component-auto-id';
-
-/**
- * A `<input type="radio">` element.
- * `value` and `selectedValue` must be equal to select
- *  radiofield.
- */
-export default Component.extend(ComponentAutoId, {
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/form/radio/radio.hbs b/addons/rose/addon/components/rose/form/radio/radio/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/form/radio/radio.hbs
rename to addons/rose/addon/components/rose/form/radio/radio/index.hbs
diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.js b/addons/rose/addon/components/rose/form/radio/radio/index.js
new file mode 100644
index 000000000..ac2c2a6ec
--- /dev/null
+++ b/addons/rose/addon/components/rose/form/radio/radio/index.js
@@ -0,0 +1,10 @@
+import Component from '@glimmer/component';
+import { generateComponentID } from '../../../../../utilities/component-auto-id';
+
+export default class RoseFormRadioRadioComponent extends Component {
+
+  // =attributes
+
+  id = generateComponentID();
+
+}
diff --git a/addons/rose/addon/components/rose/form/radio/radio.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/form/radio/radio.stories.mdx
rename to addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx