diff --git a/components/WorkboxDataView.vue b/components/WorkboxDataView.vue
index e7e5f865..1e131246 100644
--- a/components/WorkboxDataView.vue
+++ b/components/WorkboxDataView.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { Requirement } from '~/server/domain/requirements/Requirement';
-import type { ParsedRequirement } from '~/server/domain/requirements/ParsedRequirement';
+import type { Requirement } from '~/server/domain/Requirement.js';
+import type { ParsedRequirement } from '~/server/domain/ParsedRequirement.js';
 
 type RowType = { id: string; name: string; }
 
diff --git a/components/XDataTable.vue b/components/XDataTable.vue
index 75a2883b..02e55c91 100644
--- a/components/XDataTable.vue
+++ b/components/XDataTable.vue
@@ -2,7 +2,7 @@
 import type Dialog from 'primevue/dialog'
 import type DataTable from 'primevue/datatable'
 import { FilterMatchMode } from 'primevue/api';
-import camelCaseToTitle from '~/utils/camelCaseToTitle';
+import camelCaseToTitle from '~/utils/camelCaseToTitle.js';
 
 export type ViewFieldType = 'text' | 'textarea' | 'number' | 'date' | 'boolean' | 'hidden' | 'object'
 
diff --git a/middleware/org-solution-check.global.ts b/middleware/org-solution-check.global.ts
index 72791996..e83757be 100644
--- a/middleware/org-solution-check.global.ts
+++ b/middleware/org-solution-check.global.ts
@@ -3,23 +3,26 @@
  * Check if the organization exists. If not redirect to the home page.
  */
 export default defineNuxtRouteMiddleware(async (to, from) => {
-    if (to.params.organizationslug) {
+    // @ts-expect-error : For some reason the typed params are not being recognized
+    const { organizationslug, solutionslug } = to.params
+
+    if (organizationslug) {
         const organizations = await $fetch('/api/organizations', {
-            query: { slug: to.params.organizationslug }
+            query: { slug: organizationslug }
         })
 
         if (!(organizations ?? []).length) {
             return navigateTo('/')
-        } else if (to.params.solutionslug) {
+        } else if (solutionslug) {
             const solutions = await $fetch('/api/solutions', {
                 query: {
-                    organizationSlug: to.params.organizationslug,
-                    slug: to.params.solutionslug
+                    organizationSlug: organizationslug,
+                    slug: solutionslug
                 }
             })
 
             if (!(solutions ?? []).length)
-                return navigateTo(`/o/${to.params.organizationslug}`)
+                return navigateTo(`/o/${organizationslug}`)
         }
     }
 })
\ No newline at end of file
diff --git a/migrations/.snapshot-cathedral.json b/migrations/.snapshot-cathedral.json
index 4ebddd89..aba3c14c 100644
--- a/migrations/.snapshot-cathedral.json
+++ b/migrations/.snapshot-cathedral.json
@@ -17,13 +17,23 @@
         },
         "name": {
           "name": "name",
-          "type": "char(254)",
+          "type": "varchar(254)",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
           "length": 254,
-          "mappedType": "character"
+          "mappedType": "string"
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar(254)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 254,
+          "mappedType": "string"
         },
         "creation_date": {
           "name": "creation_date",
@@ -53,16 +63,6 @@
           "primary": false,
           "nullable": false,
           "mappedType": "boolean"
-        },
-        "email": {
-          "name": "email",
-          "type": "char(254)",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "length": 254,
-          "mappedType": "character"
         }
       },
       "name": "app_user",
@@ -94,24 +94,24 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "name": {
-          "name": "name",
-          "type": "varchar(100)",
+        "description": {
+          "name": "description",
+          "type": "varchar(255)",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
-          "length": 100,
+          "length": 255,
           "mappedType": "string"
         },
-        "description": {
-          "name": "description",
-          "type": "varchar(255)",
+        "name": {
+          "name": "name",
+          "type": "varchar(100)",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
-          "length": 255,
+          "length": 100,
           "mappedType": "string"
         },
         "slug": {
@@ -180,7 +180,6 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
-          "default": "'Organization Reader'",
           "enumItems": [
             "Organization Admin",
             "Organization Contributor",
@@ -245,15 +244,14 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "name": {
-          "name": "name",
-          "type": "varchar(100)",
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
-          "length": 100,
-          "mappedType": "string"
+          "mappedType": "uuid"
         },
         "description": {
           "name": "description",
@@ -265,24 +263,25 @@
           "length": 255,
           "mappedType": "string"
         },
-        "slug": {
-          "name": "slug",
-          "type": "varchar(255)",
+        "name": {
+          "name": "name",
+          "type": "varchar(100)",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
-          "length": 255,
+          "length": 100,
           "mappedType": "string"
         },
-        "organization_id": {
-          "name": "organization_id",
-          "type": "uuid",
+        "slug": {
+          "name": "slug",
+          "type": "varchar(255)",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
-          "mappedType": "uuid"
+          "length": 255,
+          "mappedType": "string"
         }
       },
       "name": "solution",
@@ -366,16 +365,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -396,6 +385,16 @@
           "nullable": false,
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
+        },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
         }
       },
       "name": "silence",
@@ -481,16 +480,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -511,6 +500,16 @@
           "nullable": false,
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
+        },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
         }
       },
       "name": "product",
@@ -596,16 +595,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -626,6 +615,16 @@
           "nullable": false,
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
+        },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
         }
       },
       "name": "parsed_requirement",
@@ -711,16 +710,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -742,24 +731,34 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
-        "follows_id": {
-          "name": "follows_id",
-          "type": "uuid",
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": true,
-          "mappedType": "uuid"
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
         },
         "email": {
           "name": "email",
-          "type": "varchar(255)",
+          "type": "varchar(254)",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": true,
-          "length": 255,
+          "length": 254,
           "mappedType": "string"
+        },
+        "follows_id": {
+          "name": "follows_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
         }
       },
       "name": "person",
@@ -858,16 +857,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -889,6 +878,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "follows_id": {
           "name": "follows_id",
           "type": "uuid",
@@ -995,16 +994,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -1026,6 +1015,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "follows_id": {
           "name": "follows_id",
           "type": "uuid",
@@ -1132,16 +1131,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -1163,6 +1152,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "priority": {
           "name": "priority",
           "type": "text",
@@ -1284,16 +1283,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -1314,6 +1303,16 @@
           "nullable": false,
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
+        },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
         }
       },
       "name": "noise",
@@ -1399,16 +1398,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -1430,6 +1419,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "follows_id": {
           "name": "follows_id",
           "type": "uuid",
@@ -1536,16 +1535,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -1567,6 +1556,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "follows_id": {
           "name": "follows_id",
           "type": "uuid",
@@ -1673,16 +1672,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -1704,6 +1693,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "follows_id": {
           "name": "follows_id",
           "type": "uuid",
@@ -1810,16 +1809,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -1840,6 +1829,16 @@
           "nullable": false,
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
+        },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
         }
       },
       "name": "hint",
