diff --git a/packages/frontend/app/components/school-manager.gjs b/packages/frontend/app/components/school-manager.gjs
index 301f080c6f..9cf97e2aff 100644
--- a/packages/frontend/app/components/school-manager.gjs
+++ b/packages/frontend/app/components/school-manager.gjs
@@ -20,8 +20,8 @@ import LeadershipExpanded from 'ilios-common/components/leadership-expanded';
 import { fn } from '@ember/helper';
 import LeadershipCollapsed from 'ilios-common/components/leadership-collapsed';
 import hasManyLength from 'ilios-common/helpers/has-many-length';
-import SchoolCompetenciesExpanded from 'frontend/components/school-competencies-expanded';
-import SchoolCompetenciesCollapsed from 'frontend/components/school-competencies-collapsed';
+import CompetenciesExpanded from 'frontend/components/school/competencies-expanded';
+import CompetenciesCollapsed from 'frontend/components/school/competencies-collapsed';
 import SchoolVocabulariesExpanded from 'frontend/components/school-vocabularies-expanded';
 import SchoolVocabulariesCollapsed from 'frontend/components/school-vocabularies-collapsed';
 import SchoolSessionTypesExpanded from 'frontend/components/school-session-types-expanded';
@@ -180,7 +180,7 @@ export default class SchoolManagerComponent extends Component {
           />
         {{/if}}
         {{#if (or (eq @school.competencies.length 0) @schoolCompetencyDetails)}}
-          <SchoolCompetenciesExpanded
+          <CompetenciesExpanded
             @school={{@school}}
             @canUpdate={{@canUpdateCompetency}}
             @canDelete={{@canDeleteCompetency}}
@@ -191,7 +191,7 @@ export default class SchoolManagerComponent extends Component {
             @setSchoolManageCompetencies={{@setSchoolManageCompetencies}}
           />
         {{else}}
-          <SchoolCompetenciesCollapsed
+          <CompetenciesCollapsed
             @school={{@school}}
             @expand={{fn @setSchoolCompetencyDetails true}}
           />
diff --git a/packages/frontend/app/components/school-competencies-collapsed.gjs b/packages/frontend/app/components/school/competencies-collapsed.gjs
similarity index 100%
rename from packages/frontend/app/components/school-competencies-collapsed.gjs
rename to packages/frontend/app/components/school/competencies-collapsed.gjs
diff --git a/packages/frontend/app/components/school-competencies-expanded.gjs b/packages/frontend/app/components/school/competencies-expanded.gjs
similarity index 95%
rename from packages/frontend/app/components/school-competencies-expanded.gjs
rename to packages/frontend/app/components/school/competencies-expanded.gjs
index d3f9610b08..442e7af253 100644
--- a/packages/frontend/app/components/school-competencies-expanded.gjs
+++ b/packages/frontend/app/components/school/competencies-expanded.gjs
@@ -12,8 +12,8 @@ import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
 import perform from 'ember-concurrency/helpers/perform';
 import { or } from 'ember-truth-helpers';
 import { fn } from '@ember/helper';
-import SchoolCompetenciesManager from 'frontend/components/school-competencies-manager';
-import SchoolCompetenciesList from 'frontend/components/school-competencies-list';
+import CompetenciesManager from 'frontend/components/school/competencies-manager';
+import CompetenciesList from 'frontend/components/school/competencies-list';
 import {
   faArrowRotateLeft,
   faCaretDown,
@@ -190,7 +190,7 @@ export default class SchoolCompetenciesExpandedComponent extends Component {
       </div>
       <div class="school-competencies-expanded-content">
         {{#if @isManaging}}
-          <SchoolCompetenciesManager
+          <CompetenciesManager
             @canUpdate={{@canUpdate}}
             @canDelete={{@canDelete}}
             @canCreate={{@canCreate}}
@@ -199,7 +199,7 @@ export default class SchoolCompetenciesExpandedComponent extends Component {
             @remove={{this.removeCompetency}}
           />
         {{else if this.domains.length}}
-          <SchoolCompetenciesList @domains={{this.domains}} @canUpdate={{@canUpdate}} />
+          <CompetenciesList @domains={{this.domains}} @canUpdate={{@canUpdate}} />
         {{/if}}
       </div>
     </section>
diff --git a/packages/frontend/app/components/school-competencies-list-item-pcrs.gjs b/packages/frontend/app/components/school/competencies-list-item-pcrs.gjs
similarity index 100%
rename from packages/frontend/app/components/school-competencies-list-item-pcrs.gjs
rename to packages/frontend/app/components/school/competencies-list-item-pcrs.gjs
diff --git a/packages/frontend/app/components/school-competencies-list-item.gjs b/packages/frontend/app/components/school/competencies-list-item.gjs
similarity index 91%
rename from packages/frontend/app/components/school-competencies-list-item.gjs
rename to packages/frontend/app/components/school/competencies-list-item.gjs
index 22eac2c587..8f1c872a98 100644
--- a/packages/frontend/app/components/school-competencies-list-item.gjs
+++ b/packages/frontend/app/components/school/competencies-list-item.gjs
@@ -4,8 +4,8 @@ import { action } from '@ember/object';
 import { service } from '@ember/service';
 import { TrackedAsyncData } from 'ember-async-data';
 import { uniqueValues } from 'ilios-common/utils/array-helpers';
-import SchoolCompetenciesListItemPcrs from 'frontend/components/school-competencies-list-item-pcrs';
-import SchoolCompetenciesPcrsMapper from 'frontend/components/school-competencies-pcrs-mapper';
+import CompetenciesListItemPcrs from 'frontend/components/school/competencies-list-item-pcrs';
+import CompetenciesPcrsMapper from 'frontend/components/school/competencies-pcrs-mapper';
 
 export default class SchoolCompetenciesListItemComponent extends Component {
   @service store;
@@ -96,7 +96,7 @@ export default class SchoolCompetenciesListItemComponent extends Component {
       <div class="grid-item {{if this.isDomain 'domain' 'competency'}}" data-test-title>
         {{@competency.title}}
       </div>
-      <SchoolCompetenciesListItemPcrs
+      <CompetenciesListItemPcrs
         @competency={{@competency}}
         @canUpdate={{@canUpdate}}
         @setIsManaging={{this.setIsManaging}}
@@ -105,7 +105,7 @@ export default class SchoolCompetenciesListItemComponent extends Component {
         @cancel={{this.cancel}}
       />
       {{#if this.isManaging}}
-        <SchoolCompetenciesPcrsMapper
+        <CompetenciesPcrsMapper
           @allPcrses={{this.allPcrses}}
           @selectedPcrses={{this.selectedPcrses}}
           @add={{this.addPcrsToBuffer}}
diff --git a/packages/frontend/app/components/school-competencies-list.gjs b/packages/frontend/app/components/school/competencies-list.gjs
similarity index 89%
rename from packages/frontend/app/components/school-competencies-list.gjs
rename to packages/frontend/app/components/school/competencies-list.gjs
index 1fe274a1ff..975b2c409a 100644
--- a/packages/frontend/app/components/school-competencies-list.gjs
+++ b/packages/frontend/app/components/school/competencies-list.gjs
@@ -4,7 +4,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import { map } from 'rsvp';
 import { sortBy } from 'ilios-common/utils/array-helpers';
 import t from 'ember-intl/helpers/t';
-import SchoolCompetenciesListItem from 'frontend/components/school-competencies-list-item';
+import CompetenciesListItem from 'frontend/components/school/competencies-list-item';
 
 export default class SchoolCompetenciesListComponent extends Component {
   @cached
@@ -32,13 +32,13 @@ export default class SchoolCompetenciesListComponent extends Component {
         <div class="grid-item">{{t "general.aamcPcrs"}}</div>
       </div>
       {{#each this.proxies as |proxy|}}
-        <SchoolCompetenciesListItem
+        <CompetenciesListItem
           @competency={{proxy.domain}}
           @isDomain={{true}}
           @canUpdate={{@canUpdate}}
         />
         {{#each proxy.competencies as |competency|}}
-          <SchoolCompetenciesListItem
+          <CompetenciesListItem
             @competency={{competency}}
             @isDomain={{false}}
             @canUpdate={{@canUpdate}}
diff --git a/packages/frontend/app/components/school-competencies-manager.gjs b/packages/frontend/app/components/school/competencies-manager.gjs
similarity index 100%
rename from packages/frontend/app/components/school-competencies-manager.gjs
rename to packages/frontend/app/components/school/competencies-manager.gjs
diff --git a/packages/frontend/app/components/school-competencies-pcrs-mapper.gjs b/packages/frontend/app/components/school/competencies-pcrs-mapper.gjs
similarity index 100%
rename from packages/frontend/app/components/school-competencies-pcrs-mapper.gjs
rename to packages/frontend/app/components/school/competencies-pcrs-mapper.gjs
diff --git a/packages/frontend/app/components/competency-title-editor.gjs b/packages/frontend/app/components/school/competency-title-editor.gjs
similarity index 92%
rename from packages/frontend/app/components/competency-title-editor.gjs
rename to packages/frontend/app/components/school/competency-title-editor.gjs
index 0beec01882..9c8166e0f7 100644
--- a/packages/frontend/app/components/competency-title-editor.gjs
+++ b/packages/frontend/app/components/school/competency-title-editor.gjs
@@ -13,7 +13,7 @@ import set from 'ember-set-helper/helpers/set';
 import YupValidationMessage from 'ilios-common/components/yup-validation-message';
 import focus from 'ilios-common/modifiers/focus';
 
-export default class CompetencyTitleEditorComponent extends Component {
+export default class SchoolCompetencyTitleEditorComponent extends Component {
   @tracked title;
 
   constructor() {
@@ -40,7 +40,7 @@ export default class CompetencyTitleEditorComponent extends Component {
     this.validations.clearErrorDisplay();
   });
   <template>
-    <span class="competency-title-editor" data-test-competency-title-editor>
+    <span class="school-competency-title-editor" data-test-school-competency-title-editor>
       {{#if @canUpdate}}
         <EditableField
           @value={{this.title}}
diff --git a/packages/frontend/app/components/new-competency.gjs b/packages/frontend/app/components/school/new-competency.gjs
similarity index 93%
rename from packages/frontend/app/components/new-competency.gjs
rename to packages/frontend/app/components/school/new-competency.gjs
index 9634c1b012..d45791bc8a 100644
--- a/packages/frontend/app/components/new-competency.gjs
+++ b/packages/frontend/app/components/school/new-competency.gjs
@@ -11,7 +11,7 @@ import perform from 'ember-concurrency/helpers/perform';
 import LoadingSpinner from 'ilios-common/components/loading-spinner';
 import YupValidationMessage from 'ilios-common/components/yup-validation-message';
 
-export default class NewCompetencyComponent extends Component {
+export default class SchoolNewCompetencyComponent extends Component {
   @tracked title;
 
   validations = new YupValidations(this, {
@@ -44,7 +44,7 @@ export default class NewCompetencyComponent extends Component {
     this.title = null;
   });
   <template>
-    <div class="new-competency" data-test-new-competency ...attributes>
+    <div class="school-new-competency" data-test-school-new-competency ...attributes>
       <input
         type="text"
         value={{this.title}}
diff --git a/packages/frontend/app/styles/components.scss b/packages/frontend/app/styles/components.scss
index a64c97d8b9..8347b6e741 100644
--- a/packages/frontend/app/styles/components.scss
+++ b/packages/frontend/app/styles/components.scss
@@ -22,11 +22,6 @@
 @forward "components/programyear-details";
 @forward "components/programyear-header";
 @forward "components/programyear-overview";
-@forward "components/school-competencies-collapsed";
-@forward "components/school-competencies-expanded";
-@forward "components/school-competencies-list";
-@forward "components/school-competencies-manager";
-@forward "components/school-competencies-pcrs-mapper";
 @forward "components/school-list";
 @forward "components/school-manager";
 @forward "components/school-new-vocabulary-form";
@@ -134,6 +129,11 @@
 @forward "components/reports/subject-header";
 @forward "components/reports/subjects-list";
 
+@forward "components/school/competencies-collapsed";
+@forward "components/school/competencies-expanded";
+@forward "components/school/competencies-list";
+@forward "components/school/competencies-manager";
+@forward "components/school/competencies-pcrs-mapper";
 @forward "components/school/emails";
 @forward "components/school/emails-editor";
 
diff --git a/packages/frontend/app/styles/components/school-competencies-collapsed.scss b/packages/frontend/app/styles/components/school/competencies-collapsed.scss
similarity index 87%
rename from packages/frontend/app/styles/components/school-competencies-collapsed.scss
rename to packages/frontend/app/styles/components/school/competencies-collapsed.scss
index a2f6519834..dd68a2097b 100644
--- a/packages/frontend/app/styles/components/school-competencies-collapsed.scss
+++ b/packages/frontend/app/styles/components/school/competencies-collapsed.scss
@@ -1,4 +1,4 @@
-@use "../ilios-common/mixins" as m;
+@use "../../ilios-common/mixins" as m;
 
 .school-competencies-collapsed {
   @include m.collapsed-container(var(--orange));
diff --git a/packages/frontend/app/styles/components/school-competencies-expanded.scss b/packages/frontend/app/styles/components/school/competencies-expanded.scss
similarity index 90%
rename from packages/frontend/app/styles/components/school-competencies-expanded.scss
rename to packages/frontend/app/styles/components/school/competencies-expanded.scss
index 042719e6c5..981a45c0c5 100644
--- a/packages/frontend/app/styles/components/school-competencies-expanded.scss
+++ b/packages/frontend/app/styles/components/school/competencies-expanded.scss
@@ -1,4 +1,4 @@
-@use "../ilios-common/mixins" as m;
+@use "../../ilios-common/mixins" as m;
 
 .school-competencies-expanded {
   @include m.detail-container(var(--orange));
diff --git a/packages/frontend/app/styles/components/school-competencies-list.scss b/packages/frontend/app/styles/components/school/competencies-list.scss
similarity index 97%
rename from packages/frontend/app/styles/components/school-competencies-list.scss
rename to packages/frontend/app/styles/components/school/competencies-list.scss
index 29cbc1f55c..8b872bb157 100644
--- a/packages/frontend/app/styles/components/school-competencies-list.scss
+++ b/packages/frontend/app/styles/components/school/competencies-list.scss
@@ -1,4 +1,4 @@
-@use "../ilios-common/mixins" as m;
+@use "../../ilios-common/mixins" as m;
 
 @use "sass:color";
 
diff --git a/packages/frontend/app/styles/components/school-competencies-manager.scss b/packages/frontend/app/styles/components/school/competencies-manager.scss
similarity index 92%
rename from packages/frontend/app/styles/components/school-competencies-manager.scss
rename to packages/frontend/app/styles/components/school/competencies-manager.scss
index 7fdf1df03e..0780c214e2 100644
--- a/packages/frontend/app/styles/components/school-competencies-manager.scss
+++ b/packages/frontend/app/styles/components/school/competencies-manager.scss
@@ -1,4 +1,4 @@
-@use "../ilios-common/mixins" as m;
+@use "../../ilios-common/mixins" as m;
 
 .school-competencies-manager {
   .domain {
diff --git a/packages/frontend/app/styles/components/school-competencies-pcrs-mapper.scss b/packages/frontend/app/styles/components/school/competencies-pcrs-mapper.scss
similarity index 86%
rename from packages/frontend/app/styles/components/school-competencies-pcrs-mapper.scss
rename to packages/frontend/app/styles/components/school/competencies-pcrs-mapper.scss
index bc5d28f432..195e07acae 100644
--- a/packages/frontend/app/styles/components/school-competencies-pcrs-mapper.scss
+++ b/packages/frontend/app/styles/components/school/competencies-pcrs-mapper.scss
@@ -1,4 +1,4 @@
-@use "../ilios-common/mixins" as m;
+@use "../../ilios-common/mixins" as m;
 
 .school-competencies-pcrs-mapper {
   margin: 1em 2em;
diff --git a/packages/frontend/tests/integration/components/competency-title-editor-test.gjs b/packages/frontend/tests/integration/components/competency-title-editor-test.gjs
index add9165d5d..e21b391171 100644
--- a/packages/frontend/tests/integration/components/competency-title-editor-test.gjs
+++ b/packages/frontend/tests/integration/components/competency-title-editor-test.gjs
@@ -2,8 +2,8 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'frontend/tests/helpers';
 import { render } from '@ember/test-helpers';
 import { setupMirage } from 'frontend/tests/test-support/mirage';
-import { component } from 'frontend/tests/pages/components/competency-title-editor';
-import CompetencyTitleEditor from 'frontend/components/competency-title-editor';
+import { component } from 'frontend/tests/pages/components/school/competency-title-editor';
+import CompetencyTitleEditor from 'frontend/components/school/competency-title-editor';
 
 module('Integration | Component | competency title editor', function (hooks) {
   setupRenderingTest(hooks);
diff --git a/packages/frontend/tests/integration/components/school-competencies-collapsed-test.gjs b/packages/frontend/tests/integration/components/school/competencies-collapsed-test.gjs
similarity index 83%
rename from packages/frontend/tests/integration/components/school-competencies-collapsed-test.gjs
rename to packages/frontend/tests/integration/components/school/competencies-collapsed-test.gjs
index a505d2a5d1..df1ad643a3 100644
--- a/packages/frontend/tests/integration/components/school-competencies-collapsed-test.gjs
+++ b/packages/frontend/tests/integration/components/school/competencies-collapsed-test.gjs
@@ -2,11 +2,11 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'frontend/tests/helpers';
 import { setupMirage } from 'frontend/tests/test-support/mirage';
 import { render } from '@ember/test-helpers';
-import { component } from 'frontend/tests/pages/components/school-competencies-collapsed';
-import SchoolCompetenciesCollapsed from 'frontend/components/school-competencies-collapsed';
+import { component } from 'frontend/tests/pages/components/school/competencies-collapsed';
+import CompetenciesCollapsed from 'frontend/components/school/competencies-collapsed';
 import noop from 'ilios-common/helpers/noop';
 
-module('Integration | Component | school competencies collapsed', function (hooks) {
+module('Integration | Component | school/competencies-collapsed', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -21,9 +21,7 @@ module('Integration | Component | school competencies collapsed', function (hook
 
     this.set('school', schoolModel);
     await render(
-      <template>
-        <SchoolCompetenciesCollapsed @school={{this.school}} @expand={{(noop)}} />
-      </template>,
+      <template><CompetenciesCollapsed @school={{this.school}} @expand={{(noop)}} /></template>,
     );
 
     assert.strictEqual(component.title.text, 'Competencies (3/4)');
@@ -44,7 +42,7 @@ module('Integration | Component | school competencies collapsed', function (hook
     this.set('expand', () => assert.step('expand called'));
     await render(
       <template>
-        <SchoolCompetenciesCollapsed @school={{this.school}} @expand={{this.expand}} />
+        <CompetenciesCollapsed @school={{this.school}} @expand={{this.expand}} />
       </template>,
     );
     await component.title.click();
diff --git a/packages/frontend/tests/integration/components/school-competencies-expanded-test.gjs b/packages/frontend/tests/integration/components/school/competencies-expanded-test.gjs
similarity index 90%
rename from packages/frontend/tests/integration/components/school-competencies-expanded-test.gjs
rename to packages/frontend/tests/integration/components/school/competencies-expanded-test.gjs
index 2707989249..4df5e7f28b 100644
--- a/packages/frontend/tests/integration/components/school-competencies-expanded-test.gjs
+++ b/packages/frontend/tests/integration/components/school/competencies-expanded-test.gjs
@@ -3,11 +3,11 @@ import { setupRenderingTest } from 'frontend/tests/helpers';
 import { render } from '@ember/test-helpers';
 import { setupMirage } from 'frontend/tests/test-support/mirage';
 import a11yAudit from 'ember-a11y-testing/test-support/audit';
-import { component } from 'frontend/tests/pages/components/school-competencies-expanded';
-import SchoolCompetenciesExpanded from 'frontend/components/school-competencies-expanded';
+import { component } from 'frontend/tests/pages/components/school/competencies-expanded';
+import CompetenciesExpanded from 'frontend/components/school/competencies-expanded';
 import noop from 'ilios-common/helpers/noop';
 
-module('Integration | Component | school competencies expanded', function (hooks) {
+module('Integration | Component | school/competencies-expanded', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -31,7 +31,7 @@ module('Integration | Component | school competencies expanded', function (hooks
     this.set('school', schoolModel);
     await render(
       <template>
-        <SchoolCompetenciesExpanded
+        <CompetenciesExpanded
           @school={{this.school}}
           @canUpdate={{true}}
           @canDelete={{true}}
@@ -58,7 +58,7 @@ module('Integration | Component | school competencies expanded', function (hooks
     this.set('school', schoolModel);
     await render(
       <template>
-        <SchoolCompetenciesExpanded
+        <CompetenciesExpanded
           @school={{this.school}}
           @canUpdate={{true}}
           @canDelete={{true}}
diff --git a/packages/frontend/tests/integration/components/school-competencies-list-item-pcrs-test.gjs b/packages/frontend/tests/integration/components/school/competencies-list-item-pcrs-test.gjs
similarity index 91%
rename from packages/frontend/tests/integration/components/school-competencies-list-item-pcrs-test.gjs
rename to packages/frontend/tests/integration/components/school/competencies-list-item-pcrs-test.gjs
index c76a273f2d..ef05a39f02 100644
--- a/packages/frontend/tests/integration/components/school-competencies-list-item-pcrs-test.gjs
+++ b/packages/frontend/tests/integration/components/school/competencies-list-item-pcrs-test.gjs
@@ -3,11 +3,11 @@ import { setupRenderingTest } from 'frontend/tests/helpers';
 import { render } from '@ember/test-helpers';
 import { setupMirage } from 'frontend/tests/test-support/mirage';
 import a11yAudit from 'ember-a11y-testing/test-support/audit';
-import { component } from 'frontend/tests/pages/components/school-competencies-list-item-pcrs';
-import SchoolCompetenciesListItemPcrs from 'frontend/components/school-competencies-list-item-pcrs';
+import { component } from 'frontend/tests/pages/components/school/competencies-list-item-pcrs';
+import CompetenciesListItemPcrs from 'frontend/components/school/competencies-list-item-pcrs';
 import noop from 'ilios-common/helpers/noop';
 
-module('Integration | Component | school-competencies-list-item-pcrs', function (hooks) {
+module('Integration | Component | school/competencies-list-item-pcrs', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -32,7 +32,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
     this.set('competency', this.competencyModel);
     await render(
       <template>
-        <SchoolCompetenciesListItemPcrs
+        <CompetenciesListItemPcrs
           @competency={{this.competency}}
           @canUpdate={{true}}
           @setIsManaging={{(noop)}}
@@ -55,7 +55,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
     this.set('competency', this.competencyModel);
     await render(
       <template>
-        <SchoolCompetenciesListItemPcrs
+        <CompetenciesListItemPcrs
           @competency={{this.competency}}
           @canUpdate={{true}}
           @setIsManaging={{(noop)}}
@@ -81,7 +81,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
     this.set('competency', this.competencyModel);
     await render(
       <template>
-        <SchoolCompetenciesListItemPcrs
+        <CompetenciesListItemPcrs
           @competency={{this.competency}}
           @canUpdate={{true}}
           @setIsManaging={{this.manage}}
@@ -104,7 +104,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
     this.set('competency', this.competencyModel);
     await render(
       <template>
-        <SchoolCompetenciesListItemPcrs
+        <CompetenciesListItemPcrs
           @competency={{this.competency}}
           @canUpdate={{true}}
           @setIsManaging={{(noop)}}
@@ -126,7 +126,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
     this.set('competency', this.competencyModel);
     await render(
       <template>
-        <SchoolCompetenciesListItemPcrs
+        <CompetenciesListItemPcrs
           @competency={{this.competency}}
           @canUpdate={{true}}
           @setIsManaging={{(noop)}}
@@ -145,7 +145,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
     this.set('competency', this.competencyModel);
     await render(
       <template>
-        <SchoolCompetenciesListItemPcrs
+        <CompetenciesListItemPcrs
           @competency={{this.competencyModel}}
           @canUpdate={{true}}
           @setIsManaging={{(noop)}}
@@ -164,7 +164,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
     this.set('competency', this.competencyModel);
     await render(
       <template>
-        <SchoolCompetenciesListItemPcrs
+        <CompetenciesListItemPcrs
           @competency={{this.competencyModel}}
           @canUpdate={{false}}
           @setIsManaging={{(noop)}}
diff --git a/packages/frontend/tests/integration/components/school-competencies-list-item-test.gjs b/packages/frontend/tests/integration/components/school/competencies-list-item-test.gjs
similarity index 92%
rename from packages/frontend/tests/integration/components/school-competencies-list-item-test.gjs
rename to packages/frontend/tests/integration/components/school/competencies-list-item-test.gjs
index e2adeb014e..bf83ad23cb 100644
--- a/packages/frontend/tests/integration/components/school-competencies-list-item-test.gjs
+++ b/packages/frontend/tests/integration/components/school/competencies-list-item-test.gjs
@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'frontend/tests/helpers';
 import { render } from '@ember/test-helpers';
 import { setupMirage } from 'frontend/tests/test-support/mirage';
 import a11yAudit from 'ember-a11y-testing/test-support/audit';
-import { component } from 'frontend/tests/pages/components/school-competencies-list-item';
-import SchoolCompetenciesListItem from 'frontend/components/school-competencies-list-item';
+import { component } from 'frontend/tests/pages/components/school/competencies-list-item';
+import CompetenciesListItem from 'frontend/components/school/competencies-list-item';
 
-module('Integration | Component | school-competencies-list-item', function (hooks) {
+module('Integration | Component | school/competencies-list-item', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -33,7 +33,7 @@ module('Integration | Component | school-competencies-list-item', function (hook
     this.set('competency', this.domainModel);
     await render(
       <template>
-        <SchoolCompetenciesListItem
+        <CompetenciesListItem
           @competency={{this.competency}}
           @isDomain={{true}}
           @canUpdate={{true}}
@@ -54,7 +54,7 @@ module('Integration | Component | school-competencies-list-item', function (hook
     this.set('competency', this.competencyModel);
     await render(
       <template>
-        <SchoolCompetenciesListItem
+        <CompetenciesListItem
           @competency={{this.competency}}
           @isDomain={{false}}
           @canUpdate={{true}}
@@ -74,7 +74,7 @@ module('Integration | Component | school-competencies-list-item', function (hook
     this.set('competency', this.competencyModel);
     await render(
       <template>
-        <SchoolCompetenciesListItem
+        <CompetenciesListItem
           @competency={{this.competency}}
           @isDomain={{false}}
           @canUpdate={{true}}
@@ -98,7 +98,7 @@ module('Integration | Component | school-competencies-list-item', function (hook
     this.set('competency', this.domainModel);
     await render(
       <template>
-        <SchoolCompetenciesListItem
+        <CompetenciesListItem
           @competency={{this.competency}}
           @isDomain={{false}}
           @canUpdate={{true}}
diff --git a/packages/frontend/tests/integration/components/school-competencies-list-test.gjs b/packages/frontend/tests/integration/components/school/competencies-list-test.gjs
similarity index 88%
rename from packages/frontend/tests/integration/components/school-competencies-list-test.gjs
rename to packages/frontend/tests/integration/components/school/competencies-list-test.gjs
index 0ce7c8dfa2..7c1be593b2 100644
--- a/packages/frontend/tests/integration/components/school-competencies-list-test.gjs
+++ b/packages/frontend/tests/integration/components/school/competencies-list-test.gjs
@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'frontend/tests/helpers';
 import { render } from '@ember/test-helpers';
 import { setupMirage } from 'frontend/tests/test-support/mirage';
 import a11yAudit from 'ember-a11y-testing/test-support/audit';
-import { component } from 'frontend/tests/pages/components/school-competencies-list';
-import SchoolCompetenciesList from 'frontend/components/school-competencies-list';
+import { component } from 'frontend/tests/pages/components/school/competencies-list';
+import CompetenciesList from 'frontend/components/school/competencies-list';
 
-module('Integration | Component | school competencies list', function (hooks) {
+module('Integration | Component | school/competencies-list', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -30,7 +30,7 @@ module('Integration | Component | school competencies list', function (hooks) {
       .findRecord('competency', domain.id);
 
     this.set('domains', [domainModel]);
-    await render(<template><SchoolCompetenciesList @domains={{this.domains}} /></template>);
+    await render(<template><CompetenciesList @domains={{this.domains}} /></template>);
     assert.strictEqual(component.items.length, 3);
     assert.strictEqual(component.items[0].title.text, 'domain 0');
     assert.strictEqual(component.items[0].pcrs.items.length, 1);
diff --git a/packages/frontend/tests/integration/components/school-competencies-manager-test.gjs b/packages/frontend/tests/integration/components/school/competencies-manager-test.gjs
similarity index 93%
rename from packages/frontend/tests/integration/components/school-competencies-manager-test.gjs
rename to packages/frontend/tests/integration/components/school/competencies-manager-test.gjs
index c91f547f56..8eb79c9f16 100644
--- a/packages/frontend/tests/integration/components/school-competencies-manager-test.gjs
+++ b/packages/frontend/tests/integration/components/school/competencies-manager-test.gjs
@@ -2,11 +2,11 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'frontend/tests/helpers';
 import { render } from '@ember/test-helpers';
 import { setupMirage } from 'frontend/tests/test-support/mirage';
-import { component } from 'frontend/tests/pages/components/school-competencies-manager';
-import SchoolCompetenciesManager from 'frontend/components/school-competencies-manager';
+import { component } from 'frontend/tests/pages/components/school/competencies-manager';
+import CompetenciesManager from 'frontend/components/school/competencies-manager';
 import noop from 'ilios-common/helpers/noop';
 
-module('Integration | Component | school competencies manager', function (hooks) {
+module('Integration | Component | school/competencies-manager', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -35,7 +35,7 @@ module('Integration | Component | school competencies manager', function (hooks)
     this.set('competencies', competencies);
     await render(
       <template>
-        <SchoolCompetenciesManager
+        <CompetenciesManager
           @canUpdate={{true}}
           @canDelete={{true}}
           @canCreate={{true}}
@@ -70,7 +70,7 @@ module('Integration | Component | school competencies manager', function (hooks)
     });
     await render(
       <template>
-        <SchoolCompetenciesManager
+        <CompetenciesManager
           @canUpdate={{true}}
           @canDelete={{true}}
           @canCreate={{true}}
@@ -101,7 +101,7 @@ module('Integration | Component | school competencies manager', function (hooks)
     });
     await render(
       <template>
-        <SchoolCompetenciesManager
+        <CompetenciesManager
           @canUpdate={{true}}
           @canDelete={{true}}
           @canCreate={{true}}
@@ -133,7 +133,7 @@ module('Integration | Component | school competencies manager', function (hooks)
     });
     await render(
       <template>
-        <SchoolCompetenciesManager
+        <CompetenciesManager
           @canUpdate={{true}}
           @canDelete={{true}}
           @canCreate={{true}}
diff --git a/packages/frontend/tests/integration/components/school-competencies-pcrs-mapper-test.gjs b/packages/frontend/tests/integration/components/school/competencies-pcrs-mapper-test.gjs
similarity index 92%
rename from packages/frontend/tests/integration/components/school-competencies-pcrs-mapper-test.gjs
rename to packages/frontend/tests/integration/components/school/competencies-pcrs-mapper-test.gjs
index 490b3104b9..9f17794fd8 100644
--- a/packages/frontend/tests/integration/components/school-competencies-pcrs-mapper-test.gjs
+++ b/packages/frontend/tests/integration/components/school/competencies-pcrs-mapper-test.gjs
@@ -3,12 +3,12 @@ import { setupRenderingTest } from 'frontend/tests/helpers';
 import { render } from '@ember/test-helpers';
 import { setupMirage } from 'frontend/tests/test-support/mirage';
 import a11yAudit from 'ember-a11y-testing/test-support/audit';
-import { component } from 'frontend/tests/pages/components/school-competencies-pcrs-mapper';
-import SchoolCompetenciesPcrsMapper from 'frontend/components/school-competencies-pcrs-mapper';
+import { component } from 'frontend/tests/pages/components/school/competencies-pcrs-mapper';
+import CompetenciesPcrsMapper from 'frontend/components/school/competencies-pcrs-mapper';
 import noop from 'ilios-common/helpers/noop';
 import { array } from '@ember/helper';
 
-module('Integration | Component | school-competencies-pcrs-mapper', function (hooks) {
+module('Integration | Component | school/competencies-pcrs-mapper', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -48,7 +48,7 @@ module('Integration | Component | school-competencies-pcrs-mapper', function (ho
 
     await render(
       <template>
-        <SchoolCompetenciesPcrsMapper
+        <CompetenciesPcrsMapper
           @allPcrses={{this.allPcrses}}
           @selectedPcrses={{this.selectedPcrses}}
           @add={{(noop)}}
@@ -80,7 +80,7 @@ module('Integration | Component | school-competencies-pcrs-mapper', function (ho
     });
     await render(
       <template>
-        <SchoolCompetenciesPcrsMapper
+        <CompetenciesPcrsMapper
           @allPcrses={{this.allPcrses}}
           @selectedPcrses={{(array)}}
           @add={{this.add}}
@@ -103,7 +103,7 @@ module('Integration | Component | school-competencies-pcrs-mapper', function (ho
     });
     await render(
       <template>
-        <SchoolCompetenciesPcrsMapper
+        <CompetenciesPcrsMapper
           @allPcrses={{this.allPcrses}}
           @selectedPcrses={{this.selectedPcrses}}
           @add={{(noop)}}
diff --git a/packages/frontend/tests/integration/components/new-competency-test.gjs b/packages/frontend/tests/integration/components/school/new-competency-test.gjs
similarity index 87%
rename from packages/frontend/tests/integration/components/new-competency-test.gjs
rename to packages/frontend/tests/integration/components/school/new-competency-test.gjs
index c160a9190b..7a2e1ea9bb 100644
--- a/packages/frontend/tests/integration/components/new-competency-test.gjs
+++ b/packages/frontend/tests/integration/components/school/new-competency-test.gjs
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'frontend/tests/helpers';
 import { render } from '@ember/test-helpers';
-import { component } from 'frontend/tests/pages/components/new-competency';
-import NewCompetency from 'frontend/components/new-competency';
+import { component } from 'frontend/tests/pages/components/school/new-competency';
+import NewCompetency from 'frontend/components/school/new-competency';
 import noop from 'ilios-common/helpers/noop';
 
-module('Integration | Component | new competency', function (hooks) {
+module('Integration | Component | school/new-competency', function (hooks) {
   setupRenderingTest(hooks);
 
   test('save', async function (assert) {
diff --git a/packages/frontend/tests/pages/components/school-manager.js b/packages/frontend/tests/pages/components/school-manager.js
index 21257c0501..bdf228f5e5 100644
--- a/packages/frontend/tests/pages/components/school-manager.js
+++ b/packages/frontend/tests/pages/components/school-manager.js
@@ -1,6 +1,6 @@
 import { clickable, create, isPresent, fillable, text } from 'ember-cli-page-object';
-import schoolCompetenciesExpanded from './school-competencies-expanded';
-import schoolCompetenciesCollapsed from './school-competencies-collapsed';
+import schoolCompetenciesExpanded from './school/competencies-expanded';
+import schoolCompetenciesCollapsed from './school/competencies-collapsed';
 import schoolVocabulariesExpanded from './school-vocabularies-expanded';
 import schoolVocabulariesCollapsed from './school-vocabularies-collapsed';
 import schoolSessionTypesExpanded from './school-session-types-expanded';
diff --git a/packages/frontend/tests/pages/components/school-competencies-collapsed.js b/packages/frontend/tests/pages/components/school/competencies-collapsed.js
similarity index 100%
rename from packages/frontend/tests/pages/components/school-competencies-collapsed.js
rename to packages/frontend/tests/pages/components/school/competencies-collapsed.js
diff --git a/packages/frontend/tests/pages/components/school-competencies-expanded.js b/packages/frontend/tests/pages/components/school/competencies-expanded.js
similarity index 83%
rename from packages/frontend/tests/pages/components/school-competencies-expanded.js
rename to packages/frontend/tests/pages/components/school/competencies-expanded.js
index 8d40098061..b8fd8ef1f6 100644
--- a/packages/frontend/tests/pages/components/school-competencies-expanded.js
+++ b/packages/frontend/tests/pages/components/school/competencies-expanded.js
@@ -1,6 +1,6 @@
 import { clickable, create, text } from 'ember-cli-page-object';
-import competenciesManager from './school-competencies-manager';
-import competenciesList from './school-competencies-list';
+import competenciesManager from './competencies-manager';
+import competenciesList from './competencies-list';
 
 const definition = {
   scope: '[data-test-school-competencies-expanded]',
diff --git a/packages/frontend/tests/pages/components/school-competencies-list-item-pcrs.js b/packages/frontend/tests/pages/components/school/competencies-list-item-pcrs.js
similarity index 100%
rename from packages/frontend/tests/pages/components/school-competencies-list-item-pcrs.js
rename to packages/frontend/tests/pages/components/school/competencies-list-item-pcrs.js
diff --git a/packages/frontend/tests/pages/components/school-competencies-list-item.js b/packages/frontend/tests/pages/components/school/competencies-list-item.js
similarity index 75%
rename from packages/frontend/tests/pages/components/school-competencies-list-item.js
rename to packages/frontend/tests/pages/components/school/competencies-list-item.js
index b516ef337c..b41034e464 100644
--- a/packages/frontend/tests/pages/components/school-competencies-list-item.js
+++ b/packages/frontend/tests/pages/components/school/competencies-list-item.js
@@ -1,7 +1,7 @@
 import { create, hasClass } from 'ember-cli-page-object';
 
-import pcrs from './school-competencies-list-item-pcrs';
-import mapper from './school-competencies-pcrs-mapper';
+import pcrs from './competencies-list-item-pcrs';
+import mapper from './competencies-pcrs-mapper';
 
 const definition = {
   scope: '[data-test-school-competencies-list-item]',
diff --git a/packages/frontend/tests/pages/components/school-competencies-list.js b/packages/frontend/tests/pages/components/school/competencies-list.js
similarity index 83%
rename from packages/frontend/tests/pages/components/school-competencies-list.js
rename to packages/frontend/tests/pages/components/school/competencies-list.js
index 080ef90242..42383d33a7 100644
--- a/packages/frontend/tests/pages/components/school-competencies-list.js
+++ b/packages/frontend/tests/pages/components/school/competencies-list.js
@@ -1,5 +1,5 @@
 import { collection, create } from 'ember-cli-page-object';
-import listItem from './school-competencies-list-item';
+import listItem from './competencies-list-item';
 const definition = {
   scope: '[data-test-school-competencies-list]',
   items: collection('[data-test-school-competencies-list-item]', listItem),
diff --git a/packages/frontend/tests/pages/components/school-competencies-manager.js b/packages/frontend/tests/pages/components/school/competencies-manager.js
similarity index 100%
rename from packages/frontend/tests/pages/components/school-competencies-manager.js
rename to packages/frontend/tests/pages/components/school/competencies-manager.js
diff --git a/packages/frontend/tests/pages/components/school-competencies-pcrs-mapper.js b/packages/frontend/tests/pages/components/school/competencies-pcrs-mapper.js
similarity index 100%
rename from packages/frontend/tests/pages/components/school-competencies-pcrs-mapper.js
rename to packages/frontend/tests/pages/components/school/competencies-pcrs-mapper.js
diff --git a/packages/frontend/tests/pages/components/competency-title-editor.js b/packages/frontend/tests/pages/components/school/competency-title-editor.js
similarity index 90%
rename from packages/frontend/tests/pages/components/competency-title-editor.js
rename to packages/frontend/tests/pages/components/school/competency-title-editor.js
index a4738c326e..4c42f64ea5 100644
--- a/packages/frontend/tests/pages/components/competency-title-editor.js
+++ b/packages/frontend/tests/pages/components/school/competency-title-editor.js
@@ -1,7 +1,7 @@
 import { clickable, create, isPresent, fillable, text, value } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-competency-title-editor]',
+  scope: '[data-test-school-competency-title-editor]',
   title: {
     scope: '[data-test-title]',
     edit: clickable('[data-test-edit]'),
diff --git a/packages/frontend/tests/pages/components/new-competency.js b/packages/frontend/tests/pages/components/school/new-competency.js
similarity index 92%
rename from packages/frontend/tests/pages/components/new-competency.js
rename to packages/frontend/tests/pages/components/school/new-competency.js
index 785cf31082..8559a2a146 100644
--- a/packages/frontend/tests/pages/components/new-competency.js
+++ b/packages/frontend/tests/pages/components/school/new-competency.js
@@ -1,7 +1,7 @@
 import { clickable, create, fillable, isPresent, text, triggerable } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-new-competency]',
+  scope: '[data-test-school-new-competency]',
   title: {
     scope: '[data-test-title]',
     set: fillable(),