diff --git a/addons/rose/addon/components/rose/form/helper-text.js b/addons/rose/addon/components/rose/form/helper-text.js
deleted file mode 100644
index 399088c44..000000000
--- a/addons/rose/addon/components/rose/form/helper-text.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/form/helper-text';
-
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/form/helper-text.hbs b/addons/rose/addon/components/rose/form/helper-text/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/form/helper-text.hbs
rename to addons/rose/addon/components/rose/form/helper-text/index.hbs
diff --git a/addons/rose/addon/components/rose/form/helper-text.stories.mdx b/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/form/helper-text.stories.mdx
rename to addons/rose/addon/components/rose/form/helper-text/index.stories.mdx
diff --git a/addons/rose/addon/components/rose/form/label.js b/addons/rose/addon/components/rose/form/label.js
deleted file mode 100644
index 1d26edc8d..000000000
--- a/addons/rose/addon/components/rose/form/label.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/form/label';
-
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/form/label.hbs b/addons/rose/addon/components/rose/form/label/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/form/label.hbs
rename to addons/rose/addon/components/rose/form/label/index.hbs
diff --git a/addons/rose/addon/components/rose/form/label.stories.mdx b/addons/rose/addon/components/rose/form/label/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/form/label.stories.mdx
rename to addons/rose/addon/components/rose/form/label/index.stories.mdx