From 7fcc1aed6ce126ca0926d89e5712aa117020d630 Mon Sep 17 00:00:00 2001
From: Michael Haufe <tno@thenewobjective.com>
Date: Sat, 31 Aug 2024 20:41:26 +0000
Subject: [PATCH] - optimized page middleware - bugfixed organization delete
 message - bugfixed org landing page solution list after delete - refactored
 domain to export from index file to avoid circular dependency errors -
 Organization now explicitly references solutions - Solution now explicitly
 references associated requirements - Justifications now created w/ Solution
 instead of lazily on rationale page

---
 middleware/org-solution-check.global.ts       |   8 +-
 migrations/.snapshot-cathedral.json           |   2 +-
 migrations/Migration20240831162504.ts         |  17 +++
 pages/index.client.vue                        |  19 ++--
 .../environment/constraints.client.vue        |   2 +-
 .../goals/functionality.client.vue            |   2 +-
 .../goals/rationale.client.vue                |  43 +------
 .../goals/scenarios.client.vue                |   2 +-
 .../goals/stakeholders.client.vue             |   3 +-
 .../system/functionality.client.vue           |   2 +-
 .../system/scenarios.client.vue               |   2 +-
 pages/o/[organization-slug]/index.client.vue  |   4 +-
 server/api/assumptions/[id].delete.ts         |   2 +-
 server/api/assumptions/[id].get.ts            |   2 +-
 server/api/assumptions/[id].put.ts            |   2 +-
 server/api/assumptions/index.get.ts           |   2 +-
 server/api/assumptions/index.post.ts          |   2 +-
 server/api/constraints/[id].delete.ts         |   2 +-
 server/api/constraints/[id].get.ts            |   2 +-
 server/api/constraints/[id].put.ts            |   3 +-
 server/api/constraints/index.get.ts           |   3 +-
 server/api/constraints/index.post.ts          |   3 +-
 server/api/effects/[id].delete.ts             |   2 +-
 server/api/effects/[id].get.ts                |   2 +-
 server/api/effects/[id].put.ts                |   2 +-
 server/api/effects/index.get.ts               |   2 +-
 server/api/effects/index.post.ts              |   2 +-
 .../api/environment-components/[id].delete.ts |   2 +-
 server/api/environment-components/[id].get.ts |   2 +-
 server/api/environment-components/[id].put.ts |   2 +-
 .../api/environment-components/index.get.ts   |   2 +-
 .../api/environment-components/index.post.ts  |   2 +-
 .../api/functional-behaviors/[id].delete.ts   |   2 +-
 server/api/functional-behaviors/[id].get.ts   |   2 +-
 server/api/functional-behaviors/[id].put.ts   |   3 +-
 server/api/functional-behaviors/index.get.ts  |   3 +-
 server/api/functional-behaviors/index.post.ts |   3 +-
 server/api/glossary-terms/[id].delete.ts      |   2 +-
 server/api/glossary-terms/[id].get.ts         |   2 +-
 server/api/glossary-terms/[id].put.ts         |   2 +-
 server/api/glossary-terms/index.get.ts        |   2 +-
 server/api/glossary-terms/index.post.ts       |   2 +-
 server/api/invariants/[id].delete.ts          |   2 +-
 server/api/invariants/[id].get.ts             |   2 +-
 server/api/invariants/[id].put.ts             |   2 +-
 server/api/invariants/index.get.ts            |   2 +-
 server/api/invariants/index.post.ts           |   2 +-
 server/api/justifications/[id].delete.ts      |   2 +-
 server/api/justifications/[id].get.ts         |   2 +-
 server/api/justifications/[id].put.ts         |   2 +-
 server/api/justifications/index.get.ts        |   2 +-
 server/api/justifications/index.post.ts       |   2 +-
 server/api/limits/[id].delete.ts              |   2 +-
 server/api/limits/[id].get.ts                 |   2 +-
 server/api/limits/[id].put.ts                 |   2 +-
 server/api/limits/index.get.ts                |   2 +-
 server/api/limits/index.post.ts               |   2 +-
 .../non-functional-behaviors/[id].delete.ts   |   2 +-
 .../api/non-functional-behaviors/[id].get.ts  |   2 +-
 .../api/non-functional-behaviors/[id].put.ts  |   3 +-
 .../api/non-functional-behaviors/index.get.ts |   3 +-
 .../non-functional-behaviors/index.post.ts    |   3 +-
 server/api/obstacles/[id].delete.ts           |   2 +-
 server/api/obstacles/[id].get.ts              |   2 +-
 server/api/obstacles/[id].put.ts              |   2 +-
 server/api/obstacles/index.get.ts             |   2 +-
 server/api/obstacles/index.post.ts            |   2 +-
 server/api/organizations/index.post.ts        |   3 +-
 server/api/outcomes/[id].delete.ts            |   2 +-
 server/api/outcomes/[id].get.ts               |   2 +-
 server/api/outcomes/[id].put.ts               |   2 +-
 server/api/outcomes/index.get.ts              |   2 +-
 server/api/outcomes/index.post.ts             |   2 +-
 server/api/persons/[id].delete.ts             |   2 +-
 server/api/persons/[id].get.ts                |   2 +-
 server/api/persons/[id].put.ts                |   2 +-
 server/api/persons/index.get.ts               |   2 +-
 server/api/persons/index.post.ts              |   2 +-
 server/api/solutions/[id].delete.ts           |  10 +-
 server/api/solutions/index.get.ts             |   2 +-
 server/api/solutions/index.post.ts            |  41 ++++++-
 server/api/stakeholders/[id].delete.ts        |   2 +-
 server/api/stakeholders/[id].get.ts           |   2 +-
 server/api/stakeholders/[id].put.ts           |   4 +-
 server/api/stakeholders/index.get.ts          |   4 +-
 server/api/stakeholders/index.post.ts         |   4 +-
 server/api/system-components/[id].delete.ts   |   2 +-
 server/api/system-components/[id].get.ts      |   2 +-
 server/api/system-components/[id].put.ts      |   2 +-
 server/api/system-components/index.get.ts     |   2 +-
 server/api/system-components/index.post.ts    |   2 +-
 server/api/use-cases/[id].delete.ts           |   2 +-
 server/api/use-cases/[id].get.ts              |   2 +-
 server/api/use-cases/[id].put.ts              |   6 +-
 server/api/use-cases/index.get.ts             |   3 +-
 server/api/use-cases/index.post.ts            |   8 +-
 server/api/user-stories/[id].delete.ts        |   2 +-
 server/api/user-stories/[id].get.ts           |   2 +-
 server/api/user-stories/[id].put.ts           |   6 +-
 server/api/user-stories/index.get.ts          |   3 +-
 server/api/user-stories/index.post.ts         |   7 +-
 server/data/models/AssumptionSchema.ts        |   3 +-
 server/data/models/BehaviorSchema.ts          |   4 +-
 server/data/models/ConstraintSchema.ts        |   4 +-
 server/data/models/EffectSchema.ts            |   3 +-
 .../data/models/EnvironmentComponentSchema.ts |   3 +-
 .../data/models/FunctionalBehaviorSchema.ts   |   3 +-
 server/data/models/GlossaryTermSchema.ts      |   3 +-
 server/data/models/HintSchema.ts              |   3 +-
 server/data/models/InvariantSchema.ts         |   3 +-
 server/data/models/JustificationSchema.ts     |   3 +-
 server/data/models/LimitSchema.ts             |   3 +-
 .../models/NonFunctionalBehaviorSchema.ts     |   3 +-
 server/data/models/ObstacleSchema.ts          |   3 +-
 server/data/models/OrganizationSchema.ts      |   3 +-
 server/data/models/OutcomeSchema.ts           |   3 +-
 server/data/models/PersonSchema.ts            |   3 +-
 server/data/models/ProductSchema.ts           |   3 +-
 server/data/models/RequirementSchema.ts       |   2 +-
 server/data/models/ScenarioSchema.ts          |   3 +-
 server/data/models/SolutionSchema.ts          |  29 ++++-
 server/data/models/StakeholderSchema.ts       |   7 +-
 server/data/models/SystemComponentSchema.ts   |   3 +-
 server/data/models/UseCaseSchema.ts           |   3 +-
 server/data/models/UserStorySchema.ts         |   3 +-
 server/domain/application/Organization.ts     |  12 +-
 server/domain/application/Solution.ts         | 107 +++++++++++++++++-
 server/domain/requirements/Actor.ts           |   4 +-
 server/domain/requirements/Assumption.ts      |   4 +-
 server/domain/requirements/Behavior.ts        |   5 +-
 server/domain/requirements/Component.ts       |   4 +-
 server/domain/requirements/Constraint.ts      |   5 +-
 .../domain/requirements/ConstraintCategory.ts |   6 +-
 server/domain/requirements/Effect.ts          |   4 +-
 .../requirements/EnvironmentComponent.ts      |   4 +-
 server/domain/requirements/Example.ts         |   4 +-
 .../domain/requirements/FunctionalBehavior.ts |   4 +-
 server/domain/requirements/Functionality.ts   |   4 +-
 server/domain/requirements/GlossaryTerm.ts    |   4 +-
 server/domain/requirements/Goal.ts            |   4 +-
 server/domain/requirements/Hint.ts            |   4 +-
 server/domain/requirements/Invariant.ts       |   4 +-
 server/domain/requirements/Justification.ts   |   4 +-
 server/domain/requirements/Limit.ts           |   4 +-
 server/domain/requirements/MetaRequirement.ts |   4 +-
 server/domain/requirements/MoscowPriority.ts  |   6 +-
 server/domain/requirements/Noise.ts           |   4 +-
 .../requirements/NonFunctionalBehavior.ts     |   4 +-
 server/domain/requirements/Obstacle.ts        |   4 +-
 server/domain/requirements/Outcome.ts         |   4 +-
 server/domain/requirements/Person.ts          |   6 +-
 server/domain/requirements/Product.ts         |   4 +-
 server/domain/requirements/Requirement.ts     |   2 +-
 server/domain/requirements/Responsibility.ts  |   4 +-
 server/domain/requirements/Role.ts            |   4 +-
 server/domain/requirements/Scenario.ts        |   5 +-
 server/domain/requirements/Silence.ts         |   4 +-
 server/domain/requirements/Stakeholder.ts     |   6 +-
 .../requirements/StakeholderCategory.ts       |   6 +-
 .../requirements/StakeholderSegmentation.ts   |   6 +-
 server/domain/requirements/SystemComponent.ts |   4 +-
 server/domain/requirements/Task.ts            |   4 +-
 server/domain/requirements/TestCase.ts        |   4 +-
 server/domain/requirements/UseCase.ts         |   6 +-
 server/domain/requirements/UserStory.ts       |   6 +-
 server/domain/requirements/index.ts           |  38 +++++++
 166 files changed, 462 insertions(+), 335 deletions(-)
 create mode 100644 migrations/Migration20240831162504.ts
 create mode 100644 server/domain/requirements/index.ts