@@ -1925,16 +1924,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -1956,8 +1945,18 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
-        "follows_id": {
-          "name": "follows_id",
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
+        "parent_component_id": {
+          "name": "parent_component_id",
           "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
@@ -1965,8 +1964,8 @@
           "nullable": true,
           "mappedType": "uuid"
         },
-        "parent_component_id": {
-          "name": "parent_component_id",
+        "follows_id": {
+          "name": "follows_id",
           "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
@@ -2015,29 +2014,29 @@
           "referencedTableName": "public.app_user",
           "updateRule": "cascade"
         },
-        "glossary_term_follows_id_foreign": {
-          "constraintName": "glossary_term_follows_id_foreign",
+        "glossary_term_parent_component_id_foreign": {
+          "constraintName": "glossary_term_parent_component_id_foreign",
           "columnNames": [
-            "follows_id"
+            "parent_component_id"
           ],
           "localTableName": "public.glossary_term",
           "referencedColumnNames": [
             "id"
           ],
-          "referencedTableName": "public.parsed_requirement",
+          "referencedTableName": "public.glossary_term",
           "deleteRule": "set null",
           "updateRule": "cascade"
         },
-        "glossary_term_parent_component_id_foreign": {
-          "constraintName": "glossary_term_parent_component_id_foreign",
+        "glossary_term_follows_id_foreign": {
+          "constraintName": "glossary_term_follows_id_foreign",
           "columnNames": [
-            "parent_component_id"
+            "follows_id"
           ],
           "localTableName": "public.glossary_term",
           "referencedColumnNames": [
             "id"
           ],
-          "referencedTableName": "public.glossary_term",
+          "referencedTableName": "public.parsed_requirement",
           "deleteRule": "set null",
           "updateRule": "cascade"
         }
@@ -2084,16 +2083,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -2115,6 +2104,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "priority": {
           "name": "priority",
           "type": "text",
@@ -2236,16 +2235,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -2267,8 +2256,18 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
-        "follows_id": {
-          "name": "follows_id",
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
+        "parent_component_id": {
+          "name": "parent_component_id",
           "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
@@ -2276,8 +2275,8 @@
           "nullable": true,
           "mappedType": "uuid"
         },
-        "parent_component_id": {
-          "name": "parent_component_id",
+        "follows_id": {
+          "name": "follows_id",
           "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
@@ -2326,29 +2325,29 @@
           "referencedTableName": "public.app_user",
           "updateRule": "cascade"
         },
-        "environment_component_follows_id_foreign": {
-          "constraintName": "environment_component_follows_id_foreign",
+        "environment_component_parent_component_id_foreign": {
+          "constraintName": "environment_component_parent_component_id_foreign",
           "columnNames": [
-            "follows_id"
+            "parent_component_id"
           ],
           "localTableName": "public.environment_component",
           "referencedColumnNames": [
             "id"
           ],
-          "referencedTableName": "public.parsed_requirement",
+          "referencedTableName": "public.environment_component",
           "deleteRule": "set null",
           "updateRule": "cascade"
         },
-        "environment_component_parent_component_id_foreign": {
-          "constraintName": "environment_component_parent_component_id_foreign",
+        "environment_component_follows_id_foreign": {
+          "constraintName": "environment_component_follows_id_foreign",
           "columnNames": [
-            "parent_component_id"
+            "follows_id"
           ],
           "localTableName": "public.environment_component",
           "referencedColumnNames": [
             "id"
           ],
-          "referencedTableName": "public.environment_component",
+          "referencedTableName": "public.parsed_requirement",
           "deleteRule": "set null",
           "updateRule": "cascade"
         }
@@ -2395,16 +2394,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -2426,6 +2415,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "follows_id": {
           "name": "follows_id",
           "type": "uuid",
@@ -2532,16 +2531,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -2563,14 +2552,15 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
-        "follows_id": {
-          "name": "follows_id",
-          "type": "uuid",
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": true,
-          "mappedType": "uuid"
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
         },
         "category": {
           "name": "category",
@@ -2585,6 +2575,15 @@
             "Engineering Decision"
           ],
           "mappedType": "enum"
+        },
+        "follows_id": {
+          "name": "follows_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
         }
       },
       "name": "constraint",
@@ -2683,16 +2682,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -2714,6 +2703,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "follows_id": {
           "name": "follows_id",
           "type": "uuid",
@@ -2820,16 +2819,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -2851,6 +2840,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "follows_id": {
           "name": "follows_id",
           "type": "uuid",
@@ -2860,23 +2859,14 @@
           "nullable": true,
           "mappedType": "uuid"
         },
-        "influence": {
-          "name": "influence",
-          "type": "int",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "mappedType": "integer"
-        },
-        "availability": {
-          "name": "availability",
-          "type": "int",
+        "parent_component_id": {
+          "name": "parent_component_id",
+          "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": false,
-          "mappedType": "integer"
+          "nullable": true,
+          "mappedType": "uuid"
         },
         "segmentation": {
           "name": "segmentation",
@@ -2906,14 +2896,23 @@
           ],
           "mappedType": "enum"
         },
-        "parent_component_id": {
-          "name": "parent_component_id",
-          "type": "uuid",
+        "availability": {
+          "name": "availability",
+          "type": "int",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": true,
-          "mappedType": "uuid"
+          "nullable": false,
+          "mappedType": "integer"
+        },
+        "influence": {
+          "name": "influence",
+          "type": "int",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "integer"
         }
       },
       "name": "stakeholder",
@@ -2930,7 +2929,20 @@
           "unique": true
         }
       ],
-      "checks": [],
+      "checks": [
+        {
+          "name": "stakeholder_availability_check",
+          "expression": "availability >= 0 AND availability <= 100",
+          "definition": "check ((availability >= 0 AND availability <= 100))",
+          "columnName": "availability"
+        },
+        {
+          "name": "stakeholder_influence_check",
+          "expression": "influence >= 0 AND influence <= 100",
+          "definition": "check ((influence >= 0 AND influence <= 100))",
+          "columnName": "influence"
+        }
+      ],
       "foreignKeys": {
         "stakeholder_solution_id_foreign": {
           "constraintName": "stakeholder_solution_id_foreign",
@@ -3025,16 +3037,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -3056,6 +3058,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "follows_id": {
           "name": "follows_id",
           "type": "uuid",
@@ -3184,16 +3196,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -3215,6 +3217,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "priority": {
           "name": "priority",
           "type": "text",
@@ -3461,16 +3473,6 @@
           "nullable": false,
           "mappedType": "uuid"
         },
-        "is_silence": {
-          "name": "is_silence",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "default": "false",
-          "mappedType": "boolean"
-        },
         "last_modified": {
           "name": "last_modified",
           "type": "timestamptz",
@@ -3492,6 +3494,16 @@
           "default": "'ac594919-50e3-438a-b9bc-efb8a8654243'",
           "mappedType": "uuid"
         },
+        "is_silence": {
+          "name": "is_silence",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
         "priority": {
           "name": "priority",
           "type": "text",
diff --git a/migrations/Migration20241002233803.ts b/migrations/Migration20241002233803.ts
new file mode 100644
index 00000000..8dc08baf
--- /dev/null
+++ b/migrations/Migration20241002233803.ts
@@ -0,0 +1,25 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20241002233803 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "app_user" alter column "name" type varchar(254) using ("name"::varchar(254));`);
+    this.addSql(`alter table "app_user" alter column "email" type varchar(254) using ("email"::varchar(254));`);
+
+    this.addSql(`alter table "person" alter column "email" type varchar(254) using ("email"::varchar(254));`);
+
+    this.addSql(`alter table "stakeholder" add constraint stakeholder_availability_check check(availability >= 0 AND availability <= 100);`);
+    this.addSql(`alter table "stakeholder" add constraint stakeholder_influence_check check(influence >= 0 AND influence <= 100);`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "app_user" alter column "name" type char(254) using ("name"::char(254));`);
+    this.addSql(`alter table "app_user" alter column "email" type char(254) using ("email"::char(254));`);
+
+    this.addSql(`alter table "person" alter column "email" type varchar(255) using ("email"::varchar(255));`);
+
+    this.addSql(`alter table "stakeholder" drop constraint stakeholder_availability_check;`);
+    this.addSql(`alter table "stakeholder" drop constraint stakeholder_influence_check;`);
+  }
+
+}
diff --git a/mikro-orm.config.ts b/mikro-orm.config.ts
index 35b0e5a4..46437e85 100644
--- a/mikro-orm.config.ts
+++ b/mikro-orm.config.ts
@@ -5,34 +5,12 @@ import dotenv from "dotenv";
 import { type Options, PostgreSqlDriver } from '@mikro-orm/postgresql';
 import { TsMorphMetadataProvider } from '@mikro-orm/reflection';
 import { Migrator } from '@mikro-orm/migrations';
-import AssumptionSchema from "./server/data/models/requirements/AssumptionSchema.js";
-import BehaviorSchema from "./server/data/models/requirements/BehaviorSchema.js";
-import ConstraintSchema from "./server/data/models/requirements/ConstraintSchema.js";
-import EffectSchema from "./server/data/models/requirements/EffectSchema.js";
-import EnvironmentComponentSchema from "./server/data/models/requirements/EnvironmentComponentSchema.js";
-import FunctionalBehaviorSchema from "./server/data/models/requirements/FunctionalBehaviorSchema.js";
-import GlossaryTermSchema from "./server/data/models/requirements/GlossaryTermSchema.js";
-import HintSchema from "./server/data/models/requirements/HintSchema.js";
-import InvariantSchema from "./server/data/models/requirements/InvariantSchema.js";
-import JustificationSchema from "./server/data/models/requirements/JustificationSchema.js";
-import LimitSchema from "./server/data/models/requirements/LimitSchema.js";
-import NonFunctionalBehaviorSchema from "./server/data/models/requirements/NonFunctionalBehaviorSchema.js";
-import ObstacleSchema from "./server/data/models/requirements/ObstacleSchema.js";
-import OutcomeSchema from "./server/data/models/requirements/OutcomeSchema.js";
-import ParsedRequirementSchema from "./server/data/models/requirements/ParsedRequirementSchema.js";
-import PersonSchema from "./server/data/models/requirements/PersonSchema.js";
-import ProductSchema from "./server/data/models/requirements/ProductSchema.js";
-import SolutionSchema from "./server/data/models/application/SolutionSchema.js";
-import StakeholderSchema from "./server/data/models/requirements/StakeholderSchema.js";
-import UseCaseSchema from "./server/data/models/requirements/UseCaseSchema.js";
-import UserStorySchema from "./server/data/models/requirements/UserStorySchema.js";
-import SilenceSchema from "./server/data/models/requirements/SilenceSchema.js";
-import SystemComponentSchema from "./server/data/models/requirements/SystemComponentSchema.js";
-import OrganizationSchema from "./server/data/models/application/OrganizationSchema.js";
-import AppUserOrganizationRoleSchema from "./server/data/models/application/AppUserOrganizationRoleSchema.js";
-import AppUserSchema from "./server/data/models/application/AppUserSchema.js";
-import MetaRequirementSchema from "./server/data/models/requirements/MetaRequirementSchema.js";
-import NoiseSchema from "./server/data/models/requirements/NoiseSchema.js";
+import {
+    AppUser, AppUserOrganizationRole, Assumption, Behavior, Constraint, Effect, EnvironmentComponent,
+    FunctionalBehavior, GlossaryTerm, Hint, Invariant, Justification, Limit, MetaRequirement, Noise,
+    NonFunctionalBehavior, Obstacle, Outcome, Organization, ParsedRequirement, Person, Product,
+    Requirement, Scenario, Silence, Solution, Stakeholder, SystemComponent, UseCase, UserStory
+} from "./server/domain/index.js";
 
 dotenv.config();
 const config: Options = {
@@ -45,18 +23,17 @@ const config: Options = {
     port: parseInt(process.env.POSTGRES_PORT!),
     // https://github.com/mikro-orm/mikro-orm/issues/303
     driverOptions: {
-        connection: {
-            ssl: true
-        }
+        connection: { ssl: true }
     },
     entities: [
-        AppUserSchema, AppUserOrganizationRoleSchema, AssumptionSchema, BehaviorSchema, ConstraintSchema,
-        EffectSchema, EnvironmentComponentSchema, FunctionalBehaviorSchema, GlossaryTermSchema,
-        HintSchema, InvariantSchema, JustificationSchema, LimitSchema, MetaRequirementSchema,
-        NoiseSchema, NonFunctionalBehaviorSchema, ObstacleSchema, OrganizationSchema, OutcomeSchema,
-        ParsedRequirementSchema, PersonSchema, ProductSchema, SilenceSchema, SolutionSchema, StakeholderSchema,
-        SystemComponentSchema, UseCaseSchema, UserStorySchema
+        AppUser, AppUserOrganizationRole, Assumption, Behavior, Constraint,
+        Effect, EnvironmentComponent, FunctionalBehavior, GlossaryTerm,
+        Hint, Invariant, Justification, Limit, MetaRequirement, Noise,
+        NonFunctionalBehavior, Obstacle, Organization, Outcome,
+        ParsedRequirement, Person, Product, Requirement, Scenario, Silence, Solution,
+        Stakeholder, SystemComponent, UseCase, UserStory
     ],
+    discovery: { disableDynamicFileAccess: true },
     seeder: {},
     forceUtcTimezone: true,
     metadataProvider: TsMorphMetadataProvider,
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 86930285..13f7119f 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -10,6 +10,9 @@ export default defineNuxtConfig({
             cert: './cert/localhost.crt'
         }
     },
+    experimental: {
+        typedPages: true
+    },
     sourcemap: process.env.NODE_ENV === 'development',
     css: [
         '~/assets/css/main.css',
@@ -46,7 +49,6 @@ export default defineNuxtConfig({
         "nuxt-primevue",
         "@vite-pwa/nuxt",
         "nuxt-security",
-        "nuxt-typed-router",
         "@sidebase/nuxt-auth"
     ],
     runtimeConfig: {
@@ -115,7 +117,16 @@ export default defineNuxtConfig({
     nitro: {
         esbuild: {
             options: {
-                target: 'esnext'
+                target: "esnext",
+                // https://github.com/vitejs/vite/issues/13736
+                tsconfigRaw: {
+                    compilerOptions: {
+                        experimentalDecorators: true,
+                        // @ts-expect-error: Is this even doing anything?
+                        emitDecoratorMetadata: true,
+                        declaration: true
+                    }
+                }
             }
         },
         experimental: {
@@ -138,16 +149,10 @@ export default defineNuxtConfig({
         }
         */
     },
-    primevue: {
-
-    },
-    pwa: {
-
-    },
+    primevue: {},
+    pwa: {},
     typescript: {
         typeCheck: true
     },
-    vite: {
-
-    }
+    vite: {}
 })
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 1e964625..6d116e29 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,6 @@
                 "nuxt": "^3.13.2",
                 "nuxt-primevue": "^3.0.0",
                 "nuxt-security": "^2.0.0",
-                "nuxt-typed-router": "^3.7.0",
                 "openai": "^4.67.0",
                 "pg": "^8.13.0",
                 "primeflex": "^3.3.1",
@@ -9907,18 +9906,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/is-unicode-supported": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz",
-            "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=18"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/is-weakref": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -10476,22 +10463,6 @@
             "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
             "license": "MIT"
         },
-        "node_modules/log-symbols": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-7.0.0.tgz",
-            "integrity": "sha512-zrc91EDk2M+2AXo/9BTvK91pqb7qrPg2nX/Hy+u8a5qQlbaOflCKO+6SqgZ+M+xUFxGdKTgwnGiL96b1W3ikRA==",
-            "license": "MIT",
-            "dependencies": {
-                "is-unicode-supported": "^2.0.0",
-                "yoctocolors": "^2.1.1"
-            },
-            "engines": {
-                "node": ">=18"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/logform": {
             "version": "2.6.1",
             "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.1.tgz",
@@ -11526,38 +11497,6 @@
                 "xss": "^1.0.14"
             }
         },
-        "node_modules/nuxt-typed-router": {
-            "version": "3.7.0",
-            "resolved": "https://registry.npmjs.org/nuxt-typed-router/-/nuxt-typed-router-3.7.0.tgz",
-            "integrity": "sha512-8JMOsChzdjIVtD0x8z5Rs2yawtlp6KMSei7gBVw9xj6prmaSWhBo+sBmVdVnHW+wH1JKgorPtn8Tia9QnnHujA==",
-            "license": "MIT",
-            "dependencies": {
-                "@nuxt/kit": "^3.13.2",
-                "chalk": "5.3.0",
-                "defu": "6.1.4",
-                "lodash-es": "4.17.21",
-                "log-symbols": "7.0.0",
-                "mkdirp": "3.0.1",
-                "nanoid": "5.0.7",
-                "pathe": "1.1.2",
-                "prettier": "3.3.3"
-            },
-            "peerDependencies": {
-                "prettier": "^2.5.x || 3.x"
-            }
-        },
-        "node_modules/nuxt-typed-router/node_modules/chalk": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-            "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-            "license": "MIT",
-            "engines": {
-                "node": "^12.17.0 || ^14.13 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
         "node_modules/nuxt/node_modules/@esbuild/linux-x64": {
             "version": "0.23.1",
             "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz",
@@ -13030,21 +12969,6 @@
                 "node": ">=6"
             }
         },
-        "node_modules/prettier": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
-            "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
-            "license": "MIT",
-            "bin": {
-                "prettier": "bin/prettier.cjs"
-            },
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/prettier/prettier?sponsor=1"
-            }
-        },
         "node_modules/pretty-bytes": {
             "version": "6.1.1",
             "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.1.1.tgz",
@@ -16972,18 +16896,6 @@
                 "node": ">=6"
             }
         },
-        "node_modules/yoctocolors": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.1.tgz",
-            "integrity": "sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=18"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/zhead": {
             "version": "2.2.4",
             "resolved": "https://registry.npmjs.org/zhead/-/zhead-2.2.4.tgz",
diff --git a/package.json b/package.json
index e864797d..1d2d9d18 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,6 @@
         "nuxt": "^3.13.2",
         "nuxt-primevue": "^3.0.0",
         "nuxt-security": "^2.0.0",
-        "nuxt-typed-router": "^3.7.0",
         "openai": "^4.67.0",
         "pg": "^8.13.0",
         "primeflex": "^3.3.1",
@@ -71,4 +70,4 @@
         "typescript": "^5.6.2",
         "vue-tsc": "^2.1.6"
     }
-}
\ No newline at end of file
+}
diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/assumptions.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/assumptions.client.vue
index 24000bba..d9d26c95 100644
--- a/pages/o/[organization-slug]/[solution-slug]/environment/assumptions.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/environment/assumptions.client.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useFetch } from 'nuxt/app';
-import { Assumption } from '~/server/domain/requirements/Assumption';
+import { Assumption } from '~/server/domain/Assumption.js';
 
 useHead({ title: 'Assumptions' })
 definePageMeta({ name: 'Assumptions' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/components.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/components.client.vue
index 23893eb3..c8385ba1 100644
--- a/pages/o/[organization-slug]/[solution-slug]/environment/components.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/environment/components.client.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { EnvironmentComponent } from '~/server/domain/requirements/EnvironmentComponent';
+import { EnvironmentComponent } from '~/server/domain/EnvironmentComponent.js';
 
 useHead({ title: 'Components' })
 definePageMeta({ name: 'Environment Components' })
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 f27f9e79..29ed8bdc 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 { Constraint } from '~/server/domain/requirements/Constraint';
-import { ConstraintCategory } from '~/server/domain/requirements/ConstraintCategory';
+import { Constraint } from '~/server/domain/Constraint.js';
+import { ConstraintCategory } from '~/server/domain/ConstraintCategory.js';
 
 useHead({ title: 'Constraints' })
 definePageMeta({ name: 'Constraints' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/effects.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/effects.client.vue
index ebf05ad5..8778f849 100644
--- a/pages/o/[organization-slug]/[solution-slug]/environment/effects.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/environment/effects.client.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { Effect } from '~/server/domain/requirements/Effect';
+import { Effect } from '~/server/domain/Effect.js';
 
 useHead({ title: 'Effects' })
 definePageMeta({ name: 'Effects' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/glossary.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/glossary.client.vue
index f0fc17c6..8ed04911 100644
--- a/pages/o/[organization-slug]/[solution-slug]/environment/glossary.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/environment/glossary.client.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { GlossaryTerm } from '~/server/domain/requirements/GlossaryTerm';
+import { GlossaryTerm } from '~/server/domain/GlossaryTerm.js';
 
 useHead({ title: 'Glossary' })
 definePageMeta({ name: 'Glossary' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/index.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/index.client.vue
index 010015e4..17f735ef 100644
--- a/pages/o/[organization-slug]/[solution-slug]/environment/index.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/environment/index.client.vue
@@ -1,18 +1,16 @@
 <script lang="ts" setup>
-import type { RoutesNamesList } from '#build/typed-router/__routes';
-
 useHead({ title: 'Environment' })
 definePageMeta({ name: 'Environment' })
 
 const { solutionslug, organizationslug } = useRoute('Environment').params
 
-const links: { name: RoutesNamesList, icon: string, label: string }[] = [
-    { name: 'Assumptions', icon: 'pi-sun', label: 'Assumptions' },
-    { name: 'Environment Components', icon: 'pi-th-large', label: 'Components' },
-    { name: 'Constraints', icon: 'pi-link', label: 'Constraints' },
-    { name: 'Effects', icon: 'pi-bolt', label: 'Effects' },
-    { name: 'Glossary', icon: 'pi-book', label: 'Glossary' },
-    { name: 'Invariants', icon: 'pi-lock', label: 'Invariants' }
+const links = [
+    { name: 'Assumptions' as const, icon: 'pi-sun', label: 'Assumptions' },
+    { name: 'Environment Components' as const, icon: 'pi-th-large', label: 'Components' },
+    { name: 'Constraints' as const, icon: 'pi-link', label: 'Constraints' },
+    { name: 'Effects' as const, icon: 'pi-bolt', label: 'Effects' },
+    { name: 'Glossary' as const, icon: 'pi-book', label: 'Glossary' },
+    { name: 'Invariants' as const, icon: 'pi-lock', label: 'Invariants' }
 ]
 </script>
 
diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/invariants.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/invariants.client.vue
index cd2c914a..a98d2405 100644
--- a/pages/o/[organization-slug]/[solution-slug]/environment/invariants.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/environment/invariants.client.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { Invariant } from '~/server/domain/requirements/Invariant';
+import { Invariant } from '~/server/domain/Invariant.js';
 
 useHead({ title: 'Invariants' })
 definePageMeta({ name: 'Invariants' })
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 6aa96a6c..dd07e027 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 { FunctionalBehavior } from '~/server/domain/requirements/FunctionalBehavior';
-import { MoscowPriority } from '~/server/domain/requirements/MoscowPriority';
+import { FunctionalBehavior } from '~/server/domain/FunctionalBehavior.js';
+import { MoscowPriority } from '~/server/domain/MoscowPriority.js';
 
 useHead({ title: 'Functionality' })
 definePageMeta({ name: 'Goals Functionality' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/index.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/index.client.vue
index a001ffc5..e48413ff 100644
--- a/pages/o/[organization-slug]/[solution-slug]/goals/index.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/goals/index.client.vue
@@ -1,19 +1,17 @@
 <script lang="ts" setup>
-import type { RoutesNamesList } from '#build/typed-router/__routes';
-
 useHead({ title: 'Goals' })
 definePageMeta({ name: 'Goals' })
 
 const { solutionslug, organizationslug } = useRoute('Goals').params
 
-const links: { name: RoutesNamesList, icon: string, label: string }[] = [
-    { name: 'Rationale', icon: 'pi-book', label: 'Rationale' },
-    { name: 'Outcomes', icon: 'pi-check-circle', label: 'Outcomes' },
-    { name: 'Stakeholders', icon: 'pi-users', label: 'Stakeholders' },
-    { name: 'Goal Scenarios', icon: 'pi-briefcase', label: 'Scenarios' },
-    { name: 'Goals Functionality', icon: 'pi-cog', label: 'Functionality' },
-    { name: 'Obstacles', icon: ' pi-exclamation-triangle', label: 'Obstacles' },
-    { name: 'Limitations', icon: 'pi-exclamation-circle', label: 'Limitations' }
+const links = [
+    { name: 'Rationale' as const, icon: 'pi-book', label: 'Rationale' },
+    { name: 'Outcomes' as const, icon: 'pi-check-circle', label: 'Outcomes' },
+    { name: 'Stakeholders' as const, icon: 'pi-users', label: 'Stakeholders' },
+    { name: 'Goal Scenarios' as const, icon: 'pi-briefcase', label: 'Scenarios' },
+    { name: 'Goals Functionality' as const, icon: 'pi-cog', label: 'Functionality' },
+    { name: 'Obstacles' as const, icon: ' pi-exclamation-triangle', label: 'Obstacles' },
+    { name: 'Limitations' as const, icon: 'pi-exclamation-circle', label: 'Limitations' }
 ]
 </script>
 
diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/limitations.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/limitations.client.vue
index 54125148..c5c6a1c8 100644
--- a/pages/o/[organization-slug]/[solution-slug]/goals/limitations.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/goals/limitations.client.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { Limit } from '~/server/domain/requirements/Limit';
+import { Limit } from '~/server/domain/Limit.js';
 
 useHead({ title: 'Limitations' })
 definePageMeta({ name: 'Limitations' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/obstacles.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/obstacles.client.vue
index 34684429..4fd61af6 100644
--- a/pages/o/[organization-slug]/[solution-slug]/goals/obstacles.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/goals/obstacles.client.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { Obstacle } from '~/server/domain/requirements/Obstacle';
+import { Obstacle } from '~/server/domain/Obstacle.js';
 
 useHead({ title: 'Obstacles' })
 definePageMeta({ name: 'Obstacles' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/outcomes.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/outcomes.client.vue
index 6048794b..b94c2510 100644
--- a/pages/o/[organization-slug]/[solution-slug]/goals/outcomes.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/goals/outcomes.client.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { Outcome } from '~/server/domain/requirements/Outcome';
+import { Outcome } from '~/server/domain/Outcome.js';
 
 useHead({ title: 'Outcomes' })
 definePageMeta({ name: 'Outcomes' })
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 21af94af..6c11ee4b 100644
--- a/pages/o/[organization-slug]/[solution-slug]/goals/scenarios.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/goals/scenarios.client.vue
@@ -1,15 +1,15 @@
 <script lang="ts" setup>
-import { FunctionalBehavior } from '~/server/domain/requirements/FunctionalBehavior'
-import { MoscowPriority } from '~/server/domain/requirements/MoscowPriority'
-import { Outcome } from '~/server/domain/requirements/Outcome'
-import { Stakeholder } from '~/server/domain/requirements/Stakeholder'
-import { UserStory } from '~/server/domain/requirements/UserStory';
+import { FunctionalBehavior } from '~/server/domain/FunctionalBehavior.js'
+import { MoscowPriority } from '~/server/domain/MoscowPriority.js'
+import { Outcome } from '~/server/domain/Outcome.js'
+import { Stakeholder } from '~/server/domain/Stakeholder.js'
+import { UserStory } from '~/server/domain/UserStory.js';
 
 useHead({ title: 'Scenarios' })
 definePageMeta({ name: 'Goal Scenarios' })
 
 const { $eventBus } = useNuxtApp(),
-    { solutionslug, organizationslug } = useRoute('Scenarios').params as { solutionslug: string, organizationslug: string },
+    { solutionslug, organizationslug } = useRoute('Scenarios').params,
     { data: solutions, error: getSolutionError } = await useFetch(`/api/solutions`, {
         query: {
             slug: solutionslug,
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 8f76c943..4333224b 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,8 @@
 <script lang="ts" setup>
 import mermaid from 'mermaid';
-import { Stakeholder } from '~/server/domain/requirements/Stakeholder';
-import { StakeholderCategory } from '~/server/domain/requirements/StakeholderCategory';
-import { StakeholderSegmentation } from '~/server/domain/requirements/StakeholderSegmentation';
+import { Stakeholder } from '~/server/domain/Stakeholder.js';
+import { StakeholderCategory } from '~/server/domain/StakeholderCategory.js';
+import { StakeholderSegmentation } from '~/server/domain/StakeholderSegmentation.js';
 
 useHead({ title: 'Stakeholders' })
 definePageMeta({ name: 'Stakeholders' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/index.client.vue b/pages/o/[organization-slug]/[solution-slug]/index.client.vue
index ce496664..23637ce0 100644
--- a/pages/o/[organization-slug]/[solution-slug]/index.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/index.client.vue
@@ -1,11 +1,9 @@
 <script lang="ts" setup>
-import type { RoutesNamesList } from '#build/typed-router/__routes';
-
 useHead({ title: 'Solution' })
 definePageMeta({ name: 'Solution' })
 
 const { $eventBus } = useNuxtApp(),
-    { solutionslug, organizationslug } = useRoute('Solution').params as { solutionslug: string, organizationslug: string },
+    { solutionslug, organizationslug } = useRoute('Solution').params,
     router = useRouter(),
     { data: solutions, error: solutionError } = await useFetch('/api/solutions', {
         query: {
@@ -23,11 +21,11 @@ const rawRequirement = ref(''),
 if (solutionError.value)
     $eventBus.$emit('page-error', solutionError.value)
 
-const links: { name: RoutesNamesList, icon: string, label: string }[] = [
-    { name: 'Project', icon: 'pi-box', label: 'Project' },
-    { name: 'Environment', icon: 'pi-cloud', label: 'Environment' },
-    { name: 'Goals', icon: 'pi-bullseye', label: 'Goals' },
-    { name: 'System', icon: 'pi-sitemap', label: 'System' }
+const links = [
+    { name: 'Project' as const, icon: 'pi-box', label: 'Project' },
+    { name: 'Environment' as const, icon: 'pi-cloud', label: 'Environment' },
+    { name: 'Goals' as const, icon: 'pi-bullseye', label: 'Goals' },
+    { name: 'System' as const, icon: 'pi-sitemap', label: 'System' }
 ]
 
 const handleSolutionDelete = async () => {
diff --git a/pages/o/[organization-slug]/[solution-slug]/project/index.client.vue b/pages/o/[organization-slug]/[solution-slug]/project/index.client.vue
index bbdb67fa..67e11512 100644
--- a/pages/o/[organization-slug]/[solution-slug]/project/index.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/project/index.client.vue
@@ -1,12 +1,10 @@
 <script lang="ts" setup>
-import type { RoutesNamesList } from '#build/typed-router/__routes';
-
 useHead({ title: 'Project' })
 definePageMeta({ name: 'Project' })
 
 const { solutionslug, organizationslug } = useRoute('Project').params,
-    links: { name: RoutesNamesList, icon: string, label: string }[] = [
-        { name: 'Roles & Personnel', icon: 'pi-users', label: 'Roles & Personnel' }
+    links = [
+        { name: 'Roles & Personnel' as const, icon: 'pi-users', label: 'Roles & Personnel' }
     ]
 </script>
 <template>
diff --git a/pages/o/[organization-slug]/[solution-slug]/project/roles-personnel.client.vue b/pages/o/[organization-slug]/[solution-slug]/project/roles-personnel.client.vue
index 7ae59d94..f768e31f 100644
--- a/pages/o/[organization-slug]/[solution-slug]/project/roles-personnel.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/project/roles-personnel.client.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { Person } from '~/server/domain/requirements/Person';
+import { Person } from '~/server/domain/Person.js';
 
 useHead({ title: 'Roles & Personnel' })
 definePageMeta({ name: 'Roles & Personnel' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/system/components.client.vue b/pages/o/[organization-slug]/[solution-slug]/system/components.client.vue
index 8009a0ea..f3130e42 100644
--- a/pages/o/[organization-slug]/[solution-slug]/system/components.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/system/components.client.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { SystemComponent } from '~/server/domain/requirements/SystemComponent';
+import { SystemComponent } from '~/server/domain/SystemComponent.js';
 
 useHead({ title: 'Components' })
 definePageMeta({ name: 'System Components' })
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 d90687f3..182bf0ee 100644
--- a/pages/o/[organization-slug]/[solution-slug]/system/functionality.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/system/functionality.client.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import { FunctionalBehavior } from '~/server/domain/requirements/FunctionalBehavior';
-import { NonFunctionalBehavior } from '~/server/domain/requirements/NonFunctionalBehavior';
-import { SystemComponent } from '~/server/domain/requirements/SystemComponent';
+import { FunctionalBehavior } from '~/server/domain/FunctionalBehavior.js';
+import { NonFunctionalBehavior } from '~/server/domain/NonFunctionalBehavior.js';
+import { SystemComponent } from '~/server/domain/SystemComponent.js';
 
 useHead({ title: 'Functionality' })
 definePageMeta({ name: 'Functionality' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/system/index.client.vue b/pages/o/[organization-slug]/[solution-slug]/system/index.client.vue
index e5109d2f..415c13d4 100644
--- a/pages/o/[organization-slug]/[solution-slug]/system/index.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/system/index.client.vue
@@ -1,15 +1,13 @@
 <script lang="ts" setup>
-import type { RoutesNamesList } from '#build/typed-router/__routes';
-
 useHead({ title: 'System' })
 definePageMeta({ name: 'System' })
 
 const { solutionslug, organizationslug } = useRoute('System').params
 
-const links: { name: RoutesNamesList, icon: string, label: string }[] = [
-    { name: 'System Components', icon: 'pi-sitemap', label: 'Components' },
-    { name: 'Scenarios', icon: 'pi-list', label: 'Scenarios' },
-    { name: 'Functionality', icon: 'pi-bolt', label: 'Functionality' }
+const links = [
+    { name: 'System Components' as const, icon: 'pi-sitemap', label: 'Components' },
+    { name: 'Scenarios' as const, icon: 'pi-list', label: 'Scenarios' },
+    { name: 'Functionality' as const, icon: 'pi-bolt', label: 'Functionality' }
 ]
 </script>
 
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 c969da7f..09dd0b8a 100644
--- a/pages/o/[organization-slug]/[solution-slug]/system/scenarios.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/system/scenarios.client.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup>
-import { Assumption } from '~/server/domain/requirements/Assumption';
-import { Effect } from '~/server/domain/requirements/Effect';
-import { FunctionalBehavior } from '~/server/domain/requirements/FunctionalBehavior';
-import { MoscowPriority } from '~/server/domain/requirements/MoscowPriority';
-import { Outcome } from '~/server/domain/requirements/Outcome';
-import { Stakeholder } from '~/server/domain/requirements/Stakeholder';
-import { UseCase } from '~/server/domain/requirements/UseCase';
-import { UserStory } from '~/server/domain/requirements/UserStory';
+import { Assumption } from '~/server/domain/Assumption.js';
+import { Effect } from '~/server/domain/Effect.js';
+import { FunctionalBehavior } from '~/server/domain/FunctionalBehavior.js';
+import { MoscowPriority } from '~/server/domain/MoscowPriority.js';
+import { Outcome } from '~/server/domain/Outcome.js';
+import { Stakeholder } from '~/server/domain/Stakeholder.js';
+import { UseCase } from '~/server/domain/UseCase.js';
+import { UserStory } from '~/server/domain/UserStory.js';
 
 useHead({ title: 'Scenarios' })
 definePageMeta({ name: 'Scenarios' })
diff --git a/pages/o/[organization-slug]/[solution-slug]/workbox.client.vue b/pages/o/[organization-slug]/[solution-slug]/workbox.client.vue
index 67436597..5c88131c 100644
--- a/pages/o/[organization-slug]/[solution-slug]/workbox.client.vue
+++ b/pages/o/[organization-slug]/[solution-slug]/workbox.client.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
-import type { ParsedRequirement } from '~/server/domain/requirements';
+import type { ParsedRequirement } from '~/server/domain/index.js';
 
 useHead({ title: 'Workbox' });
 definePageMeta({ name: 'Workbox' });
 
 const { $eventBus } = useNuxtApp(),
-    { solutionslug, organizationslug } = useRoute('Workbox').params as { solutionslug: string, organizationslug: string },
+    { solutionslug, organizationslug } = useRoute('Workbox').params,
     { data: solutions, error: solutionError } = await useFetch('/api/solutions', {
         query: {
             organizationSlug: organizationslug,
diff --git a/pages/o/[organization-slug]/users.vue b/pages/o/[organization-slug]/users.vue
index 6d3a43f4..0252175a 100644
--- a/pages/o/[organization-slug]/users.vue
+++ b/pages/o/[organization-slug]/users.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { AppUser } from '~/server/domain/application/AppUser'
-import { AppRole } from '~/server/domain/application/AppRole'
+import { AppUser } from '~/server/domain/AppUser.js'
+import { AppRole } from '~/server/domain/AppRole.js'
 
 useHead({ title: 'Users' })
 definePageMeta({ name: 'Organization Users' })
diff --git a/seeders/AppUserSeeder.ts b/seeders/AppUserSeeder.ts
index 704a858b..b874cbeb 100644
--- a/seeders/AppUserSeeder.ts
+++ b/seeders/AppUserSeeder.ts
@@ -1,6 +1,6 @@
 import type { EntityManager } from '@mikro-orm/core';
 import { Seeder } from '@mikro-orm/seeder';
-import { AppUser } from '../server/domain/application/index.js';
+import { AppUser } from '../server/domain/index.js';
 
 export class AppUserSeeder extends Seeder {
 
diff --git a/server/api/appusers/[id].delete.ts b/server/api/appusers/[id].delete.ts
index e66a2d63..fd7c50b9 100644
--- a/server/api/appusers/[id].delete.ts
+++ b/server/api/appusers/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { AppRole, AppUserOrganizationRole } from "~/server/domain/application/index"
+import { fork } from "~/server/data/orm.js"
+import { AppRole, AppUserOrganizationRole } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/appusers/[id].get.ts b/server/api/appusers/[id].get.ts
index 726959ae..f6583598 100644
--- a/server/api/appusers/[id].get.ts
+++ b/server/api/appusers/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { AppUserOrganizationRole } from "~/server/domain/application/index"
+import { fork } from "~/server/data/orm.js"
+import { AppUser, AppUserOrganizationRole } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
@@ -33,5 +33,5 @@ export default defineEventHandler(async (event) => {
     return {
         ...appUserRole.appUser,
         role: appUserRole.role
-    }
+    } as AppUser
 })
\ No newline at end of file
diff --git a/server/api/appusers/[id].put.ts b/server/api/appusers/[id].put.ts
index cac6b57d..50e4f3d4 100644
--- a/server/api/appusers/[id].put.ts
+++ b/server/api/appusers/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { AppRole, AppUserOrganizationRole } from "~/server/domain/application/index"
+import { fork } from "~/server/data/orm.js"
+import { AppRole, AppUserOrganizationRole } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/appusers/index.get.ts b/server/api/appusers/index.get.ts
index be97544f..4167ec5d 100644
--- a/server/api/appusers/index.get.ts
+++ b/server/api/appusers/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { AppUser, AppUserOrganizationRole } from "~/server/domain/application/index"
+import { fork } from "~/server/data/orm.js"
+import { AppUser, AppUserOrganizationRole } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     organizationId: z.string().uuid(),
diff --git a/server/api/appusers/index.post.ts b/server/api/appusers/index.post.ts
index 434c2920..9b9082d8 100644
--- a/server/api/appusers/index.post.ts
+++ b/server/api/appusers/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { AppRole, AppUser, AppUserOrganizationRole } from "~/server/domain/application/index"
+import { fork } from "~/server/data/orm.js"
+import { AppRole, AppUser, AppUserOrganizationRole } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     email: z.string(),
diff --git a/server/api/assumptions/[id].delete.ts b/server/api/assumptions/[id].delete.ts
index 3351a66a..55916b92 100644
--- a/server/api/assumptions/[id].delete.ts
+++ b/server/api/assumptions/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Assumption } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Assumption } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/assumptions/[id].get.ts b/server/api/assumptions/[id].get.ts
index 46aba362..c45cc1a3 100644
--- a/server/api/assumptions/[id].get.ts
+++ b/server/api/assumptions/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Assumption } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Assumption } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/assumptions/[id].put.ts b/server/api/assumptions/[id].put.ts
index 9a6bc573..b618aaaa 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 { fork } from "~/server/data/orm.js"
 import { z } from "zod"
-import { Assumption } from "~/server/domain/requirements/index.js"
+import { Assumption } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/assumptions/index.get.ts b/server/api/assumptions/index.get.ts
index e5722825..25f7e5cf 100644
--- a/server/api/assumptions/index.get.ts
+++ b/server/api/assumptions/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { Assumption } from "~/server/domain/requirements/index.js"
-import { fork } from "~/server/data/orm"
+import { Assumption } from "~/server/domain/index.js"
+import { fork } from "~/server/data/orm.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/assumptions/index.post.ts b/server/api/assumptions/index.post.ts
index d5cb1f0c..f5db8036 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 { fork } from "~/server/data/orm.js"
 import { z } from "zod"
-import { Assumption } from "~/server/domain/requirements/index.js"
+import { Assumption } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/auth/[...].ts b/server/api/auth/[...].ts
index a1487a8f..cec6546f 100644
--- a/server/api/auth/[...].ts
+++ b/server/api/auth/[...].ts
@@ -1,7 +1,7 @@
 import { NuxtAuthHandler } from '#auth'
 import AzureADB2CProvider, { type AzureB2CProfile } from "next-auth/providers/azure-ad-b2c";
-import { fork } from '~/server/data/orm'
-import { AppUser } from '~/server/domain/application/index';
+import { fork } from '~/server/data/orm.js'
+import { AppUser } from '~/server/domain/index.js';
 
 const config = useRuntimeConfig()
 
diff --git a/server/api/constraints/[id].delete.ts b/server/api/constraints/[id].delete.ts
index 66cf42a9..1a5d61c7 100644
--- a/server/api/constraints/[id].delete.ts
+++ b/server/api/constraints/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Constraint } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Constraint } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/constraints/[id].get.ts b/server/api/constraints/[id].get.ts
index de3f6378..c006376d 100644
--- a/server/api/constraints/[id].get.ts
+++ b/server/api/constraints/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Constraint } from "~/server/domain/requirements/Constraint.js"
+import { fork } from "~/server/data/orm.js"
+import { Constraint } from "~/server/domain/Constraint.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/constraints/[id].put.ts b/server/api/constraints/[id].put.ts
index fb2f19d9..fe8a480b 100644
--- a/server/api/constraints/[id].put.ts
+++ b/server/api/constraints/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { Constraint, ConstraintCategory } from "~/server/domain/requirements/index.js"
-import { fork } from "~/server/data/orm"
+import { Constraint, ConstraintCategory } from "~/server/domain/index.js"
+import { fork } from "~/server/data/orm.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/constraints/index.get.ts b/server/api/constraints/index.get.ts
index 44280d00..712b7bc6 100644
--- a/server/api/constraints/index.get.ts
+++ b/server/api/constraints/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Constraint, ConstraintCategory } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Constraint, ConstraintCategory } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/constraints/index.post.ts b/server/api/constraints/index.post.ts
index 32eda4be..7adbcfff 100644
--- a/server/api/constraints/index.post.ts
+++ b/server/api/constraints/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Constraint, ConstraintCategory } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Constraint, ConstraintCategory } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/effects/[id].delete.ts b/server/api/effects/[id].delete.ts
index bebb23f6..ac88e69d 100644
--- a/server/api/effects/[id].delete.ts
+++ b/server/api/effects/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Effect } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Effect } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/effects/[id].get.ts b/server/api/effects/[id].get.ts
index 8ee8992b..81889d76 100644
--- a/server/api/effects/[id].get.ts
+++ b/server/api/effects/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Effect } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Effect } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/effects/[id].put.ts b/server/api/effects/[id].put.ts
index c2e57378..140ccd20 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 { fork } from "~/server/data/orm.js"
 import { z } from "zod"
-import { Effect } from "~/server/domain/requirements/index.js"
+import { Effect } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/effects/index.get.ts b/server/api/effects/index.get.ts
index 80b66977..1d952bbe 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Effect } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/effects/index.post.ts b/server/api/effects/index.post.ts
index 524fe3f7..7ccd336d 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 { fork } from "~/server/data/orm.js"
 import { z } from "zod"
-import { Effect } from "~/server/domain/requirements/index.js"
+import { Effect } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/environment-components/[id].delete.ts b/server/api/environment-components/[id].delete.ts
index cd712706..5a684078 100644
--- a/server/api/environment-components/[id].delete.ts
+++ b/server/api/environment-components/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { EnvironmentComponent } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { EnvironmentComponent } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/environment-components/[id].get.ts b/server/api/environment-components/[id].get.ts
index c274eada..52ec045b 100644
--- a/server/api/environment-components/[id].get.ts
+++ b/server/api/environment-components/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { EnvironmentComponent } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { EnvironmentComponent } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/environment-components/[id].put.ts b/server/api/environment-components/[id].put.ts
index c3a207ea..6b7d4f48 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { EnvironmentComponent } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/environment-components/index.get.ts b/server/api/environment-components/index.get.ts
index 480d046b..56b8e2e1 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { EnvironmentComponent } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/environment-components/index.post.ts b/server/api/environment-components/index.post.ts
index 6201ed7b..3cc5458c 100644
--- a/server/api/environment-components/index.post.ts
+++ b/server/api/environment-components/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { EnvironmentComponent } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { EnvironmentComponent } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/functional-behaviors/[id].delete.ts b/server/api/functional-behaviors/[id].delete.ts
index 60417250..defebdb8 100644
--- a/server/api/functional-behaviors/[id].delete.ts
+++ b/server/api/functional-behaviors/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { FunctionalBehavior } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { FunctionalBehavior } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/functional-behaviors/[id].get.ts b/server/api/functional-behaviors/[id].get.ts
index edbeeb1b..80e5b188 100644
--- a/server/api/functional-behaviors/[id].get.ts
+++ b/server/api/functional-behaviors/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { FunctionalBehavior } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { FunctionalBehavior } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/functional-behaviors/[id].put.ts b/server/api/functional-behaviors/[id].put.ts
index d7bac075..c0901ed0 100644
--- a/server/api/functional-behaviors/[id].put.ts
+++ b/server/api/functional-behaviors/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { FunctionalBehavior, MoscowPriority } from "~/server/domain/requirements/index.js"
-import { fork } from "~/server/data/orm"
+import { FunctionalBehavior, MoscowPriority } from "~/server/domain/index.js"
+import { fork } from "~/server/data/orm.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/functional-behaviors/index.get.ts b/server/api/functional-behaviors/index.get.ts
index 94917bb7..0dd9f648 100644
--- a/server/api/functional-behaviors/index.get.ts
+++ b/server/api/functional-behaviors/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { FunctionalBehavior, MoscowPriority } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { FunctionalBehavior, MoscowPriority } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/functional-behaviors/index.post.ts b/server/api/functional-behaviors/index.post.ts
index d2b1ff2d..ef8e1872 100644
--- a/server/api/functional-behaviors/index.post.ts
+++ b/server/api/functional-behaviors/index.post.ts
@@ -1,6 +1,6 @@
-import { fork } from "~/server/data/orm"
+import { fork } from "~/server/data/orm.js"
 import { z } from "zod"
-import { MoscowPriority, FunctionalBehavior } from "~/server/domain/requirements/index.js"
+import { MoscowPriority, FunctionalBehavior } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/glossary-terms/[id].delete.ts b/server/api/glossary-terms/[id].delete.ts
index 0bc8ea03..adaaad9c 100644
--- a/server/api/glossary-terms/[id].delete.ts
+++ b/server/api/glossary-terms/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { GlossaryTerm } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { GlossaryTerm } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/glossary-terms/[id].get.ts b/server/api/glossary-terms/[id].get.ts
index 3bce8712..b9bfd073 100644
--- a/server/api/glossary-terms/[id].get.ts
+++ b/server/api/glossary-terms/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { GlossaryTerm } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { GlossaryTerm } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/glossary-terms/[id].put.ts b/server/api/glossary-terms/[id].put.ts
index faebcbfd..709b3f52 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { GlossaryTerm } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/glossary-terms/index.get.ts b/server/api/glossary-terms/index.get.ts
index 21d99cc3..1057a8c3 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { GlossaryTerm } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/glossary-terms/index.post.ts b/server/api/glossary-terms/index.post.ts
index 78026731..de162e20 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { GlossaryTerm } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/invariants/[id].delete.ts b/server/api/invariants/[id].delete.ts
index 30460fd2..b1a5733c 100644
--- a/server/api/invariants/[id].delete.ts
+++ b/server/api/invariants/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Invariant } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Invariant } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/invariants/[id].get.ts b/server/api/invariants/[id].get.ts
index 0641f358..deb6c0f1 100644
--- a/server/api/invariants/[id].get.ts
+++ b/server/api/invariants/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Invariant } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Invariant } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/invariants/[id].put.ts b/server/api/invariants/[id].put.ts
index 66cd83d4..19de0cfc 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Invariant } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/invariants/index.get.ts b/server/api/invariants/index.get.ts
index 459bc040..8b4ad9c8 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Invariant } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/invariants/index.post.ts b/server/api/invariants/index.post.ts
index 9a0b5fd1..8bea2935 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Invariant } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/justifications/[id].delete.ts b/server/api/justifications/[id].delete.ts
index 8a7d1961..8594295b 100644
--- a/server/api/justifications/[id].delete.ts
+++ b/server/api/justifications/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Justification } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Justification } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/justifications/[id].get.ts b/server/api/justifications/[id].get.ts
index 6ab63537..0b7b46ee 100644
--- a/server/api/justifications/[id].get.ts
+++ b/server/api/justifications/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Justification } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Justification } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/justifications/[id].put.ts b/server/api/justifications/[id].put.ts
index 2782ff56..56b14ef1 100644
--- a/server/api/justifications/[id].put.ts
+++ b/server/api/justifications/[id].put.ts
@@ -1,6 +1,6 @@
-import { fork } from "~/server/data/orm"
+import { fork } from "~/server/data/orm.js"
 import { z } from "zod"
-import { Justification } from "~/server/domain/requirements/index.js"
+import { Justification } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/justifications/index.get.ts b/server/api/justifications/index.get.ts
index 0a654ef1..44ca03a3 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Justification } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/justifications/index.post.ts b/server/api/justifications/index.post.ts
index 61e05d2c..4ac0f6ec 100644
--- a/server/api/justifications/index.post.ts
+++ b/server/api/justifications/index.post.ts
@@ -1,6 +1,6 @@
-import { fork } from "~/server/data/orm"
+import { fork } from "~/server/data/orm.js"
 import { z } from "zod"
-import { Justification } from "~/server/domain/requirements/index.js"
+import { Justification } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/limits/[id].delete.ts b/server/api/limits/[id].delete.ts
index 611f510e..02d80458 100644
--- a/server/api/limits/[id].delete.ts
+++ b/server/api/limits/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Limit } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Limit } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/limits/[id].get.ts b/server/api/limits/[id].get.ts
index 8a96b780..f8bdc85c 100644
--- a/server/api/limits/[id].get.ts
+++ b/server/api/limits/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Limit } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Limit } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/limits/[id].put.ts b/server/api/limits/[id].put.ts
index 33d0b8bd..9c0ab090 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Limit } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/limits/index.get.ts b/server/api/limits/index.get.ts
index b7db6f5d..67fbc09d 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Limit } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/limits/index.post.ts b/server/api/limits/index.post.ts
index ac1de304..223b71ce 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Limit } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/non-functional-behaviors/[id].delete.ts b/server/api/non-functional-behaviors/[id].delete.ts
index 8b8f5988..a8665655 100644
--- a/server/api/non-functional-behaviors/[id].delete.ts
+++ b/server/api/non-functional-behaviors/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { NonFunctionalBehavior } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { NonFunctionalBehavior } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/non-functional-behaviors/[id].get.ts b/server/api/non-functional-behaviors/[id].get.ts
index 62398e8c..6c1639c7 100644
--- a/server/api/non-functional-behaviors/[id].get.ts
+++ b/server/api/non-functional-behaviors/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { NonFunctionalBehavior } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { NonFunctionalBehavior } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/non-functional-behaviors/[id].put.ts b/server/api/non-functional-behaviors/[id].put.ts
index 954799a4..71795cc1 100644
--- a/server/api/non-functional-behaviors/[id].put.ts
+++ b/server/api/non-functional-behaviors/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { NonFunctionalBehavior, MoscowPriority } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { NonFunctionalBehavior, MoscowPriority } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/non-functional-behaviors/index.get.ts b/server/api/non-functional-behaviors/index.get.ts
index 4a18c4ae..8ad71bb6 100644
--- a/server/api/non-functional-behaviors/index.get.ts
+++ b/server/api/non-functional-behaviors/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { MoscowPriority, NonFunctionalBehavior } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { MoscowPriority, NonFunctionalBehavior } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/non-functional-behaviors/index.post.ts b/server/api/non-functional-behaviors/index.post.ts
index 21a4d501..82fafa16 100644
--- a/server/api/non-functional-behaviors/index.post.ts
+++ b/server/api/non-functional-behaviors/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { MoscowPriority, NonFunctionalBehavior } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { MoscowPriority, NonFunctionalBehavior } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/obstacles/[id].delete.ts b/server/api/obstacles/[id].delete.ts
index cf5d06ca..73839269 100644
--- a/server/api/obstacles/[id].delete.ts
+++ b/server/api/obstacles/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Obstacle } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Obstacle } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/obstacles/[id].get.ts b/server/api/obstacles/[id].get.ts
index a73fd272..b8f81705 100644
--- a/server/api/obstacles/[id].get.ts
+++ b/server/api/obstacles/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Obstacle } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Obstacle } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/obstacles/[id].put.ts b/server/api/obstacles/[id].put.ts
index 8aef48b8..acc17124 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Obstacle } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/obstacles/index.get.ts b/server/api/obstacles/index.get.ts
index 101216c2..bed47e0c 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Obstacle } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/obstacles/index.post.ts b/server/api/obstacles/index.post.ts
index 347472c3..a951b32e 100644
--- a/server/api/obstacles/index.post.ts
+++ b/server/api/obstacles/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Obstacle } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Obstacle } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/organizations/[id].delete.ts b/server/api/organizations/[id].delete.ts
index f1ec78d9..4645be43 100644
--- a/server/api/organizations/[id].delete.ts
+++ b/server/api/organizations/[id].delete.ts
@@ -1,7 +1,7 @@
 import { Collection } from "@mikro-orm/core"
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { AppUserOrganizationRole } from "~/server/domain/application/index"
+import { fork } from "~/server/data/orm.js"
+import { AppUserOrganizationRole } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/organizations/[id].put.ts b/server/api/organizations/[id].put.ts
index dba1f618..811f1643 100644
--- a/server/api/organizations/[id].put.ts
+++ b/server/api/organizations/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import slugify from "~/utils/slugify"
+import { fork } from "~/server/data/orm.js"
+import slugify from "~/utils/slugify.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/organizations/index.get.ts b/server/api/organizations/index.get.ts
index 16cb9473..66436046 100644
--- a/server/api/organizations/index.get.ts
+++ b/server/api/organizations/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { AppUserOrganizationRole, Organization } from "~/server/domain/application/index"
+import { fork } from "~/server/data/orm.js"
+import { AppUserOrganizationRole, Organization } from "~/server/domain/index.js"
 import { getServerSession } from '#auth'
 
 const querySchema = z.object({
diff --git a/server/api/organizations/index.post.ts b/server/api/organizations/index.post.ts
index 697c2ada..9ad96a5a 100644
--- a/server/api/organizations/index.post.ts
+++ b/server/api/organizations/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { AppRole, AppUserOrganizationRole, AppUser, Organization } from "~/server/domain/application/index"
+import { fork } from "~/server/data/orm.js"
+import { AppRole, AppUserOrganizationRole, AppUser, Organization } from "~/server/domain/index.js"
 import { getServerSession } from '#auth'
 
 const bodySchema = z.object({
diff --git a/server/api/outcomes/[id].delete.ts b/server/api/outcomes/[id].delete.ts
index b1f8ebc6..53309dd7 100644
--- a/server/api/outcomes/[id].delete.ts
+++ b/server/api/outcomes/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Outcome } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Outcome } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/outcomes/[id].get.ts b/server/api/outcomes/[id].get.ts
index 45fffcb1..7445a5ce 100644
--- a/server/api/outcomes/[id].get.ts
+++ b/server/api/outcomes/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Outcome } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Outcome } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/outcomes/[id].put.ts b/server/api/outcomes/[id].put.ts
index 59b6e6fd..00b717d8 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Outcome } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/outcomes/index.get.ts b/server/api/outcomes/index.get.ts
index 14e508b6..8dc1d7ca 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Outcome } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/outcomes/index.post.ts b/server/api/outcomes/index.post.ts
index bc8c7759..6c261020 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Outcome } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/parse-requirements/index.get.ts b/server/api/parse-requirements/index.get.ts
index b8ebecb1..ce09a705 100644
--- a/server/api/parse-requirements/index.get.ts
+++ b/server/api/parse-requirements/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
-import { fork } from "~/server/data/orm"
-import { ParsedRequirement } from "~/server/domain/requirements";
+import { fork } from "~/server/data/orm.js"
+import { ParsedRequirement } from "~/server/domain/index.js";
 
 const querySchema = z.object({
     solutionId: z.string().uuid()
diff --git a/server/api/parse-requirements/index.post.ts b/server/api/parse-requirements/index.post.ts
index 4eb0c647..93c14920 100644
--- a/server/api/parse-requirements/index.post.ts
+++ b/server/api/parse-requirements/index.post.ts
@@ -2,15 +2,15 @@ import { z } from "zod"
 import { zodResponseFormat } from "openai/helpers/zod";
 import zodToJsonSchema from "zod-to-json-schema";
 import { AzureOpenAI } from "openai";
-import zodSchema from '../../data/llm-zod-schemas'
-import { fork } from "~/server/data/orm";
+import zodSchema from '../../data/llm-zod-schemas/index.js'
+import { fork } from "~/server/data/orm.js";
 import { v7 as uuidv7 } from 'uuid';
 import {
     Assumption, Constraint, ConstraintCategory, Effect, EnvironmentComponent, FunctionalBehavior,
     GlossaryTerm, Invariant, Justification, Limit, MoscowPriority, NonFunctionalBehavior, Obstacle,
     Outcome, ParsedRequirement, Person, Stakeholder, StakeholderCategory, StakeholderSegmentation,
     SystemComponent, UseCase, UserStory
-} from "~/server/domain/requirements";
+} from "~/server/domain/index.js";
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/persons/[id].delete.ts b/server/api/persons/[id].delete.ts
index 04661209..ae504474 100644
--- a/server/api/persons/[id].delete.ts
+++ b/server/api/persons/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Person } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Person } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/persons/[id].get.ts b/server/api/persons/[id].get.ts
index 15edb72b..5ec6c087 100644
--- a/server/api/persons/[id].get.ts
+++ b/server/api/persons/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Person } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Person } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/persons/[id].put.ts b/server/api/persons/[id].put.ts
index 669e977b..7b6f0d47 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Person } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/persons/index.get.ts b/server/api/persons/index.get.ts
index 8e157fe9..a6742a7e 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Person } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/persons/index.post.ts b/server/api/persons/index.post.ts
index 1141aa64..c3d693c1 100644
--- a/server/api/persons/index.post.ts
+++ b/server/api/persons/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Person } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Person } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/solutions/[id].delete.ts b/server/api/solutions/[id].delete.ts
index 30515393..7e049542 100644
--- a/server/api/solutions/[id].delete.ts
+++ b/server/api/solutions/[id].delete.ts
@@ -1,8 +1,8 @@
-import { fork } from "~/server/data/orm"
+import { fork } from "~/server/data/orm.js"
 import { z } from "zod"
 import { Collection } from "@mikro-orm/core";
