- {{yield (hash
- title=(component 'rose/layout/main/header/title')
- )}}
-
-
- {{yield (hash
- action=(component 'rose/button')
- )}}
-
-
diff --git a/addons/rose/addon/templates/components/rose/layout/main/header/title.hbs b/addons/rose/addon/templates/components/rose/layout/main/header/title.hbs
deleted file mode 100644
index 1147d6c48..000000000
--- a/addons/rose/addon/templates/components/rose/layout/main/header/title.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-
- {{#if (has-block)}}
- {{yield (hash
- dropdown=(component 'rose/header/dropdown' style='dark')
- )}}
- {{else}}
-
- {{#if @icon}}
- {{inline-svg @icon}}
- {{/if}}
-
- {{#if @text}}
- {{@text}}
- {{/if}}
-
- {{/if}}
-
diff --git a/addons/rose/addon/templates/components/rose/page-header/title.hbs b/addons/rose/addon/templates/components/rose/page-header/title.hbs
new file mode 100644
index 000000000..388e53812
--- /dev/null
+++ b/addons/rose/addon/templates/components/rose/page-header/title.hbs
@@ -0,0 +1,17 @@
+
diff --git a/addons/rose/addon/templates/components/rose/page-header/utilities.hbs b/addons/rose/addon/templates/components/rose/page-header/utilities.hbs
new file mode 100644
index 000000000..3203ea86e
--- /dev/null
+++ b/addons/rose/addon/templates/components/rose/page-header/utilities.hbs
@@ -0,0 +1,5 @@
+
diff --git a/addons/rose/app/components/rose/layout/main/header.js b/addons/rose/app/components/rose/layout/main/header.js
deleted file mode 100644
index cc3ca8769..000000000
--- a/addons/rose/app/components/rose/layout/main/header.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'rose/components/rose/layout/main/header';
diff --git a/addons/rose/app/components/rose/layout/main/header/title.js b/addons/rose/app/components/rose/layout/main/header/title.js
deleted file mode 100644
index c189eb8d5..000000000
--- a/addons/rose/app/components/rose/layout/main/header/title.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'rose/components/rose/layout/main/header/title';
diff --git a/addons/rose/app/components/rose/layout/page-header.js b/addons/rose/app/components/rose/layout/page-header.js
index 0ee612631..5235f3c7b 100644
--- a/addons/rose/app/components/rose/layout/page-header.js
+++ b/addons/rose/app/components/rose/layout/page-header.js
@@ -1 +1 @@
-export { default } from 'rose/components/rose/layout/page-header';
\ No newline at end of file
+export { default } from 'rose/components/rose/layout/page-header';
diff --git a/addons/rose/app/components/rose/page-header/title.js b/addons/rose/app/components/rose/page-header/title.js
new file mode 100644
index 000000000..880f984d0
--- /dev/null
+++ b/addons/rose/app/components/rose/page-header/title.js
@@ -0,0 +1 @@
+export { default } from 'rose/components/rose/page-header/title';
diff --git a/addons/rose/app/components/rose/page-header/utilities.js b/addons/rose/app/components/rose/page-header/utilities.js
new file mode 100644
index 000000000..69dd95a0c
--- /dev/null
+++ b/addons/rose/app/components/rose/page-header/utilities.js
@@ -0,0 +1 @@
+export { default } from 'rose/components/rose/page-header/utilities';
diff --git a/addons/rose/tests/integration/components/rose/layout/main/header-test.js b/addons/rose/tests/integration/components/rose/layout/main/header-test.js
deleted file mode 100644
index e2261a66d..000000000
--- a/addons/rose/tests/integration/components/rose/layout/main/header-test.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, find, findAll } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | rose/layout/main/header', function (hooks) {
- setupRenderingTest(hooks);
-
- test('it renders', async function (assert) {
- await render(hbs`