diff --git a/middleware/org-solution-check.global.ts b/middleware/org-solution-check.global.ts
index 5862f168..72791996 100644
--- a/middleware/org-solution-check.global.ts
+++ b/middleware/org-solution-check.global.ts
@@ -4,21 +4,21 @@
  */
 export default defineNuxtRouteMiddleware(async (to, from) => {
     if (to.params.organizationslug) {
-        const { data: organizations } = await useFetch('/api/organizations', {
+        const organizations = await $fetch('/api/organizations', {
             query: { slug: to.params.organizationslug }
         })
 
-        if (!(organizations?.value ?? []).length) {
+        if (!(organizations ?? []).length) {
             return navigateTo('/')
         } else if (to.params.solutionslug) {
-            const { data: solutions } = await useFetch('/api/solutions', {
+            const solutions = await $fetch('/api/solutions', {
                 query: {
                     organizationSlug: to.params.organizationslug,
                     slug: to.params.solutionslug
                 }
             })
 
-            if (!(solutions?.value ?? []).length)
+            if (!(solutions ?? []).length)
                 return navigateTo(`/o/${to.params.organizationslug}`)
         }
     }
diff --git a/migrations/.snapshot-cathedral.json b/migrations/.snapshot-cathedral.json
index 63e694a4..0caaf51c 100644
--- a/migrations/.snapshot-cathedral.json
+++ b/migrations/.snapshot-cathedral.json
@@ -321,7 +321,7 @@
             "id"
           ],
           "referencedTableName": "public.organization",
-          "deleteRule": "cascade"
+          "updateRule": "cascade"
         }
       },
       "nativeEnums": {}
diff --git a/migrations/Migration20240831162504.ts b/migrations/Migration20240831162504.ts
new file mode 100644
index 00000000..c64412da
--- /dev/null
+++ b/migrations/Migration20240831162504.ts
@@ -0,0 +1,17 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20240831162504 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql('alter table "solution" drop constraint "solution_organization_id_foreign";');
+
+    this.addSql('alter table "solution" add constraint "solution_organization_id_foreign" foreign key ("organization_id") references "organization" ("id") on update cascade;');
+  }
+
+  override async down(): Promise<void> {
+    this.addSql('alter table "solution" drop constraint "solution_organization_id_foreign";');
+
+    this.addSql('alter table "solution" add constraint "solution_organization_id_foreign" foreign key ("organization_id") references "organization" ("id") on delete cascade;');
+  }
+
+}
diff --git a/pages/index.client.vue b/pages/index.client.vue
index ff58382a..eccbd196 100644
--- a/pages/index.client.vue
+++ b/pages/index.client.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup>
-import Organization from '~/server/domain/application/Organization';
-import type { Properties } from '~/server/domain/Properties';
-
 definePageMeta({ name: 'Home' })
 
 const router = useRouter(),
@@ -12,9 +9,9 @@ const router = useRouter(),
 if (getOrgError.value)
     $eventBus.$emit('page-error', getOrgError.value)
 
-const handleDelete = async (organization: Properties<Organization>) => {
+const handleDelete = async (organization: { id: string, name: string }) => {
     confirm.require({
-        message: `Are you sure you want to delete ${Organization.name}? This will also delete all associated solutions.`,
+        message: `Are you sure you want to delete ${organization.name}? This will also delete all associated solutions.`,
         header: 'Delete Confirmation',
         icon: 'pi pi-exclamation-triangle',
         rejectLabel: 'Cancel',
@@ -29,11 +26,11 @@ const handleDelete = async (organization: Properties<Organization>) => {
     })
 }
 
-const handleEdit = (organization: Organization) => {
+const handleEdit = (organization: { slug: string }) => {
     router.push({ name: 'Edit Organization', params: { organizationslug: organization.slug } });
 }
 
-const handleUsers = (organization: Organization) => {
+const handleUsers = (organization: { slug: string }) => {
     router.push({ name: 'Organization Users', params: { organizationslug: organization.slug } });
 }
 </script>
@@ -64,12 +61,12 @@ const handleUsers = (organization: Organization) => {
                 {{ organization.description }}
             </template>
             <template #footer>
-                <Button icon="pi pi-pencil" class="edit-button mr-2" @click="handleEdit(organization as Organization)"
+                <Button icon="pi pi-pencil" class="edit-button mr-2" @click="handleEdit(organization)"
                     title="Edit Organization" />
-                <Button icon="pi pi-users" class="edit-button mr-2" @click="handleUsers(organization as Organization)"
+                <Button icon="pi pi-users" class="edit-button mr-2" @click="handleUsers(organization)"
                     title="Manage Users" />
-                <Button icon="pi pi-trash" class="delete-button" @click="handleDelete(organization as Organization)"
-                    severity="danger" title="Delete Organization" />
+                <Button icon="pi pi-trash" class="delete-button" @click="handleDelete(organization)" severity="danger"
+                    title="Delete Organization" />
             </template>
         </Card>
     </div>
diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/constraints.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/constraints.client.vue
index dfad346a..25a0fa56 100644
--- a/pages/o/[organization-slug]/[solution-slug]/environment/constraints.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/environment/constraints.client.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useFetch } from 'nuxt/app';
 import { FilterMatchMode } from 'primevue/api';
-import ConstraintCategory from '~/server/domain/requirements/ConstraintCategory';
+import { ConstraintCategory } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Constraints' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/functionality.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/functionality.client.vue
index 825c4146..1f0ac092 100644
--- a/pages/o/[organization-slug]/[solution-slug]/goals/functionality.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/goals/functionality.client.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
-import MoscowPriority from '~/server/domain/requirements/MoscowPriority';
+import { MoscowPriority } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Functionality' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/rationale.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/rationale.client.vue
index f3f8062d..4100e8d8 100644
--- a/pages/o/[organization-slug]/[solution-slug]/goals/rationale.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/goals/rationale.client.vue
@@ -22,10 +22,10 @@ type JustificationModel = {
 }
 
 const [
-    { data: visionJustifications, refresh: refreshVision, error: getVisionError },
-    { data: missionJustifications, refresh: refreshMission, error: getMissionError },
-    { data: situationJustifications, refresh: refreshSituation, error: getSituationError },
-    { data: objectiveJustifications, refresh: refreshObjective, error: getObjectiveError }
+    { data: visionJustifications, error: getVisionError },
+    { data: missionJustifications, error: getMissionError },
+    { data: situationJustifications, error: getSituationError },
+    { data: objectiveJustifications, error: getObjectiveError }
 ] = await Promise.all([
     useFetch(`/api/justifications?solutionId=${solutionId}&name=Vision`),
     useFetch(`/api/justifications?solutionId=${solutionId}&name=Mission`),
@@ -42,41 +42,6 @@ if (getSituationError.value)
 if (getObjectiveError.value)
     $eventBus.$emit('page-error', getObjectiveError.value);
 
-if (!visionJustifications.value?.length) {
-    useFetch(`/api/justifications`, {
-        method: 'POST',
-        body: { solutionId, name: 'Vision', statement: '' }
-    }).catch((e) => $eventBus.$emit('page-error', e));
-}
-
-if (!missionJustifications.value?.length) {
-    useFetch(`/api/justifications`, {
-        method: 'POST',
-        body: { solutionId, name: 'Mission', statement: '' }
-    }).catch((e) => $eventBus.$emit('page-error', e));
-}
-
-if (!situationJustifications.value?.length) {
-    useFetch(`/api/justifications`, {
-        method: 'POST',
-        body: { solutionId, name: 'Situation', statement: '' }
-    }).catch((e) => $eventBus.$emit('page-error', e));
-}
-
-if (!objectiveJustifications.value?.length) {
-    useFetch(`/api/justifications`, {
-        method: 'POST',
-        body: { solutionId, name: 'Objective', statement: '' }
-    }).catch((e) => $eventBus.$emit('page-error', e));
-}
-
-await Promise.all([
-    refreshVision(),
-    refreshMission(),
-    refreshSituation(),
-    refreshObjective()
-]);
-
 const visionStatement = ref(visionJustifications.value?.[0].statement!),
     missionStatement = ref(missionJustifications.value?.[0].statement!),
     situationStatement = ref(situationJustifications.value?.[0].statement!),
diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/scenarios.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/scenarios.client.vue
index a8700bd6..977d23ff 100644
--- a/pages/o/[organization-slug]/[solution-slug]/goals/scenarios.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/goals/scenarios.client.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
-import MoscowPriority from '~/server/domain/requirements/MoscowPriority';
+import { MoscowPriority } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Scenarios' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/stakeholders.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/stakeholders.client.vue
index 94be3c1d..b828a81d 100644
--- a/pages/o/[organization-slug]/[solution-slug]/goals/stakeholders.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/goals/stakeholders.client.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
 import mermaid from 'mermaid';
-import StakeholderCategory from '~/server/domain/requirements/StakeholderCategory';
-import StakeholderSegmentation from '~/server/domain/requirements/StakeholderSegmentation';
+import { StakeholderCategory, StakeholderSegmentation } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Stakeholders' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/system/functionality.client.vue b/pages/o/[organization-slug]/[solution-slug]/system/functionality.client.vue
index 9067dca0..c2cfbbbf 100644
--- a/pages/o/[organization-slug]/[solution-slug]/system/functionality.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/system/functionality.client.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
-import MoscowPriority from '~/server/domain/requirements/MoscowPriority';
+import { MoscowPriority } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Functionality' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/system/scenarios.client.vue b/pages/o/[organization-slug]/[solution-slug]/system/scenarios.client.vue
index e089848b..2e5fa983 100644
--- a/pages/o/[organization-slug]/[solution-slug]/system/scenarios.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/system/scenarios.client.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
-import MoscowPriority from '~/server/domain/requirements/MoscowPriority';
+import { MoscowPriority } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Scenarios' })
diff --git a/pages/o/[organization-slug]/index.client.vue b/pages/o/[organization-slug]/index.client.vue
index b979f5bb..957e2df7 100644
--- a/pages/o/[organization-slug]/index.client.vue
+++ b/pages/o/[organization-slug]/index.client.vue
@@ -11,7 +11,7 @@ const { $eventBus } = useNuxtApp(),
         query: { slug: organizationslug }
     }),
     organization = organizations.value![0],
-    { refresh, status, data: solutions, error: getSolutionError } = await useFetch('/api/solutions', {
+    { refresh: refreshSolutions, status, data: solutions, error: getSolutionError } = await useFetch('/api/solutions', {
         query: { organizationSlug: organizationslug }
     }),
     confirm = useConfirm()
@@ -65,7 +65,7 @@ const handleSolutionDelete = async (solution: Properties<SolutionModel>) => {
             await $fetch(`/api/solutions/${solution.id}`, {
                 method: 'delete'
             }).catch((e) => $eventBus.$emit('page-error', e))
-            router.push({ name: 'Organization', params: { organizationslug } });
+            await refreshSolutions()
         },
         reject: () => { }
     })
diff --git a/server/api/assumptions/[id].delete.ts b/server/api/assumptions/[id].delete.ts
index 60339ee4..9926d9cf 100644
--- a/server/api/assumptions/[id].delete.ts
+++ b/server/api/assumptions/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Assumption from "~/server/domain/requirements/Assumption"
+import { Assumption } from "~/server/domain/requirements/index"
 
 /**
  * Delete an assumption by id.
diff --git a/server/api/assumptions/[id].get.ts b/server/api/assumptions/[id].get.ts
index 98e07b15..f0270298 100644
--- a/server/api/assumptions/[id].get.ts
+++ b/server/api/assumptions/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Assumption from "~/server/domain/requirements/Assumption"
+import { Assumption } from "~/server/domain/requirements/index"
 
 /**
  * Returns an assumption by id
diff --git a/server/api/assumptions/[id].put.ts b/server/api/assumptions/[id].put.ts
index f01955b2..12ea5642 100644
--- a/server/api/assumptions/[id].put.ts
+++ b/server/api/assumptions/[id].put.ts
@@ -1,6 +1,6 @@
 import { fork } from "~/server/data/orm"
 import { z } from "zod"
-import Assumption from "~/server/domain/requirements/Assumption"
+import { Assumption } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/assumptions/index.get.ts b/server/api/assumptions/index.get.ts
index 895f6f8d..d8f5eb7c 100644
--- a/server/api/assumptions/index.get.ts
+++ b/server/api/assumptions/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Assumption from "~/server/domain/requirements/Assumption"
+import { Assumption } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/assumptions/index.post.ts b/server/api/assumptions/index.post.ts
index 9b447ce4..37a4786a 100644
--- a/server/api/assumptions/index.post.ts
+++ b/server/api/assumptions/index.post.ts
@@ -1,6 +1,6 @@
 import { fork } from "~/server/data/orm"
 import { z } from "zod"
-import Assumption from "~/server/domain/requirements/Assumption"
+import { Assumption } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/constraints/[id].delete.ts b/server/api/constraints/[id].delete.ts
index 324903cc..44942cfb 100644
--- a/server/api/constraints/[id].delete.ts
+++ b/server/api/constraints/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Constraint from "~/server/domain/requirements/Constraint"
+import { Constraint } from "~/server/domain/requirements/index"
 
 /**
  * Delete constraint by id.
diff --git a/server/api/constraints/[id].get.ts b/server/api/constraints/[id].get.ts
index a8443d3e..b2a5032d 100644
--- a/server/api/constraints/[id].get.ts
+++ b/server/api/constraints/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Constraint from "~/server/domain/requirements/Constraint"
+import { Constraint } from "~/server/domain/requirements/index"
 
 /**
  * Returns a constraint by id
diff --git a/server/api/constraints/[id].put.ts b/server/api/constraints/[id].put.ts
index 7cfe06f1..d3bd7905 100644
--- a/server/api/constraints/[id].put.ts
+++ b/server/api/constraints/[id].put.ts
@@ -1,6 +1,5 @@
 import { z } from "zod"
-import Constraint from "~/server/domain/requirements/Constraint"
-import ConstraintCategory from "~/server/domain/requirements/ConstraintCategory"
+import { Constraint, ConstraintCategory } from "~/server/domain/requirements/index"
 import { fork } from "~/server/data/orm"
 import Solution from "~/server/domain/application/Solution"
 
diff --git a/server/api/constraints/index.get.ts b/server/api/constraints/index.get.ts
index 288a972a..cedd1bf3 100644
--- a/server/api/constraints/index.get.ts
+++ b/server/api/constraints/index.get.ts
@@ -1,7 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Constraint from "~/server/domain/requirements/Constraint"
-import ConstraintCategory from "~/server/domain/requirements/ConstraintCategory"
+import { Constraint, ConstraintCategory } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/constraints/index.post.ts b/server/api/constraints/index.post.ts
index 308ec41e..d672bbc1 100644
--- a/server/api/constraints/index.post.ts
+++ b/server/api/constraints/index.post.ts
@@ -1,8 +1,7 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Constraint from "~/server/domain/requirements/Constraint"
+import { Constraint, ConstraintCategory } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
-import ConstraintCategory from "~/server/domain/requirements/ConstraintCategory"
 
 const bodySchema = z.object({
     name: z.string().min(1),
diff --git a/server/api/effects/[id].delete.ts b/server/api/effects/[id].delete.ts
index b67b4f4d..ff3ca7de 100644
--- a/server/api/effects/[id].delete.ts
+++ b/server/api/effects/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Effect from "~/server/domain/requirements/Effect"
+import { Effect } from "~/server/domain/requirements/index"
 
 /**
  * Delete an effect by id.
diff --git a/server/api/effects/[id].get.ts b/server/api/effects/[id].get.ts
index 846101b1..93a2995c 100644
--- a/server/api/effects/[id].get.ts
+++ b/server/api/effects/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Effect from "~/server/domain/requirements/Effect"
+import { Effect } from "~/server/domain/requirements/index"
 
 /**
  * Returns an effect by id
diff --git a/server/api/effects/[id].put.ts b/server/api/effects/[id].put.ts
index 020203df..2b919dcf 100644
--- a/server/api/effects/[id].put.ts
+++ b/server/api/effects/[id].put.ts
@@ -1,6 +1,6 @@
 import { fork } from "~/server/data/orm"
 import { z } from "zod"
-import Effect from "~/server/domain/requirements/Effect"
+import { Effect } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/effects/index.get.ts b/server/api/effects/index.get.ts
index 84972cf1..9b759bc0 100644
--- a/server/api/effects/index.get.ts
+++ b/server/api/effects/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Effect from "~/server/domain/requirements/Effect"
+import { Effect } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/effects/index.post.ts b/server/api/effects/index.post.ts
index b79cbe76..8c462027 100644
--- a/server/api/effects/index.post.ts
+++ b/server/api/effects/index.post.ts
@@ -1,6 +1,6 @@
 import { fork } from "~/server/data/orm"
 import { z } from "zod"
-import Effect from "~/server/domain/requirements/Effect"
+import { Effect } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/environment-components/[id].delete.ts b/server/api/environment-components/[id].delete.ts
index 5ef43469..40891cb2 100644
--- a/server/api/environment-components/[id].delete.ts
+++ b/server/api/environment-components/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import EnvironmentComponent from "~/server/domain/requirements/EnvironmentComponent"
+import { EnvironmentComponent } from "~/server/domain/requirements/index"
 
 /**
  * Delete an environment component by id.
diff --git a/server/api/environment-components/[id].get.ts b/server/api/environment-components/[id].get.ts
index 601d20fc..04d07696 100644
--- a/server/api/environment-components/[id].get.ts
+++ b/server/api/environment-components/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import EnvironmentComponent from "~/server/domain/requirements/EnvironmentComponent"
+import { EnvironmentComponent } from "~/server/domain/requirements/index"
 
 /**
  * Returns an environment component by id
diff --git a/server/api/environment-components/[id].put.ts b/server/api/environment-components/[id].put.ts
index d5be8dd0..3bc53e54 100644
--- a/server/api/environment-components/[id].put.ts
+++ b/server/api/environment-components/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import EnvironmentComponent from "~/server/domain/requirements/EnvironmentComponent"
+import { EnvironmentComponent } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/environment-components/index.get.ts b/server/api/environment-components/index.get.ts
index 042b818a..b67b68f8 100644
--- a/server/api/environment-components/index.get.ts
+++ b/server/api/environment-components/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import EnvironmentComponent from "~/server/domain/requirements/EnvironmentComponent"
+import { EnvironmentComponent } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/environment-components/index.post.ts b/server/api/environment-components/index.post.ts
index 82ea892f..72c24d87 100644
--- a/server/api/environment-components/index.post.ts
+++ b/server/api/environment-components/index.post.ts
@@ -1,7 +1,7 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
 import Solution from "~/server/domain/application/Solution"
-import EnvironmentComponent from "~/server/domain/requirements/EnvironmentComponent"
+import { EnvironmentComponent } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string(),
diff --git a/server/api/functional-behaviors/[id].delete.ts b/server/api/functional-behaviors/[id].delete.ts
index 65e4727c..c81cf15e 100644
--- a/server/api/functional-behaviors/[id].delete.ts
+++ b/server/api/functional-behaviors/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import FunctionalBehavior from "~/server/domain/requirements/FunctionalBehavior"
+import { FunctionalBehavior } from "~/server/domain/requirements/index"
 
 /**
  * Delete an functional behavior by id.
diff --git a/server/api/functional-behaviors/[id].get.ts b/server/api/functional-behaviors/[id].get.ts
index e41048ca..cd282265 100644
--- a/server/api/functional-behaviors/[id].get.ts
+++ b/server/api/functional-behaviors/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import FunctionalBehavior from "~/server/domain/requirements/FunctionalBehavior"
+import { FunctionalBehavior } from "~/server/domain/requirements/index"
 
 /**
  * Returns a functional behavior by id
diff --git a/server/api/functional-behaviors/[id].put.ts b/server/api/functional-behaviors/[id].put.ts
index 0dd0d067..ba0af089 100644
--- a/server/api/functional-behaviors/[id].put.ts
+++ b/server/api/functional-behaviors/[id].put.ts
@@ -1,7 +1,6 @@
 import { z } from "zod"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
 import { fork } from "~/server/data/orm"
-import FunctionalBehavior from "~/server/domain/requirements/FunctionalBehavior"
+import { FunctionalBehavior, MoscowPriority } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/functional-behaviors/index.get.ts b/server/api/functional-behaviors/index.get.ts
index dc6cec6b..d083fcd5 100644
--- a/server/api/functional-behaviors/index.get.ts
+++ b/server/api/functional-behaviors/index.get.ts
@@ -1,7 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import FunctionalBehavior from "~/server/domain/requirements/FunctionalBehavior"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
+import { FunctionalBehavior, MoscowPriority } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/functional-behaviors/index.post.ts b/server/api/functional-behaviors/index.post.ts
index 57bae8ec..1e60bdb1 100644
--- a/server/api/functional-behaviors/index.post.ts
+++ b/server/api/functional-behaviors/index.post.ts
@@ -1,8 +1,7 @@
 import { fork } from "~/server/data/orm"
 import { z } from "zod"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
 import Solution from "~/server/domain/application/Solution"
-import FunctionalBehavior from "~/server/domain/requirements/FunctionalBehavior"
+import { FunctionalBehavior, MoscowPriority } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string().min(1),
diff --git a/server/api/glossary-terms/[id].delete.ts b/server/api/glossary-terms/[id].delete.ts
index 806dfe1d..35af327f 100644
--- a/server/api/glossary-terms/[id].delete.ts
+++ b/server/api/glossary-terms/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import GlossaryTerm from "~/server/domain/requirements/GlossaryTerm"
+import { GlossaryTerm } from "~/server/domain/requirements/index"
 
 /**
  * Delete glossary term by id.
diff --git a/server/api/glossary-terms/[id].get.ts b/server/api/glossary-terms/[id].get.ts
index 8d12e145..13912153 100644
--- a/server/api/glossary-terms/[id].get.ts
+++ b/server/api/glossary-terms/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import GlossaryTerm from "~/server/domain/requirements/GlossaryTerm"
+import { GlossaryTerm } from "~/server/domain/requirements/index"
 
 /**
  * Returns a glossary term by id
diff --git a/server/api/glossary-terms/[id].put.ts b/server/api/glossary-terms/[id].put.ts
index 6be093e1..da8463d4 100644
--- a/server/api/glossary-terms/[id].put.ts
+++ b/server/api/glossary-terms/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import GlossaryTerm from "~/server/domain/requirements/GlossaryTerm.js"
+import { GlossaryTerm } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution.js"
 
 const bodySchema = z.object({
diff --git a/server/api/glossary-terms/index.get.ts b/server/api/glossary-terms/index.get.ts
index ff4a616c..ff1672d0 100644
--- a/server/api/glossary-terms/index.get.ts
+++ b/server/api/glossary-terms/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import GlossaryTerm from "~/server/domain/requirements/GlossaryTerm"
+import { GlossaryTerm } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/glossary-terms/index.post.ts b/server/api/glossary-terms/index.post.ts
index ed200153..7a1e769d 100644
--- a/server/api/glossary-terms/index.post.ts
+++ b/server/api/glossary-terms/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import GlossaryTerm from "~/server/domain/requirements/GlossaryTerm.js"
+import { GlossaryTerm } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution.js"
 
 const bodySchema = z.object({
diff --git a/server/api/invariants/[id].delete.ts b/server/api/invariants/[id].delete.ts
index d7ec7360..8e0f3428 100644
--- a/server/api/invariants/[id].delete.ts
+++ b/server/api/invariants/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Invariant from "~/server/domain/requirements/Invariant"
+import { Invariant } from "~/server/domain/requirements/index"
 
 /**
  * Delete invariant by id.
diff --git a/server/api/invariants/[id].get.ts b/server/api/invariants/[id].get.ts
index 8e6edf36..4e2057a5 100644
--- a/server/api/invariants/[id].get.ts
+++ b/server/api/invariants/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Invariant from "~/server/domain/requirements/Invariant"
+import { Invariant } from "~/server/domain/requirements/index"
 
 /**
  * Returns an invariant by id
diff --git a/server/api/invariants/[id].put.ts b/server/api/invariants/[id].put.ts
index 0b61a622..05820674 100644
--- a/server/api/invariants/[id].put.ts
+++ b/server/api/invariants/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Invariant from "~/server/domain/requirements/Invariant"
+import { Invariant } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/invariants/index.get.ts b/server/api/invariants/index.get.ts
index 9ae79883..173dea2e 100644
--- a/server/api/invariants/index.get.ts
+++ b/server/api/invariants/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Invariant from "~/server/domain/requirements/Invariant"
+import { Invariant } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/invariants/index.post.ts b/server/api/invariants/index.post.ts
index 7ae34183..96b0eb73 100644
--- a/server/api/invariants/index.post.ts
+++ b/server/api/invariants/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Invariant from "~/server/domain/requirements/Invariant"
+import { Invariant } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/justifications/[id].delete.ts b/server/api/justifications/[id].delete.ts
index 9471ee47..99550e92 100644
--- a/server/api/justifications/[id].delete.ts
+++ b/server/api/justifications/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Justification from "~/server/domain/requirements/Justification"
+import { Justification } from "~/server/domain/requirements/index"
 
 /**
  * Delete a justification by id.
diff --git a/server/api/justifications/[id].get.ts b/server/api/justifications/[id].get.ts
index 170fb7c7..b98670c8 100644
--- a/server/api/justifications/[id].get.ts
+++ b/server/api/justifications/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Justification from "~/server/domain/requirements/Justification"
+import { Justification } from "~/server/domain/requirements/index"
 
 /**
  * Returns a justification by id
diff --git a/server/api/justifications/[id].put.ts b/server/api/justifications/[id].put.ts
index 1c2a1974..1f253e75 100644
--- a/server/api/justifications/[id].put.ts
+++ b/server/api/justifications/[id].put.ts
@@ -1,7 +1,7 @@
 import { fork } from "~/server/data/orm"
 import { z } from "zod"
 import Solution from "~/server/domain/application/Solution"
-import Justification from "~/server/domain/requirements/Justification"
+import { Justification } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string().min(1),
diff --git a/server/api/justifications/index.get.ts b/server/api/justifications/index.get.ts
index 09634641..c76ea22c 100644
--- a/server/api/justifications/index.get.ts
+++ b/server/api/justifications/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Justification from "~/server/domain/requirements/Justification"
+import { Justification } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/justifications/index.post.ts b/server/api/justifications/index.post.ts
index c22e6058..6abd1599 100644
--- a/server/api/justifications/index.post.ts
+++ b/server/api/justifications/index.post.ts
@@ -1,7 +1,7 @@
 import { fork } from "~/server/data/orm"
 import { z } from "zod"
 import Solution from "~/server/domain/application/Solution"
-import Justification from "~/server/domain/requirements/Justification"
+import { Justification } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string().min(1),
diff --git a/server/api/limits/[id].delete.ts b/server/api/limits/[id].delete.ts
index 0d6bb424..cd504d69 100644
--- a/server/api/limits/[id].delete.ts
+++ b/server/api/limits/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Limit from "~/server/domain/requirements/Limit"
+import { Limit } from "~/server/domain/requirements/index"
 
 /**
  * Delete limit by id.
diff --git a/server/api/limits/[id].get.ts b/server/api/limits/[id].get.ts
index 8e2839b0..a0782f9e 100644
--- a/server/api/limits/[id].get.ts
+++ b/server/api/limits/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Limit from "~/server/domain/requirements/Limit"
+import { Limit } from "~/server/domain/requirements/index"
 
 /**
  * Returns a limit by id
diff --git a/server/api/limits/[id].put.ts b/server/api/limits/[id].put.ts
index bbc251ef..b2423177 100644
--- a/server/api/limits/[id].put.ts
+++ b/server/api/limits/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Limit from "~/server/domain/requirements/Limit"
+import { Limit } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/limits/index.get.ts b/server/api/limits/index.get.ts
index b045e1dc..8daea77d 100644
--- a/server/api/limits/index.get.ts
+++ b/server/api/limits/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Limit from "~/server/domain/requirements/Limit"
+import { Limit } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/limits/index.post.ts b/server/api/limits/index.post.ts
index 2ed52d63..4f20b9e4 100644
--- a/server/api/limits/index.post.ts
+++ b/server/api/limits/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Limit from "~/server/domain/requirements/Limit"
+import { Limit } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/non-functional-behaviors/[id].delete.ts b/server/api/non-functional-behaviors/[id].delete.ts
index fdd95c0d..ccd89bc4 100644
--- a/server/api/non-functional-behaviors/[id].delete.ts
+++ b/server/api/non-functional-behaviors/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import NonFunctionalBehavior from "~/server/domain/requirements/NonFunctionalBehavior"
+import { NonFunctionalBehavior } from "~/server/domain/requirements/index"
 
 /**
  * Delete non-functional behavior by id.
diff --git a/server/api/non-functional-behaviors/[id].get.ts b/server/api/non-functional-behaviors/[id].get.ts
index 36b47227..2ade296d 100644
--- a/server/api/non-functional-behaviors/[id].get.ts
+++ b/server/api/non-functional-behaviors/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import NonFunctionalBehavior from "~/server/domain/requirements/NonFunctionalBehavior"
+import { NonFunctionalBehavior } from "~/server/domain/requirements/index"
 
 /**
  * Returns a non-functional behavior by id
diff --git a/server/api/non-functional-behaviors/[id].put.ts b/server/api/non-functional-behaviors/[id].put.ts
index be163036..192503be 100644
--- a/server/api/non-functional-behaviors/[id].put.ts
+++ b/server/api/non-functional-behaviors/[id].put.ts
@@ -1,7 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
-import NonFunctionalBehavior from "~/server/domain/requirements/NonFunctionalBehavior"
+import { NonFunctionalBehavior, MoscowPriority } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/non-functional-behaviors/index.get.ts b/server/api/non-functional-behaviors/index.get.ts
index 5f54993c..3e40fa21 100644
--- a/server/api/non-functional-behaviors/index.get.ts
+++ b/server/api/non-functional-behaviors/index.get.ts
@@ -1,7 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
-import NonFunctionalBehavior from "~/server/domain/requirements/NonFunctionalBehavior"
+import { NonFunctionalBehavior, MoscowPriority } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/non-functional-behaviors/index.post.ts b/server/api/non-functional-behaviors/index.post.ts
index de21d5c7..8e788dd8 100644
--- a/server/api/non-functional-behaviors/index.post.ts
+++ b/server/api/non-functional-behaviors/index.post.ts
@@ -1,7 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
-import NonFunctionalBehavior from "~/server/domain/requirements/NonFunctionalBehavior"
+import { NonFunctionalBehavior, MoscowPriority } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/obstacles/[id].delete.ts b/server/api/obstacles/[id].delete.ts
index 6bd1450e..9d1abd3b 100644
--- a/server/api/obstacles/[id].delete.ts
+++ b/server/api/obstacles/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Obstacle from "~/server/domain/requirements/Obstacle"
+import { Obstacle } from "~/server/domain/requirements/index"
 
 /**
  * Delete obstacle by id.
diff --git a/server/api/obstacles/[id].get.ts b/server/api/obstacles/[id].get.ts
index 17e1ee95..d11c81d3 100644
--- a/server/api/obstacles/[id].get.ts
+++ b/server/api/obstacles/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Obstacle from "~/server/domain/requirements/Obstacle"
+import { Obstacle } from "~/server/domain/requirements/index"
 
 /**
  * Returns a obstacle by id
diff --git a/server/api/obstacles/[id].put.ts b/server/api/obstacles/[id].put.ts
index 22109daa..bb81c27a 100644
--- a/server/api/obstacles/[id].put.ts
+++ b/server/api/obstacles/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Obstacle from "~/server/domain/requirements/Obstacle"
+import { Obstacle } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/obstacles/index.get.ts b/server/api/obstacles/index.get.ts
index b97727c4..888b1323 100644
--- a/server/api/obstacles/index.get.ts
+++ b/server/api/obstacles/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Obstacle from "~/server/domain/requirements/Obstacle"
+import { Obstacle } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/obstacles/index.post.ts b/server/api/obstacles/index.post.ts
index 3800ad1f..bb634bce 100644
--- a/server/api/obstacles/index.post.ts
+++ b/server/api/obstacles/index.post.ts
@@ -1,7 +1,7 @@
 import { z } from "zod"
 import Solution from "~/server/domain/application/Solution"
 import { fork } from "~/server/data/orm"
-import Obstacle from "~/server/domain/requirements/Obstacle"
+import { Obstacle } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string().min(1),
diff --git a/server/api/organizations/index.post.ts b/server/api/organizations/index.post.ts
index 8a40eec5..9aa01fb3 100644
--- a/server/api/organizations/index.post.ts
+++ b/server/api/organizations/index.post.ts
@@ -32,7 +32,8 @@ export default defineEventHandler(async (event) => {
 
     const newOrg = new Organization({
         name: body.data.name,
-        description: body.data.description
+        description: body.data.description,
+        solutions: []
     })
 
     // add the current user as an admin of the new organization
diff --git a/server/api/outcomes/[id].delete.ts b/server/api/outcomes/[id].delete.ts
index ff26137d..6ce81c32 100644
--- a/server/api/outcomes/[id].delete.ts
+++ b/server/api/outcomes/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Outcome from "~/server/domain/requirements/Outcome"
+import { Outcome } from "~/server/domain/requirements/index"
 
 /**
  * Delete outcome by id.
diff --git a/server/api/outcomes/[id].get.ts b/server/api/outcomes/[id].get.ts
index b912f0e6..fe688263 100644
--- a/server/api/outcomes/[id].get.ts
+++ b/server/api/outcomes/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Outcome from "~/server/domain/requirements/Outcome"
+import { Outcome } from "~/server/domain/requirements/index"
 
 /**
  * Returns an outcome by id
diff --git a/server/api/outcomes/[id].put.ts b/server/api/outcomes/[id].put.ts
index 2c008caf..76450a7e 100644
--- a/server/api/outcomes/[id].put.ts
+++ b/server/api/outcomes/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Outcome from "~/server/domain/requirements/Outcome"
+import { Outcome } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/outcomes/index.get.ts b/server/api/outcomes/index.get.ts
index 1c802428..1e0d7c74 100644
--- a/server/api/outcomes/index.get.ts
+++ b/server/api/outcomes/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Outcome from "~/server/domain/requirements/Outcome"
+import { Outcome } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/outcomes/index.post.ts b/server/api/outcomes/index.post.ts
index 71d5ef56..adb56d6c 100644
--- a/server/api/outcomes/index.post.ts
+++ b/server/api/outcomes/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Outcome from "~/server/domain/requirements/Outcome"
+import { Outcome } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/persons/[id].delete.ts b/server/api/persons/[id].delete.ts
index 2ec42dca..e2d04473 100644
--- a/server/api/persons/[id].delete.ts
+++ b/server/api/persons/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Person from "~/server/domain/requirements/Person"
+import { Person } from "~/server/domain/requirements/index"
 
 /**
  * Delete Person by id.
diff --git a/server/api/persons/[id].get.ts b/server/api/persons/[id].get.ts
index 23e336cd..d4f59dd4 100644
--- a/server/api/persons/[id].get.ts
+++ b/server/api/persons/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Person from "~/server/domain/requirements/Person"
+import { Person } from "~/server/domain/requirements/index"
 
 /**
  * Returns a person by id
diff --git a/server/api/persons/[id].put.ts b/server/api/persons/[id].put.ts
index 778da114..037118cf 100644
--- a/server/api/persons/[id].put.ts
+++ b/server/api/persons/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Person from "~/server/domain/requirements/Person"
+import { Person } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({
diff --git a/server/api/persons/index.get.ts b/server/api/persons/index.get.ts
index 2ea0cb86..03e82f31 100644
--- a/server/api/persons/index.get.ts
+++ b/server/api/persons/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Person from "~/server/domain/requirements/Person"
+import { Person } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/persons/index.post.ts b/server/api/persons/index.post.ts
index a64bc7f3..71875149 100644
--- a/server/api/persons/index.post.ts
+++ b/server/api/persons/index.post.ts
@@ -1,7 +1,7 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
 import Solution from "~/server/domain/application/Solution"
-import Person from "~/server/domain/requirements/Person"
+import { Person } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string(),
diff --git a/server/api/solutions/[id].delete.ts b/server/api/solutions/[id].delete.ts
index 9cca517a..6cb29874 100644
--- a/server/api/solutions/[id].delete.ts
+++ b/server/api/solutions/[id].delete.ts
@@ -4,6 +4,7 @@ import Organization from "~/server/domain/application/Organization";
 import AppUserOrganizationRole from "~/server/domain/application/AppUserOrganizationRole";
 import { getServerSession } from '#auth'
 import AppRole from "~/server/domain/application/AppRole";
+import { Collection } from "@mikro-orm/core";
 
 /**
  * Delete a solution by id.
@@ -32,10 +33,15 @@ export default defineEventHandler(async (event) => {
 
     // A solution can only be deleted by a system admin
     // or the associated organization admin
-
     if (session.isSystemAdmin || appUserOrgRoles.some(r => r.role === AppRole.ORGANIZATION_ADMIN)) {
-        em.remove(solution)
+        // for each property of the solution that is a collection, remove all items
+        for (const key in solution) {
+            const maybeCollection = Reflect.get(solution, key) as Collection<any>
+            if (maybeCollection instanceof Collection)
+                maybeCollection.removeAll()
+        }
         await em.flush()
+        await em.removeAndFlush(solution)
     } else {
         throw createError({
             statusCode: 403,
diff --git a/server/api/solutions/index.get.ts b/server/api/solutions/index.get.ts
index d1b2f060..4b676424 100644
--- a/server/api/solutions/index.get.ts
+++ b/server/api/solutions/index.get.ts
@@ -81,5 +81,5 @@ export default defineEventHandler(async (event) => {
             statusMessage: "Forbidden: You do not have access to this organization"
         })
 
-    return allOrgSolutions.filter((sol) => appUserOrgs.some((aou) => aou.organization === sol.organization))
+    return allOrgSolutions.filter((sol) => appUserOrgs.some((aou) => aou.organization.id === sol.organization.id))
 })
\ No newline at end of file
diff --git a/server/api/solutions/index.post.ts b/server/api/solutions/index.post.ts
index 9ecdfb5d..11ea7c46 100644
--- a/server/api/solutions/index.post.ts
+++ b/server/api/solutions/index.post.ts
@@ -5,6 +5,7 @@ import Solution from "~/server/domain/application/Solution"
 import AppUserOrganizationRole from "~/server/domain/application/AppUserOrganizationRole"
 import { getServerSession } from '#auth'
 import AppRole from "~/server/domain/application/AppRole"
+import { Justification } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string().min(1).max(100),
@@ -54,9 +55,47 @@ export default defineEventHandler(async (event) => {
     const newSolution = new Solution({
         name: body.data.name,
         description: body.data.description,
-        organization
+        organization,
+        assumptions: [],
+        constraints: [],
+        effects: [],
+        environmentComponents: [],
+        functionalBehaviors: [],
+        glossaryTerms: [],
+        invariants: [],
+        justifications: [],
+        limits: [],
+        nonFunctionalBehaviors: [],
+        obstacles: [],
+        outcomes: [],
+        persons: [],
+        stakeholders: [],
+        systemComponents: [],
+        useCases: [],
+        userStories: []
     })
 
+    newSolution.justifications.add(new Justification({
+        name: 'Vision',
+        solution: newSolution,
+        statement: ''
+    }))
+    newSolution.justifications.add(new Justification({
+        name: 'Mission',
+        solution: newSolution,
+        statement: ''
+    }))
+    newSolution.justifications.add(new Justification({
+        name: 'Situation',
+        solution: newSolution,
+        statement: ''
+    }))
+    newSolution.justifications.add(new Justification({
+        name: 'Objective',
+        solution: newSolution,
+        statement: ''
+    }))
+
     await em.persistAndFlush(newSolution)
 
     return newSolution.id
diff --git a/server/api/stakeholders/[id].delete.ts b/server/api/stakeholders/[id].delete.ts
index bbf2d5dc..3f0f7f4d 100644
--- a/server/api/stakeholders/[id].delete.ts
+++ b/server/api/stakeholders/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Stakeholder from "~/server/domain/requirements/Stakeholder"
+import { Stakeholder } from "~/server/domain/requirements/index"
 
 /**
  * Delete Stakeholder by id.
diff --git a/server/api/stakeholders/[id].get.ts b/server/api/stakeholders/[id].get.ts
index 18c8373e..84659b1c 100644
--- a/server/api/stakeholders/[id].get.ts
+++ b/server/api/stakeholders/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Stakeholder from "~/server/domain/requirements/Stakeholder"
+import { Stakeholder } from "~/server/domain/requirements/index"
 
 /**
  * Returns a stakeholder by id
diff --git a/server/api/stakeholders/[id].put.ts b/server/api/stakeholders/[id].put.ts
index ff4ff460..30194eb7 100644
--- a/server/api/stakeholders/[id].put.ts
+++ b/server/api/stakeholders/[id].put.ts
@@ -1,9 +1,7 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
 import Solution from "~/server/domain/application/Solution"
-import Stakeholder from "~/server/domain/requirements/Stakeholder"
-import StakeholderSegmentation from "~/server/domain/requirements/StakeholderSegmentation"
-import StakeholderCategory from "~/server/domain/requirements/StakeholderCategory"
+import { Stakeholder, StakeholderCategory, StakeholderSegmentation } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string(),
diff --git a/server/api/stakeholders/index.get.ts b/server/api/stakeholders/index.get.ts
index 62e94d03..698bfb9b 100644
--- a/server/api/stakeholders/index.get.ts
+++ b/server/api/stakeholders/index.get.ts
@@ -1,8 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Stakeholder from "~/server/domain/requirements/Stakeholder"
-import StakeholderSegmentation from "~/server/domain/requirements/StakeholderSegmentation"
-import StakeholderCategory from "~/server/domain/requirements/StakeholderCategory"
+import { Stakeholder, StakeholderCategory, StakeholderSegmentation } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/stakeholders/index.post.ts b/server/api/stakeholders/index.post.ts
index e24087a7..e7d0cf41 100644
--- a/server/api/stakeholders/index.post.ts
+++ b/server/api/stakeholders/index.post.ts
@@ -1,9 +1,7 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
 import Solution from "~/server/domain/application/Solution"
-import Stakeholder from "~/server/domain/requirements/Stakeholder"
-import StakeholderSegmentation from "~/server/domain/requirements/StakeholderSegmentation"
-import StakeholderCategory from "~/server/domain/requirements/StakeholderCategory"
+import { Stakeholder, StakeholderCategory, StakeholderSegmentation } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string(),
diff --git a/server/api/system-components/[id].delete.ts b/server/api/system-components/[id].delete.ts
index 60db237c..27571e0c 100644
--- a/server/api/system-components/[id].delete.ts
+++ b/server/api/system-components/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import SystemComponent from "~/server/domain/requirements/SystemComponent"
+import { SystemComponent } from "~/server/domain/requirements/index"
 
 /**
  * Delete an system component by id.
diff --git a/server/api/system-components/[id].get.ts b/server/api/system-components/[id].get.ts
index efe5a6c6..e337ee1d 100644
--- a/server/api/system-components/[id].get.ts
+++ b/server/api/system-components/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import SystemComponent from "~/server/domain/requirements/SystemComponent"
+import { SystemComponent } from "~/server/domain/requirements/index"
 
 /**
  * Returns an system component by id
diff --git a/server/api/system-components/[id].put.ts b/server/api/system-components/[id].put.ts
index f596205b..974191bd 100644
--- a/server/api/system-components/[id].put.ts
+++ b/server/api/system-components/[id].put.ts
@@ -1,7 +1,7 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
 import Solution from "~/server/domain/application/Solution"
-import SystemComponent from "~/server/domain/requirements/SystemComponent"
+import { SystemComponent } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string(),
diff --git a/server/api/system-components/index.get.ts b/server/api/system-components/index.get.ts
index a7b32e65..a7b3a635 100644
--- a/server/api/system-components/index.get.ts
+++ b/server/api/system-components/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import SystemComponent from "~/server/domain/requirements/SystemComponent"
+import { SystemComponent } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/system-components/index.post.ts b/server/api/system-components/index.post.ts
index d81c06b9..6f794c9e 100644
--- a/server/api/system-components/index.post.ts
+++ b/server/api/system-components/index.post.ts
@@ -1,7 +1,7 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
 import Solution from "~/server/domain/application/Solution"
-import SystemComponent from "~/server/domain/requirements/SystemComponent"
+import { SystemComponent } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string(),
diff --git a/server/api/use-cases/[id].delete.ts b/server/api/use-cases/[id].delete.ts
index 31c22129..9b8a3714 100644
--- a/server/api/use-cases/[id].delete.ts
+++ b/server/api/use-cases/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import UseCase from "~/server/domain/requirements/UseCase"
+import { UseCase } from "~/server/domain/requirements/index"
 
 /**
  * Delete UseCase by id.
diff --git a/server/api/use-cases/[id].get.ts b/server/api/use-cases/[id].get.ts
index 50fcd26c..c94891b5 100644
--- a/server/api/use-cases/[id].get.ts
+++ b/server/api/use-cases/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import UseCase from "~/server/domain/requirements/UseCase"
+import { UseCase } from "~/server/domain/requirements/index"
 
 /**
  * Returns a UseCase by id
diff --git a/server/api/use-cases/[id].put.ts b/server/api/use-cases/[id].put.ts
index 41302922..b6d81438 100644
--- a/server/api/use-cases/[id].put.ts
+++ b/server/api/use-cases/[id].put.ts
@@ -1,11 +1,7 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Assumption from "~/server/domain/requirements/Assumption"
-import Effect from "~/server/domain/requirements/Effect"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
+import { Assumption, Effect, MoscowPriority, Stakeholder, UseCase } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
-import Stakeholder from "~/server/domain/requirements/Stakeholder"
-import UseCase from "~/server/domain/requirements/UseCase"
 import { NIL as emptyUuid } from "uuid"
 
 const bodySchema = z.object({
diff --git a/server/api/use-cases/index.get.ts b/server/api/use-cases/index.get.ts
index 4e607822..ddbba1fc 100644
--- a/server/api/use-cases/index.get.ts
+++ b/server/api/use-cases/index.get.ts
@@ -1,7 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
-import UseCase from "~/server/domain/requirements/UseCase"
+import { UseCase, MoscowPriority } from "~/server/domain/requirements/index"
 import { NIL as emptyUuid } from "uuid"
 
 const querySchema = z.object({
diff --git a/server/api/use-cases/index.post.ts b/server/api/use-cases/index.post.ts
index e99aa84f..06fc84b1 100644
--- a/server/api/use-cases/index.post.ts
+++ b/server/api/use-cases/index.post.ts
@@ -1,12 +1,10 @@
 import { NIL as emptyUuid } from "uuid"
 import { z } from "zod"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
 import { fork } from "~/server/data/orm"
 import Solution from "~/server/domain/application/Solution"
-import Stakeholder from "~/server/domain/requirements/Stakeholder"
-import Assumption from "~/server/domain/requirements/Assumption"
-import Effect from "~/server/domain/requirements/Effect"
-import UseCase from "~/server/domain/requirements/UseCase"
+import { Assumption, MoscowPriority, Stakeholder } from "~/server/domain/requirements/index"
+import { Effect } from "~/server/domain/requirements/index"
+import { UseCase } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string(),
diff --git a/server/api/user-stories/[id].delete.ts b/server/api/user-stories/[id].delete.ts
index 73e80d0b..5c41238f 100644
--- a/server/api/user-stories/[id].delete.ts
+++ b/server/api/user-stories/[id].delete.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import UserStory from "~/server/domain/requirements/UserStory"
+import { UserStory } from "~/server/domain/requirements/index"
 
 /**
  * Delete User Story by id.
diff --git a/server/api/user-stories/[id].get.ts b/server/api/user-stories/[id].get.ts
index 2313938a..92916764 100644
--- a/server/api/user-stories/[id].get.ts
+++ b/server/api/user-stories/[id].get.ts
@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import UserStory from "~/server/domain/requirements/UserStory"
+import { UserStory } from "~/server/domain/requirements/index"
 
 /**
  * Returns a User Story by id
diff --git a/server/api/user-stories/[id].put.ts b/server/api/user-stories/[id].put.ts
index 9c5a876a..f4fda6c4 100644
--- a/server/api/user-stories/[id].put.ts
+++ b/server/api/user-stories/[id].put.ts
@@ -1,11 +1,7 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import FunctionalBehavior from "~/server/domain/requirements/FunctionalBehavior"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
-import Outcome from "~/server/domain/requirements/Outcome"
+import { FunctionalBehavior, MoscowPriority, Outcome, Stakeholder, UserStory } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
-import Stakeholder from "~/server/domain/requirements/Stakeholder"
-import UserStory from "~/server/domain/requirements/UserStory"
 
 const bodySchema = z.object({
     name: z.string(),
diff --git a/server/api/user-stories/index.get.ts b/server/api/user-stories/index.get.ts
index 9c023b1c..caa77b33 100644
--- a/server/api/user-stories/index.get.ts
+++ b/server/api/user-stories/index.get.ts
@@ -1,7 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
-import UserStory from "~/server/domain/requirements/UserStory"
+import { MoscowPriority, UserStory } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),
diff --git a/server/api/user-stories/index.post.ts b/server/api/user-stories/index.post.ts
index 0c9c2dff..d48eb2d9 100644
--- a/server/api/user-stories/index.post.ts
+++ b/server/api/user-stories/index.post.ts
@@ -1,11 +1,8 @@
 import { z } from "zod"
-import MoscowPriority from "~/server/domain/requirements/MoscowPriority"
 import Solution from "~/server/domain/application/Solution"
 import { fork } from "~/server/data/orm"
-import Outcome from "~/server/domain/requirements/Outcome"
-import Stakeholder from "~/server/domain/requirements/Stakeholder"
-import FunctionalBehavior from "~/server/domain/requirements/FunctionalBehavior"
-import UserStory from "~/server/domain/requirements/UserStory"
+import { FunctionalBehavior, MoscowPriority, Outcome, Stakeholder } from "~/server/domain/requirements/index"
+import { UserStory } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string(),
diff --git a/server/data/models/AssumptionSchema.ts b/server/data/models/AssumptionSchema.ts
index dba1f35c..e4b2f05f 100644
--- a/server/data/models/AssumptionSchema.ts
+++ b/server/data/models/AssumptionSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
 import RequirementSchema from "./RequirementSchema.js";
-import Assumption from "../../domain/requirements/Assumption.js";
-import Requirement from "../../domain/requirements/Requirement.js";
+import { Assumption, Requirement } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Assumption, Requirement>({
     class: Assumption,
diff --git a/server/data/models/BehaviorSchema.ts b/server/data/models/BehaviorSchema.ts
index 8cf4f614..f67d2df2 100644
--- a/server/data/models/BehaviorSchema.ts
+++ b/server/data/models/BehaviorSchema.ts
@@ -1,8 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Behavior from "../../domain/requirements/Behavior.js";
-import MoscowPriority from "../../domain/requirements/MoscowPriority.js";
-import Requirement from "../../domain/requirements/Requirement.js";
 import RequirementSchema from "./RequirementSchema.js";
+import { Behavior, MoscowPriority, Requirement } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Behavior, Requirement>({
     class: Behavior,
diff --git a/server/data/models/ConstraintSchema.ts b/server/data/models/ConstraintSchema.ts
index a830dfb2..a7f8e162 100644
--- a/server/data/models/ConstraintSchema.ts
+++ b/server/data/models/ConstraintSchema.ts
@@ -1,8 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
 import RequirementSchema from "./RequirementSchema.js";
-import Requirement from "../../domain/requirements/Requirement.js";
-import Constraint from "../../domain/requirements/Constraint.js";
-import ConstraintCategory from "../../domain/requirements/ConstraintCategory.js";
+import { Requirement, Constraint, ConstraintCategory } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Constraint, Requirement>({
     class: Constraint,
diff --git a/server/data/models/EffectSchema.ts b/server/data/models/EffectSchema.ts
index edddf74d..47594039 100644
--- a/server/data/models/EffectSchema.ts
+++ b/server/data/models/EffectSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
 import RequirementSchema from "./RequirementSchema.js";
-import Requirement from "../../domain/requirements/Requirement.js";
-import Effect from "../../domain/requirements/Effect.js";
+import { Requirement, Effect } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Effect, Requirement>({
     class: Effect,
diff --git a/server/data/models/EnvironmentComponentSchema.ts b/server/data/models/EnvironmentComponentSchema.ts
index e751af68..4ac0721e 100644
--- a/server/data/models/EnvironmentComponentSchema.ts
+++ b/server/data/models/EnvironmentComponentSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Component from "../../domain/requirements/Component.js";
-import EnvironmentComponent from "../../domain/requirements/EnvironmentComponent.js";
 import RequirementSchema from "./RequirementSchema.js";
+import { Component, EnvironmentComponent } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<EnvironmentComponent, Component>({
     class: EnvironmentComponent,
diff --git a/server/data/models/FunctionalBehaviorSchema.ts b/server/data/models/FunctionalBehaviorSchema.ts
index 2c7d059e..adc93dc2 100644
--- a/server/data/models/FunctionalBehaviorSchema.ts
+++ b/server/data/models/FunctionalBehaviorSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
-import FunctionalBehavior from "../../domain/requirements/FunctionalBehavior.js";
-import Functionality from "../../domain/requirements/Functionality.js";
 import BehaviorSchema from "./BehaviorSchema.js";
+import { FunctionalBehavior, Functionality } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<FunctionalBehavior, Functionality>({
     class: FunctionalBehavior,
diff --git a/server/data/models/GlossaryTermSchema.ts b/server/data/models/GlossaryTermSchema.ts
index 061787af..f729cb70 100644
--- a/server/data/models/GlossaryTermSchema.ts
+++ b/server/data/models/GlossaryTermSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Component from "../../domain/requirements/Component.js";
-import GlossaryTerm from "../../domain/requirements/GlossaryTerm.js";
 import RequirementSchema from "./RequirementSchema.js";
+import { Component, GlossaryTerm } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<GlossaryTerm, Component>({
     class: GlossaryTerm,
diff --git a/server/data/models/HintSchema.ts b/server/data/models/HintSchema.ts
index 07cbaf52..0b958d18 100644
--- a/server/data/models/HintSchema.ts
+++ b/server/data/models/HintSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Hint from "../../domain/requirements/Hint.js";
-import Noise from "../../domain/requirements/Noise.js";
 import RequirementSchema from "./RequirementSchema.js";
+import { Hint, Noise } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Hint, Noise>({
     class: Hint,
diff --git a/server/data/models/InvariantSchema.ts b/server/data/models/InvariantSchema.ts
index 86bca874..c9bbb620 100644
--- a/server/data/models/InvariantSchema.ts
+++ b/server/data/models/InvariantSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
 import RequirementSchema from "./RequirementSchema.js";
-import Requirement from "../../domain/requirements/Requirement.js";
-import Invariant from "../../domain/requirements/Invariant.js";
+import { Requirement, Invariant } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Invariant, Requirement>({
     class: Invariant,
diff --git a/server/data/models/JustificationSchema.ts b/server/data/models/JustificationSchema.ts
index ab8abdf7..39e622e8 100644
--- a/server/data/models/JustificationSchema.ts
+++ b/server/data/models/JustificationSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
 import RequirementSchema from "./RequirementSchema.js";
-import Justification from "../../domain/requirements/Justification.js";
-import MetaRequirement from "../../domain/requirements/MetaRequirement.js";
+import { Justification, MetaRequirement } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Justification, MetaRequirement>({
     class: Justification,
diff --git a/server/data/models/LimitSchema.ts b/server/data/models/LimitSchema.ts
index 1760f0b2..f9abe7a5 100644
--- a/server/data/models/LimitSchema.ts
+++ b/server/data/models/LimitSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
 import RequirementSchema from "./RequirementSchema.js";
-import Requirement from "../../domain/requirements/Requirement.js";
-import Limit from "../../domain/requirements/Limit.js";
+import { Requirement, Limit } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Limit, Requirement>({
     class: Limit,
diff --git a/server/data/models/NonFunctionalBehaviorSchema.ts b/server/data/models/NonFunctionalBehaviorSchema.ts
index 3930487b..e32fcd64 100644
--- a/server/data/models/NonFunctionalBehaviorSchema.ts
+++ b/server/data/models/NonFunctionalBehaviorSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Functionality from "../../domain/requirements/Functionality.js";
 import BehaviorSchema from "./BehaviorSchema.js";
-import NonFunctionalBehavior from "../../domain/requirements/NonFunctionalBehavior.js";
+import { Functionality, NonFunctionalBehavior } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<NonFunctionalBehavior, Functionality>({
     class: NonFunctionalBehavior,
diff --git a/server/data/models/ObstacleSchema.ts b/server/data/models/ObstacleSchema.ts
index c9246286..0501cea1 100644
--- a/server/data/models/ObstacleSchema.ts
+++ b/server/data/models/ObstacleSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
 import RequirementSchema from "./RequirementSchema.js";
-import Obstacle from "../../domain/requirements/Obstacle.js";
-import Goal from "../../domain/requirements/Goal.js";
+import { Obstacle, Goal } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Obstacle, Goal>({
     class: Obstacle,
diff --git a/server/data/models/OrganizationSchema.ts b/server/data/models/OrganizationSchema.ts
index fb67031d..99309681 100644
--- a/server/data/models/OrganizationSchema.ts
+++ b/server/data/models/OrganizationSchema.ts
@@ -7,6 +7,7 @@ export default new EntitySchema<Organization>({
         id: { type: 'uuid', primary: true },
         name: { type: 'string', nullable: false, length: 100 },
         description: { type: 'string', nullable: false },
-        slug: { type: 'string', unique: true }
+        slug: { type: 'string', unique: true },
+        solutions: { kind: '1:m', entity: 'Solution', mappedBy: 'organization', orphanRemoval: true }
     }
 })
\ No newline at end of file
diff --git a/server/data/models/OutcomeSchema.ts b/server/data/models/OutcomeSchema.ts
index 503d140b..27759f01 100644
--- a/server/data/models/OutcomeSchema.ts
+++ b/server/data/models/OutcomeSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
 import RequirementSchema from "./RequirementSchema.js";
-import Goal from "../../domain/requirements/Goal.js";
-import Outcome from "../../domain/requirements/Outcome.js";
+import { Goal, Outcome } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Outcome, Goal>({
     class: Outcome,
diff --git a/server/data/models/PersonSchema.ts b/server/data/models/PersonSchema.ts
index 3558028d..4f215f23 100644
--- a/server/data/models/PersonSchema.ts
+++ b/server/data/models/PersonSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Actor from "../../domain/requirements/Actor.js";
-import Person from "../../domain/requirements/Person.js";
 import RequirementSchema from "./RequirementSchema.js";
+import { Actor, Person } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Person, Actor>({
     class: Person,
diff --git a/server/data/models/ProductSchema.ts b/server/data/models/ProductSchema.ts
index bb3736ba..f2c9cea8 100644
--- a/server/data/models/ProductSchema.ts
+++ b/server/data/models/ProductSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
 import RequirementSchema from "./RequirementSchema.js";
-import Requirement from "../../domain/requirements/Requirement.js";
-import Product from "../../domain/requirements/Product.js";
+import { Requirement, Product } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Product, Requirement>({
     class: Product,
diff --git a/server/data/models/RequirementSchema.ts b/server/data/models/RequirementSchema.ts
index ee9581d3..539d1d0e 100644
--- a/server/data/models/RequirementSchema.ts
+++ b/server/data/models/RequirementSchema.ts
@@ -1,5 +1,5 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Requirement from "../../domain/requirements/Requirement.js";
+import { Requirement } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Requirement>({
     class: Requirement,
diff --git a/server/data/models/ScenarioSchema.ts b/server/data/models/ScenarioSchema.ts
index 53bd56f1..685d9b39 100644
--- a/server/data/models/ScenarioSchema.ts
+++ b/server/data/models/ScenarioSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Example from "../../domain/requirements/Example.js";
-import Scenario from "../../domain/requirements/Scenario.js";
 import BehaviorSchema from "./BehaviorSchema.js";
+import { Example, Scenario } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Scenario, Example>({
     abstract: true,
diff --git a/server/data/models/SolutionSchema.ts b/server/data/models/SolutionSchema.ts
index 7c22640e..ea91c02d 100644
--- a/server/data/models/SolutionSchema.ts
+++ b/server/data/models/SolutionSchema.ts
@@ -1,5 +1,11 @@
-import { Cascade, EntitySchema } from "@mikro-orm/core";
+import { EntitySchema } from "@mikro-orm/core";
 import Solution from "../../domain/application/Solution.js";
+import Organization from "../../domain/application/Organization.js";
+import {
+    Assumption, Constraint, Effect, EnvironmentComponent, FunctionalBehavior,
+    GlossaryTerm, Invariant, Justification, Limit, NonFunctionalBehavior, Obstacle,
+    Outcome, Person, Stakeholder, SystemComponent, UseCase, UserStory
+} from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Solution>({
     class: Solution,
@@ -8,8 +14,23 @@ export default new EntitySchema<Solution>({
         name: { type: 'string', nullable: false, length: 100 },
         description: { type: 'string', nullable: false },
         slug: { type: 'string', unique: true },
-        organization: {
-            kind: 'm:1', entity: 'Organization', ref: true, nullable: false, cascade: [Cascade.REMOVE]
-        }
+        organization: { kind: 'm:1', entity: () => Organization, inversedBy: 'solutions' },
+        assumptions: { kind: '1:m', entity: () => Assumption, mappedBy: 'solution', orphanRemoval: true },
+        constraints: { kind: '1:m', entity: () => Constraint, mappedBy: 'solution', orphanRemoval: true },
+        effects: { kind: '1:m', entity: () => Effect, mappedBy: 'solution', orphanRemoval: true },
+        environmentComponents: { kind: '1:m', entity: () => EnvironmentComponent, mappedBy: 'solution', orphanRemoval: true },
+        functionalBehaviors: { kind: '1:m', entity: () => FunctionalBehavior, mappedBy: 'solution', orphanRemoval: true },
+        glossaryTerms: { kind: '1:m', entity: () => GlossaryTerm, mappedBy: 'solution', orphanRemoval: true },
+        invariants: { kind: '1:m', entity: () => Invariant, mappedBy: 'solution', orphanRemoval: true },
+        justifications: { kind: '1:m', entity: () => Justification, mappedBy: 'solution', orphanRemoval: true },
+        limits: { kind: '1:m', entity: () => Limit, mappedBy: 'solution', orphanRemoval: true },
+        nonFunctionalBehaviors: { kind: '1:m', entity: () => NonFunctionalBehavior, mappedBy: 'solution', orphanRemoval: true },
+        obstacles: { kind: '1:m', entity: () => Obstacle, mappedBy: 'solution', orphanRemoval: true },
+        outcomes: { kind: '1:m', entity: () => Outcome, mappedBy: 'solution', orphanRemoval: true },
+        persons: { kind: '1:m', entity: () => Person, mappedBy: 'solution', orphanRemoval: true },
+        stakeholders: { kind: '1:m', entity: () => Stakeholder, mappedBy: 'solution', orphanRemoval: true },
+        systemComponents: { kind: '1:m', entity: () => SystemComponent, mappedBy: 'solution', orphanRemoval: true },
+        useCases: { kind: '1:m', entity: () => UseCase, mappedBy: 'solution', orphanRemoval: true },
+        userStories: { kind: '1:m', entity: () => UserStory, mappedBy: 'solution', orphanRemoval: true }
     }
 })
\ No newline at end of file
diff --git a/server/data/models/StakeholderSchema.ts b/server/data/models/StakeholderSchema.ts
index 915aa92d..645b0d28 100644
--- a/server/data/models/StakeholderSchema.ts
+++ b/server/data/models/StakeholderSchema.ts
@@ -1,9 +1,8 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Component from "../../domain/requirements/Component.js";
 import RequirementSchema from "./RequirementSchema.js";
-import Stakeholder from "../../domain/requirements/Stakeholder.js";
-import StakeholderSegmentation from "../../domain/requirements/StakeholderSegmentation.js";
-import StakeholderCategory from "../../domain/requirements/StakeholderCategory.js";
+import {
+    Component, Stakeholder, StakeholderSegmentation, StakeholderCategory
+} from "../../domain/requirements/index.js";
 
 export default new EntitySchema<Stakeholder, Component>({
     class: Stakeholder,
diff --git a/server/data/models/SystemComponentSchema.ts b/server/data/models/SystemComponentSchema.ts
index 6fc22dbc..1b28f437 100644
--- a/server/data/models/SystemComponentSchema.ts
+++ b/server/data/models/SystemComponentSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Component from "../../domain/requirements/Component.js";
-import SystemComponent from "../../domain/requirements/SystemComponent.js";
 import RequirementSchema from "./RequirementSchema.js";
+import { Component, SystemComponent } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<SystemComponent, Component>({
     class: SystemComponent,
diff --git a/server/data/models/UseCaseSchema.ts b/server/data/models/UseCaseSchema.ts
index 854e4f61..d55fe459 100644
--- a/server/data/models/UseCaseSchema.ts
+++ b/server/data/models/UseCaseSchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Scenario from "../../domain/requirements/Scenario.js";
-import UseCase from "../../domain/requirements/UseCase.js";
 import ScenarioSchema from "./ScenarioSchema.js";
+import { Scenario, UseCase } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<UseCase, Scenario>({
     class: UseCase,
diff --git a/server/data/models/UserStorySchema.ts b/server/data/models/UserStorySchema.ts
index 2a739f66..b8790bf8 100644
--- a/server/data/models/UserStorySchema.ts
+++ b/server/data/models/UserStorySchema.ts
@@ -1,7 +1,6 @@
 import { EntitySchema } from "@mikro-orm/core";
-import Scenario from "../../domain/requirements/Scenario.js";
-import UserStory from "../../domain/requirements/UserStory.js";
 import ScenarioSchema from "./ScenarioSchema.js";
+import { Scenario, UserStory } from "../../domain/requirements/index.js";
 
 export default new EntitySchema<UserStory, Scenario>({
     class: UserStory,
diff --git a/server/domain/application/Organization.ts b/server/domain/application/Organization.ts
index 2db8db5b..afa01b65 100644
--- a/server/domain/application/Organization.ts
+++ b/server/domain/application/Organization.ts
@@ -1,16 +1,19 @@
+import { Collection } from "@mikro-orm/core";
 import slugify from "../../../utils/slugify.js";
 import type { Properties } from "../Properties.js";
 import { v7 as uuidv7 } from 'uuid';
+import type Solution from "./Solution.js";
 
 /**
  * An Organization is a collection of people and solutions
  */
 export default class Organization {
-    constructor(properties: Omit<Properties<Organization>, 'id' | 'slug'>) {
+    constructor(properties: Omit<Properties<Organization>, 'id' | 'slug' | 'solutions'> & { solutions: Solution[] }) {
         this.id = uuidv7();
         this.name = properties.name;
         this.description = properties.description;
         this.slug = slugify(this.name);
+        properties.solutions.forEach(solution => this.solutions.add(solution));
     }
 
     /**
@@ -34,12 +37,17 @@ export default class Organization {
      */
     slug: string
 
+    /**
+     * The solutions that belong to this organization
+     */
+    solutions = new Collection<Solution>(this);
+
     toJSON() {
         return {
             id: this.id,
             description: this.description,
             name: this.name,
-            slug: this.slug,
+            slug: this.slug
         }
     }
 }
\ No newline at end of file
diff --git a/server/domain/application/Solution.ts b/server/domain/application/Solution.ts
index 96a56632..dc7f5dab 100644
--- a/server/domain/application/Solution.ts
+++ b/server/domain/application/Solution.ts
@@ -2,17 +2,37 @@ import { v7 as uuidv7 } from 'uuid';
 import { type Properties } from '../Properties.js';
 import Organization from './Organization.js';
 import slugify from '../../../utils/slugify.js';
+import { Collection } from '@mikro-orm/core';
+import {
+    type Assumption, type Constraint, type Effect, type Justification, type EnvironmentComponent,
+    type FunctionalBehavior, type GlossaryTerm, type Invariant, type Limit, type NonFunctionalBehavior,
+    type Obstacle, type Outcome, type Person, type Stakeholder, type SystemComponent, type UseCase,
+    type UserStory
+} from '../requirements/index.js';
+
+type CollectionToArrayProps<T> = {
+    [P in keyof T]: T[P] extends Collection<infer U> ? U[] : T[P];
+};
 
 /**
  * A Solution is the aggregation of a Project, Environment, Goals, and a System
  */
 export default class Solution {
-    constructor(properties: Omit<Properties<Solution>, 'slug' | 'id'>) {
+    constructor(properties: Omit<Properties<CollectionToArrayProps<Solution>>, 'slug' | 'id'>) {
         this.id = uuidv7();
         this.description = properties.description;
         this.name = properties.name
         this.organization = properties.organization;
         this.slug = slugify(this.name);
+
+        //for each array property, assign to the corresponding collection property
+        for (const key in properties) {
+            const xs = Reflect.get(properties, key) as any[];
+            if (Array.isArray(xs)) {
+                const collection = Reflect.get(this, key) as Collection<any>;
+                xs.forEach(x => collection.add(x));
+            }
+        }
     }
 
     /**
@@ -40,6 +60,91 @@ export default class Solution {
      */
     slug: string
 
+    /**
+     * The assumptions for this solution
+     */
+    assumptions = new Collection<Assumption>(this);
+
+    /**
+     * The constraints for this solution
+     */
+    constraints = new Collection<Constraint>(this);
+
+    /**
+     * The effects for this solution
+     */
+    effects = new Collection<Effect>(this);
+
+    /**
+     * The environment components for this solution
+     */
+    environmentComponents = new Collection<EnvironmentComponent>(this);
+
+    /**
+     * The functional behaviors for this solution
+     */
+    functionalBehaviors = new Collection<FunctionalBehavior>(this);
+
+    /**
+     * The glossary terms for this solution
+     */
+    glossaryTerms = new Collection<GlossaryTerm>(this);
+
+    /**
+     * The invariants for this solution
+     */
+    invariants = new Collection<Invariant>(this);
+
+    /**
+     * The justifications for this solution
+     */
+    justifications = new Collection<Justification>(this);
+
+    /**
+     * The limits for this solution
+     */
+    limits = new Collection<Limit>(this);
+
+    /**
+     * The non-functional behaviors for this solution
+     */
+    nonFunctionalBehaviors = new Collection<NonFunctionalBehavior>(this);
+
+    /**
+     * The obstacles for this solution
+     */
+    obstacles = new Collection<Obstacle>(this);
+
+    /**
+     * The outcomes for this solution
+     */
+    outcomes = new Collection<Outcome>(this);
+
+    /**
+     * The persons for this solution
+     */
+    persons = new Collection<Person>(this);
+
+    /**
+     * The stakeholders for this solution
+     */
+    stakeholders = new Collection<Stakeholder>(this);
+
+    /**
+     * The system components for this solution
+     */
+    systemComponents = new Collection<SystemComponent>(this);
+
+    /**
+     * The use cases for this solution
+     */
+    useCases = new Collection<UseCase>(this);
+
+    /**
+     * The user stories for this solution
+     */
+    userStories = new Collection<UserStory>(this);
+
     toJSON() {
         return {
             id: this.id,
diff --git a/server/domain/requirements/Actor.ts b/server/domain/requirements/Actor.ts
index 072691da..a44d7dac 100644
--- a/server/domain/requirements/Actor.ts
+++ b/server/domain/requirements/Actor.ts
@@ -1,6 +1,6 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * A part of a Project, Environment, System, or Goals that may affect or be affected by the associated entities
  */
-export default abstract class Actor extends Requirement { }
+export abstract class Actor extends Requirement { }
diff --git a/server/domain/requirements/Assumption.ts b/server/domain/requirements/Assumption.ts
index 32bcdba9..6ec6c4b7 100644
--- a/server/domain/requirements/Assumption.ts
+++ b/server/domain/requirements/Assumption.ts
@@ -1,6 +1,6 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * Posited property of the environment
  */
-export default class Assumption extends Requirement { }
\ No newline at end of file
+export class Assumption extends Requirement { }
\ No newline at end of file
diff --git a/server/domain/requirements/Behavior.ts b/server/domain/requirements/Behavior.ts
index 420ca943..1075a4ec 100644
--- a/server/domain/requirements/Behavior.ts
+++ b/server/domain/requirements/Behavior.ts
@@ -1,11 +1,10 @@
 import type { Properties } from "../Properties.js";
-import Requirement from "./Requirement.js";
-import type MoscowPriority from "./MoscowPriority.js";
+import { Requirement, type MoscowPriority } from "./index.js";
 
 /**
  * Property of the operation of the system
  */
-export default abstract class Behavior extends Requirement {
+export abstract class Behavior extends Requirement {
     constructor({ priority, ...rest }: Omit<Properties<Behavior>, 'id'>) {
         super(rest)
         this.priority = priority
diff --git a/server/domain/requirements/Component.ts b/server/domain/requirements/Component.ts
index 1dcd9084..62b7de24 100644
--- a/server/domain/requirements/Component.ts
+++ b/server/domain/requirements/Component.ts
@@ -1,6 +1,6 @@
-import Actor from "./Actor.js";
+import { Actor } from "./index.js";
 
 /**
  * Idenfitication of a part (of the Project, Environment, Goals, or System)
  */
-export default abstract class Component extends Actor { }
+export abstract class Component extends Actor { }
diff --git a/server/domain/requirements/Constraint.ts b/server/domain/requirements/Constraint.ts
index b8025aee..db373561 100644
--- a/server/domain/requirements/Constraint.ts
+++ b/server/domain/requirements/Constraint.ts
@@ -1,11 +1,10 @@
-import Requirement from './Requirement.js';
 import { type Properties } from '../Properties.js';
-import ConstraintCategory from './ConstraintCategory.js';
+import { Requirement, ConstraintCategory } from './index.js';
 
 /**
  * A Constraint is a property imposed by the environment
  */
-export default class Constraint extends Requirement {
+export class Constraint extends Requirement {
     constructor({ category, ...rest }: Omit<Properties<Constraint>, 'id'>) {
         super(rest);
 
diff --git a/server/domain/requirements/ConstraintCategory.ts b/server/domain/requirements/ConstraintCategory.ts
index 92948798..144b9fec 100644
--- a/server/domain/requirements/ConstraintCategory.ts
+++ b/server/domain/requirements/ConstraintCategory.ts
@@ -1,7 +1,5 @@
-enum ConstraintCategory {
+export enum ConstraintCategory {
     BUSINESS = 'Business Rule',
     PHYSICS = 'Physical Law',
     ENGINEERING = 'Engineering Decision'
-}
-
-export default ConstraintCategory;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/server/domain/requirements/Effect.ts b/server/domain/requirements/Effect.ts
index 7cc4020f..96f34be6 100644
--- a/server/domain/requirements/Effect.ts
+++ b/server/domain/requirements/Effect.ts
@@ -1,6 +1,6 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * Environment property affected by the system
  */
-export default class Effect extends Requirement { }
\ No newline at end of file
+export class Effect extends Requirement { }
\ No newline at end of file
diff --git a/server/domain/requirements/EnvironmentComponent.ts b/server/domain/requirements/EnvironmentComponent.ts
index 227484b3..ebaee530 100644
--- a/server/domain/requirements/EnvironmentComponent.ts
+++ b/server/domain/requirements/EnvironmentComponent.ts
@@ -1,7 +1,7 @@
-import Component from "./Component.js";
 import { type Properties } from "../Properties.js";
+import { Component } from "./index.js";
 
-export default class EnvironmentComponent extends Component {
+export class EnvironmentComponent extends Component {
     constructor({ parentComponent, ...rest }: Omit<Properties<EnvironmentComponent>, 'id'>) {
         super(rest)
         this.parentComponent = parentComponent
diff --git a/server/domain/requirements/Example.ts b/server/domain/requirements/Example.ts
index 1d58bec5..0bbd17f2 100644
--- a/server/domain/requirements/Example.ts
+++ b/server/domain/requirements/Example.ts
@@ -1,6 +1,6 @@
-import Behavior from "./Behavior.js";
+import { Behavior } from "./index.js";
 
 /**
  * Illustration of behavior through a usage scenario
  */
-export default abstract class Example extends Behavior { }
+export abstract class Example extends Behavior { }
diff --git a/server/domain/requirements/FunctionalBehavior.ts b/server/domain/requirements/FunctionalBehavior.ts
index a4f7903e..1065cc20 100644
--- a/server/domain/requirements/FunctionalBehavior.ts
+++ b/server/domain/requirements/FunctionalBehavior.ts
@@ -1,8 +1,8 @@
-import Functionality from "./Functionality.js";
+import { Functionality } from "./index.js";
 
 /**
  * FunctionalBehavior specifies **what** behavior the system should exhibit, i.e.,
  * the results or effects of the system's operation.
  * Generally expressed in the form "system must do <requirement>"
  */
-export default class FunctionalBehavior extends Functionality { }
\ No newline at end of file
+export class FunctionalBehavior extends Functionality { }
\ No newline at end of file
diff --git a/server/domain/requirements/Functionality.ts b/server/domain/requirements/Functionality.ts
index db702a48..8dab1b7d 100644
--- a/server/domain/requirements/Functionality.ts
+++ b/server/domain/requirements/Functionality.ts
@@ -1,6 +1,6 @@
-import Behavior from "./Behavior.js";
+import { Behavior } from "./index.js";
 
 /**
  * Functionality describes what system will do and how it will do it.
  */
-export default abstract class Functionality extends Behavior { }
\ No newline at end of file
+export abstract class Functionality extends Behavior { }
\ No newline at end of file
diff --git a/server/domain/requirements/GlossaryTerm.ts b/server/domain/requirements/GlossaryTerm.ts
index 309f6f09..923bab4f 100644
--- a/server/domain/requirements/GlossaryTerm.ts
+++ b/server/domain/requirements/GlossaryTerm.ts
@@ -1,7 +1,7 @@
 import { type Properties } from "../Properties.js";
-import Component from "./Component.js";
+import { Component } from "./index.js";
 
-export default class GlossaryTerm extends Component {
+export class GlossaryTerm extends Component {
     constructor({ parentComponent, ...rest }: Omit<Properties<GlossaryTerm>, 'id'>) {
         super(rest)
         this.parentComponent = parentComponent
diff --git a/server/domain/requirements/Goal.ts b/server/domain/requirements/Goal.ts
index c8bdab33..de047125 100644
--- a/server/domain/requirements/Goal.ts
+++ b/server/domain/requirements/Goal.ts
@@ -1,8 +1,8 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * A result desired by an organization.
  * an objective of the project or system, in terms
  * of their desired effect on the environment
  */
-export default abstract class Goal extends Requirement { }
\ No newline at end of file
+export abstract class Goal extends Requirement { }
\ No newline at end of file
diff --git a/server/domain/requirements/Hint.ts b/server/domain/requirements/Hint.ts
index c3699acc..7b9f3d74 100644
--- a/server/domain/requirements/Hint.ts
+++ b/server/domain/requirements/Hint.ts
@@ -1,6 +1,6 @@
-import Noise from "./Noise.js";
+import { Noise } from "./index.js";
 
 /**
  * Design or implementation suggestion
  */
-export default class Hint extends Noise { }
\ No newline at end of file
+export class Hint extends Noise { }
\ No newline at end of file
diff --git a/server/domain/requirements/Invariant.ts b/server/domain/requirements/Invariant.ts
index 3f68b2ee..db3a9d0c 100644
--- a/server/domain/requirements/Invariant.ts
+++ b/server/domain/requirements/Invariant.ts
@@ -1,8 +1,8 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * Environment property that must be maintained.
  * It exists as both an assumption and an effect.
  * (precondition and postcondition)
  */
-export default class Invariant extends Requirement { }
\ No newline at end of file
+export class Invariant extends Requirement { }
\ No newline at end of file
diff --git a/server/domain/requirements/Justification.ts b/server/domain/requirements/Justification.ts
index cd9a0c0a..bcf3a22f 100644
--- a/server/domain/requirements/Justification.ts
+++ b/server/domain/requirements/Justification.ts
@@ -1,6 +1,6 @@
-import MetaRequirement from "./MetaRequirement.js";
+import { MetaRequirement } from "./index.js";
 
 /**
  * Explanation of a project or system property in reference to a goal or environment property
  */
-export default class Justification extends MetaRequirement { }
\ No newline at end of file
+export class Justification extends MetaRequirement { }
\ No newline at end of file
diff --git a/server/domain/requirements/Limit.ts b/server/domain/requirements/Limit.ts
index 0f98d1ab..d30f0b6e 100644
--- a/server/domain/requirements/Limit.ts
+++ b/server/domain/requirements/Limit.ts
@@ -1,6 +1,6 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * Exclusion from the scope of requirements
  */
-export default class Limit extends Requirement { }
\ No newline at end of file
+export class Limit extends Requirement { }
\ No newline at end of file
diff --git a/server/domain/requirements/MetaRequirement.ts b/server/domain/requirements/MetaRequirement.ts
index aedd0089..c43e40c0 100644
--- a/server/domain/requirements/MetaRequirement.ts
+++ b/server/domain/requirements/MetaRequirement.ts
@@ -1,6 +1,6 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * Property of requirements themselves (not of the Project, Environment, Goals, or System)
  */
-export default abstract class MetaRequirement extends Requirement { }
+export abstract class MetaRequirement extends Requirement { }
diff --git a/server/domain/requirements/MoscowPriority.ts b/server/domain/requirements/MoscowPriority.ts
index cd34c2fb..2b2b945f 100644
--- a/server/domain/requirements/MoscowPriority.ts
+++ b/server/domain/requirements/MoscowPriority.ts
@@ -2,11 +2,9 @@
  * Represents a MoSCoW priority.
  * @see https://en.wikipedia.org/wiki/MoSCoW_method
  */
-enum MoscowPriority {
+export enum MoscowPriority {
     MUST = 'MUST',
     SHOULD = 'SHOULD',
     COULD = 'COULD',
     WONT = 'WONT'
-}
-
-export default MoscowPriority;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/server/domain/requirements/Noise.ts b/server/domain/requirements/Noise.ts
index 3c8915b1..e825e7e7 100644
--- a/server/domain/requirements/Noise.ts
+++ b/server/domain/requirements/Noise.ts
@@ -1,6 +1,6 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * Property that is in requirements but should not be
  */
-export default class Noise extends Requirement { }
+export class Noise extends Requirement { }
diff --git a/server/domain/requirements/NonFunctionalBehavior.ts b/server/domain/requirements/NonFunctionalBehavior.ts
index 4c65d081..eaed4f70 100644
--- a/server/domain/requirements/NonFunctionalBehavior.ts
+++ b/server/domain/requirements/NonFunctionalBehavior.ts
@@ -1,8 +1,8 @@
-import Functionality from "./Functionality.js";
+import { Functionality } from "./index.js";
 
 /**
  * NonFunctionalBehavior is a type of Behavior that is not directly related to the functionality of a system.
  * It specifies **how** the system should behave, i.e., the qualities that the system must exhibit.
  * Generally expressed in the form "system shall be <requirement>."
  */
-export default class NonFunctionalBehavior extends Functionality { }
\ No newline at end of file
+export class NonFunctionalBehavior extends Functionality { }
\ No newline at end of file
diff --git a/server/domain/requirements/Obstacle.ts b/server/domain/requirements/Obstacle.ts
index 39f28559..d35c5581 100644
--- a/server/domain/requirements/Obstacle.ts
+++ b/server/domain/requirements/Obstacle.ts
@@ -1,6 +1,6 @@
-import Goal from "./Goal.js";
+import { Goal } from "./index.js";
 
 /**
  * Obstacles are the challenges that prevent the goals from being achieved.
  */
-export default class Obstacle extends Goal { }
\ No newline at end of file
+export class Obstacle extends Goal { }
\ No newline at end of file
diff --git a/server/domain/requirements/Outcome.ts b/server/domain/requirements/Outcome.ts
index d0dfe2db..6cc937e2 100644
--- a/server/domain/requirements/Outcome.ts
+++ b/server/domain/requirements/Outcome.ts
@@ -1,6 +1,6 @@
-import Goal from "./Goal.js";
+import { Goal } from "./index.js";
 
 /**
  * A result desired by an organization
  */
-export default class Outcome extends Goal { }
\ No newline at end of file
+export class Outcome extends Goal { }
\ No newline at end of file
diff --git a/server/domain/requirements/Person.ts b/server/domain/requirements/Person.ts
index c009390f..ec34aa73 100644
--- a/server/domain/requirements/Person.ts
+++ b/server/domain/requirements/Person.ts
@@ -1,10 +1,10 @@
-import Actor from "./Actor.js";
 import { type Properties } from "../Properties.js";
+import { Actor } from "./index.js";
 
 /**
- *  A person is a member of the Project staff
+ * A person is a member of the Project staff
  */
-export default class Person extends Actor {
+export class Person extends Actor {
     constructor({ email, ...rest }: Omit<Properties<Person>, 'id'>) {
         super(rest);
 
diff --git a/server/domain/requirements/Product.ts b/server/domain/requirements/Product.ts
index 4400a1a3..21456b0b 100644
--- a/server/domain/requirements/Product.ts
+++ b/server/domain/requirements/Product.ts
@@ -1,6 +1,6 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * Artifact needed or produced by a task
  */
-export default class Product extends Requirement { }
\ No newline at end of file
+export class Product extends Requirement { }
\ No newline at end of file
diff --git a/server/domain/requirements/Requirement.ts b/server/domain/requirements/Requirement.ts
index 4393c8ec..77c0c5fa 100644
--- a/server/domain/requirements/Requirement.ts
+++ b/server/domain/requirements/Requirement.ts
@@ -5,7 +5,7 @@ import Solution from '../application/Solution.js';
 /**
  * A Requirement is a statement that specifies a property.
  */
-export default abstract class Requirement {
+export abstract class Requirement {
     constructor({ name, statement, solution }: Omit<Properties<Requirement>, 'id'>) {
         this.id = uuidv7();
         this.name = name
diff --git a/server/domain/requirements/Responsibility.ts b/server/domain/requirements/Responsibility.ts
index a8e9ce8a..c10e39ef 100644
--- a/server/domain/requirements/Responsibility.ts
+++ b/server/domain/requirements/Responsibility.ts
@@ -1,6 +1,6 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * Assignment of behavior or task to a component
  */
-export default class Responsibility extends Requirement { }
+export class Responsibility extends Requirement { }
diff --git a/server/domain/requirements/Role.ts b/server/domain/requirements/Role.ts
index 1136a9ba..d0215f84 100644
--- a/server/domain/requirements/Role.ts
+++ b/server/domain/requirements/Role.ts
@@ -1,6 +1,6 @@
-import Responsibility from "./Responsibility.js";
+import { Responsibility } from "./index.js";
 
 /**
  * Human responsibility
  */
-export default class Role extends Responsibility { }
+export class Role extends Responsibility { }
diff --git a/server/domain/requirements/Scenario.ts b/server/domain/requirements/Scenario.ts
index 2a4e7615..1b36fcdb 100644
--- a/server/domain/requirements/Scenario.ts
+++ b/server/domain/requirements/Scenario.ts
@@ -1,12 +1,11 @@
-import Example from "./Example.js";
 import { type Properties } from "../Properties.js";
-import Stakeholder from "./Stakeholder.js";
+import { Example, Stakeholder } from "./index.js";
 
 /**
  * A Scenario specifies system behavior by describing paths
  * of interaction between actors and the system.
  */
-export default abstract class Scenario extends Example {
+export abstract class Scenario extends Example {
     constructor({ primaryActor, ...rest }: Omit<Properties<Scenario>, 'id'>) {
         super(rest);
         this.primaryActor = primaryActor;
diff --git a/server/domain/requirements/Silence.ts b/server/domain/requirements/Silence.ts
index 1998dedc..5d8b426e 100644
--- a/server/domain/requirements/Silence.ts
+++ b/server/domain/requirements/Silence.ts
@@ -1,6 +1,6 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * Propery that is not in requirements but should be
  */
-export default class Silence extends Requirement { }
+export class Silence extends Requirement { }
diff --git a/server/domain/requirements/Stakeholder.ts b/server/domain/requirements/Stakeholder.ts
index 001f1aa2..8d84b687 100644
--- a/server/domain/requirements/Stakeholder.ts
+++ b/server/domain/requirements/Stakeholder.ts
@@ -1,12 +1,10 @@
-import Component from "./Component.js";
 import type { Properties } from "../Properties.js";
-import StakeholderCategory from "./StakeholderCategory.js";
-import StakeholderSegmentation from "./StakeholderSegmentation.js";
+import { Component, StakeholderCategory, StakeholderSegmentation } from "./index.js";
 
 /**
  * A human actor who may affect or be affected by a project or its associated system
  */
-export default class Stakeholder extends Component {
+export class Stakeholder extends Component {
     constructor({ influence, availability, segmentation, category, parentComponent, ...rest }: Omit<Properties<Stakeholder>, 'id'>) {
         super(rest)
 
diff --git a/server/domain/requirements/StakeholderCategory.ts b/server/domain/requirements/StakeholderCategory.ts
index 30f23d74..09e9494c 100644
--- a/server/domain/requirements/StakeholderCategory.ts
+++ b/server/domain/requirements/StakeholderCategory.ts
@@ -1,8 +1,6 @@
-enum StakeholderCategory {
+export enum StakeholderCategory {
     KEY_STAKEHOLDER = 'Key Stakeholder',
     SHADOW_INFLUENCER = 'Shadow Influencer',
     FELLOW_TRAVELER = 'Fellow Traveler',
     OBSERVER = 'Observer'
-}
-
-export default StakeholderCategory
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/server/domain/requirements/StakeholderSegmentation.ts b/server/domain/requirements/StakeholderSegmentation.ts
index a281b883..298b197b 100644
--- a/server/domain/requirements/StakeholderSegmentation.ts
+++ b/server/domain/requirements/StakeholderSegmentation.ts
@@ -1,6 +1,4 @@
-enum StakeholderSegmentation {
+export enum StakeholderSegmentation {
     CLIENT = 'Client',
     VENDOR = 'Vendor'
-}
-
-export default StakeholderSegmentation
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/server/domain/requirements/SystemComponent.ts b/server/domain/requirements/SystemComponent.ts
index 2971f2bb..cb691dca 100644
--- a/server/domain/requirements/SystemComponent.ts
+++ b/server/domain/requirements/SystemComponent.ts
@@ -1,7 +1,7 @@
-import Component from "./Component.js"
 import { type Properties } from "../Properties.js";
+import { Component } from "./index.js"
 
-export default class SystemComponent extends Component {
+export class SystemComponent extends Component {
     constructor({ parentComponent, ...rest }: Omit<Properties<SystemComponent>, 'id'>) {
         super(rest)
         this.parentComponent = parentComponent
diff --git a/server/domain/requirements/Task.ts b/server/domain/requirements/Task.ts
index deeecb0c..c2ea83e0 100644
--- a/server/domain/requirements/Task.ts
+++ b/server/domain/requirements/Task.ts
@@ -1,6 +1,6 @@
-import Requirement from "./Requirement.js";
+import { Requirement } from "./index.js";
 
 /**
  * Activity included in the project
  */
-export default class Task extends Requirement { }
+export class Task extends Requirement { }
diff --git a/server/domain/requirements/TestCase.ts b/server/domain/requirements/TestCase.ts
index 418e5fd8..18838003 100644
--- a/server/domain/requirements/TestCase.ts
+++ b/server/domain/requirements/TestCase.ts
@@ -1,8 +1,8 @@
-import Example from "./Example.js";
+import { Example } from "./index.js";
 
 /**
  * A TestCase is a specification of the inputs, execution conditions,
  * testing procedure, and expected results that define a single test to
  * be executed to achieve a particular goal.,
  */
-export default class TestCase extends Example { }
\ No newline at end of file
+export class TestCase extends Example { }
\ No newline at end of file
diff --git a/server/domain/requirements/UseCase.ts b/server/domain/requirements/UseCase.ts
index b21e2f5a..5925734d 100644
--- a/server/domain/requirements/UseCase.ts
+++ b/server/domain/requirements/UseCase.ts
@@ -1,14 +1,12 @@
-import Scenario from "./Scenario.js";
 import { NIL as emptyUuid } from "uuid";
 import type { Properties } from "../Properties.js";
-import Assumption from "./Assumption.js";
-import Effect from "./Effect.js";
+import { Assumption, Effect, Scenario } from "./index.js";
 
 /**
  * A Use Case specifies the scenario of a complete
  * interaction of a user through a system.
  */
-export default class UseCase extends Scenario {
+export class UseCase extends Scenario {
     constructor(props: Omit<Properties<UseCase>, 'id'>) {
         super(props)
         this.scope = props.scope
diff --git a/server/domain/requirements/UserStory.ts b/server/domain/requirements/UserStory.ts
index 927bf6e1..2d0e1d9f 100644
--- a/server/domain/requirements/UserStory.ts
+++ b/server/domain/requirements/UserStory.ts
@@ -1,7 +1,5 @@
-import Scenario from "./Scenario.js";
 import type { Properties } from "../Properties.js";
-import FunctionalBehavior from "./FunctionalBehavior.js";
-import Outcome from "./Outcome.js";
+import { FunctionalBehavior, Outcome, Scenario } from "./index.js";
 
 /**
  * A User Story specifies the handling of a specific user need.
@@ -12,7 +10,7 @@ import Outcome from "./Outcome.js";
  * [behavior] - behaviorId (Functional Behavior)
  * [goal] - outcomeId
  */
-export default class UserStory extends Scenario {
+export class UserStory extends Scenario {
     constructor({ outcome, functionalBehavior, ...rest }: Omit<Properties<UserStory>, 'id'>) {
         super(rest);
         this.outcome = outcome;
diff --git a/server/domain/requirements/index.ts b/server/domain/requirements/index.ts
new file mode 100644
index 00000000..3c9a570c
--- /dev/null
+++ b/server/domain/requirements/index.ts
@@ -0,0 +1,38 @@
+export { Requirement } from './Requirement.js';
+export { Actor } from './Actor.js';
+export { Assumption } from './Assumption.js';
+export { Behavior } from './Behavior.js';
+export { Component } from './Component.js';
+export { Constraint } from './Constraint.js';
+export { ConstraintCategory } from './ConstraintCategory.js';
+export { Effect } from './Effect.js';
+export { EnvironmentComponent } from './EnvironmentComponent.js';
+export { Example } from './Example.js';
+export { Functionality } from './Functionality.js';
+export { FunctionalBehavior } from './FunctionalBehavior.js';
+export { GlossaryTerm } from './GlossaryTerm.js';
+export { Goal } from './Goal.js';
+export { Invariant } from './Invariant.js';
+export { Limit } from './Limit.js';
+export { MetaRequirement } from './MetaRequirement.js';
+export { Justification } from './Justification.js';
+export { MoscowPriority } from './MoscowPriority.js';
+export { Noise } from './Noise.js';
+export { Hint } from './Hint.js';
+export { NonFunctionalBehavior } from './NonFunctionalBehavior.js';
+export { Obstacle } from './Obstacle.js';
+export { Outcome } from './Outcome.js';
+export { Person } from './Person.js';
+export { Product } from './Product.js';
+export { Responsibility } from './Responsibility.js';
+export { Role } from './Role.js';
+export { Scenario } from './Scenario.js';
+export { Silence } from './Silence.js';
+export { Stakeholder } from './Stakeholder.js';
+export { StakeholderCategory } from './StakeholderCategory.js';
+export { StakeholderSegmentation } from './StakeholderSegmentation.js';
+export { SystemComponent } from './SystemComponent.js';
+export { Task } from './Task.js';
+export { TestCase } from './TestCase.js';
+export { UseCase } from './UseCase.js';
+export { UserStory } from './UserStory.js';
\ No newline at end of file