-import assertSolutionAdmin from "~/server/utils/assertSolutionAdmin";
-import { Requirement } from "~/server/domain/requirements";
+import assertSolutionAdmin from "~/server/utils/assertSolutionAdmin.js";
+import { Requirement } from "~/server/domain/index.js";
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/solutions/[id].put.ts b/server/api/solutions/[id].put.ts
index 540ae9a7..c029345b 100644
--- a/server/api/solutions/[id].put.ts
+++ b/server/api/solutions/[id].put.ts
@@ -1,5 +1,5 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
+import { fork } from "~/server/data/orm.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/solutions/index.get.ts b/server/api/solutions/index.get.ts
index 6dcc3822..8f99f50c 100644
--- a/server/api/solutions/index.get.ts
+++ b/server/api/solutions/index.get.ts
@@ -1,6 +1,6 @@
-import { fork } from "~/server/data/orm"
+import { fork } from "~/server/data/orm.js"
 import { z } from "zod"
-import { Organization } from "~/server/domain/application/index"
+import { Organization } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     name: z.string().max(100).optional(),
diff --git a/server/api/solutions/index.post.ts b/server/api/solutions/index.post.ts
index c9ddc60f..2a7da9a4 100644
--- a/server/api/solutions/index.post.ts
+++ b/server/api/solutions/index.post.ts
@@ -1,7 +1,7 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Solution } from "~/server/domain/application/index"
-import { Justification } from "~/server/domain/requirements/index"
+import { fork } from "~/server/data/orm.js"
+import { Solution } from "~/server/domain/index.js"
+import { Justification } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     name: z.string().min(1).max(100),
diff --git a/server/api/stakeholders/[id].delete.ts b/server/api/stakeholders/[id].delete.ts
index d952fcd4..d952d2a3 100644
--- a/server/api/stakeholders/[id].delete.ts
+++ b/server/api/stakeholders/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Stakeholder } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Stakeholder } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/stakeholders/[id].get.ts b/server/api/stakeholders/[id].get.ts
index 6d996924..489b2f68 100644
--- a/server/api/stakeholders/[id].get.ts
+++ b/server/api/stakeholders/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Stakeholder } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Stakeholder } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/stakeholders/[id].put.ts b/server/api/stakeholders/[id].put.ts
index e0a3bf62..03fed6f5 100644
--- a/server/api/stakeholders/[id].put.ts
+++ b/server/api/stakeholders/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Stakeholder, StakeholderSegmentation, StakeholderCategory } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Stakeholder, StakeholderSegmentation, StakeholderCategory } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/stakeholders/index.get.ts b/server/api/stakeholders/index.get.ts
index 1ccea252..aa988966 100644
--- a/server/api/stakeholders/index.get.ts
+++ b/server/api/stakeholders/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Stakeholder, StakeholderSegmentation, StakeholderCategory } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Stakeholder, StakeholderSegmentation, StakeholderCategory } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/stakeholders/index.post.ts b/server/api/stakeholders/index.post.ts
index 51eacee4..d6ae8b7b 100644
--- a/server/api/stakeholders/index.post.ts
+++ b/server/api/stakeholders/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Stakeholder, StakeholderCategory, StakeholderSegmentation } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Stakeholder, StakeholderCategory, StakeholderSegmentation } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/system-components/[id].delete.ts b/server/api/system-components/[id].delete.ts
index 5a3ccddc..c27887cc 100644
--- a/server/api/system-components/[id].delete.ts
+++ b/server/api/system-components/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { SystemComponent } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { SystemComponent } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/system-components/[id].get.ts b/server/api/system-components/[id].get.ts
index e9603e51..6fcb28d2 100644
--- a/server/api/system-components/[id].get.ts
+++ b/server/api/system-components/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { SystemComponent } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { SystemComponent } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/system-components/[id].put.ts b/server/api/system-components/[id].put.ts
index 1a4aa10d..774a3c1f 100644
--- a/server/api/system-components/[id].put.ts
+++ b/server/api/system-components/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { SystemComponent } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { SystemComponent } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/system-components/index.get.ts b/server/api/system-components/index.get.ts
index fe72dbc2..0c23a002 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/index.js"
+import { fork } from "~/server/data/orm.js"
+import { SystemComponent } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/system-components/index.post.ts b/server/api/system-components/index.post.ts
index 614d1730..f1ea8b70 100644
--- a/server/api/system-components/index.post.ts
+++ b/server/api/system-components/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { SystemComponent } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { SystemComponent } from "~/server/domain/index.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/use-cases/[id].delete.ts b/server/api/use-cases/[id].delete.ts
index a0199279..2bd61ed4 100644
--- a/server/api/use-cases/[id].delete.ts
+++ b/server/api/use-cases/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { UseCase } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { UseCase } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/use-cases/[id].get.ts b/server/api/use-cases/[id].get.ts
index 7529bbea..8a4b95a2 100644
--- a/server/api/use-cases/[id].get.ts
+++ b/server/api/use-cases/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { UseCase } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { UseCase } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/use-cases/[id].put.ts b/server/api/use-cases/[id].put.ts
index 5949851d..d6972911 100644
--- a/server/api/use-cases/[id].put.ts
+++ b/server/api/use-cases/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { Assumption, Effect, MoscowPriority, Stakeholder, UseCase } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { Assumption, Effect, MoscowPriority, Stakeholder, UseCase } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/use-cases/index.get.ts b/server/api/use-cases/index.get.ts
index 0927a99a..d6127934 100644
--- a/server/api/use-cases/index.get.ts
+++ b/server/api/use-cases/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { MoscowPriority, UseCase } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { MoscowPriority, UseCase } from "~/server/domain/index.js"
 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 896e5a40..2ed684e1 100644
