diff --git a/addons/rose/addon/components/rose/form.js b/addons/rose/addon/components/rose/form.js
deleted file mode 100644
index 0805f0348..000000000
--- a/addons/rose/addon/components/rose/form.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../templates/components/rose/form';
-import { action } from '@ember/object';
-
-/**
- * A component for building accessible forms.  Yields contextual fields
- * and actions.
- */
-export default Component.extend({
-  layout,
-  tagName: '',
-
-  // =actions
-
-  /**
-   * Calls the passed `onSubmit` function and disabled the default form
-   * submit behavior.
-   * @param {Event} e
-   */
-  @action
-  handleSubmit(e) {
-    e.preventDefault();
-    e.stopPropagation();
-    this.onSubmit();
-    return false;
-  },
-});
diff --git a/addons/rose/addon/templates/components/rose/form.hbs b/addons/rose/addon/components/rose/form/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/form.hbs
rename to addons/rose/addon/components/rose/form/index.hbs
diff --git a/addons/rose/addon/components/rose/form/index.js b/addons/rose/addon/components/rose/form/index.js
new file mode 100644
index 000000000..24bb8e0c2
--- /dev/null
+++ b/addons/rose/addon/components/rose/form/index.js
@@ -0,0 +1,21 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+
+export default class RoseFormComponent extends Component {
+
+  // =actions
+
+  /**
+   * Calls the passed `onSubmit` function while disabling the default form
+   * submit behavior.
+   * @param {Event} e
+   */
+  @action
+  handleSubmit(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    this.args.onSubmit();
+    return false;
+  }
+
+}
diff --git a/addons/rose/addon/components/rose/form.stories.mdx b/addons/rose/addon/components/rose/form/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/form.stories.mdx
rename to addons/rose/addon/components/rose/form/index.stories.mdx