--- a/server/api/use-cases/index.post.ts
+++ b/server/api/use-cases/index.post.ts
@@ -1,7 +1,7 @@
 import { NIL as emptyUuid } from "uuid"
 import { z } from "zod"
-import { MoscowPriority, Stakeholder, Assumption, Effect, UseCase } from "~/server/domain/requirements/index.js"
-import { fork } from "~/server/data/orm"
+import { MoscowPriority, Stakeholder, Assumption, Effect, UseCase } from "~/server/domain/index.js"
+import { fork } from "~/server/data/orm.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/user-stories/[id].delete.ts b/server/api/user-stories/[id].delete.ts
index 736773fa..f5cf4581 100644
--- a/server/api/user-stories/[id].delete.ts
+++ b/server/api/user-stories/[id].delete.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { UserStory } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { UserStory } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/user-stories/[id].get.ts b/server/api/user-stories/[id].get.ts
index 37021610..94b70386 100644
--- a/server/api/user-stories/[id].get.ts
+++ b/server/api/user-stories/[id].get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { UserStory } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { UserStory } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/user-stories/[id].put.ts b/server/api/user-stories/[id].put.ts
index 2e859942..9cbca912 100644
--- a/server/api/user-stories/[id].put.ts
+++ b/server/api/user-stories/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { FunctionalBehavior, MoscowPriority, Outcome, Stakeholder, UserStory } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { FunctionalBehavior, MoscowPriority, Outcome, Stakeholder, UserStory } from "~/server/domain/index.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()
diff --git a/server/api/user-stories/index.get.ts b/server/api/user-stories/index.get.ts
index b3fbfc2b..eda439a1 100644
--- a/server/api/user-stories/index.get.ts
+++ b/server/api/user-stories/index.get.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { fork } from "~/server/data/orm"
-import { UserStory, MoscowPriority } from "~/server/domain/requirements/index.js"
+import { fork } from "~/server/data/orm.js"
+import { UserStory, MoscowPriority } from "~/server/domain/index.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/api/user-stories/index.post.ts b/server/api/user-stories/index.post.ts
index 06dc5ad8..c5da70b4 100644
--- a/server/api/user-stories/index.post.ts
+++ b/server/api/user-stories/index.post.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
-import { MoscowPriority, Outcome, Stakeholder, FunctionalBehavior, UserStory } from "~/server/domain/requirements/index.js"
-import { fork } from "~/server/data/orm"
+import { MoscowPriority, Outcome, Stakeholder, FunctionalBehavior, UserStory } from "~/server/domain/index.js"
+import { fork } from "~/server/data/orm.js"
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),
diff --git a/server/data/llm-zod-schemas/index.ts b/server/data/llm-zod-schemas/index.ts
index 6bfc07ce..d3fac6c9 100644
--- a/server/data/llm-zod-schemas/index.ts
+++ b/server/data/llm-zod-schemas/index.ts
@@ -1,22 +1,22 @@
 import { z } from "zod"
-import StakeholderSchema from "./StakeholderSchema"
-import SilenceSchema from "./SilenceSchema"
-import AssumptionSchema from "./AssumptionSchema"
-import ConstraintSchema from "./ConstraintSchema"
-import EffectSchema from "./EffectSchema"
-import EnvironmentComponentSchema from "./EnvironmentComponentSchema"
-import FunctionalBehaviorSchema from "./FunctionalBehaviorSchema"
-import GlossaryTermSchema from "./GlossaryTermSchema"
-import InvariantSchema from "./InvariantSchema"
-import JustificationSchema from "./JustificationSchema"
-import LimitSchema from "./LimitSchema"
-import NonFunctionalBehaviorSchema from "./NonFunctionalBehaviorSchema"
-import ObstacleSchema from "./ObstacleSchema"
-import OutcomeSchema from "./OutcomeSchema"
-import PersonSchema from "./PersonSchema"
-import SystemComponentSchema from "./SystemComponentSchema"
-import UserStorySchema from "./UserStorySchema"
-import UseCaseSchema from "./UseCaseSchema"
+import StakeholderSchema from "./StakeholderSchema.js"
+import SilenceSchema from "./SilenceSchema.js"
+import AssumptionSchema from "./AssumptionSchema.js"
+import ConstraintSchema from "./ConstraintSchema.js"
+import EffectSchema from "./EffectSchema.js"
+import EnvironmentComponentSchema from "./EnvironmentComponentSchema.js"
+import FunctionalBehaviorSchema from "./FunctionalBehaviorSchema.js"
+import GlossaryTermSchema from "./GlossaryTermSchema.js"
+import InvariantSchema from "./InvariantSchema.js"
+import JustificationSchema from "./JustificationSchema.js"
+import LimitSchema from "./LimitSchema.js"
+import NonFunctionalBehaviorSchema from "./NonFunctionalBehaviorSchema.js"
+import ObstacleSchema from "./ObstacleSchema.js"
+import OutcomeSchema from "./OutcomeSchema.js"
+import PersonSchema from "./PersonSchema.js"
+import SystemComponentSchema from "./SystemComponentSchema.js"
+import UserStorySchema from "./UserStorySchema.js"
+import UseCaseSchema from "./UseCaseSchema.js"
 
 export default z.object({
     requirements: z.array(z.union([
diff --git a/server/data/models/application/AppUserOrganizationRoleSchema.ts b/server/data/models/application/AppUserOrganizationRoleSchema.ts
deleted file mode 100644
index 142f75dc..00000000
--- a/server/data/models/application/AppUserOrganizationRoleSchema.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import { AppRole, AppUserOrganizationRole } from "../../../domain/application/index.js"
-
-export default new EntitySchema<AppUserOrganizationRole>({
-    class: AppUserOrganizationRole,
-    properties: {
-        appUser: {
-            kind: 'm:1',
-            entity: 'AppUser',
-            primary: true
-        },
-        organization: {
-            kind: 'm:1',
-            entity: 'Organization',
-            primary: true
-        },
-        role: {
-            enum: true,
-            items: () => AppRole,
-            default: AppRole.ORGANIZATION_READER,
-            primary: true
-        }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/application/AppUserSchema.ts b/server/data/models/application/AppUserSchema.ts
deleted file mode 100644
index a1955211..00000000
--- a/server/data/models/application/AppUserSchema.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import { AppUser } from "../../../domain/application/AppUser.js";
-
-export default new EntitySchema<AppUser>({
-    class: AppUser,
-    properties: {
-        id: { type: 'uuid', primary: true },
-        name: { type: 'character varying', nullable: false, length: 254 },
-        creationDate: { type: 'datetime', nullable: false },
-        lastLoginDate: { type: 'datetime', nullable: true },
-        isSystemAdmin: { type: 'boolean', nullable: false },
-        // email address: https://stackoverflow.com/a/574698
-        email: { type: 'character varying', nullable: false, length: 254 },
-        role: { entity: 'AppRole', persist: false }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/application/OrganizationSchema.ts b/server/data/models/application/OrganizationSchema.ts
deleted file mode 100644
index be2233be..00000000
--- a/server/data/models/application/OrganizationSchema.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import { Organization } from "../../../domain/application/Organization.js";
-
-export default new EntitySchema<Organization>({
-    class: Organization,
-    properties: {
-        id: { type: 'uuid', primary: true },
-        name: { type: 'string', nullable: false, length: 100 },
-        description: { type: 'string', nullable: false },
-        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/application/SolutionSchema.ts b/server/data/models/application/SolutionSchema.ts
deleted file mode 100644
index ee27e22f..00000000
--- a/server/data/models/application/SolutionSchema.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import { Solution, Organization } from "../../../domain/application/index.js";
-import {
-    Assumption, Constraint, Effect, EnvironmentComponent, FunctionalBehavior,
-    GlossaryTerm, Invariant, Justification, Limit, MetaRequirement, NonFunctionalBehavior,
-    Obstacle, Outcome, Person, Stakeholder, SystemComponent, UseCase, UserStory
-} from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Solution>({
-    class: Solution,
-    properties: {
-        id: { type: 'uuid', primary: true },
-        name: { type: 'string', nullable: false, length: 100 },
-        description: { type: 'string', nullable: false },
-        slug: { type: 'string', unique: true },
-        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/requirements/AssumptionSchema.ts b/server/data/models/requirements/AssumptionSchema.ts
deleted file mode 100644
index 296d7b62..00000000
--- a/server/data/models/requirements/AssumptionSchema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Assumption, ParsedRequirement, Requirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Assumption, Requirement>({
-    class: Assumption,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/BehaviorSchema.ts b/server/data/models/requirements/BehaviorSchema.ts
deleted file mode 100644
index 501441fe..00000000
--- a/server/data/models/requirements/BehaviorSchema.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Behavior, MoscowPriority, Requirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Behavior, Requirement>({
-    class: Behavior,
-    extends: RequirementSchema,
-    abstract: true,
-    properties: {
-        priority: { enum: true, items: () => MoscowPriority, nullable: false }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/ConstraintSchema.ts b/server/data/models/requirements/ConstraintSchema.ts
deleted file mode 100644
index 2757931c..00000000
--- a/server/data/models/requirements/ConstraintSchema.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Requirement, Constraint, ConstraintCategory, ParsedRequirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Constraint, Requirement>({
-    class: Constraint,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true },
-        category: { enum: true, items: () => ConstraintCategory, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/EffectSchema.ts b/server/data/models/requirements/EffectSchema.ts
deleted file mode 100644
index 4723c0c2..00000000
--- a/server/data/models/requirements/EffectSchema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Requirement, Effect, ParsedRequirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Effect, Requirement>({
-    class: Effect,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/EnvironmentComponentSchema.ts b/server/data/models/requirements/EnvironmentComponentSchema.ts
deleted file mode 100644
index 3f4cec54..00000000
--- a/server/data/models/requirements/EnvironmentComponentSchema.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Component, EnvironmentComponent, ParsedRequirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<EnvironmentComponent, Component>({
-    class: EnvironmentComponent,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true },
-        parentComponent: { kind: 'm:1', entity: () => EnvironmentComponent, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/FunctionalBehaviorSchema.ts b/server/data/models/requirements/FunctionalBehaviorSchema.ts
deleted file mode 100644
index 0fa94bed..00000000
--- a/server/data/models/requirements/FunctionalBehaviorSchema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import BehaviorSchema from "./BehaviorSchema.js";
-import { FunctionalBehavior, Functionality, ParsedRequirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<FunctionalBehavior, Functionality>({
-    class: FunctionalBehavior,
-    extends: BehaviorSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/GlossaryTermSchema.ts b/server/data/models/requirements/GlossaryTermSchema.ts
deleted file mode 100644
index 467cf5ab..00000000
--- a/server/data/models/requirements/GlossaryTermSchema.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Component, GlossaryTerm, ParsedRequirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<GlossaryTerm, Component>({
-    class: GlossaryTerm,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true },
-        parentComponent: { kind: 'm:1', entity: () => GlossaryTerm, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/HintSchema.ts b/server/data/models/requirements/HintSchema.ts
deleted file mode 100644
index 63274091..00000000
--- a/server/data/models/requirements/HintSchema.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import NoiseSchema from "./NoiseSchema.js"
-import { Hint, Noise } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Hint, Noise>({
-    class: Hint,
-    extends: NoiseSchema
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/InvariantSchema.ts b/server/data/models/requirements/InvariantSchema.ts
deleted file mode 100644
index 6081d47a..00000000
--- a/server/data/models/requirements/InvariantSchema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Requirement, Invariant, ParsedRequirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Invariant, Requirement>({
-    class: Invariant,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/JustificationSchema.ts b/server/data/models/requirements/JustificationSchema.ts
deleted file mode 100644
index ac3b2862..00000000
--- a/server/data/models/requirements/JustificationSchema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import { Justification, MetaRequirement, ParsedRequirement } from "../../../domain/requirements/index.js";
-import MetaRequirementSchema from "./MetaRequirementSchema.js";
-
-export default new EntitySchema<Justification, MetaRequirement>({
-    class: Justification,
-    extends: MetaRequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/LimitSchema.ts b/server/data/models/requirements/LimitSchema.ts
deleted file mode 100644
index 2c2abdb5..00000000
--- a/server/data/models/requirements/LimitSchema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Requirement, Limit, ParsedRequirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Limit, Requirement>({
-    class: Limit,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/MetaRequirementSchema.ts b/server/data/models/requirements/MetaRequirementSchema.ts
deleted file mode 100644
index 40e94968..00000000
--- a/server/data/models/requirements/MetaRequirementSchema.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { MetaRequirement, Requirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<MetaRequirement, Requirement>({
-    class: MetaRequirement,
-    abstract: true,
-    extends: RequirementSchema
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/NoiseSchema.ts b/server/data/models/requirements/NoiseSchema.ts
deleted file mode 100644
index 161b000f..00000000
--- a/server/data/models/requirements/NoiseSchema.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Noise, Requirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Noise, Requirement>({
-    class: Noise,
-    extends: RequirementSchema
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/NonFunctionalBehaviorSchema.ts b/server/data/models/requirements/NonFunctionalBehaviorSchema.ts
deleted file mode 100644
index 8c773a66..00000000
--- a/server/data/models/requirements/NonFunctionalBehaviorSchema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import BehaviorSchema from "./BehaviorSchema.js";
-import { Functionality, NonFunctionalBehavior, ParsedRequirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<NonFunctionalBehavior, Functionality>({
-    class: NonFunctionalBehavior,
-    extends: BehaviorSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/ObstacleSchema.ts b/server/data/models/requirements/ObstacleSchema.ts
deleted file mode 100644
index e1c671fb..00000000
--- a/server/data/models/requirements/ObstacleSchema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Obstacle, Goal, ParsedRequirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Obstacle, Goal>({
-    class: Obstacle,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/OutcomeSchema.ts b/server/data/models/requirements/OutcomeSchema.ts
deleted file mode 100644
index 01716226..00000000
--- a/server/data/models/requirements/OutcomeSchema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Goal, Outcome, ParsedRequirement } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Outcome, Goal>({
-    class: Outcome,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/ParsedRequirementSchema.ts b/server/data/models/requirements/ParsedRequirementSchema.ts
deleted file mode 100644
index 2c65834a..00000000
--- a/server/data/models/requirements/ParsedRequirementSchema.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import MetaRequirementSchema from "./MetaRequirementSchema.js";
-import {
-    Assumption, Constraint, Effect, EnvironmentComponent, FunctionalBehavior, GlossaryTerm,
-    Invariant, Justification, Limit, MetaRequirement, NonFunctionalBehavior, Obstacle, Outcome,
-    ParsedRequirement, Person, Stakeholder, SystemComponent, UseCase, UserStory
-} from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<ParsedRequirement, MetaRequirement>({
-    class: ParsedRequirement,
-    extends: MetaRequirementSchema,
-    properties: {
-        assumptions: { kind: '1:m', entity: () => Assumption, mappedBy: (e) => e.follows },
-        constraints: { kind: '1:m', entity: () => Constraint, mappedBy: (e) => e.follows },
-        effects: { kind: '1:m', entity: () => Effect, mappedBy: (e) => e.follows },
-        environmentComponents: { kind: '1:m', entity: () => EnvironmentComponent, mappedBy: (e) => e.follows },
-        functionalBehaviors: { kind: '1:m', entity: () => FunctionalBehavior, mappedBy: (e) => e.follows },
-        glossaryTerms: { kind: '1:m', entity: () => GlossaryTerm, mappedBy: (e) => e.follows },
-        invariants: { kind: '1:m', entity: () => Invariant, mappedBy: (e) => e.follows },
-        justifications: { kind: '1:m', entity: () => Justification, mappedBy: (e) => e.follows },
-        limits: { kind: '1:m', entity: () => Limit, mappedBy: (e) => e.follows },
-        nonFunctionalBehaviors: { kind: '1:m', entity: () => NonFunctionalBehavior, mappedBy: (e) => e.follows },
-        obstacles: { kind: '1:m', entity: () => Obstacle, mappedBy: (e) => e.follows },
-        outcomes: { kind: '1:m', entity: () => Outcome, mappedBy: (e) => e.follows },
-        persons: { kind: '1:m', entity: () => Person, mappedBy: (e) => e.follows },
-        stakeholders: { kind: '1:m', entity: () => Stakeholder, mappedBy: (e) => e.follows },
-        systemComponents: { kind: '1:m', entity: () => SystemComponent, mappedBy: (e) => e.follows },
-        useCases: { kind: '1:m', entity: () => UseCase, mappedBy: (e) => e.follows },
-        userStories: { kind: '1:m', entity: () => UserStory, mappedBy: (e) => e.follows }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/PersonSchema.ts b/server/data/models/requirements/PersonSchema.ts
deleted file mode 100644
index 86029088..00000000
--- a/server/data/models/requirements/PersonSchema.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Actor, ParsedRequirement, Person } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Person, Actor>({
-    class: Person,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true },
-        email: { type: 'string', nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/ProductSchema.ts b/server/data/models/requirements/ProductSchema.ts
deleted file mode 100644
index 3adfae94..00000000
--- a/server/data/models/requirements/ProductSchema.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Requirement, Product } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Product, Requirement>({
-    class: Product,
-    extends: RequirementSchema
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/RequirementSchema.ts b/server/data/models/requirements/RequirementSchema.ts
deleted file mode 100644
index 9b1091cd..00000000
--- a/server/data/models/requirements/RequirementSchema.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import { Requirement } from "../../../domain/requirements/index.js";
-import { AppUser, Solution } from "../../../domain/application/index.js";
-
-export default new EntitySchema<Requirement>({
-    class: Requirement,
-    abstract: true,
-    properties: {
-        id: { type: 'uuid', primary: true },
-        name: { type: 'string', nullable: false },
-        statement: { type: 'string', length: 1000, nullable: false },
-        solution: { kind: 'm:1', entity: () => Solution },
-        isSilence: { type: 'boolean', nullable: false, default: false },
-        lastModified: {
-            type: 'datetime',
-            nullable: false,
-            onCreate: () => new Date(),
-            onUpdate: () => new Date(),
-            defaultRaw: 'now()'
-        },
-        modifiedBy: {
-            kind: 'm:1', entity: () => AppUser, nullable: false,
-            // System Admin is the default user for the initial migration
-            // This can be removed in v0.14.0 or later
-            default: 'ac594919-50e3-438a-b9bc-efb8a8654243'
-        }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/ScenarioSchema.ts b/server/data/models/requirements/ScenarioSchema.ts
deleted file mode 100644
index 43b0f231..00000000
--- a/server/data/models/requirements/ScenarioSchema.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import BehaviorSchema from "./BehaviorSchema.js";
-import { Example, Scenario } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Scenario, Example>({
-    abstract: true,
-    class: Scenario,
-    extends: BehaviorSchema,
-    properties: {
-        primaryActor: { kind: 'm:1', entity: 'Stakeholder', nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/SilenceSchema.ts b/server/data/models/requirements/SilenceSchema.ts
deleted file mode 100644
index bc6029e8..00000000
--- a/server/data/models/requirements/SilenceSchema.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Requirement, Silence } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Silence, Requirement>({
-    class: Silence,
-    extends: RequirementSchema
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/StakeholderSchema.ts b/server/data/models/requirements/StakeholderSchema.ts
deleted file mode 100644
index 07d2da2b..00000000
--- a/server/data/models/requirements/StakeholderSchema.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import {
-    Component, Stakeholder, StakeholderSegmentation, StakeholderCategory,
-    ParsedRequirement
-} from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<Stakeholder, Component>({
-    class: Stakeholder,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true },
-        influence: { type: 'number', nullable: false, check: 'influence >= 0 AND influence <= 100' },
-        availability: { type: 'number', nullable: false, check: 'availability >= 0 AND availability <= 100' },
-        segmentation: { enum: true, items: () => StakeholderSegmentation, nullable: true },
-        category: { enum: true, items: () => StakeholderCategory, nullable: true },
-        parentComponent: { kind: 'm:1', entity: () => Stakeholder, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/SystemComponentSchema.ts b/server/data/models/requirements/SystemComponentSchema.ts
deleted file mode 100644
index b76a1b8d..00000000
--- a/server/data/models/requirements/SystemComponentSchema.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import RequirementSchema from "./RequirementSchema.js";
-import { Component, ParsedRequirement, SystemComponent } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<SystemComponent, Component>({
-    class: SystemComponent,
-    extends: RequirementSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true },
-        parentComponent: { kind: 'm:1', entity: () => SystemComponent, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/UseCaseSchema.ts b/server/data/models/requirements/UseCaseSchema.ts
deleted file mode 100644
index 9468a5c9..00000000
--- a/server/data/models/requirements/UseCaseSchema.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import ScenarioSchema from "./ScenarioSchema.js";
-import { Assumption, Effect, ParsedRequirement, Scenario, UseCase } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<UseCase, Scenario>({
-    class: UseCase,
-    extends: ScenarioSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true },
-        scope: { type: 'string', nullable: false },
-        level: { type: 'string', nullable: false },
-        goalInContext: { type: 'string', nullable: false },
-        precondition: { kind: 'm:1', entity: () => Assumption, nullable: true },
-        triggerId: { type: 'uuid', nullable: true },
-        mainSuccessScenario: { type: 'string', nullable: false },
-        successGuarantee: { kind: 'm:1', entity: () => Effect, nullable: true },
-        extensions: { type: 'string', nullable: false },
-    }
-})
\ No newline at end of file
diff --git a/server/data/models/requirements/UserStorySchema.ts b/server/data/models/requirements/UserStorySchema.ts
deleted file mode 100644
index 158f0143..00000000
--- a/server/data/models/requirements/UserStorySchema.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { EntitySchema } from "@mikro-orm/core";
-import ScenarioSchema from "./ScenarioSchema.js";
-import { FunctionalBehavior, Outcome, ParsedRequirement, Scenario, UserStory } from "../../../domain/requirements/index.js";
-
-export default new EntitySchema<UserStory, Scenario>({
-    class: UserStory,
-    extends: ScenarioSchema,
-    properties: {
-        follows: { kind: 'm:1', entity: () => ParsedRequirement, nullable: true },
-        functionalBehavior: { kind: 'm:1', entity: () => FunctionalBehavior, nullable: true },
-        outcome: { kind: 'm:1', entity: () => Outcome, nullable: true }
-    }
-})
\ No newline at end of file
diff --git a/server/domain/requirements/Actor.ts b/server/domain/Actor.ts
similarity index 100%
rename from server/domain/requirements/Actor.ts
rename to server/domain/Actor.ts
diff --git a/server/domain/application/AppRole.ts b/server/domain/AppRole.ts
similarity index 100%
rename from server/domain/application/AppRole.ts
rename to server/domain/AppRole.ts
diff --git a/server/domain/application/AppUser.ts b/server/domain/AppUser.ts
similarity index 70%
rename from server/domain/application/AppUser.ts
rename to server/domain/AppUser.ts
index c2f13652..dab10514 100644
--- a/server/domain/application/AppUser.ts
+++ b/server/domain/AppUser.ts
@@ -1,9 +1,11 @@
+import { Entity, Enum, Property } from "@mikro-orm/core";
 import { AppRole } from "./AppRole.js";
 
 /**
  * An AppUser is a user of the application
  */
-export class AppUser {
+@Entity()
+class AppUser {
     constructor(properties: AppUser) {
         this.id = properties.id;
         this.creationDate = properties.creationDate;
@@ -17,31 +19,38 @@ export class AppUser {
     /**
      * The unique identifier of the AppUser (uuid)
      */
+    @Property({ type: 'uuid', primary: true })
     id: string;
 
     /**
      * The name of the AppUser
      */
+    @Property({ type: 'string', length: 254 })
     name: string;
 
     /**
      * The email address of the AppUser
      */
+    // email address: https://stackoverflow.com/a/574698
+    @Property({ type: 'string', length: 254 })
     email: string;
 
     /**
      * The date the AppUser was created
      */
+    @Property({ type: 'datetime' })
     creationDate: Date;
 
     /**
      * The date the AppUser last logged in
      */
+    @Property({ type: 'datetime', nullable: true })
     lastLoginDate?: Date;
 
     /**
      * Whether the AppUser is a system administrator
      */
+    @Property({ type: 'boolean' })
     isSystemAdmin: boolean;
 
     /**
@@ -49,5 +58,8 @@ export class AppUser {
      * Note: this field is not mapped in the ORM. It is populated in the API layer.
      * It's a design smell that needs to be addressed.
      */
+    @Enum({ items: () => AppRole, persist: false })
     role?: AppRole;
 }
+
+export { AppUser };
\ No newline at end of file
diff --git a/server/domain/application/AppUserOrganizationRole.ts b/server/domain/AppUserOrganizationRole.ts
similarity index 63%
rename from server/domain/application/AppUserOrganizationRole.ts
rename to server/domain/AppUserOrganizationRole.ts
index 5cc95ac0..4f6b3d32 100644
--- a/server/domain/application/AppUserOrganizationRole.ts
+++ b/server/domain/AppUserOrganizationRole.ts
@@ -1,9 +1,11 @@
+import { Entity, Enum, ManyToOne } from "@mikro-orm/core";
 import { AppRole, AppUser, Organization } from "./index.js";
 
 /**
  * An AppUserOrganizationRole is a mapping between an AppUser, an Organization, and a Role
  */
-export class AppUserOrganizationRole {
+@Entity()
+class AppUserOrganizationRole {
     constructor({ appUser, organization, role }: AppUserOrganizationRole) {
         this.appUser = appUser;
         this.organization = organization;
@@ -13,15 +15,20 @@ export class AppUserOrganizationRole {
     /**
      * The user associated with the OrganizationRole
      */
+    @ManyToOne({ primary: true, entity: () => AppUser })
     appUser: AppUser;
 
     /**
      * The Organization associated with the OrganizationRole
      */
+    @ManyToOne({ primary: true, entity: () => Organization })
     organization: Organization;
 
     /**
      * The Role associated with the OrganizationRole
      */
-    role: AppRole;
+    @Enum({ items: () => AppRole, primary: true })
+    role: AppRole = AppRole.ORGANIZATION_READER;
 }
+
+export { AppUserOrganizationRole };
\ No newline at end of file
diff --git a/server/domain/requirements/Assumption.ts b/server/domain/Assumption.ts
similarity index 63%
rename from server/domain/requirements/Assumption.ts
rename to server/domain/Assumption.ts
index 26170e24..c7775caf 100644
--- a/server/domain/requirements/Assumption.ts
+++ b/server/domain/Assumption.ts
@@ -1,9 +1,11 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { ParsedRequirement, Requirement } from "./index.js";
 
 /**
  * Posited property of the environment
  */
-export class Assumption extends Requirement {
+@Entity()
+class Assumption extends Requirement {
     constructor({ follows, ...rest }: Omit<Assumption, 'id'>) {
         super(rest);
         this.follows = follows;
@@ -12,5 +14,8 @@ export class Assumption extends Requirement {
     /**
      * Requirement that this assumption follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement
-}
\ No newline at end of file
+}
+
+export { Assumption };
\ No newline at end of file
diff --git a/server/domain/requirements/Behavior.ts b/server/domain/Behavior.ts
similarity index 50%
rename from server/domain/requirements/Behavior.ts
rename to server/domain/Behavior.ts
index e51d8e9f..315f1145 100644
--- a/server/domain/requirements/Behavior.ts
+++ b/server/domain/Behavior.ts
@@ -1,9 +1,11 @@
-import { Requirement, type MoscowPriority } from "./index.js";
+import { Entity, Enum } from "@mikro-orm/core";
+import { Requirement, MoscowPriority } from "./index.js";
 
 /**
  * Property of the operation of the system
  */
-export abstract class Behavior extends Requirement {
+@Entity({ abstract: true })
+abstract class Behavior extends Requirement {
     constructor({ priority, ...rest }: Omit<Behavior, 'id'>) {
         super(rest);
         this.priority = priority;
@@ -12,5 +14,8 @@ export abstract class Behavior extends Requirement {
     /**
      * The priority of the behavior.
      */
+    @Enum({ items: () => MoscowPriority, nullable: false })
     priority: MoscowPriority;
 }
+
+export { Behavior };
\ No newline at end of file
diff --git a/server/domain/requirements/Component.ts b/server/domain/Component.ts
similarity index 100%
rename from server/domain/requirements/Component.ts
rename to server/domain/Component.ts
diff --git a/server/domain/requirements/Constraint.ts b/server/domain/Constraint.ts
similarity index 65%
rename from server/domain/requirements/Constraint.ts
rename to server/domain/Constraint.ts
index 08997749..b1f5db1d 100644
--- a/server/domain/requirements/Constraint.ts
+++ b/server/domain/Constraint.ts
@@ -1,9 +1,11 @@
+import { Entity, Enum, ManyToOne } from '@mikro-orm/core';
 import { Requirement, ConstraintCategory, ParsedRequirement } from './index.js';
 
 /**
  * A Constraint is a property imposed by the environment
  */
-export class Constraint extends Requirement {
+@Entity()
+class Constraint extends Requirement {
     constructor({ category, follows, ...rest }: Omit<Constraint, 'id'>) {
         super(rest);
         this.category = category;
@@ -13,10 +15,14 @@ export class Constraint extends Requirement {
     /**
      * Category of the constraint
      */
+    @Enum({ items: () => ConstraintCategory, nullable: true })
     category?: ConstraintCategory;
 
     /**
      * Requirement that this constraint follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
 }
+
+export { Constraint };
\ No newline at end of file
diff --git a/server/domain/requirements/ConstraintCategory.ts b/server/domain/ConstraintCategory.ts
similarity index 100%
rename from server/domain/requirements/ConstraintCategory.ts
rename to server/domain/ConstraintCategory.ts
diff --git a/server/domain/requirements/Effect.ts b/server/domain/Effect.ts
similarity index 64%
rename from server/domain/requirements/Effect.ts
rename to server/domain/Effect.ts
index 4acf22d5..618ab52a 100644
--- a/server/domain/requirements/Effect.ts
+++ b/server/domain/Effect.ts
@@ -1,9 +1,11 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { ParsedRequirement, Requirement } from "./index.js";
 
 /**
  * Environment property affected by the system
  */
-export class Effect extends Requirement {
+@Entity()
+class Effect extends Requirement {
     constructor({ follows, ...rest }: Omit<Effect, 'id'>) {
         super(rest);
         this.follows = follows;
@@ -12,5 +14,8 @@ export class Effect extends Requirement {
     /**
      * Requirement that this effect follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
-}
\ No newline at end of file
+}
+
+export { Effect };
\ No newline at end of file
diff --git a/server/domain/requirements/EnvironmentComponent.ts b/server/domain/EnvironmentComponent.ts
similarity index 67%
rename from server/domain/requirements/EnvironmentComponent.ts
rename to server/domain/EnvironmentComponent.ts
index d6dea066..5a245d77 100644
--- a/server/domain/requirements/EnvironmentComponent.ts
+++ b/server/domain/EnvironmentComponent.ts
@@ -1,9 +1,11 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { Component, ParsedRequirement } from "./index.js";
 
 /**
  * Represents a component that is part of an environment.
  */
-export class EnvironmentComponent extends Component {
+@Entity()
+class EnvironmentComponent extends Component {
     constructor({ parentComponent, follows, ...rest }: Omit<EnvironmentComponent, 'id'>) {
         super(rest);
         this.parentComponent = parentComponent;
@@ -13,10 +15,14 @@ export class EnvironmentComponent extends Component {
     /**
      * The parent component of the current environment component if any
      */
+    @ManyToOne({ entity: () => EnvironmentComponent, nullable: true })
     parentComponent?: EnvironmentComponent;
 
     /**
      * Requirement that this environment component follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
 }
+
+export { EnvironmentComponent };
\ No newline at end of file
diff --git a/server/domain/requirements/Example.ts b/server/domain/Example.ts
similarity index 100%
rename from server/domain/requirements/Example.ts
rename to server/domain/Example.ts
diff --git a/server/domain/requirements/FunctionalBehavior.ts b/server/domain/FunctionalBehavior.ts
similarity index 70%
rename from server/domain/requirements/FunctionalBehavior.ts
rename to server/domain/FunctionalBehavior.ts
index a29f105d..494152d7 100644
--- a/server/domain/requirements/FunctionalBehavior.ts
+++ b/server/domain/FunctionalBehavior.ts
@@ -1,3 +1,4 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { Functionality, ParsedRequirement } from "./index.js";
 
 /**
@@ -5,7 +6,8 @@ import { Functionality, ParsedRequirement } from "./index.js";
  * the results or effects of the system's operation.
  * Generally expressed in the form "system must do <requirement>"
  */
-export class FunctionalBehavior extends Functionality {
+@Entity()
+class FunctionalBehavior extends Functionality {
     constructor({ follows, ...rest }: Omit<FunctionalBehavior, 'id'>) {
         super(rest);
         this.follows = follows;
@@ -14,5 +16,8 @@ export class FunctionalBehavior extends Functionality {
     /**
      * Requirement that this functional behavior follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
-}
\ No newline at end of file
+}
+
+export { FunctionalBehavior };
\ No newline at end of file
diff --git a/server/domain/requirements/Functionality.ts b/server/domain/Functionality.ts
similarity index 100%
rename from server/domain/requirements/Functionality.ts
rename to server/domain/Functionality.ts
diff --git a/server/domain/requirements/GlossaryTerm.ts b/server/domain/GlossaryTerm.ts
similarity index 68%
rename from server/domain/requirements/GlossaryTerm.ts
rename to server/domain/GlossaryTerm.ts
index 2de91b41..e9691f46 100644
--- a/server/domain/requirements/GlossaryTerm.ts
+++ b/server/domain/GlossaryTerm.ts
@@ -1,9 +1,11 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { Component, ParsedRequirement } from "./index.js";
 
 /**
  * A word or phrase that is part of a glossary. Provides a definition for the term
  */
-export class GlossaryTerm extends Component {
+@Entity()
+class GlossaryTerm extends Component {
     constructor({ parentComponent, follows, ...rest }: Omit<GlossaryTerm, 'id'>) {
         super(rest);
         this.parentComponent = parentComponent;
@@ -13,10 +15,14 @@ export class GlossaryTerm extends Component {
     /**
      * The parent term of the glossary term, if any.
      */
+    @ManyToOne({ entity: () => GlossaryTerm, nullable: true })
     parentComponent?: GlossaryTerm;
 
     /**
      * Requirement that this glossary term follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
 }
+
+export { GlossaryTerm }
\ No newline at end of file
diff --git a/server/domain/requirements/Goal.ts b/server/domain/Goal.ts
similarity index 100%
rename from server/domain/requirements/Goal.ts
rename to server/domain/Goal.ts
diff --git a/server/domain/Hint.ts b/server/domain/Hint.ts
new file mode 100644
index 00000000..54ee85f6
--- /dev/null
+++ b/server/domain/Hint.ts
@@ -0,0 +1,10 @@
+import { Entity } from "@mikro-orm/core";
+import { Noise } from "./index.js";
+
+/**
+ * Design or implementation suggestion
+ */
+@Entity()
+class Hint extends Noise { }
+
+export { Hint };
\ No newline at end of file
diff --git a/server/domain/requirements/Invariant.ts b/server/domain/Invariant.ts
similarity index 68%
rename from server/domain/requirements/Invariant.ts
rename to server/domain/Invariant.ts
index ed9485e5..54db7466 100644
--- a/server/domain/requirements/Invariant.ts
+++ b/server/domain/Invariant.ts
@@ -1,3 +1,4 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { ParsedRequirement, Requirement } from "./index.js";
 
 /**
@@ -5,7 +6,8 @@ import { ParsedRequirement, Requirement } from "./index.js";
  * It exists as both an assumption and an effect.
  * (precondition and postcondition)
  */
-export class Invariant extends Requirement {
+@Entity()
+class Invariant extends Requirement {
     constructor({ follows, ...rest }: Omit<Invariant, 'id'>) {
         super(rest);
         this.follows = follows;
@@ -14,5 +16,8 @@ export class Invariant extends Requirement {
     /**
      * Requirement that this invariant follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
-}
\ No newline at end of file
+}
+
+export { Invariant };
\ No newline at end of file
diff --git a/server/domain/requirements/Justification.ts b/server/domain/Justification.ts
similarity index 66%
rename from server/domain/requirements/Justification.ts
rename to server/domain/Justification.ts
index fa69d34a..6222e6aa 100644
--- a/server/domain/requirements/Justification.ts
+++ b/server/domain/Justification.ts
@@ -1,9 +1,11 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { MetaRequirement, ParsedRequirement } from "./index.js";
 
 /**
  * Explanation of a project or system property in reference to a goal or environment property
  */
-export class Justification extends MetaRequirement {
+@Entity()
+class Justification extends MetaRequirement {
     constructor({ follows, ...rest }: Omit<Justification, 'id'>) {
         super(rest);
         this.follows = follows;
@@ -12,5 +14,8 @@ export class Justification extends MetaRequirement {
     /**
      * Requirement that this justification follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
-}
\ No newline at end of file
+}
+
+export { Justification };
\ No newline at end of file
diff --git a/server/domain/requirements/Limit.ts b/server/domain/Limit.ts
similarity index 64%
rename from server/domain/requirements/Limit.ts
rename to server/domain/Limit.ts
index a9fea4aa..bab581de 100644
--- a/server/domain/requirements/Limit.ts
+++ b/server/domain/Limit.ts
@@ -1,9 +1,11 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { ParsedRequirement, Requirement } from "./index.js";
 
 /**
  * An Exclusion from the scope of requirements
  */
-export class Limit extends Requirement {
+@Entity()
+class Limit extends Requirement {
     constructor({ follows, ...rest }: Omit<Limit, 'id'>) {
         super(rest);
         this.follows = follows;
@@ -12,5 +14,8 @@ export class Limit extends Requirement {
     /**
      * Requirement that this limit follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
-}
\ No newline at end of file
+}
+
+export { Limit };
\ No newline at end of file
diff --git a/server/domain/MetaRequirement.ts b/server/domain/MetaRequirement.ts
new file mode 100644
index 00000000..a5ec1f75
--- /dev/null
+++ b/server/domain/MetaRequirement.ts
@@ -0,0 +1,10 @@
+import { Entity } from "@mikro-orm/core";
+import { Requirement } from "./index.js";
+
+/**
+ * Property of requirements themselves (not of the Project, Environment, Goals, or System)
+ */
+@Entity({ abstract: true })
+abstract class MetaRequirement extends Requirement { }
+
+export { MetaRequirement };
\ No newline at end of file
diff --git a/server/domain/requirements/MoscowPriority.ts b/server/domain/MoscowPriority.ts
similarity index 100%
rename from server/domain/requirements/MoscowPriority.ts
rename to server/domain/MoscowPriority.ts
diff --git a/server/domain/Noise.ts b/server/domain/Noise.ts
new file mode 100644
index 00000000..8229fbf9
--- /dev/null
+++ b/server/domain/Noise.ts
@@ -0,0 +1,10 @@
+import { Entity } from "@mikro-orm/core";
+import { Requirement } from "./index.js";
+
+/**
+ * Property that is in requirements but should not be
+ */
+@Entity()
+class Noise extends Requirement { }
+
+export { Noise };
\ No newline at end of file
diff --git a/server/domain/requirements/NonFunctionalBehavior.ts b/server/domain/NonFunctionalBehavior.ts
similarity index 73%
rename from server/domain/requirements/NonFunctionalBehavior.ts
rename to server/domain/NonFunctionalBehavior.ts
index 1f26b2f5..be37c64e 100644
--- a/server/domain/requirements/NonFunctionalBehavior.ts
+++ b/server/domain/NonFunctionalBehavior.ts
@@ -1,3 +1,4 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { Functionality, ParsedRequirement } from "./index.js";
 
 /**
@@ -5,7 +6,8 @@ import { Functionality, ParsedRequirement } from "./index.js";
  * 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 class NonFunctionalBehavior extends Functionality {
+@Entity()
+class NonFunctionalBehavior extends Functionality {
     constructor({ follows, ...rest }: Omit<NonFunctionalBehavior, 'id'>) {
         super(rest);
         this.follows = follows;
@@ -14,5 +16,8 @@ export class NonFunctionalBehavior extends Functionality {
     /**
      * Requirement that this non-functional behavior follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
-}
\ No newline at end of file
+}
+
+export { NonFunctionalBehavior };
\ No newline at end of file
diff --git a/server/domain/requirements/Obstacle.ts b/server/domain/Obstacle.ts
similarity index 66%
rename from server/domain/requirements/Obstacle.ts
rename to server/domain/Obstacle.ts
index a03c3871..15099575 100644
--- a/server/domain/requirements/Obstacle.ts
+++ b/server/domain/Obstacle.ts
@@ -1,9 +1,11 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { Goal, ParsedRequirement } from "./index.js";
 
 /**
  * Obstacles are the challenges that prevent the goals from being achieved.
  */
-export class Obstacle extends Goal {
+@Entity()
+class Obstacle extends Goal {
     constructor({ follows, ...rest }: Omit<Obstacle, 'id'>) {
         super(rest);
         this.follows = follows;
@@ -12,5 +14,8 @@ export class Obstacle extends Goal {
     /**
      * Requirement that this obstacle follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
-}
\ No newline at end of file
+}
+
+export { Obstacle };
\ No newline at end of file
diff --git a/server/domain/application/Organization.ts b/server/domain/Organization.ts
similarity index 61%
rename from server/domain/application/Organization.ts
rename to server/domain/Organization.ts
index 76d49f9a..524739c8 100644
--- a/server/domain/application/Organization.ts
+++ b/server/domain/Organization.ts
@@ -1,12 +1,13 @@
-import { Collection } from "@mikro-orm/core";
-import slugify from "../../../utils/slugify.js";
+import { Collection, Entity, OneToMany, Property } from "@mikro-orm/core";
+import slugify from "../../utils/slugify.js";
 import { v7 as uuidv7 } from 'uuid';
-import { type Solution } from "./index.js";
+import { Solution } from "./index.js";
 
 /**
  * An Organization is a collection of people and solutions
  */
-export class Organization {
+@Entity()
+class Organization {
     constructor(properties: Omit<Organization, 'id' | 'slug' | 'solutions'> & { solutions: Solution[] }) {
         this.id = uuidv7();
         this.name = properties.name;
@@ -18,26 +19,33 @@ export class Organization {
     /**
      * The unique identifier of the Organization
      */
+    @Property({ type: 'uuid', primary: true })
     id: string;
 
     /**
      * The description of the Organization
      */
+    @Property({ type: 'string' })
     description: string;
 
     /**
      * The name of the Organization
-     * @throws {Error} if the name is longer than 60 characters
+     * @throws {Error} if the name is longer than 100 characters
      */
+    @Property({ type: 'string', length: 100 })
     name: string
 
     /**
      * A slugified version of the name
      */
+    @Property({ type: 'string', unique: true })
     slug: string;
 
     /**
      * The solutions that belong to this organization
      */
+    @OneToMany({ entity: () => Solution, mappedBy: 'organization', orphanRemoval: true })
     solutions = new Collection<Solution>(this);
 }
+
+export { Organization };
\ No newline at end of file
diff --git a/server/domain/requirements/Outcome.ts b/server/domain/Outcome.ts
similarity index 63%
rename from server/domain/requirements/Outcome.ts
rename to server/domain/Outcome.ts
index 707463d3..dfeeeae8 100644
--- a/server/domain/requirements/Outcome.ts
+++ b/server/domain/Outcome.ts
@@ -1,9 +1,11 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { Goal, ParsedRequirement } from "./index.js";
 
 /**
  * A result desired by an organization
  */
-export class Outcome extends Goal {
+@Entity()
+class Outcome extends Goal {
     constructor({ follows, ...rest }: Omit<Outcome, 'id'>) {
         super(rest);
         this.follows = follows;
@@ -12,5 +14,8 @@ export class Outcome extends Goal {
     /**
      * Requirement that this outcome follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
-}
\ No newline at end of file
+}
+
+export { Outcome };
\ No newline at end of file
diff --git a/server/domain/ParsedRequirement.ts b/server/domain/ParsedRequirement.ts
new file mode 100644
index 00000000..16075749
--- /dev/null
+++ b/server/domain/ParsedRequirement.ts
@@ -0,0 +1,80 @@
+import { Collection, Entity, OneToMany } from '@mikro-orm/core';
+import { type CollectionToArrayProps } from './types/index.js';
+import {
+    Assumption, Constraint, Effect, EnvironmentComponent,
+    FunctionalBehavior, GlossaryTerm, Invariant, Justification, Limit, MetaRequirement,
+    NonFunctionalBehavior, Obstacle, Outcome, Person, Stakeholder,
+    SystemComponent, UseCase, UserStory
+} from './index.js';
+
+/**
+ * A requirement that has been parsed from natural language text
+ */
+@Entity()
+class ParsedRequirement extends MetaRequirement {
+    constructor(properties: Omit<CollectionToArrayProps<ParsedRequirement>, 'id'>) {
+        super(properties);
+
+        // 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));
+            }
+        }
+    }
+
+    @OneToMany({ entity: () => Assumption, mappedBy: 'follows' })
+    assumptions = new Collection<Assumption>(this);
+
+    @OneToMany({ entity: () => Constraint, mappedBy: 'follows' })
+    constraints = new Collection<Constraint>(this);
+
+    @OneToMany({ entity: () => Effect, mappedBy: 'follows' })
+    effects = new Collection<Effect>(this);
+
+    @OneToMany({ entity: () => EnvironmentComponent, mappedBy: 'follows' })
+    environmentComponents = new Collection<EnvironmentComponent>(this);
+
+    @OneToMany({ entity: () => FunctionalBehavior, mappedBy: 'follows' })
+    functionalBehaviors = new Collection<FunctionalBehavior>(this);
+
+    @OneToMany({ entity: () => GlossaryTerm, mappedBy: 'follows' })
+    glossaryTerms = new Collection<GlossaryTerm>(this);
+
+    @OneToMany({ entity: () => Invariant, mappedBy: 'follows' })
+    invariants = new Collection<Invariant>(this);
+
+    @OneToMany({ entity: () => Justification, mappedBy: 'follows' })
+    justifications = new Collection<Justification>(this);
+
+    @OneToMany({ entity: () => Limit, mappedBy: 'follows' })
+    limits = new Collection<Limit>(this);
+
+    @OneToMany({ entity: () => NonFunctionalBehavior, mappedBy: 'follows' })
+    nonFunctionalBehaviors = new Collection<NonFunctionalBehavior>(this);
+
+    @OneToMany({ entity: () => Obstacle, mappedBy: 'follows' })
+    obstacles = new Collection<Obstacle>(this);
+
+    @OneToMany({ entity: () => Outcome, mappedBy: 'follows' })
+    outcomes = new Collection<Outcome>(this);
+
+    @OneToMany({ entity: () => Person, mappedBy: 'follows' })
+    persons = new Collection<Person>(this);
+
+    @OneToMany({ entity: () => Stakeholder, mappedBy: 'follows' })
+    stakeholders = new Collection<Stakeholder>(this);
+
+    @OneToMany({ entity: () => SystemComponent, mappedBy: 'follows' })
+    systemComponents = new Collection<SystemComponent>(this);
+
+    @OneToMany({ entity: () => UseCase, mappedBy: 'follows' })
+    useCases = new Collection<UseCase>(this);
+
+    @OneToMany({ entity: () => UserStory, mappedBy: 'follows' })
+    userStories = new Collection<UserStory>(this);
+}
+
+export { ParsedRequirement };
\ No newline at end of file
diff --git a/server/domain/requirements/Person.ts b/server/domain/Person.ts
similarity index 58%
rename from server/domain/requirements/Person.ts
rename to server/domain/Person.ts
index b24ca9c7..c4473020 100644
--- a/server/domain/requirements/Person.ts
+++ b/server/domain/Person.ts
@@ -1,9 +1,11 @@
+import { Entity, ManyToOne, Property } from "@mikro-orm/core";
 import { Actor, ParsedRequirement } from "./index.js";
 
 /**
  * A person is a member of the Project staff
  */
-export class Person extends Actor {
+@Entity()
+class Person extends Actor {
     constructor({ email, follows, ...rest }: Omit<Person, 'id'>) {
         super(rest);
         this.email = email;
@@ -13,10 +15,15 @@ export class Person extends Actor {
     /**
      * Email address of the person
      */
+    // email address: https://stackoverflow.com/a/574698
+    @Property({ type: 'string', length: 254, nullable: true })
     email?: string;
 
     /**
      * Requirement that this person follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
 }
+
+export { Person };
\ No newline at end of file
diff --git a/server/domain/Product.ts b/server/domain/Product.ts
new file mode 100644
index 00000000..3ec183eb
--- /dev/null
+++ b/server/domain/Product.ts
@@ -0,0 +1,10 @@
+import { Entity } from "@mikro-orm/core";
+import { Requirement } from "./index.js";
+
+/**
+ * Artifact needed or produced by a task
+ */
+@Entity()
+class Product extends Requirement { }
+
+export { Product };
\ No newline at end of file
diff --git a/server/domain/requirements/Requirement.ts b/server/domain/Requirement.ts
similarity index 58%
rename from server/domain/requirements/Requirement.ts
rename to server/domain/Requirement.ts
index 6ed7b6e8..5ec1e908 100644
--- a/server/domain/requirements/Requirement.ts
+++ b/server/domain/Requirement.ts
@@ -1,10 +1,12 @@
 import { v7 as uuidv7 } from 'uuid';
-import { AppUser, Solution } from '../application/index.js';
+import { Entity, ManyToOne, Property } from '@mikro-orm/core';
+import { Solution, AppUser } from './index.js';
 
 /**
  * A Requirement is a statement that specifies a property.
  */
-export abstract class Requirement {
+@Entity({ abstract: true })
+abstract class Requirement {
     constructor(props: Omit<Requirement, 'id'>) {
         this.id = uuidv7();
         this.name = props.name;
@@ -18,6 +20,7 @@ export abstract class Requirement {
     /**
      * The unique identifier of the Requirement
      */
+    @Property({ type: 'uuid', primary: true })
     id: string;
 
     // A property is a Predicate formalizing its associated statement.
@@ -27,31 +30,42 @@ export abstract class Requirement {
     /**
      * A short name for the requirement
      */
+    @Property({ type: 'string', nullable: false })
     name: string;
 
     /**
      * A human-readable description of a property
+     * @throws {Error} if the statement is longer than 1000 characters
      */
+    @Property({ type: 'string', length: 1000, nullable: false })
     statement: string;
 
     /**
      * The solution that owns this requirement
      */
+    @ManyToOne({ entity: () => Solution, nullable: false })
     solution: Solution;
 
     /**
      * The date and time when the requirement was last modified
      */
+    @Property({ type: 'datetime', nullable: false, onCreate: () => new Date(), onUpdate: () => new Date(), defaultRaw: 'now()' })
     lastModified: Date;
 
     /**
      * The user who last modified the requirement
      */
+    // System Admin is the default user for the initial migration
+    // This can be removed in v0.14.0 or later
+    @ManyToOne({ entity: () => AppUser, nullable: false, default: 'ac594919-50e3-438a-b9bc-efb8a8654243' })
     modifiedBy: AppUser;
 
     /**
      * Whether the requirement is a silence requirement.
      * (i.e. a requirement that is not included in the solution)
      */
+    @Property({ type: 'boolean', nullable: false, default: false })
     isSilence: boolean;
 }
+
+export { Requirement };
\ No newline at end of file
diff --git a/server/domain/requirements/Responsibility.ts b/server/domain/Responsibility.ts
similarity index 100%
rename from server/domain/requirements/Responsibility.ts
rename to server/domain/Responsibility.ts
diff --git a/server/domain/requirements/Role.ts b/server/domain/Role.ts
similarity index 100%
rename from server/domain/requirements/Role.ts
rename to server/domain/Role.ts
diff --git a/server/domain/requirements/Scenario.ts b/server/domain/Scenario.ts
similarity index 66%
rename from server/domain/requirements/Scenario.ts
rename to server/domain/Scenario.ts
index bb916504..e8691302 100644
--- a/server/domain/requirements/Scenario.ts
+++ b/server/domain/Scenario.ts
@@ -1,10 +1,12 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { Example, Stakeholder } from "./index.js";
 
 /**
  * A Scenario specifies system behavior by describing paths
  * of interaction between actors and the system.
  */
-export abstract class Scenario extends Example {
+@Entity({ abstract: true })
+abstract class Scenario extends Example {
     constructor({ primaryActor, ...rest }: Omit<Scenario, 'id'>) {
         super(rest);
         this.primaryActor = primaryActor;
@@ -13,5 +15,8 @@ export abstract class Scenario extends Example {
     /**
      * Primary actor involved in the scenario
      */
+    @ManyToOne({ entity: () => Stakeholder, nullable: true })
     primaryActor?: Stakeholder;
 }
+
+export { Scenario };
\ No newline at end of file
diff --git a/server/domain/requirements/Silence.ts b/server/domain/Silence.ts
similarity index 67%
rename from server/domain/requirements/Silence.ts
rename to server/domain/Silence.ts
index 8a9fea16..18921040 100644
--- a/server/domain/requirements/Silence.ts
+++ b/server/domain/Silence.ts
@@ -1,10 +1,14 @@
+import { Entity } from "@mikro-orm/core";
 import { Requirement } from "./index.js";
 
 /**
  * Propery that is not in requirements but should be
  */
-export class Silence extends Requirement {
+@Entity()
+class Silence extends Requirement {
     constructor(properties: Omit<Silence, 'id' | 'isSilence'>) {
         super({ ...properties, isSilence: true });
     }
 }
+
+export { Silence };
\ No newline at end of file
diff --git a/server/domain/application/Solution.ts b/server/domain/Solution.ts
similarity index 57%
rename from server/domain/application/Solution.ts
rename to server/domain/Solution.ts
index b977f4aa..b21e5dd6 100644
--- a/server/domain/application/Solution.ts
+++ b/server/domain/Solution.ts
@@ -1,20 +1,17 @@
 import { v7 as uuidv7 } from 'uuid';
-import { Collection } from '@mikro-orm/core';
-import { type CollectionToArrayProps } from '../types/index.js';
-import { Organization } from './index.js';
-import slugify from '../../../utils/slugify.js';
+import { Collection, Entity, ManyToOne, OneToMany, Property } from '@mikro-orm/core';
+import { type CollectionToArrayProps } from './types/index.js';
+import slugify from '../../utils/slugify.js';
 import {
-    type Assumption, type Constraint, type Effect, type Justification, type EnvironmentComponent,
-    type FunctionalBehavior, type GlossaryTerm, type Invariant, type Limit, type MetaRequirement,
-    type NonFunctionalBehavior, type Obstacle, type Outcome, type Person, type Stakeholder,
-    type SystemComponent, type UseCase, type UserStory,
-
-} from '../requirements/index.js';
+    Assumption, Constraint, Effect, EnvironmentComponent, FunctionalBehavior, GlossaryTerm, Invariant, Justification,
+    Limit, NonFunctionalBehavior, Obstacle, Organization, Outcome, Person, Stakeholder, SystemComponent, UseCase, UserStory, type MetaRequirement,
+} from './index.js';
 
 /**
  * A Solution is the aggregation of a Project, Environment, Goals, and a System
  */
-export class Solution {
+@Entity()
+class Solution {
     constructor(properties: Omit<CollectionToArrayProps<Solution>, 'slug' | 'id'>) {
         this.id = uuidv7();
         this.description = properties.description;
@@ -35,110 +32,135 @@ export class Solution {
     /**
      * The unique identifier of the Solution
      */
+    @Property({ type: 'uuid', primary: true })
     id: string;
 
     /**
      * The Organization that owns this Solution
      */
+    @ManyToOne({ entity: () => Organization, inversedBy: 'solutions' })
     organization: Organization;
 
     /**
      * The description of the Solution
      */
+    @Property({ type: 'string' })
     description: string;
 
     /**
      * The name of the Solution
+     * @throws {Error} if the name is longer than 100 characters
      */
+    @Property({ type: 'string', length: 100 })
     name: string;
 
     /**
      * A slugified version of the name
      */
+    @Property({ type: 'string', unique: true })
     slug: string;
 
     /**
      * The assumptions for this solution
      */
+    @OneToMany({ entity: () => Assumption, mappedBy: 'solution', orphanRemoval: true })
     assumptions = new Collection<Assumption>(this);
 
     /**
      * The constraints for this solution
      */
+    @OneToMany({ entity: () => Constraint, mappedBy: 'solution', orphanRemoval: true })
     constraints = new Collection<Constraint>(this);
 
     /**
      * The effects for this solution
      */
+    @OneToMany({ entity: () => Effect, mappedBy: 'solution', orphanRemoval: true })
     effects = new Collection<Effect>(this);
 
     /**
      * The environment components for this solution
      */
+    @OneToMany({ entity: () => EnvironmentComponent, mappedBy: 'solution', orphanRemoval: true })
     environmentComponents = new Collection<EnvironmentComponent>(this);
 
     /**
      * The functional behaviors for this solution
      */
+    @OneToMany({ entity: () => FunctionalBehavior, mappedBy: 'solution', orphanRemoval: true })
     functionalBehaviors = new Collection<FunctionalBehavior>(this);
 
     /**
      * The glossary terms for this solution
      */
+    @OneToMany({ entity: () => GlossaryTerm, mappedBy: 'solution', orphanRemoval: true })
     glossaryTerms = new Collection<GlossaryTerm>(this);
 
     /**
      * The invariants for this solution
      */
+    @OneToMany({ entity: () => Invariant, mappedBy: 'solution', orphanRemoval: true })
     invariants = new Collection<Invariant>(this);
 
     /**
      * The justifications for this solution
      */
+    @OneToMany({ entity: () => Justification, mappedBy: 'solution', orphanRemoval: true })
     justifications = new Collection<Justification>(this);
 
     /**
      * The limits for this solution
      */
+    @OneToMany({ entity: () => Limit, mappedBy: 'solution', orphanRemoval: true })
     limits = new Collection<Limit>(this);
 
     /**
      * The non-functional behaviors for this solution
      */
+    @OneToMany({ entity: () => NonFunctionalBehavior, mappedBy: 'solution', orphanRemoval: true })
     nonFunctionalBehaviors = new Collection<NonFunctionalBehavior>(this);
 
     /**
      * The obstacles for this solution
      */
+    @OneToMany({ entity: () => Obstacle, mappedBy: 'solution', orphanRemoval: true })
     obstacles = new Collection<Obstacle>(this);
 
     /**
      * The outcomes for this solution
      */
+    @OneToMany({ entity: () => Outcome, mappedBy: 'solution', orphanRemoval: true })
     outcomes = new Collection<Outcome>(this);
 
     /**
      * The persons for this solution
      */
+    @OneToMany({ entity: () => Person, mappedBy: 'solution', orphanRemoval: true })
     persons = new Collection<Person>(this);
 
     /**
      * The stakeholders for this solution
      */
+    @OneToMany({ entity: () => Stakeholder, mappedBy: 'solution', orphanRemoval: true })
     stakeholders = new Collection<Stakeholder>(this);
 
     /**
      * The system components for this solution
      */
+    @OneToMany({ entity: () => SystemComponent, mappedBy: 'solution', orphanRemoval: true })
     systemComponents = new Collection<SystemComponent>(this);
 
     /**
      * The use cases for this solution
      */
+    @OneToMany({ entity: () => UseCase, mappedBy: 'solution', orphanRemoval: true })
     useCases = new Collection<UseCase>(this);
 
     /**
      * The user stories for this solution
      */
+    @OneToMany({ entity: () => UserStory, mappedBy: 'solution', orphanRemoval: true })
     userStories = new Collection<UserStory>(this);
 }
+
+export { Solution };
\ No newline at end of file
diff --git a/server/domain/requirements/Stakeholder.ts b/server/domain/Stakeholder.ts
similarity index 66%
rename from server/domain/requirements/Stakeholder.ts
rename to server/domain/Stakeholder.ts
index b0fb3607..988980bc 100644
--- a/server/domain/requirements/Stakeholder.ts
+++ b/server/domain/Stakeholder.ts
@@ -1,17 +1,11 @@
+import { Entity, Enum, ManyToOne, Property } from "@mikro-orm/core";
 import { Component, ParsedRequirement, StakeholderCategory, StakeholderSegmentation } from "./index.js";
 
-export interface IStakeholder {
-    influence: number
-    availability: number
-    segmentation: StakeholderSegmentation
-    category: StakeholderCategory
-    parentComponent: Stakeholder
-}
-
 /**
  * A human actor who may affect or be affected by a project or its associated system
  */
-export class Stakeholder extends Component {
+@Entity()
+class Stakeholder extends Component {
     constructor({ influence, availability, segmentation, category, parentComponent, follows, ...rest }: Omit<Stakeholder, 'id'>) {
         super(rest);
 
@@ -26,30 +20,38 @@ export class Stakeholder extends Component {
     /**
      * Requirement that this stakeholder follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
 
     /**
      * The parent component of the stakeholder, if any.
      */
+    @ManyToOne({ entity: () => Stakeholder, nullable: true })
     parentComponent?: Stakeholder;
 
     /**
      * The segmentation of the stakeholder.
      */
+    @Enum({ items: () => StakeholderSegmentation, nullable: true })
     segmentation?: StakeholderSegmentation;
 
     /**
      * The category of the stakeholder.
      */
+    @Enum({ items: () => StakeholderCategory, nullable: true })
     category?: StakeholderCategory;
 
     /**
      * The availability of the stakeholder.
      */
+    @Property({ type: 'number', nullable: false, check: 'availability >= 0 AND availability <= 100' })
     availability: number;
 
     /**
      * The influence of the stakeholder.
      */
+    @Property({ type: 'number', nullable: false, check: 'influence >= 0 AND influence <= 100' })
     influence: number;
-}
\ No newline at end of file
+}
+
+export { Stakeholder };
\ No newline at end of file
diff --git a/server/domain/requirements/StakeholderCategory.ts b/server/domain/StakeholderCategory.ts
similarity index 100%
rename from server/domain/requirements/StakeholderCategory.ts
rename to server/domain/StakeholderCategory.ts
diff --git a/server/domain/requirements/StakeholderSegmentation.ts b/server/domain/StakeholderSegmentation.ts
similarity index 100%
rename from server/domain/requirements/StakeholderSegmentation.ts
rename to server/domain/StakeholderSegmentation.ts
diff --git a/server/domain/requirements/SystemComponent.ts b/server/domain/SystemComponent.ts
similarity index 65%
rename from server/domain/requirements/SystemComponent.ts
rename to server/domain/SystemComponent.ts
index d8e14550..1781c424 100644
--- a/server/domain/requirements/SystemComponent.ts
+++ b/server/domain/SystemComponent.ts
@@ -1,9 +1,11 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { Component, ParsedRequirement } from "./index.js"
 
 /**
  * A component of a system
  */
-export class SystemComponent extends Component {
+@Entity()
+class SystemComponent extends Component {
     constructor({ parentComponent, follows, ...rest }: Omit<SystemComponent, 'id'>) {
         super(rest);
         this.parentComponent = parentComponent;
@@ -13,10 +15,14 @@ export class SystemComponent extends Component {
     /**
      * Requirement that this system component follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
 
     /**
      * Parent component of the current system component
      */
+    @ManyToOne({ entity: () => SystemComponent, nullable: true })
     parentComponent?: SystemComponent;
 }
+
+export { SystemComponent };
\ No newline at end of file
diff --git a/server/domain/requirements/Task.ts b/server/domain/Task.ts
similarity index 100%
rename from server/domain/requirements/Task.ts
rename to server/domain/Task.ts
diff --git a/server/domain/requirements/TestCase.ts b/server/domain/TestCase.ts
similarity index 100%
rename from server/domain/requirements/TestCase.ts
rename to server/domain/TestCase.ts
diff --git a/server/domain/requirements/UseCase.ts b/server/domain/UseCase.ts
similarity index 79%
rename from server/domain/requirements/UseCase.ts
rename to server/domain/UseCase.ts
index 08698ea4..88d1a08a 100644
--- a/server/domain/requirements/UseCase.ts
+++ b/server/domain/UseCase.ts
@@ -1,10 +1,12 @@
+import { Entity, ManyToOne, Property } from "@mikro-orm/core";
 import { Assumption, Effect, ParsedRequirement, Scenario } from "./index.js";
 
 /**
  * A Use Case specifies the scenario of a complete
  * interaction of a user through a system.
  */
-export class UseCase extends Scenario {
+@Entity()
+class UseCase extends Scenario {
     constructor(props: Omit<UseCase, 'id'>) {
         super(props);
         this.scope = props.scope;
@@ -22,34 +24,40 @@ export class UseCase extends Scenario {
     /**
      * Requirement that this use case follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
 
     /**
      * The scope of the use case.
      */
     // TODO: <https://github.com/final-hill/cathedral/issues/154>
+    @Property({ type: 'string', nullable: false })
     scope: string;
 
     /**
      * The level of the use case.
      */
     // TODO: <https://github.com/final-hill/cathedral/issues/154>
+    @Property({ type: 'string', nullable: false })
     level: string;
 
     /**
      * The goal in context of the use case.
      */
     // TODO: is this just the Goal.description?
+    @Property({ type: 'string', nullable: false })
     goalInContext: string;
 
     /**
      * The precondition is an Assumption that must be true before the use case can start.
      */
+    @ManyToOne({ entity: () => Assumption, nullable: true })
     precondition?: Assumption;
 
     /**
      * The action upon the system that starts the use case.
      */
+    @Property({ type: 'uuid', nullable: true })
     triggerId?: string;
 
     /**
@@ -61,19 +69,24 @@ export class UseCase extends Scenario {
      * ...
      */
     //mainSuccessScenario: [FunctionalRequirement | Constraint | Role | Responsibility][]
+    @Property({ type: 'string', nullable: false })
     mainSuccessScenario: string
 
     /**
      * An Effect that is guaranteed to be true after the use case is completed.
      */
+    @ManyToOne({ entity: () => Effect, nullable: true })
     successGuarantee?: Effect;
 
     /**
      * Extensions of the use case.
      */
     // extensions: [FunctionalRequirement | Constraint | Role | Responsibility][]
+    @Property({ type: 'string', nullable: false })
     extensions: string
 
     // TODO: <https://github.com/final-hill/cathedral/issues/154>
     // stakeHoldersAndInterests: string[] // Actor[]
 }
+
+export { UseCase };
\ No newline at end of file
diff --git a/server/domain/requirements/UserStory.ts b/server/domain/UserStory.ts
similarity index 73%
rename from server/domain/requirements/UserStory.ts
rename to server/domain/UserStory.ts
index 2b02823e..2b39bd25 100644
--- a/server/domain/requirements/UserStory.ts
+++ b/server/domain/UserStory.ts
@@ -1,3 +1,4 @@
+import { Entity, ManyToOne } from "@mikro-orm/core";
 import { FunctionalBehavior, Outcome, ParsedRequirement, Scenario } from "./index.js";
 
 /**
@@ -9,7 +10,8 @@ import { FunctionalBehavior, Outcome, ParsedRequirement, Scenario } from "./inde
  * [behavior] - behaviorId (Functional Behavior)
  * [goal] - outcomeId
  */
-export class UserStory extends Scenario {
+@Entity()
+class UserStory extends Scenario {
     constructor({ outcome, functionalBehavior, follows, ...rest }: Omit<UserStory, 'id'>) {
         super(rest);
         this.outcome = outcome;
@@ -20,15 +22,20 @@ export class UserStory extends Scenario {
     /**
      * Requirement that this user story follows from
      */
+    @ManyToOne({ entity: () => ParsedRequirement, nullable: true })
     follows?: ParsedRequirement;
 
     /**
      * The action that the user wants to perform.
      */
+    @ManyToOne({ entity: () => FunctionalBehavior, nullable: true })
     functionalBehavior?: FunctionalBehavior;
 
     /**
      * The outcome that the story is aiming to achieve.
      */
+    @ManyToOne({ entity: () => Outcome, nullable: true })
     outcome?: Outcome;
 }
+
+export { UserStory };
\ No newline at end of file
diff --git a/server/domain/application/index.ts b/server/domain/application/index.ts
deleted file mode 100644
index 3eb9621c..00000000
--- a/server/domain/application/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { AppRole } from './AppRole.js';
-export { AppUser } from './AppUser.js';
-export { AppUserOrganizationRole } from './AppUserOrganizationRole.js';
-export { Organization } from './Organization.js';
-export { Solution } from './Solution.js';
diff --git a/server/domain/requirements/index.ts b/server/domain/index.ts
similarity index 79%
rename from server/domain/requirements/index.ts
rename to server/domain/index.ts
index 93b3a093..424ac726 100644
--- a/server/domain/requirements/index.ts
+++ b/server/domain/index.ts
@@ -1,12 +1,21 @@
+// The order matters due to circular dependencies.
+// If you receive a "not found (Cannot access 'Foo' before initialization)" error,
+// move the 'Foo' import up in the list.
+export { Organization } from './Organization.js';
+export { Solution } from './Solution.js';
+export { AppUser } from './AppUser.js';
 export { Requirement } from './Requirement.js';
 export { MetaRequirement } from './MetaRequirement.js';
 export { ParsedRequirement } from './ParsedRequirement.js';
+export { Constraint } from './Constraint.js';
+export { ConstraintCategory } from './ConstraintCategory.js';
 export { Actor } from './Actor.js';
+export { Component } from './Component.js';
+export { Stakeholder } from './Stakeholder.js';
+export { StakeholderCategory } from './StakeholderCategory.js';
+export { StakeholderSegmentation } from './StakeholderSegmentation.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';
@@ -29,11 +38,10 @@ 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
+export { UserStory } from './UserStory.js';
+export { AppRole } from './AppRole.js';
+export { AppUserOrganizationRole } from './AppUserOrganizationRole.js';
\ No newline at end of file
diff --git a/server/domain/requirements/Hint.ts b/server/domain/requirements/Hint.ts
deleted file mode 100644
index 7b9f3d74..00000000
--- a/server/domain/requirements/Hint.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Noise } from "./index.js";
-
-/**
- * Design or implementation suggestion
- */
-export class Hint extends Noise { }
\ No newline at end of file
diff --git a/server/domain/requirements/MetaRequirement.ts b/server/domain/requirements/MetaRequirement.ts
deleted file mode 100644
index c43e40c0..00000000
--- a/server/domain/requirements/MetaRequirement.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Requirement } from "./index.js";
-
-/**
- * Property of requirements themselves (not of the Project, Environment, Goals, or System)
- */
-export abstract class MetaRequirement extends Requirement { }
diff --git a/server/domain/requirements/Noise.ts b/server/domain/requirements/Noise.ts
deleted file mode 100644
index e825e7e7..00000000
--- a/server/domain/requirements/Noise.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Requirement } from "./index.js";
-
-/**
- * Property that is in requirements but should not be
- */
-export class Noise extends Requirement { }
diff --git a/server/domain/requirements/ParsedRequirement.ts b/server/domain/requirements/ParsedRequirement.ts
deleted file mode 100644
index fa3b6f16..00000000
--- a/server/domain/requirements/ParsedRequirement.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Collection } from '@mikro-orm/core';
-import { type CollectionToArrayProps } from '../types/index.js';
-import {
-    type Assumption, type Constraint, type Effect, type Justification, type EnvironmentComponent,
-    type FunctionalBehavior, type GlossaryTerm, type Invariant, type Limit, MetaRequirement,
-    type NonFunctionalBehavior, type Obstacle, type Outcome, type Person, type Stakeholder,
-    type SystemComponent, type UseCase, type UserStory
-} from '../requirements/index.js';
-
-/**
- * A requirement that has been parsed from natural language text
- */
-export class ParsedRequirement extends MetaRequirement {
-    constructor(properties: Omit<CollectionToArrayProps<ParsedRequirement>, 'id'>) {
-        super(properties);
-
-        // 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));
-            }
-        }
-    }
-
-    assumptions = new Collection<Assumption>(this);
-    constraints = new Collection<Constraint>(this);
-    effects = new Collection<Effect>(this);
-    environmentComponents = new Collection<EnvironmentComponent>(this);
-    functionalBehaviors = new Collection<FunctionalBehavior>(this);
-    glossaryTerms = new Collection<GlossaryTerm>(this);
-    invariants = new Collection<Invariant>(this);
-    justifications = new Collection<Justification>(this);
-    limits = new Collection<Limit>(this);
-    nonFunctionalBehaviors = new Collection<NonFunctionalBehavior>(this);
-    obstacles = new Collection<Obstacle>(this);
-    outcomes = new Collection<Outcome>(this);
-    persons = new Collection<Person>(this);
-    stakeholders = new Collection<Stakeholder>(this);
-    systemComponents = new Collection<SystemComponent>(this);
-    useCases = new Collection<UseCase>(this);
-    userStories = new Collection<UserStory>(this);
-}
\ No newline at end of file
diff --git a/server/domain/requirements/Product.ts b/server/domain/requirements/Product.ts
deleted file mode 100644
index 21456b0b..00000000
--- a/server/domain/requirements/Product.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Requirement } from "./index.js";
-
-/**
- * Artifact needed or produced by a task
- */
-export class Product extends Requirement { }
\ No newline at end of file
diff --git a/server/tsconfig.json b/server/tsconfig.json
index 2580404e..b9629468 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -1,5 +1,10 @@
 {
     "extends": "../.nuxt/tsconfig.server.json",
+    "compilerOptions": {
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "declaration": true
+    },
     "ts-node": {
         "esm": true,
         "transpileOnly": true
diff --git a/server/utils/assertOrgAdmin.ts b/server/utils/assertOrgAdmin.ts
index 19d354f6..ea43416a 100644
--- a/server/utils/assertOrgAdmin.ts
+++ b/server/utils/assertOrgAdmin.ts
@@ -1,7 +1,7 @@
 import type { H3Event, EventHandlerRequest } from 'h3'
 import { getServerSession } from '#auth'
-import { AppRole, AppUser, AppUserOrganizationRole, Organization } from "~/server/domain/application/index"
-import { fork } from "~/server/data/orm"
+import { AppRole, AppUser, AppUserOrganizationRole, Organization } from "~/server/domain/index.js"
+import { fork } from "~/server/data/orm.js"
 
 /**
  * Asserts that the user is an admin of the organization that owns the solution or is a system admin
diff --git a/server/utils/assertOrgContributor.ts b/server/utils/assertOrgContributor.ts
index a5c955d7..ba776d9b 100644
--- a/server/utils/assertOrgContributor.ts
+++ b/server/utils/assertOrgContributor.ts
@@ -1,7 +1,7 @@
 import type { H3Event, EventHandlerRequest } from 'h3'
 import { getServerSession } from '#auth'
-import { AppRole, AppUser, AppUserOrganizationRole, Organization } from "~/server/domain/application/index"
-import { fork } from "~/server/data/orm"
+import { AppRole, AppUser, AppUserOrganizationRole, Organization } from "~/server/domain/index.js"
+import { fork } from "~/server/data/orm.js"
 
 /**
  * Asserts that the user is a contributor of the organization that owns the solution or is a system admin
diff --git a/server/utils/assertOrgReader.ts b/server/utils/assertOrgReader.ts
index 9c7b575b..edba77e1 100644
--- a/server/utils/assertOrgReader.ts
+++ b/server/utils/assertOrgReader.ts
@@ -1,7 +1,7 @@
 import type { H3Event, EventHandlerRequest } from 'h3'
 import { getServerSession } from '#auth'
-import { AppRole, AppUser, AppUserOrganizationRole, Organization } from "~/server/domain/application/index"
-import { fork } from "~/server/data/orm"
+import { AppRole, AppUser, AppUserOrganizationRole, Organization } from "~/server/domain/index.js"
+import { fork } from "~/server/data/orm.js"
 
 /**
  * Asserts that the user is a member of the organization that owns the solution or is a system admin
diff --git a/server/utils/assertSolutionAdmin.ts b/server/utils/assertSolutionAdmin.ts
index 149950cd..4ac8fe1e 100644
--- a/server/utils/assertSolutionAdmin.ts
+++ b/server/utils/assertSolutionAdmin.ts
@@ -1,7 +1,7 @@
 import type { H3Event, EventHandlerRequest } from 'h3'
 import { getServerSession } from '#auth'
-import { fork } from "~/server/data/orm"
-import { AppRole, AppUser, AppUserOrganizationRole, Solution } from '../domain/application/index'
+import { fork } from "~/server/data/orm.js"
+import { AppRole, AppUser, AppUserOrganizationRole, Solution } from '../domain/index.js'
 
 /**
  * Asserts that the user is an admin of the organization that owns the solution or is a system admin
diff --git a/server/utils/assertSolutionContributor.ts b/server/utils/assertSolutionContributor.ts
index 58a91de2..726b5718 100644
--- a/server/utils/assertSolutionContributor.ts
+++ b/server/utils/assertSolutionContributor.ts
@@ -1,7 +1,7 @@
 import type { H3Event, EventHandlerRequest } from 'h3'
 import { getServerSession } from '#auth'
-import { AppRole, AppUser, AppUserOrganizationRole, Solution } from "~/server/domain/application/index"
-import { fork } from "~/server/data/orm"
+import { AppRole, AppUser, AppUserOrganizationRole, Solution } from "~/server/domain/index.js"
+import { fork } from "~/server/data/orm.js"
 
 /**
  * Asserts that the user is a contributor of the organization that owns the solution or is a system admin
diff --git a/server/utils/assertSolutionReader.ts b/server/utils/assertSolutionReader.ts
index 63dd12cc..e94ef150 100644
--- a/server/utils/assertSolutionReader.ts
+++ b/server/utils/assertSolutionReader.ts
@@ -1,7 +1,7 @@
 import type { H3Event, EventHandlerRequest } from 'h3'
 import { getServerSession } from '#auth'
-import { AppRole, AppUser, AppUserOrganizationRole, Solution } from "~/server/domain/application/index"
-import { fork } from "~/server/data/orm"
+import { AppRole, AppUser, AppUserOrganizationRole, Solution } from "~/server/domain/index.js"
+import { fork } from "~/server/data/orm.js"
 
 /**
  * Asserts that the user is a member of the organization that owns the solution or is a system admin
diff --git a/tsconfig.json b/tsconfig.json
index 82a44a26..76d236a9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,11 @@
 {
     // https://nuxt.com/docs/guide/concepts/typescript
     "extends": "./.nuxt/tsconfig.json",
+    "compilerOptions": {
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "declaration": true
+    },
     "ts-node": {
         "esm": true,
         "transpileOnly": true