From 555315d0372b1897ff82d4a6f8c35e081064d0d2 Mon Sep 17 00:00:00 2001
From: "Christopher S. Case" <chris.case@g33xnexus.com>
Date: Tue, 10 Dec 2024 02:02:33 -0600
Subject: [PATCH 1/3] Started cleaning up the models.

---
 src/client/lib/managers/systems/eote.ts      |  3 ++-
 src/client/lib/resource-access/supplement.ts |  3 ++-
 src/client/lib/stores/systems/eote.ts        |  3 ++-
 src/client/lib/stores/systems/genesys.ts     |  3 ++-
 src/common/interfaces/common.ts              |  8 ++++----
 src/common/interfaces/models/account.ts      |  7 ++-----
 src/common/interfaces/models/dice.ts         |  2 +-
 src/common/interfaces/models/messages.ts     |  2 +-
 src/common/interfaces/models/notebook.ts     | 21 +++++++-------------
 src/common/interfaces/models/reference.ts    |  7 ++-----
 src/common/interfaces/models/role.ts         |  7 ++-----
 src/common/interfaces/models/supplement.ts   |  5 +----
 src/common/interfaces/systems/supplements.ts |  6 ------
 13 files changed, 28 insertions(+), 49 deletions(-)

diff --git a/src/client/lib/managers/systems/eote.ts b/src/client/lib/managers/systems/eote.ts
index fd2bce34..4e5bb8a7 100644
--- a/src/client/lib/managers/systems/eote.ts
+++ b/src/client/lib/managers/systems/eote.ts
@@ -7,7 +7,8 @@ import { XOR } from 'ts-essentials';
 // Interfaces
 import { Character } from '../../../../common/interfaces/common';
 import * as Models from '../../../../common/interfaces/systems/eote';
-import { Reference, Supplement } from '../../../../common/interfaces/systems/supplements';
+import { Supplement } from '../../../../common/interfaces/systems/supplements';
+import { Reference } from '../../../../common/interfaces/models/reference';
 
 // Stores
 import { useEoteStore } from '../../stores/systems/eote';
diff --git a/src/client/lib/resource-access/supplement.ts b/src/client/lib/resource-access/supplement.ts
index 136c4f39..c11cff1f 100644
--- a/src/client/lib/resource-access/supplement.ts
+++ b/src/client/lib/resource-access/supplement.ts
@@ -5,7 +5,8 @@
 import axios from 'axios';
 
 // Interfaces
-import { Reference, Supplement } from '../../../common/interfaces/systems/supplements';
+import { Supplement } from '../../../common/interfaces/systems/supplements';
+import { Reference } from '../../../common/interfaces/models/reference';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/client/lib/stores/systems/eote.ts b/src/client/lib/stores/systems/eote.ts
index af4f5ad3..cfcc5252 100644
--- a/src/client/lib/stores/systems/eote.ts
+++ b/src/client/lib/stores/systems/eote.ts
@@ -6,7 +6,8 @@ import { defineStore } from 'pinia';
 
 // Models
 import * as EoteModels from '../../../../common/interfaces/systems/eote';
-import { Reference, Supplement } from '../../../../common/interfaces/systems/supplements';
+import { Supplement } from '../../../../common/interfaces/systems/supplements';
+import { Reference } from '../../../../common/interfaces/models/reference';
 
 // Resource Access
 import suppRA from '../../resource-access/supplement';
diff --git a/src/client/lib/stores/systems/genesys.ts b/src/client/lib/stores/systems/genesys.ts
index 2fdaf1d4..0a238fe7 100644
--- a/src/client/lib/stores/systems/genesys.ts
+++ b/src/client/lib/stores/systems/genesys.ts
@@ -6,7 +6,8 @@ import { defineStore } from 'pinia';
 
 // Models
 import * as GenesysModels from '../../../../common/interfaces/systems/eote';
-import { Reference, Supplement } from '../../../../common/interfaces/systems/supplements';
+import { Supplement } from '../../../../common/interfaces/systems/supplements';
+import { Reference } from '../../../../common/interfaces/models/reference';
 
 // Resource Access
 import suppRA from '../../resource-access/supplement';
diff --git a/src/common/interfaces/common.ts b/src/common/interfaces/common.ts
index 1da8ea08..e7e3fc81 100644
--- a/src/common/interfaces/common.ts
+++ b/src/common/interfaces/common.ts
@@ -2,13 +2,13 @@
 // Common Interfaces
 // ---------------------------------------------------------------------------------------------------------------------
 
-export { AccountOptions, AccountSettings, Account } from './models/account.js';
+export { AccountSettings, Account } from './models/account.js';
 export { CharacterOptions, SystemDetails, Character } from './models/character.js';
 export { DiceRoll } from './models/dice.js';
-export { NotebookOptions, NotebookPageOptions, Notebook, NotebookPage } from './models/notebook.js';
-export { RoleOptions, Role } from './models/role.js';
+export { Notebook, NotebookPage } from './models/notebook.js';
+export { Role } from './models/role.js';
 export { RPGKMessage, RPGKEventMessage, RPGKRemoveMessage, RPGKUpdateMessage } from './models/messages.js';
-export { SupplementOptions, Supplement } from './models/supplement.js';
+export { Supplement } from './models/supplement.js';
 export { SupportStatus, System } from './models/system.js';
 
 // ---------------------------------------------------------------------------------------------------------------------
diff --git a/src/common/interfaces/models/account.ts b/src/common/interfaces/models/account.ts
index d8eb62d1..9c594644 100644
--- a/src/common/interfaces/models/account.ts
+++ b/src/common/interfaces/models/account.ts
@@ -2,7 +2,7 @@
 // Account
 //----------------------------------------------------------------------------------------------------------------------
 
-import { ValidColorMode } from './colorMode';
+import { ValidColorMode } from './colorMode.js';
 
 //----------------------------------------------------------------------------------------------------------------------
 
@@ -11,7 +11,7 @@ export interface AccountSettings
     colorMode ?: ValidColorMode
 }
 
-export interface AccountOptions
+export interface Account
 {
     id : string;
     email : string;
@@ -22,9 +22,6 @@ export interface AccountOptions
     settings ?: AccountSettings;
 }
 
-// FIXME: Once Models are removed, `AccountOptions` should be named 'Account'.
-export type Account = AccountOptions;
-
 export type NewAccount = Omit<Account, 'id'>;
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/common/interfaces/models/dice.ts b/src/common/interfaces/models/dice.ts
index d8bf2ea0..b03b0393 100644
--- a/src/common/interfaces/models/dice.ts
+++ b/src/common/interfaces/models/dice.ts
@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------------------------------------------------
-// Dice
+// Dice Roll Models
 // ---------------------------------------------------------------------------------------------------------------------
 
 import { Roll } from 'rpgdicejs';
diff --git a/src/common/interfaces/models/messages.ts b/src/common/interfaces/models/messages.ts
index 1a7827e4..a369e821 100644
--- a/src/common/interfaces/models/messages.ts
+++ b/src/common/interfaces/models/messages.ts
@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------------------------------------------------
-// Messages
+// Messages Models
 // ---------------------------------------------------------------------------------------------------------------------
 
 import { Character } from './character.js';
diff --git a/src/common/interfaces/models/notebook.ts b/src/common/interfaces/models/notebook.ts
index dfc88d1c..66dd9c76 100644
--- a/src/common/interfaces/models/notebook.ts
+++ b/src/common/interfaces/models/notebook.ts
@@ -1,15 +1,8 @@
 //----------------------------------------------------------------------------------------------------------------------
-// Note
+// Notebook Models
 //----------------------------------------------------------------------------------------------------------------------
 
-export interface NotebookOptions 
-{
-    id : string;
-    // eslint-disable-next-line no-use-before-define
-    pages ?: NotebookPageOptions[]
-}
-
-export interface NotebookPageOptions 
+export interface NotebookPage
 {
     id : string;
     title : string;
@@ -17,11 +10,11 @@ export interface NotebookPageOptions
     notebookID : string;
 }
 
-// FIXME: Once Models are removed, `NotebookOptions` should be named 'Notebook'.
-export type Notebook = NotebookOptions;
-
-// FIXME: Once Models are removed, `NotebookPageOptions` should be named 'NotebookPage'.
-export type NotebookPage = NotebookPageOptions;
+export interface Notebook
+{
+    id : string;
+    pages ?: NotebookPage[]
+}
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/common/interfaces/models/reference.ts b/src/common/interfaces/models/reference.ts
index 02dbed65..7bc7bddd 100644
--- a/src/common/interfaces/models/reference.ts
+++ b/src/common/interfaces/models/reference.ts
@@ -1,15 +1,12 @@
 //----------------------------------------------------------------------------------------------------------------------
-// Reference
+// Reference Models
 //----------------------------------------------------------------------------------------------------------------------
 
-export interface ReferenceOptions 
+export interface Reference
 {
     abbr : string;
     name : string;
     productCode : string;
 }
 
-// FIXME: Once Models are removed, `ReferenceOptions` should be named 'Reference'.
-export type Reference = ReferenceOptions;
-
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/common/interfaces/models/role.ts b/src/common/interfaces/models/role.ts
index 7f0f32aa..94b8532d 100644
--- a/src/common/interfaces/models/role.ts
+++ b/src/common/interfaces/models/role.ts
@@ -1,15 +1,12 @@
 //----------------------------------------------------------------------------------------------------------------------
-// Role
+// Role Models
 //----------------------------------------------------------------------------------------------------------------------
 
-export interface RoleOptions 
+export interface Role
 {
     id : number;
     name : string;
     permissions : string[];
 }
 
-// FIXME: Once Models are removed, `RoleOptions` should be named 'Role'.
-export type Role = RoleOptions;
-
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/common/interfaces/models/supplement.ts b/src/common/interfaces/models/supplement.ts
index a27d822b..f7bf30f4 100644
--- a/src/common/interfaces/models/supplement.ts
+++ b/src/common/interfaces/models/supplement.ts
@@ -2,7 +2,7 @@
 // Supplement
 //----------------------------------------------------------------------------------------------------------------------
 
-export interface SupplementOptions 
+export interface Supplement
 {
     id : number;
     name : string;
@@ -14,7 +14,4 @@ export interface SupplementOptions
     [ key : string ] : unknown;
 }
 
-// FIXME: Once Models are removed, `SupplementOptions` should be named 'Supplement'.
-export type Supplement = SupplementOptions;
-
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/common/interfaces/systems/supplements.ts b/src/common/interfaces/systems/supplements.ts
index bf03a264..de2873c5 100644
--- a/src/common/interfaces/systems/supplements.ts
+++ b/src/common/interfaces/systems/supplements.ts
@@ -2,14 +2,8 @@
 // System Supplements
 // ---------------------------------------------------------------------------------------------------------------------
 
-import { ReferenceOptions } from '../models/reference.js';
-
-// ---------------------------------------------------------------------------------------------------------------------
-
 export type SupplementScope = 'public' | 'user';
 
-export type Reference = ReferenceOptions;
-
 export interface Supplement
 {
     id ?: number | string;

From ed9af0927b89f2bae0bd71eeed00fa21f052c048 Mon Sep 17 00:00:00 2001
From: "Christopher S. Case" <chris.case@g33xnexus.com>
Date: Tue, 10 Dec 2024 02:31:01 -0600
Subject: [PATCH 2/3] more model cleanup.

---
 knexfile.ts                                        |  8 ++++----
 src/client/components/character/addEditModal.vue   |  2 +-
 src/client/components/character/charThumbnail.vue  |  2 +-
 src/client/components/character/deleteModal.vue    |  2 +-
 src/client/components/character/scopeBadge.vue     |  2 +-
 .../components/character/supplementSearch.vue      |  2 +-
 .../components/character/supplementSelect.vue      |  2 +-
 src/client/components/notes/addEditModal.vue       |  2 +-
 src/client/components/notes/deleteModal.vue        |  2 +-
 src/client/components/notes/noteBook.vue           |  2 +-
 src/client/components/systems/coc/bioCard.vue      |  4 ++--
 src/client/components/systems/coc/charCard.vue     |  4 ++--
 src/client/components/systems/coc/cocCharacter.vue |  4 ++--
 .../components/systems/coc/modals/editBioModal.vue |  4 ++--
 .../coc/modals/editCharacteristicsModal.vue        |  4 ++--
 src/client/components/systems/coc/rollsBlock.vue   |  2 +-
 src/client/components/systems/eote/armorCard.vue   |  2 +-
 src/client/components/systems/eote/bioCard.vue     |  2 +-
 src/client/components/systems/eote/charCard.vue    |  2 +-
 .../systems/eote/components/criticalCard.vue       |  2 +-
 .../systems/eote/components/forcePowerCard.vue     |  2 +-
 .../systems/eote/components/qualityEdit.vue        |  2 +-
 .../systems/eote/components/talentCard.vue         |  2 +-
 .../components/systems/eote/criticalsCard.vue      |  2 +-
 .../components/systems/eote/defensesCard.vue       |  2 +-
 .../components/systems/eote/eoteCharacter.vue      |  2 +-
 src/client/components/systems/eote/expCard.vue     |  2 +-
 src/client/components/systems/eote/forcePool.vue   |  2 +-
 src/client/components/systems/eote/forcePowers.vue |  2 +-
 .../systems/eote/modals/addEditAbilityModal.vue    |  2 +-
 .../eote/modals/addEditForcePowersModal.vue        |  2 +-
 .../systems/eote/modals/addEditMotivationModal.vue |  2 +-
 .../systems/eote/modals/addEditQualityModal.vue    |  2 +-
 .../systems/eote/modals/addEditTalentModal.vue     |  2 +-
 .../systems/eote/modals/editArmorModal.vue         |  2 +-
 .../systems/eote/modals/editBiographyModal.vue     |  2 +-
 .../eote/modals/editCharacteristicsModal.vue       |  2 +-
 .../systems/eote/modals/editDefensesModal.vue      |  2 +-
 .../systems/eote/modals/editExperienceModal.vue    |  2 +-
 .../systems/eote/modals/editForcePowersModal.vue   |  2 +-
 .../systems/eote/modals/editMotivationsModal.vue   |  2 +-
 .../systems/eote/modals/editSkillsModal.vue        |  2 +-
 .../systems/eote/modals/editTalentsModal.vue       |  2 +-
 .../systems/eote/modals/editWeaponsModal.vue       |  2 +-
 .../systems/eote/modals/editWoundsModal.vue        |  2 +-
 .../components/systems/eote/motivationsCard.vue    |  2 +-
 src/client/components/systems/eote/rollsCard.vue   |  2 +-
 src/client/components/systems/eote/skillsCard.vue  |  2 +-
 .../components/systems/eote/sub/eoteTalents.vue    |  2 +-
 .../components/systems/eote/sub/genesysTalents.vue |  2 +-
 src/client/components/systems/eote/sub/tierRow.vue |  2 +-
 src/client/components/systems/eote/talentsCard.vue |  2 +-
 src/client/components/systems/eote/weaponsCard.vue |  2 +-
 src/client/components/systems/eote/woundsCard.vue  |  2 +-
 src/client/components/systems/fate/aspectsCard.vue |  2 +-
 .../components/systems/fate/consequencesCard.vue   |  2 +-
 .../components/systems/fate/editAspectsModal.vue   |  2 +-
 .../systems/fate/editConsequencesModal.vue         |  2 +-
 .../components/systems/fate/editIdentityModal.vue  |  4 ++--
 .../components/systems/fate/editSkillsModal.vue    |  2 +-
 .../components/systems/fate/editStuntsModal.vue    |  2 +-
 .../components/systems/fate/fateCharacter.vue      |  4 ++--
 .../components/systems/fate/identityCard.vue       |  4 ++--
 src/client/components/systems/fate/rollsCard.vue   |  2 +-
 src/client/components/systems/fate/skillsCard.vue  |  2 +-
 src/client/components/systems/fate/stressCard.vue  |  2 +-
 src/client/components/systems/fate/stuntsCard.vue  |  2 +-
 src/client/components/systems/risus/bioCard.vue    |  4 ++--
 .../components/systems/risus/clichesCard.vue       |  4 ++--
 .../components/systems/risus/editBioModal.vue      |  4 ++--
 .../components/systems/risus/editClichesModal.vue  |  2 +-
 .../components/systems/risus/editHooksModal.vue    |  2 +-
 src/client/components/systems/risus/hooksCard.vue  |  4 ++--
 .../components/systems/risus/risusCharacter.vue    |  4 ++--
 src/client/components/systems/risus/rollsBlock.vue |  2 +-
 src/client/components/systems/wfrp/bioCard.vue     |  2 +-
 .../components/systems/wfrp/editBioModal.vue       |  4 ++--
 .../components/systems/wfrp/editSkillsModal.vue    |  2 +-
 .../components/systems/wfrp/editStatsModal.vue     |  2 +-
 src/client/components/systems/wfrp/skillsCard.vue  |  4 ++--
 src/client/components/systems/wfrp/statsCard.vue   |  4 ++--
 .../components/systems/wfrp/wfrpCharacter.vue      |  4 ++--
 src/client/index.html                              |  2 +-
 src/client/lib/managers/character.ts               |  2 +-
 src/client/lib/managers/systems.ts                 |  2 +-
 src/client/lib/managers/systems/eote.ts            |  8 ++++----
 src/client/lib/models/account.ts                   |  2 +-
 src/client/lib/models/notebook.ts                  |  2 +-
 src/client/lib/resource-access/auth.ts             |  2 +-
 src/client/lib/resource-access/character.ts        |  2 +-
 src/client/lib/resource-access/permissions.ts      |  2 +-
 src/client/lib/resource-access/roles.ts            |  2 +-
 src/client/lib/resource-access/supplement.ts       |  4 ++--
 src/client/lib/resource-access/systems.ts          |  2 +-
 src/client/lib/stores/characters.ts                |  2 +-
 src/client/lib/stores/colorMode.ts                 |  4 ++--
 src/client/lib/stores/systems.ts                   |  2 +-
 src/client/lib/stores/systems/eote.ts              |  6 +++---
 src/client/lib/stores/systems/genesys.ts           |  6 +++---
 src/client/lib/utils/dice-systems/eote.ts          |  2 +-
 src/client/lib/utils/dice.ts                       |  2 +-
 src/client/pages/dashboardPage.vue                 |  2 +-
 src/client/scss/_custom.scss                       |  1 -
 src/common/interfaces/common.ts                    | 14 --------------
 src/common/{interfaces => }/models/account.ts      |  0
 src/common/{interfaces => }/models/character.ts    |  0
 src/common/{interfaces => }/models/colorMode.ts    |  0
 src/common/{interfaces => }/models/dice.ts         |  0
 src/common/models/index.ts                         | 14 ++++++++++++++
 src/common/{interfaces => }/models/messages.ts     |  0
 src/common/{interfaces => }/models/notebook.ts     |  0
 src/common/{interfaces => }/models/reference.ts    |  0
 src/common/{interfaces => }/models/role.ts         |  0
 src/common/{interfaces => }/models/supplement.ts   |  0
 src/common/{interfaces => }/models/system.ts       |  0
 src/common/{interfaces => models}/systems/coc.ts   |  2 +-
 src/common/{interfaces => models}/systems/eote.ts  |  6 +++---
 src/common/{interfaces => models}/systems/fate.ts  |  0
 src/common/models/systems/index.ts                 | 13 +++++++++++++
 src/common/{interfaces => models}/systems/risus.ts |  0
 .../{interfaces => models}/systems/supplements.ts  |  0
 src/common/{interfaces => models}/systems/wfrp.ts  |  0
 src/server/auth/google.ts                          |  2 +-
 src/server/auth/serialization.ts                   |  2 +-
 src/{common => server}/interfaces/config.ts        |  0
 src/server/knex/seeds/admin_role.ts                |  2 +-
 src/server/knex/seeds/coc_references.ts            |  2 +-
 src/server/knex/seeds/eote_attachments.ts          |  2 +-
 src/server/knex/seeds/eote_qualities.ts            |  2 +-
 src/server/knex/seeds/eote_references.ts           |  2 +-
 src/server/knex/seeds/eote_talents.ts              |  2 +-
 src/server/managers/account.ts                     |  2 +-
 src/server/managers/character.ts                   |  2 +-
 src/server/managers/notebook.ts                    |  2 +-
 src/server/managers/reference.ts                   |  2 +-
 src/server/managers/role.ts                        |  2 +-
 src/server/managers/supplement.ts                  | 10 +++++-----
 src/server/models/character.ts                     |  2 +-
 src/server/resource-access/account.ts              |  2 +-
 src/server/resource-access/character.ts            |  2 +-
 src/server/resource-access/notebook.ts             |  4 ++--
 src/server/resource-access/reference.ts            |  2 +-
 src/server/resource-access/role.ts                 |  2 +-
 src/server/resource-access/supplement.ts           |  4 ++--
 src/server/resource-access/system.ts               |  2 +-
 src/server/resource-access/transforms/account.ts   |  2 +-
 src/server/resource-access/transforms/character.ts |  2 +-
 src/server/resource-access/transforms/notebook.ts  |  2 +-
 src/server/resource-access/transforms/reference.ts |  4 ++--
 src/server/resource-access/transforms/role.ts      |  2 +-
 .../resource-access/transforms/supplement.ts       |  2 +-
 src/server/server.ts                               |  2 +-
 src/server/systems/base.ts                         |  4 ++--
 src/server/systems/coc/defaults.ts                 |  4 ++--
 src/server/systems/coc/system.ts                   |  2 +-
 src/server/systems/eote/system.ts                  |  4 ++--
 src/server/systems/eote/validations.ts             |  4 ++--
 src/server/systems/wfrp/system.ts                  |  2 +-
 src/server/utils/database.ts                       |  2 +-
 src/server/utils/permissions.ts                    |  4 ++--
 src/server/utils/sio.ts                            |  2 +-
 vite.config.ts                                     |  2 +-
 162 files changed, 213 insertions(+), 201 deletions(-)
 delete mode 100644 src/common/interfaces/common.ts
 rename src/common/{interfaces => }/models/account.ts (100%)
 rename src/common/{interfaces => }/models/character.ts (100%)
 rename src/common/{interfaces => }/models/colorMode.ts (100%)
 rename src/common/{interfaces => }/models/dice.ts (100%)
 create mode 100644 src/common/models/index.ts
 rename src/common/{interfaces => }/models/messages.ts (100%)
 rename src/common/{interfaces => }/models/notebook.ts (100%)
 rename src/common/{interfaces => }/models/reference.ts (100%)
 rename src/common/{interfaces => }/models/role.ts (100%)
 rename src/common/{interfaces => }/models/supplement.ts (100%)
 rename src/common/{interfaces => }/models/system.ts (100%)
 rename src/common/{interfaces => models}/systems/coc.ts (97%)
 rename src/common/{interfaces => models}/systems/eote.ts (98%)
 rename src/common/{interfaces => models}/systems/fate.ts (100%)
 create mode 100644 src/common/models/systems/index.ts
 rename src/common/{interfaces => models}/systems/risus.ts (100%)
 rename src/common/{interfaces => models}/systems/supplements.ts (100%)
 rename src/common/{interfaces => models}/systems/wfrp.ts (100%)
 rename src/{common => server}/interfaces/config.ts (100%)

diff --git a/knexfile.ts b/knexfile.ts
index 25cd05e3..49127a82 100644
--- a/knexfile.ts
+++ b/knexfile.ts
@@ -6,7 +6,7 @@ import 'dotenv/config';
 import configUtil from '@strata-js/util-config';
 import type { Knex } from 'knex';
 
-import { ServerConfig } from './src/common/interfaces/config';
+import { ServerConfig } from './src/server/interfaces/config';
 
 //----------------------------------------------------------------------------------------------------------------------
 
@@ -18,11 +18,11 @@ configUtil.load(`./config/${ env }.yml`);
 module.exports = {
     ...configUtil.get<ServerConfig>().database ?? {},
     migrations: {
-        directory: './src/server/knex/migrations'
+        directory: './src/server/knex/migrations',
     },
     seeds: {
-        directory: './src/server/knex/seeds'
-    }
+        directory: './src/server/knex/seeds',
+    },
 } satisfies Knex.Config;
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/client/components/character/addEditModal.vue b/src/client/components/character/addEditModal.vue
index ec99137a..095b53dc 100644
--- a/src/client/components/character/addEditModal.vue
+++ b/src/client/components/character/addEditModal.vue
@@ -206,7 +206,7 @@
     import { maxLength, minLength, required } from '@vuelidate/validators';
 
     // Interfaces
-    import { Character } from '../../../common/interfaces/common';
+    import { Character } from '../../../common/models';
 
     // Managers
     import systemsMan from '../../lib/managers/systems';
diff --git a/src/client/components/character/charThumbnail.vue b/src/client/components/character/charThumbnail.vue
index 29f0187a..f70de40e 100644
--- a/src/client/components/character/charThumbnail.vue
+++ b/src/client/components/character/charThumbnail.vue
@@ -51,7 +51,7 @@
 <!--------------------------------------------------------------------------------------------------------------------->
 
 <script lang="ts" setup>
-    import { Character } from '../../../common/interfaces/common';
+    import { Character } from '../../../common/models';
 
     //------------------------------------------------------------------------------------------------------------------
     // Component Definition
diff --git a/src/client/components/character/deleteModal.vue b/src/client/components/character/deleteModal.vue
index 592fed6d..c6d340d4 100644
--- a/src/client/components/character/deleteModal.vue
+++ b/src/client/components/character/deleteModal.vue
@@ -53,7 +53,7 @@
     import { ref } from 'vue';
 
     // Interfaces
-    import { Character } from '../../../common/interfaces/common';
+    import { Character } from '../../../common/models';
 
     // Components
     import CloseButton from '../ui/closeButton.vue';
diff --git a/src/client/components/character/scopeBadge.vue b/src/client/components/character/scopeBadge.vue
index 2ad232d4..dd39631c 100644
--- a/src/client/components/character/scopeBadge.vue
+++ b/src/client/components/character/scopeBadge.vue
@@ -14,7 +14,7 @@
     import { computed } from 'vue';
 
     // Models
-    import { Supplement } from '../../../common/interfaces/common';
+    import { Supplement } from '../../../common/models';
 
     //------------------------------------------------------------------------------------------------------------------
     // Component Definition
diff --git a/src/client/components/character/supplementSearch.vue b/src/client/components/character/supplementSearch.vue
index 634ac3bd..b9fb7756 100644
--- a/src/client/components/character/supplementSearch.vue
+++ b/src/client/components/character/supplementSearch.vue
@@ -61,7 +61,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { Supplement, SupplementInst } from '../../../common/interfaces/systems/supplements';
+    import { Supplement, SupplementInst } from '../../../common/models/systems';
 
     // Components
     import { VueBootstrapAutocomplete } from '@morgul/vue-bootstrap-autocomplete';
diff --git a/src/client/components/character/supplementSelect.vue b/src/client/components/character/supplementSelect.vue
index 68ebd371..a87d1b44 100644
--- a/src/client/components/character/supplementSelect.vue
+++ b/src/client/components/character/supplementSelect.vue
@@ -135,7 +135,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { Supplement, SupplementInst } from '../../../common/interfaces/systems/supplements';
+    import { Supplement, SupplementInst } from '../../../common/models/systems';
 
     // Managers
     import authMan from '../../lib/managers/auth';
diff --git a/src/client/components/notes/addEditModal.vue b/src/client/components/notes/addEditModal.vue
index ff44cc15..34512ed4 100644
--- a/src/client/components/notes/addEditModal.vue
+++ b/src/client/components/notes/addEditModal.vue
@@ -70,7 +70,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { NotebookPage } from '../../lib/models/notebook';
+    import { NotebookPage } from '../../../common/models';
 
     // Components
     import MarkdownEditor from '../ui/markdownEditor.vue';
diff --git a/src/client/components/notes/deleteModal.vue b/src/client/components/notes/deleteModal.vue
index 3569ddc1..e5e80263 100644
--- a/src/client/components/notes/deleteModal.vue
+++ b/src/client/components/notes/deleteModal.vue
@@ -59,7 +59,7 @@
     import { ref } from 'vue';
 
     // Managers
-    import { NotebookPage } from '../../lib/models/notebook';
+    import { NotebookPage } from '../../../common/models';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/notes/noteBook.vue b/src/client/components/notes/noteBook.vue
index ff931bef..052c99a3 100644
--- a/src/client/components/notes/noteBook.vue
+++ b/src/client/components/notes/noteBook.vue
@@ -78,7 +78,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { NotebookPage } from '../../lib/models/notebook';
+    import { NotebookPage } from '../../../common/models';
 
     // Stores
     import { useNotebookStore } from '../../lib/stores/notebook';
diff --git a/src/client/components/systems/coc/bioCard.vue b/src/client/components/systems/coc/bioCard.vue
index b3e47daa..098ff3dc 100644
--- a/src/client/components/systems/coc/bioCard.vue
+++ b/src/client/components/systems/coc/bioCard.vue
@@ -82,8 +82,8 @@
     import { truncate } from 'lodash';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { CoCSystemDetails, CocBiography } from '../../../../common/interfaces/systems/coc';
+    import { Character } from '../../../../common/models';
+    import { CoCSystemDetails, CocBiography } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/coc/charCard.vue b/src/client/components/systems/coc/charCard.vue
index 9b67a45d..c05f337e 100644
--- a/src/client/components/systems/coc/charCard.vue
+++ b/src/client/components/systems/coc/charCard.vue
@@ -103,12 +103,12 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { Character } from '../../../../common/interfaces/common';
+    import { Character } from '../../../../common/models';
     import {
         CoCCharacteristics,
         CoCSystemDetails,
         validCoCCharacteristicNames,
-    } from '../../../../common/interfaces/systems/coc';
+    } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/coc/cocCharacter.vue b/src/client/components/systems/coc/cocCharacter.vue
index d6009684..45bb1052 100644
--- a/src/client/components/systems/coc/cocCharacter.vue
+++ b/src/client/components/systems/coc/cocCharacter.vue
@@ -37,8 +37,8 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { CoCSystemDetails } from '../../../../common/interfaces/systems/coc';
+    import { Character } from '../../../../common/models';
+    import { CoCSystemDetails } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/coc/modals/editBioModal.vue b/src/client/components/systems/coc/modals/editBioModal.vue
index 8637e187..f670e732 100644
--- a/src/client/components/systems/coc/modals/editBioModal.vue
+++ b/src/client/components/systems/coc/modals/editBioModal.vue
@@ -124,8 +124,8 @@
     import { ref } from 'vue';
 
     // Interfaces
-    import { Character } from '../../../../../common/interfaces/common';
-    import { CoCSystemDetails, CocBiography } from '../../../../../common/interfaces/systems/coc';
+    import { Character } from '../../../../../common/models';
+    import { CoCSystemDetails, CocBiography } from '../../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/coc/modals/editCharacteristicsModal.vue b/src/client/components/systems/coc/modals/editCharacteristicsModal.vue
index b4a6616c..f5d4f031 100644
--- a/src/client/components/systems/coc/modals/editCharacteristicsModal.vue
+++ b/src/client/components/systems/coc/modals/editCharacteristicsModal.vue
@@ -75,11 +75,11 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { Character } from '../../../../../common/interfaces/common';
+    import { Character } from '../../../../../common/models';
     import {
         CoCCharacteristics,
         CoCSystemDetails,
-    } from '../../../../../common/interfaces/systems/coc';
+    } from '../../../../../common/models/systems';
 
     // Utils
     import { startCase } from '../../../../lib/utils/misc';
diff --git a/src/client/components/systems/coc/rollsBlock.vue b/src/client/components/systems/coc/rollsBlock.vue
index a610df6e..53a9c4cb 100644
--- a/src/client/components/systems/coc/rollsBlock.vue
+++ b/src/client/components/systems/coc/rollsBlock.vue
@@ -74,7 +74,7 @@
     import { computed, ref } from 'vue';
 
     // Interfaces
-    import { DiceRoll } from '../../../../common/interfaces/common';
+    import { DiceRoll } from '../../../../common/models';
 
     // Utils
     import diceUtil from '../../../lib/utils/dice';
diff --git a/src/client/components/systems/eote/armorCard.vue b/src/client/components/systems/eote/armorCard.vue
index cc37d388..7e2ae759 100644
--- a/src/client/components/systems/eote/armorCard.vue
+++ b/src/client/components/systems/eote/armorCard.vue
@@ -109,7 +109,7 @@
     import { useCharactersStore } from '../../../lib/stores/characters';
 
     // Models
-    import { EoteArmorRef, EoteCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteArmorRef, EoteCharacter } from '../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/bioCard.vue b/src/client/components/systems/eote/bioCard.vue
index d982766d..add543fd 100644
--- a/src/client/components/systems/eote/bioCard.vue
+++ b/src/client/components/systems/eote/bioCard.vue
@@ -60,7 +60,7 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/eote/charCard.vue b/src/client/components/systems/eote/charCard.vue
index 50a2506c..26c0bb2f 100644
--- a/src/client/components/systems/eote/charCard.vue
+++ b/src/client/components/systems/eote/charCard.vue
@@ -66,7 +66,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { EoteCharacteristics, EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteCharacteristics, EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/eote/components/criticalCard.vue b/src/client/components/systems/eote/components/criticalCard.vue
index 229656fa..856e5e0e 100644
--- a/src/client/components/systems/eote/components/criticalCard.vue
+++ b/src/client/components/systems/eote/components/criticalCard.vue
@@ -56,7 +56,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteCritical } from '../../../../../common/interfaces/systems/eote';
+    import { EoteCritical } from '../../../../../common/models/systems';
 
     // Utils
     import { shortID } from '../../../../lib/utils/misc';
diff --git a/src/client/components/systems/eote/components/forcePowerCard.vue b/src/client/components/systems/eote/components/forcePowerCard.vue
index dbc1a725..93f3a528 100644
--- a/src/client/components/systems/eote/components/forcePowerCard.vue
+++ b/src/client/components/systems/eote/components/forcePowerCard.vue
@@ -62,7 +62,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteForcePower, EoteForcePowerInst } from '../../../../../common/interfaces/systems/eote';
+    import { EoteForcePower, EoteForcePowerInst } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/components/qualityEdit.vue b/src/client/components/systems/eote/components/qualityEdit.vue
index cfe4f12c..cf34585c 100644
--- a/src/client/components/systems/eote/components/qualityEdit.vue
+++ b/src/client/components/systems/eote/components/qualityEdit.vue
@@ -59,7 +59,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteQuality, EoteQualityRef } from '../../../../../common/interfaces/systems/eote';
+    import { EoteQuality, EoteQualityRef } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/components/talentCard.vue b/src/client/components/systems/eote/components/talentCard.vue
index fd8055f1..4a81049a 100644
--- a/src/client/components/systems/eote/components/talentCard.vue
+++ b/src/client/components/systems/eote/components/talentCard.vue
@@ -59,7 +59,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteTalentInst, GenesysTalent } from '../../../../../common/interfaces/systems/eote';
+    import { EoteTalentInst, GenesysTalent } from '../../../../../common/models/systems';
 
     // Utils
     import { shortID } from '../../../../lib/utils/misc';
diff --git a/src/client/components/systems/eote/criticalsCard.vue b/src/client/components/systems/eote/criticalsCard.vue
index 94456513..7b1bccc2 100644
--- a/src/client/components/systems/eote/criticalsCard.vue
+++ b/src/client/components/systems/eote/criticalsCard.vue
@@ -74,7 +74,7 @@
     import { useCharactersStore } from '../../../lib/stores/characters';
 
     // Models
-    import { EoteCritical, EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteCritical, EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Managers
     import diceMan from '../../../lib/utils/dice';
diff --git a/src/client/components/systems/eote/defensesCard.vue b/src/client/components/systems/eote/defensesCard.vue
index 6314b79e..814ed406 100644
--- a/src/client/components/systems/eote/defensesCard.vue
+++ b/src/client/components/systems/eote/defensesCard.vue
@@ -57,7 +57,7 @@
     import { useCharactersStore } from '../../../lib/stores/characters';
 
     // Models
-    import { EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Components
     import RpgkCard from '../../ui/rpgkCard.vue';
diff --git a/src/client/components/systems/eote/eoteCharacter.vue b/src/client/components/systems/eote/eoteCharacter.vue
index b0305d66..f8b383c6 100644
--- a/src/client/components/systems/eote/eoteCharacter.vue
+++ b/src/client/components/systems/eote/eoteCharacter.vue
@@ -78,7 +78,7 @@
     import { useCharactersStore } from '../../../lib/stores/characters';
 
     // Models
-    import { EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Managers
     import charMan from '../../../lib/managers/character';
diff --git a/src/client/components/systems/eote/expCard.vue b/src/client/components/systems/eote/expCard.vue
index 4204a008..5f4c79d5 100644
--- a/src/client/components/systems/eote/expCard.vue
+++ b/src/client/components/systems/eote/expCard.vue
@@ -61,7 +61,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/eote/forcePool.vue b/src/client/components/systems/eote/forcePool.vue
index 1d385ce6..63fa9db2 100644
--- a/src/client/components/systems/eote/forcePool.vue
+++ b/src/client/components/systems/eote/forcePool.vue
@@ -62,7 +62,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { EoteCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteCharacter } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/eote/forcePowers.vue b/src/client/components/systems/eote/forcePowers.vue
index a1c3ed89..389b0067 100644
--- a/src/client/components/systems/eote/forcePowers.vue
+++ b/src/client/components/systems/eote/forcePowers.vue
@@ -46,7 +46,7 @@
     import { sortBy } from 'lodash';
 
     // Models
-    import { EoteCharacter, EoteForcePowerInst } from '../../../../common/interfaces/systems/eote';
+    import { EoteCharacter, EoteForcePowerInst } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/eote/modals/addEditAbilityModal.vue b/src/client/components/systems/eote/modals/addEditAbilityModal.vue
index 86c6bf01..eedca555 100644
--- a/src/client/components/systems/eote/modals/addEditAbilityModal.vue
+++ b/src/client/components/systems/eote/modals/addEditAbilityModal.vue
@@ -71,7 +71,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteAbility, EoteForcePower } from '../../../../../common/interfaces/systems/eote';
+    import { EoteAbility, EoteForcePower } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/modals/addEditForcePowersModal.vue b/src/client/components/systems/eote/modals/addEditForcePowersModal.vue
index d9d7db82..1e5683a5 100644
--- a/src/client/components/systems/eote/modals/addEditForcePowersModal.vue
+++ b/src/client/components/systems/eote/modals/addEditForcePowersModal.vue
@@ -284,7 +284,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteForcePower, EoteQuality } from '../../../../../common/interfaces/systems/eote';
+    import { EoteForcePower, EoteQuality } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/modals/addEditMotivationModal.vue b/src/client/components/systems/eote/modals/addEditMotivationModal.vue
index 0fb0b5f7..5b257b08 100644
--- a/src/client/components/systems/eote/modals/addEditMotivationModal.vue
+++ b/src/client/components/systems/eote/modals/addEditMotivationModal.vue
@@ -127,7 +127,7 @@
         EoteQuality,
         GenesysMotivation,
         GenesysMotivationType,
-    } from '../../../../../common/interfaces/systems/eote';
+    } from '../../../../../common/models/systems';
 
     // Components
     import EditReference from '../../../character/editReference.vue';
diff --git a/src/client/components/systems/eote/modals/addEditQualityModal.vue b/src/client/components/systems/eote/modals/addEditQualityModal.vue
index 153e2473..4aab7844 100644
--- a/src/client/components/systems/eote/modals/addEditQualityModal.vue
+++ b/src/client/components/systems/eote/modals/addEditQualityModal.vue
@@ -84,7 +84,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteQuality } from '../../../../../common/interfaces/systems/eote';
+    import { EoteQuality } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/modals/addEditTalentModal.vue b/src/client/components/systems/eote/modals/addEditTalentModal.vue
index 07c052b5..b0272dce 100644
--- a/src/client/components/systems/eote/modals/addEditTalentModal.vue
+++ b/src/client/components/systems/eote/modals/addEditTalentModal.vue
@@ -126,7 +126,7 @@
     import {
         EoteOrGenesysTalent,
         EoteTalent,
-    } from '../../../../../common/interfaces/systems/eote';
+    } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/modals/editArmorModal.vue b/src/client/components/systems/eote/modals/editArmorModal.vue
index 2f2c9bcd..20e58894 100644
--- a/src/client/components/systems/eote/modals/editArmorModal.vue
+++ b/src/client/components/systems/eote/modals/editArmorModal.vue
@@ -160,7 +160,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteArmorRef, EoteOrGenCharacter } from '../../../../../common/interfaces/systems/eote';
+    import { EoteArmorRef, EoteOrGenCharacter } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/modals/editBiographyModal.vue b/src/client/components/systems/eote/modals/editBiographyModal.vue
index c3931b88..603d02af 100644
--- a/src/client/components/systems/eote/modals/editBiographyModal.vue
+++ b/src/client/components/systems/eote/modals/editBiographyModal.vue
@@ -168,7 +168,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteOrGenCharacter } from '../../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/modals/editCharacteristicsModal.vue b/src/client/components/systems/eote/modals/editCharacteristicsModal.vue
index 4e4f3c78..95b1738e 100644
--- a/src/client/components/systems/eote/modals/editCharacteristicsModal.vue
+++ b/src/client/components/systems/eote/modals/editCharacteristicsModal.vue
@@ -101,7 +101,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteCharacteristics, EoteOrGenCharacter } from '../../../../../common/interfaces/systems/eote';
+    import { EoteCharacteristics, EoteOrGenCharacter } from '../../../../../common/models/systems';
 
     // Utils
     import { startCase } from '../../../../lib/utils/misc';
diff --git a/src/client/components/systems/eote/modals/editDefensesModal.vue b/src/client/components/systems/eote/modals/editDefensesModal.vue
index 1005bb81..8a7a82a1 100644
--- a/src/client/components/systems/eote/modals/editDefensesModal.vue
+++ b/src/client/components/systems/eote/modals/editDefensesModal.vue
@@ -123,7 +123,7 @@
     import { ref } from 'vue';
 
     // Models
-    import { EoteOrGenCharacter } from '../../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/eote/modals/editExperienceModal.vue b/src/client/components/systems/eote/modals/editExperienceModal.vue
index 0b9a7059..bd4b5f6e 100644
--- a/src/client/components/systems/eote/modals/editExperienceModal.vue
+++ b/src/client/components/systems/eote/modals/editExperienceModal.vue
@@ -123,7 +123,7 @@
     import { ref } from 'vue';
 
     // Models
-    import { EoteOrGenCharacter } from '../../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/eote/modals/editForcePowersModal.vue b/src/client/components/systems/eote/modals/editForcePowersModal.vue
index 389a7b8a..a82fc27e 100644
--- a/src/client/components/systems/eote/modals/editForcePowersModal.vue
+++ b/src/client/components/systems/eote/modals/editForcePowersModal.vue
@@ -128,7 +128,7 @@
         EoteForcePower,
         EoteForcePowerInst, EoteForcePowerUpgrade,
         EoteTalentInst,
-    } from '../../../../../common/interfaces/systems/eote';
+    } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/modals/editMotivationsModal.vue b/src/client/components/systems/eote/modals/editMotivationsModal.vue
index d7318178..c1aa906a 100644
--- a/src/client/components/systems/eote/modals/editMotivationsModal.vue
+++ b/src/client/components/systems/eote/modals/editMotivationsModal.vue
@@ -289,7 +289,7 @@
         GenesysCharacter,
         GenesysMotivation,
         GenesysMotivationType,
-    } from '../../../../../common/interfaces/systems/eote';
+    } from '../../../../../common/models/systems';
 
     // Managers
     import authMan from '../../../../lib/managers/auth';
diff --git a/src/client/components/systems/eote/modals/editSkillsModal.vue b/src/client/components/systems/eote/modals/editSkillsModal.vue
index 5caf6fde..a595f646 100644
--- a/src/client/components/systems/eote/modals/editSkillsModal.vue
+++ b/src/client/components/systems/eote/modals/editSkillsModal.vue
@@ -277,7 +277,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteOrGenCharacter, EoteSkill } from '../../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter, EoteSkill } from '../../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/eote/modals/editTalentsModal.vue b/src/client/components/systems/eote/modals/editTalentsModal.vue
index 47b83ea9..49045d1b 100644
--- a/src/client/components/systems/eote/modals/editTalentsModal.vue
+++ b/src/client/components/systems/eote/modals/editTalentsModal.vue
@@ -147,7 +147,7 @@
         EoteOrGenCharacter,
         EoteTalentInst,
         GenesysTalent,
-    } from '../../../../../common/interfaces/systems/eote';
+    } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/modals/editWeaponsModal.vue b/src/client/components/systems/eote/modals/editWeaponsModal.vue
index 58cff119..b3121f52 100644
--- a/src/client/components/systems/eote/modals/editWeaponsModal.vue
+++ b/src/client/components/systems/eote/modals/editWeaponsModal.vue
@@ -177,7 +177,7 @@
         EoteCharacter,
         EoteQualityRef,
         EoteWeapon,
-    } from '../../../../../common/interfaces/systems/eote';
+    } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/modals/editWoundsModal.vue b/src/client/components/systems/eote/modals/editWoundsModal.vue
index 603da252..4964258d 100644
--- a/src/client/components/systems/eote/modals/editWoundsModal.vue
+++ b/src/client/components/systems/eote/modals/editWoundsModal.vue
@@ -148,7 +148,7 @@
     import { ref } from 'vue';
 
     // Models
-    import { EoteOrGenCharacter } from '../../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/eote/motivationsCard.vue b/src/client/components/systems/eote/motivationsCard.vue
index e39a3dbd..345f99df 100644
--- a/src/client/components/systems/eote/motivationsCard.vue
+++ b/src/client/components/systems/eote/motivationsCard.vue
@@ -71,7 +71,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { GenesysCharacter } from '../../../../common/interfaces/systems/eote';
+    import { GenesysCharacter } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/eote/rollsCard.vue b/src/client/components/systems/eote/rollsCard.vue
index 884b5091..d8cc3054 100644
--- a/src/client/components/systems/eote/rollsCard.vue
+++ b/src/client/components/systems/eote/rollsCard.vue
@@ -103,7 +103,7 @@
 
     // Components
     import RpgkCard from '../../ui/rpgkCard.vue';
-    import { EoteSkill } from '../../../../common/interfaces/systems/eote';
+    import { EoteSkill } from '../../../../common/models/systems';
 
     //------------------------------------------------------------------------------------------------------------------
     // Component Definition
diff --git a/src/client/components/systems/eote/skillsCard.vue b/src/client/components/systems/eote/skillsCard.vue
index b12d73bd..4a90bba1 100644
--- a/src/client/components/systems/eote/skillsCard.vue
+++ b/src/client/components/systems/eote/skillsCard.vue
@@ -218,7 +218,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { EoteOrGenCharacter, EoteSkill } from '../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter, EoteSkill } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/eote/sub/eoteTalents.vue b/src/client/components/systems/eote/sub/eoteTalents.vue
index dec1feb7..f10b65e3 100644
--- a/src/client/components/systems/eote/sub/eoteTalents.vue
+++ b/src/client/components/systems/eote/sub/eoteTalents.vue
@@ -30,7 +30,7 @@
     import { useCharactersStore } from '../../../../lib/stores/characters';
 
     // Models
-    import { EoteCharacter } from '../../../../../common/interfaces/systems/eote';
+    import { EoteCharacter } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/eote/sub/genesysTalents.vue b/src/client/components/systems/eote/sub/genesysTalents.vue
index 493f0952..1c0d1283 100644
--- a/src/client/components/systems/eote/sub/genesysTalents.vue
+++ b/src/client/components/systems/eote/sub/genesysTalents.vue
@@ -33,7 +33,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { EoteCharacter } from '../../../../../common/interfaces/systems/eote';
+    import { EoteCharacter } from '../../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../../lib/stores/characters';
diff --git a/src/client/components/systems/eote/sub/tierRow.vue b/src/client/components/systems/eote/sub/tierRow.vue
index 2af8c141..ebb87786 100644
--- a/src/client/components/systems/eote/sub/tierRow.vue
+++ b/src/client/components/systems/eote/sub/tierRow.vue
@@ -38,7 +38,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { GenesysCharacter } from '../../../../../common/interfaces/systems/eote';
+    import { GenesysCharacter } from '../../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../../lib/stores/characters';
diff --git a/src/client/components/systems/eote/talentsCard.vue b/src/client/components/systems/eote/talentsCard.vue
index 0cdc6356..e3174ad4 100644
--- a/src/client/components/systems/eote/talentsCard.vue
+++ b/src/client/components/systems/eote/talentsCard.vue
@@ -35,7 +35,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { EoteOrGenCharacter, EoteTalentInst } from '../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter, EoteTalentInst } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/eote/weaponsCard.vue b/src/client/components/systems/eote/weaponsCard.vue
index ca5a5bb6..5e6a4965 100644
--- a/src/client/components/systems/eote/weaponsCard.vue
+++ b/src/client/components/systems/eote/weaponsCard.vue
@@ -91,7 +91,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { EoteCharacter, EoteWeapon } from '../../../../common/interfaces/systems/eote';
+    import { EoteCharacter, EoteWeapon } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/eote/woundsCard.vue b/src/client/components/systems/eote/woundsCard.vue
index 37ad0237..11715da0 100644
--- a/src/client/components/systems/eote/woundsCard.vue
+++ b/src/client/components/systems/eote/woundsCard.vue
@@ -225,7 +225,7 @@
     import { useCharactersStore } from '../../../lib/stores/characters';
 
     // Models
-    import { EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../lib/managers/systems/eote';
diff --git a/src/client/components/systems/fate/aspectsCard.vue b/src/client/components/systems/fate/aspectsCard.vue
index 1fe7ef29..2bb186e3 100644
--- a/src/client/components/systems/fate/aspectsCard.vue
+++ b/src/client/components/systems/fate/aspectsCard.vue
@@ -87,7 +87,7 @@
     import { computed, ref } from 'vue';
 
     // Interfaces
-    import { FateAspect } from '../../../../common/interfaces/systems/fate';
+    import { FateAspect } from '../../../../common/models/systems';
 
     // Components
     import RpgkCard from '../../ui/rpgkCard.vue';
diff --git a/src/client/components/systems/fate/consequencesCard.vue b/src/client/components/systems/fate/consequencesCard.vue
index c52be8f3..4866a14e 100644
--- a/src/client/components/systems/fate/consequencesCard.vue
+++ b/src/client/components/systems/fate/consequencesCard.vue
@@ -79,7 +79,7 @@
     import { computed, ref } from 'vue';
 
     // Interfaces
-    import { FateAspect, FateSkill } from '../../../../common/interfaces/systems/fate';
+    import { FateAspect, FateSkill } from '../../../../common/models/systems';
 
     // Components
     import RpgkCard from '../../ui/rpgkCard.vue';
diff --git a/src/client/components/systems/fate/editAspectsModal.vue b/src/client/components/systems/fate/editAspectsModal.vue
index 08f96de2..a327b25c 100644
--- a/src/client/components/systems/fate/editAspectsModal.vue
+++ b/src/client/components/systems/fate/editAspectsModal.vue
@@ -97,7 +97,7 @@
     import { computed, ref } from 'vue';
 
     // Interfaces
-    import { FateAspect } from '../../../../common/interfaces/systems/fate';
+    import { FateAspect } from '../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/fate/editConsequencesModal.vue b/src/client/components/systems/fate/editConsequencesModal.vue
index fa67c219..e8f154ee 100644
--- a/src/client/components/systems/fate/editConsequencesModal.vue
+++ b/src/client/components/systems/fate/editConsequencesModal.vue
@@ -135,7 +135,7 @@
     import { computed, ref } from 'vue';
 
     // Interfaces
-    import { FateAspect, FateSkill } from '../../../../common/interfaces/systems/fate';
+    import { FateAspect, FateSkill } from '../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/fate/editIdentityModal.vue b/src/client/components/systems/fate/editIdentityModal.vue
index 30b70ac6..d94674fe 100644
--- a/src/client/components/systems/fate/editIdentityModal.vue
+++ b/src/client/components/systems/fate/editIdentityModal.vue
@@ -75,8 +75,8 @@
     import { ref } from 'vue';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { FateSystemDetails } from '../../../../common/interfaces/systems/fate';
+    import { Character } from '../../../../common/models';
+    import { FateSystemDetails } from '../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/fate/editSkillsModal.vue b/src/client/components/systems/fate/editSkillsModal.vue
index 833569a3..f3434132 100644
--- a/src/client/components/systems/fate/editSkillsModal.vue
+++ b/src/client/components/systems/fate/editSkillsModal.vue
@@ -94,7 +94,7 @@
     import { orderBy } from 'lodash';
 
     // Interfaces
-    import { FateSkill } from '../../../../common/interfaces/systems/fate';
+    import { FateSkill } from '../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/fate/editStuntsModal.vue b/src/client/components/systems/fate/editStuntsModal.vue
index 2acd6877..987e23a8 100644
--- a/src/client/components/systems/fate/editStuntsModal.vue
+++ b/src/client/components/systems/fate/editStuntsModal.vue
@@ -85,7 +85,7 @@
     import { computed, ref } from 'vue';
 
     // Interfaces
-    import { FateStunt } from '../../../../common/interfaces/systems/fate';
+    import { FateStunt } from '../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/fate/fateCharacter.vue b/src/client/components/systems/fate/fateCharacter.vue
index 8c6ebe10..bcbd8d47 100644
--- a/src/client/components/systems/fate/fateCharacter.vue
+++ b/src/client/components/systems/fate/fateCharacter.vue
@@ -50,8 +50,8 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { FateSystemDetails } from '../../../../common/interfaces/systems/fate';
+    import { Character } from '../../../../common/models';
+    import { FateSystemDetails } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/fate/identityCard.vue b/src/client/components/systems/fate/identityCard.vue
index 3505f689..d72b3f95 100644
--- a/src/client/components/systems/fate/identityCard.vue
+++ b/src/client/components/systems/fate/identityCard.vue
@@ -74,8 +74,8 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { FateSystemDetails } from '../../../../common/interfaces/systems/fate';
+    import { Character } from '../../../../common/models';
+    import { FateSystemDetails } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/fate/rollsCard.vue b/src/client/components/systems/fate/rollsCard.vue
index dcf0c98f..2f47f0fa 100644
--- a/src/client/components/systems/fate/rollsCard.vue
+++ b/src/client/components/systems/fate/rollsCard.vue
@@ -63,7 +63,7 @@
     import { orderBy } from 'lodash';
 
     // Interfaces
-    import { FateSkill } from '../../../../common/interfaces/systems/fate';
+    import { FateSkill } from '../../../../common/models/systems';
 
     // Utils
     import diceUtil from '../../../lib/utils/dice';
diff --git a/src/client/components/systems/fate/skillsCard.vue b/src/client/components/systems/fate/skillsCard.vue
index d2dcaf85..e9c85774 100644
--- a/src/client/components/systems/fate/skillsCard.vue
+++ b/src/client/components/systems/fate/skillsCard.vue
@@ -46,7 +46,7 @@
     import { orderBy, range } from 'lodash';
 
     // Interfaces
-    import { FateSkill } from '../../../../common/interfaces/systems/fate';
+    import { FateSkill } from '../../../../common/models/systems';
 
     // Components
     import RpgkCard from '../../ui/rpgkCard.vue';
diff --git a/src/client/components/systems/fate/stressCard.vue b/src/client/components/systems/fate/stressCard.vue
index 01a239ba..5a254176 100644
--- a/src/client/components/systems/fate/stressCard.vue
+++ b/src/client/components/systems/fate/stressCard.vue
@@ -93,7 +93,7 @@
     import { computed } from 'vue';
 
     // Interfaces
-    import { FateSkill, FateStress } from '../../../../common/interfaces/systems/fate';
+    import { FateSkill, FateStress } from '../../../../common/models/systems';
 
     // Components
     import RpgkCard from '../../ui/rpgkCard.vue';
diff --git a/src/client/components/systems/fate/stuntsCard.vue b/src/client/components/systems/fate/stuntsCard.vue
index 090a2af2..1267f80d 100644
--- a/src/client/components/systems/fate/stuntsCard.vue
+++ b/src/client/components/systems/fate/stuntsCard.vue
@@ -44,7 +44,7 @@
     import { orderBy } from 'lodash';
 
     // Interfaces
-    import { FateStunt } from '../../../../common/interfaces/systems/fate';
+    import { FateStunt } from '../../../../common/models/systems';
 
     // Components
     import RpgkCard from '../../ui/rpgkCard.vue';
diff --git a/src/client/components/systems/risus/bioCard.vue b/src/client/components/systems/risus/bioCard.vue
index 2d1c2de1..f31c8786 100644
--- a/src/client/components/systems/risus/bioCard.vue
+++ b/src/client/components/systems/risus/bioCard.vue
@@ -114,8 +114,8 @@
     import { truncate } from 'lodash';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { RisusSystemDetails } from '../../../../common/interfaces/systems/risus';
+    import { Character } from '../../../../common/models';
+    import { RisusSystemDetails } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/risus/clichesCard.vue b/src/client/components/systems/risus/clichesCard.vue
index 5654e0ae..4e4c1079 100644
--- a/src/client/components/systems/risus/clichesCard.vue
+++ b/src/client/components/systems/risus/clichesCard.vue
@@ -94,8 +94,8 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { RisusCliche, RisusSystemDetails } from '../../../../common/interfaces/systems/risus';
+    import { Character } from '../../../../common/models';
+    import { RisusCliche, RisusSystemDetails } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/risus/editBioModal.vue b/src/client/components/systems/risus/editBioModal.vue
index be1ec677..8b84d464 100644
--- a/src/client/components/systems/risus/editBioModal.vue
+++ b/src/client/components/systems/risus/editBioModal.vue
@@ -62,8 +62,8 @@
     import { ref } from 'vue';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { RisusSystemDetails } from '../../../../common/interfaces/systems/risus';
+    import { Character } from '../../../../common/models';
+    import { RisusSystemDetails } from '../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/risus/editClichesModal.vue b/src/client/components/systems/risus/editClichesModal.vue
index 6ebe333a..1ac0c525 100644
--- a/src/client/components/systems/risus/editClichesModal.vue
+++ b/src/client/components/systems/risus/editClichesModal.vue
@@ -95,7 +95,7 @@
     import { computed, ref } from 'vue';
 
     // Interfaces
-    import { RisusCliche } from '../../../../common/interfaces/systems/risus';
+    import { RisusCliche } from '../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/risus/editHooksModal.vue b/src/client/components/systems/risus/editHooksModal.vue
index 17143f6e..5850b5a0 100644
--- a/src/client/components/systems/risus/editHooksModal.vue
+++ b/src/client/components/systems/risus/editHooksModal.vue
@@ -77,7 +77,7 @@
     import { ref } from 'vue';
 
     // Interfaces
-    import { RisusHook } from '../../../../common/interfaces/systems/risus';
+    import { RisusHook } from '../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/risus/hooksCard.vue b/src/client/components/systems/risus/hooksCard.vue
index f65ab4c8..5f4894e3 100644
--- a/src/client/components/systems/risus/hooksCard.vue
+++ b/src/client/components/systems/risus/hooksCard.vue
@@ -60,8 +60,8 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { RisusHook, RisusSystemDetails } from '../../../../common/interfaces/systems/risus';
+    import { Character } from '../../../../common/models';
+    import { RisusHook, RisusSystemDetails } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/risus/risusCharacter.vue b/src/client/components/systems/risus/risusCharacter.vue
index 3ce88b17..981e9a0e 100644
--- a/src/client/components/systems/risus/risusCharacter.vue
+++ b/src/client/components/systems/risus/risusCharacter.vue
@@ -67,8 +67,8 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { RisusSystemDetails } from '../../../../common/interfaces/systems/risus';
+    import { Character } from '../../../../common/models';
+    import { RisusSystemDetails } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/risus/rollsBlock.vue b/src/client/components/systems/risus/rollsBlock.vue
index 18fe3f89..90113c61 100644
--- a/src/client/components/systems/risus/rollsBlock.vue
+++ b/src/client/components/systems/risus/rollsBlock.vue
@@ -53,7 +53,7 @@
     import { computed, ref } from 'vue';
 
     // Interfaces
-    import { DiceRoll } from '../../../../common/interfaces/common';
+    import { DiceRoll } from '../../../../common/models';
 
     // Utils
     import diceUtil from '../../../lib/utils/dice';
diff --git a/src/client/components/systems/wfrp/bioCard.vue b/src/client/components/systems/wfrp/bioCard.vue
index d6aaec76..107db3ea 100644
--- a/src/client/components/systems/wfrp/bioCard.vue
+++ b/src/client/components/systems/wfrp/bioCard.vue
@@ -62,7 +62,7 @@
     import { truncate } from 'lodash';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
+    import { Character } from '../../../../common/models';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/wfrp/editBioModal.vue b/src/client/components/systems/wfrp/editBioModal.vue
index be1ec677..8b84d464 100644
--- a/src/client/components/systems/wfrp/editBioModal.vue
+++ b/src/client/components/systems/wfrp/editBioModal.vue
@@ -62,8 +62,8 @@
     import { ref } from 'vue';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { RisusSystemDetails } from '../../../../common/interfaces/systems/risus';
+    import { Character } from '../../../../common/models';
+    import { RisusSystemDetails } from '../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/wfrp/editSkillsModal.vue b/src/client/components/systems/wfrp/editSkillsModal.vue
index f9138fc1..13fe7489 100644
--- a/src/client/components/systems/wfrp/editSkillsModal.vue
+++ b/src/client/components/systems/wfrp/editSkillsModal.vue
@@ -93,7 +93,7 @@
     import { computed, ref } from 'vue';
 
     // Interfaces
-    import { WFRPSkill } from '../../../../common/interfaces/systems/wfrp';
+    import { WFRPSkill } from '../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/wfrp/editStatsModal.vue b/src/client/components/systems/wfrp/editStatsModal.vue
index b157d3b1..2703d6ff 100644
--- a/src/client/components/systems/wfrp/editStatsModal.vue
+++ b/src/client/components/systems/wfrp/editStatsModal.vue
@@ -93,7 +93,7 @@
     import { computed, ref } from 'vue';
 
     // Interfaces
-    import { WFRPStat } from '../../../../common/interfaces/systems/wfrp';
+    import { WFRPStat } from '../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';
diff --git a/src/client/components/systems/wfrp/skillsCard.vue b/src/client/components/systems/wfrp/skillsCard.vue
index bc2d6645..7a305dd8 100644
--- a/src/client/components/systems/wfrp/skillsCard.vue
+++ b/src/client/components/systems/wfrp/skillsCard.vue
@@ -61,8 +61,8 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { WFRPSkill, WFRPSystemDetails } from '../../../../common/interfaces/systems/wfrp';
+    import { Character } from '../../../../common/models';
+    import { WFRPSkill, WFRPSystemDetails } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/wfrp/statsCard.vue b/src/client/components/systems/wfrp/statsCard.vue
index 032ea348..c893afda 100644
--- a/src/client/components/systems/wfrp/statsCard.vue
+++ b/src/client/components/systems/wfrp/statsCard.vue
@@ -61,8 +61,8 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { WFRPStat, WFRPSystemDetails } from '../../../../common/interfaces/systems/wfrp';
+    import { Character } from '../../../../common/models';
+    import { WFRPStat, WFRPSystemDetails } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/components/systems/wfrp/wfrpCharacter.vue b/src/client/components/systems/wfrp/wfrpCharacter.vue
index 5da47139..e473f29a 100644
--- a/src/client/components/systems/wfrp/wfrpCharacter.vue
+++ b/src/client/components/systems/wfrp/wfrpCharacter.vue
@@ -22,8 +22,8 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { WFRPSystemDetails } from '../../../../common/interfaces/systems/wfrp';
+    import { Character } from '../../../../common/models';
+    import { WFRPSystemDetails } from '../../../../common/models/systems';
 
     // Store
     import { useCharactersStore } from '../../../lib/stores/characters';
diff --git a/src/client/index.html b/src/client/index.html
index e0129a81..7738481c 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" data-bs-theme="dark">
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
diff --git a/src/client/lib/managers/character.ts b/src/client/lib/managers/character.ts
index de0478a1..e1f44fd2 100644
--- a/src/client/lib/managers/character.ts
+++ b/src/client/lib/managers/character.ts
@@ -5,7 +5,7 @@
 import { Socket, io } from 'socket.io-client';
 
 // Interfaces
-import { Character, RPGKMessage, SystemDetails } from '../../../common/interfaces/common';
+import { Character, RPGKMessage, SystemDetails } from '../../../common/models';
 
 // Models
 import { Account } from '../models/account';
diff --git a/src/client/lib/managers/systems.ts b/src/client/lib/managers/systems.ts
index dfa80c96..70c748fb 100644
--- a/src/client/lib/managers/systems.ts
+++ b/src/client/lib/managers/systems.ts
@@ -3,7 +3,7 @@
 //----------------------------------------------------------------------------------------------------------------------
 
 // Interfaces
-import { System } from '../../../common/interfaces/common';
+import { System } from '../../../common/models';
 
 // Store
 import { useSystemsStore } from '../stores/systems';
diff --git a/src/client/lib/managers/systems/eote.ts b/src/client/lib/managers/systems/eote.ts
index 4e5bb8a7..d55b8c4d 100644
--- a/src/client/lib/managers/systems/eote.ts
+++ b/src/client/lib/managers/systems/eote.ts
@@ -5,10 +5,10 @@
 import { XOR } from 'ts-essentials';
 
 // Interfaces
-import { Character } from '../../../../common/interfaces/common';
-import * as Models from '../../../../common/interfaces/systems/eote';
-import { Supplement } from '../../../../common/interfaces/systems/supplements';
-import { Reference } from '../../../../common/interfaces/models/reference';
+import { Character } from '../../../../common/models';
+import * as Models from '../../../../common/models/systems/eote';
+import { Supplement } from '../../../../common/models/systems';
+import { Reference } from '../../../../common/models/reference';
 
 // Stores
 import { useEoteStore } from '../../stores/systems/eote';
diff --git a/src/client/lib/models/account.ts b/src/client/lib/models/account.ts
index 52e5290d..9e204bb7 100644
--- a/src/client/lib/models/account.ts
+++ b/src/client/lib/models/account.ts
@@ -2,7 +2,7 @@
 // AccountModel
 //----------------------------------------------------------------------------------------------------------------------
 
-import { Account as ServerAccountModel } from '../../../common/interfaces/common';
+import { Account as ServerAccountModel } from '../../../common/models';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/client/lib/models/notebook.ts b/src/client/lib/models/notebook.ts
index 4e030aa1..f72601c1 100644
--- a/src/client/lib/models/notebook.ts
+++ b/src/client/lib/models/notebook.ts
@@ -3,6 +3,6 @@
 //----------------------------------------------------------------------------------------------------------------------
 
 // Models
-export { Notebook, NotebookPage } from '../../../common/interfaces/common';
+export { Notebook, NotebookPage } from '../../../common/models';
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/client/lib/resource-access/auth.ts b/src/client/lib/resource-access/auth.ts
index 7bf5322d..817f5fd7 100644
--- a/src/client/lib/resource-access/auth.ts
+++ b/src/client/lib/resource-access/auth.ts
@@ -5,7 +5,7 @@
 import $http from 'axios';
 
 // Models
-import { Account as ServerAccount } from '../../../common/interfaces/common';
+import { Account as ServerAccount } from '../../../common/models';
 import { Account } from '../models/account';
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/client/lib/resource-access/character.ts b/src/client/lib/resource-access/character.ts
index 2842ebc7..5805bf14 100644
--- a/src/client/lib/resource-access/character.ts
+++ b/src/client/lib/resource-access/character.ts
@@ -5,7 +5,7 @@
 import $http from 'axios';
 
 // Interfaces
-import { Character, SystemDetails } from '../../../common/interfaces/common';
+import { Character, SystemDetails } from '../../../common/models';
 
 // Store
 import { useAccountStore } from '../stores/account';
diff --git a/src/client/lib/resource-access/permissions.ts b/src/client/lib/resource-access/permissions.ts
index 27bac964..f4891b7b 100644
--- a/src/client/lib/resource-access/permissions.ts
+++ b/src/client/lib/resource-access/permissions.ts
@@ -8,7 +8,7 @@ import tp from 'trivialperms';
 import rolesRA from './roles';
 
 // Models
-import { Account } from '../../../common/interfaces/common';
+import { Account } from '../../../common/models';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/client/lib/resource-access/roles.ts b/src/client/lib/resource-access/roles.ts
index 82957a3c..3292e10b 100644
--- a/src/client/lib/resource-access/roles.ts
+++ b/src/client/lib/resource-access/roles.ts
@@ -5,7 +5,7 @@
 import $http from 'axios';
 
 // Interfaces
-import { Role } from '../../../common/interfaces/common';
+import { Role } from '../../../common/models';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/client/lib/resource-access/supplement.ts b/src/client/lib/resource-access/supplement.ts
index c11cff1f..0580d651 100644
--- a/src/client/lib/resource-access/supplement.ts
+++ b/src/client/lib/resource-access/supplement.ts
@@ -5,8 +5,8 @@
 import axios from 'axios';
 
 // Interfaces
-import { Supplement } from '../../../common/interfaces/systems/supplements';
-import { Reference } from '../../../common/interfaces/models/reference';
+import { Supplement } from '../../../common/models/systems';
+import { Reference } from '../../../common/models/reference';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/client/lib/resource-access/systems.ts b/src/client/lib/resource-access/systems.ts
index 11c9665a..9370e303 100644
--- a/src/client/lib/resource-access/systems.ts
+++ b/src/client/lib/resource-access/systems.ts
@@ -5,7 +5,7 @@
 import $http from 'axios';
 
 // Interfaces
-import { System } from '../../../common/interfaces/common';
+import { System } from '../../../common/models';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/client/lib/stores/characters.ts b/src/client/lib/stores/characters.ts
index 308eeb4d..4ebb29e4 100644
--- a/src/client/lib/stores/characters.ts
+++ b/src/client/lib/stores/characters.ts
@@ -5,7 +5,7 @@
 import { defineStore } from 'pinia';
 
 // Models
-import { Character, SystemDetails } from '../../../common/interfaces/common';
+import { Character, SystemDetails } from '../../../common/models';
 
 // Resource Access
 import charactersRA from '../resource-access/character';
diff --git a/src/client/lib/stores/colorMode.ts b/src/client/lib/stores/colorMode.ts
index 149b2021..58f7f133 100644
--- a/src/client/lib/stores/colorMode.ts
+++ b/src/client/lib/stores/colorMode.ts
@@ -5,7 +5,7 @@
 import { defineStore } from 'pinia';
 
 // Models
-import { ValidBSTheme, ValidColorMode } from '../../../common/interfaces/models/colorMode';
+import { ValidBSTheme, ValidColorMode } from '../../../common/models/colorMode';
 
 // ---------------------------------------------------------------------------------------------------------------------
 
@@ -25,7 +25,7 @@ export const useColorModeStore = defineStore('colorMode', {
     state() : ColorModeStoreState
     {
         return {
-            colorMode: 'auto',
+            colorMode: 'dark',
         };
     },
     getters: {
diff --git a/src/client/lib/stores/systems.ts b/src/client/lib/stores/systems.ts
index b0402a63..ef12d592 100644
--- a/src/client/lib/stores/systems.ts
+++ b/src/client/lib/stores/systems.ts
@@ -5,7 +5,7 @@
 import { defineStore } from 'pinia';
 
 // Models
-import { System } from '../../../common/interfaces/common';
+import { System } from '../../../common/models';
 
 // Resource Access
 import systemsRA from '../resource-access/systems';
diff --git a/src/client/lib/stores/systems/eote.ts b/src/client/lib/stores/systems/eote.ts
index cfcc5252..9176a9de 100644
--- a/src/client/lib/stores/systems/eote.ts
+++ b/src/client/lib/stores/systems/eote.ts
@@ -5,9 +5,9 @@
 import { defineStore } from 'pinia';
 
 // Models
-import * as EoteModels from '../../../../common/interfaces/systems/eote';
-import { Supplement } from '../../../../common/interfaces/systems/supplements';
-import { Reference } from '../../../../common/interfaces/models/reference';
+import * as EoteModels from '../../../../common/models/systems/eote';
+import { Supplement } from '../../../../common/models/systems';
+import { Reference } from '../../../../common/models/reference';
 
 // Resource Access
 import suppRA from '../../resource-access/supplement';
diff --git a/src/client/lib/stores/systems/genesys.ts b/src/client/lib/stores/systems/genesys.ts
index 0a238fe7..18b8d95c 100644
--- a/src/client/lib/stores/systems/genesys.ts
+++ b/src/client/lib/stores/systems/genesys.ts
@@ -5,9 +5,9 @@
 import { defineStore } from 'pinia';
 
 // Models
-import * as GenesysModels from '../../../../common/interfaces/systems/eote';
-import { Supplement } from '../../../../common/interfaces/systems/supplements';
-import { Reference } from '../../../../common/interfaces/models/reference';
+import * as GenesysModels from '../../../../common/models/systems/eote';
+import { Supplement } from '../../../../common/models/systems';
+import { Reference } from '../../../../common/models/reference';
 
 // Resource Access
 import suppRA from '../../resource-access/supplement';
diff --git a/src/client/lib/utils/dice-systems/eote.ts b/src/client/lib/utils/dice-systems/eote.ts
index a3392900..79400000 100644
--- a/src/client/lib/utils/dice-systems/eote.ts
+++ b/src/client/lib/utils/dice-systems/eote.ts
@@ -5,7 +5,7 @@
 import _ from 'lodash';
 
 // Interfaces
-import { EoteCritical } from '../../../../common/interfaces/systems/eote';
+import { EoteCritical } from '../../../../common/models/systems';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/client/lib/utils/dice.ts b/src/client/lib/utils/dice.ts
index cabc0be8..1d10550e 100644
--- a/src/client/lib/utils/dice.ts
+++ b/src/client/lib/utils/dice.ts
@@ -18,7 +18,7 @@ import {
 } from './dice-systems/eote';
 
 // Interfaces
-import { EoteCritical } from '../../../common/interfaces/systems/eote';
+import { EoteCritical } from '../../../common/models/systems';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/client/pages/dashboardPage.vue b/src/client/pages/dashboardPage.vue
index fba025b0..c9a8f2cd 100644
--- a/src/client/pages/dashboardPage.vue
+++ b/src/client/pages/dashboardPage.vue
@@ -162,7 +162,7 @@
     import { BaseColorVariant } from 'bootstrap-vue-next';
 
     // Interfaces
-    import { Character, System } from '../../common/interfaces/common';
+    import { Character, System } from '../../common/models';
 
     // Stores
     import { useAccountStore } from '../lib/stores/account';
diff --git a/src/client/scss/_custom.scss b/src/client/scss/_custom.scss
index e0a01abd..98a88445 100644
--- a/src/client/scss/_custom.scss
+++ b/src/client/scss/_custom.scss
@@ -2,7 +2,6 @@
 // Custom Theme SCSS
 //
 // Note: Mixins and variable references are perfectly acceptable here.
-//
 //----------------------------------------------------------------------------------------------------------------------
 
 @use "sass:map";
diff --git a/src/common/interfaces/common.ts b/src/common/interfaces/common.ts
deleted file mode 100644
index e7e3fc81..00000000
--- a/src/common/interfaces/common.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// ---------------------------------------------------------------------------------------------------------------------
-// Common Interfaces
-// ---------------------------------------------------------------------------------------------------------------------
-
-export { AccountSettings, Account } from './models/account.js';
-export { CharacterOptions, SystemDetails, Character } from './models/character.js';
-export { DiceRoll } from './models/dice.js';
-export { Notebook, NotebookPage } from './models/notebook.js';
-export { Role } from './models/role.js';
-export { RPGKMessage, RPGKEventMessage, RPGKRemoveMessage, RPGKUpdateMessage } from './models/messages.js';
-export { Supplement } from './models/supplement.js';
-export { SupportStatus, System } from './models/system.js';
-
-// ---------------------------------------------------------------------------------------------------------------------
diff --git a/src/common/interfaces/models/account.ts b/src/common/models/account.ts
similarity index 100%
rename from src/common/interfaces/models/account.ts
rename to src/common/models/account.ts
diff --git a/src/common/interfaces/models/character.ts b/src/common/models/character.ts
similarity index 100%
rename from src/common/interfaces/models/character.ts
rename to src/common/models/character.ts
diff --git a/src/common/interfaces/models/colorMode.ts b/src/common/models/colorMode.ts
similarity index 100%
rename from src/common/interfaces/models/colorMode.ts
rename to src/common/models/colorMode.ts
diff --git a/src/common/interfaces/models/dice.ts b/src/common/models/dice.ts
similarity index 100%
rename from src/common/interfaces/models/dice.ts
rename to src/common/models/dice.ts
diff --git a/src/common/models/index.ts b/src/common/models/index.ts
new file mode 100644
index 00000000..417d078e
--- /dev/null
+++ b/src/common/models/index.ts
@@ -0,0 +1,14 @@
+// ---------------------------------------------------------------------------------------------------------------------
+// Common Models
+// ---------------------------------------------------------------------------------------------------------------------
+
+export { AccountSettings, Account } from './account.js';
+export { CharacterOptions, SystemDetails, Character } from './character.js';
+export { DiceRoll } from './dice.js';
+export { Notebook, NotebookPage } from './notebook.js';
+export { Role } from './role.js';
+export { RPGKMessage, RPGKEventMessage, RPGKRemoveMessage, RPGKUpdateMessage } from './messages.js';
+export { Supplement } from './supplement.js';
+export { SupportStatus, System } from './system.js';
+
+// ---------------------------------------------------------------------------------------------------------------------
diff --git a/src/common/interfaces/models/messages.ts b/src/common/models/messages.ts
similarity index 100%
rename from src/common/interfaces/models/messages.ts
rename to src/common/models/messages.ts
diff --git a/src/common/interfaces/models/notebook.ts b/src/common/models/notebook.ts
similarity index 100%
rename from src/common/interfaces/models/notebook.ts
rename to src/common/models/notebook.ts
diff --git a/src/common/interfaces/models/reference.ts b/src/common/models/reference.ts
similarity index 100%
rename from src/common/interfaces/models/reference.ts
rename to src/common/models/reference.ts
diff --git a/src/common/interfaces/models/role.ts b/src/common/models/role.ts
similarity index 100%
rename from src/common/interfaces/models/role.ts
rename to src/common/models/role.ts
diff --git a/src/common/interfaces/models/supplement.ts b/src/common/models/supplement.ts
similarity index 100%
rename from src/common/interfaces/models/supplement.ts
rename to src/common/models/supplement.ts
diff --git a/src/common/interfaces/models/system.ts b/src/common/models/system.ts
similarity index 100%
rename from src/common/interfaces/models/system.ts
rename to src/common/models/system.ts
diff --git a/src/common/interfaces/systems/coc.ts b/src/common/models/systems/coc.ts
similarity index 97%
rename from src/common/interfaces/systems/coc.ts
rename to src/common/models/systems/coc.ts
index 9aa80b46..8724ec55 100644
--- a/src/common/interfaces/systems/coc.ts
+++ b/src/common/models/systems/coc.ts
@@ -2,7 +2,7 @@
 // Call of Cthulhu Models
 //----------------------------------------------------------------------------------------------------------------------
 
-import { Supplement } from '../models/supplement.js';
+import { Supplement } from '../supplement.js';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/common/interfaces/systems/eote.ts b/src/common/models/systems/eote.ts
similarity index 98%
rename from src/common/interfaces/systems/eote.ts
rename to src/common/models/systems/eote.ts
index 5439fc79..6809927b 100644
--- a/src/common/interfaces/systems/eote.ts
+++ b/src/common/models/systems/eote.ts
@@ -5,7 +5,7 @@
 import { Supplement } from './supplements.js';
 import { BoundedRange } from '../../utils/types.js';
 
-import { Character } from '../common.js';
+import { Character } from '../index.js';
 
 // ---------------------------------------------------------------------------------------------------------------------
 
@@ -98,7 +98,7 @@ interface BaseArmor extends Supplement
     rarity : number;
 }
 
-interface BaseArmorRef 
+interface BaseArmorRef
 {
     name : string;
     description ?: string;
@@ -284,7 +284,7 @@ export type GenesysWeapon = BaseWeapon;
 
 export type GenesysMotivationType = 'strength' | 'flaw' | 'desire' | 'fear';
 
-export interface GenesysMotivation extends Supplement 
+export interface GenesysMotivation extends Supplement
 {
     id ?: number;
     type : GenesysMotivationType;
diff --git a/src/common/interfaces/systems/fate.ts b/src/common/models/systems/fate.ts
similarity index 100%
rename from src/common/interfaces/systems/fate.ts
rename to src/common/models/systems/fate.ts
diff --git a/src/common/models/systems/index.ts b/src/common/models/systems/index.ts
new file mode 100644
index 00000000..5e5d04b4
--- /dev/null
+++ b/src/common/models/systems/index.ts
@@ -0,0 +1,13 @@
+//----------------------------------------------------------------------------------------------------------------------
+// System Models
+//----------------------------------------------------------------------------------------------------------------------
+
+export * from './coc.js';
+export * from './eote.js';
+export * from './fate.js';
+export * from './risus.js';
+export * from './wfrp.js';
+
+export * from './supplements.js';
+
+//----------------------------------------------------------------------------------------------------------------------
diff --git a/src/common/interfaces/systems/risus.ts b/src/common/models/systems/risus.ts
similarity index 100%
rename from src/common/interfaces/systems/risus.ts
rename to src/common/models/systems/risus.ts
diff --git a/src/common/interfaces/systems/supplements.ts b/src/common/models/systems/supplements.ts
similarity index 100%
rename from src/common/interfaces/systems/supplements.ts
rename to src/common/models/systems/supplements.ts
diff --git a/src/common/interfaces/systems/wfrp.ts b/src/common/models/systems/wfrp.ts
similarity index 100%
rename from src/common/interfaces/systems/wfrp.ts
rename to src/common/models/systems/wfrp.ts
diff --git a/src/server/auth/google.ts b/src/server/auth/google.ts
index 8050817d..640a9758 100644
--- a/src/server/auth/google.ts
+++ b/src/server/auth/google.ts
@@ -11,7 +11,7 @@ import logging from '@strata-js/util-logging';
 import './serialization.js';
 
 // Interfaces
-import { ServerConfig } from '../../common/interfaces/config.js';
+import { ServerConfig } from '../interfaces/config.js';
 
 // Managers
 import * as accountMan from '../managers/account.js';
diff --git a/src/server/auth/serialization.ts b/src/server/auth/serialization.ts
index 4152bd20..2c3cef1b 100644
--- a/src/server/auth/serialization.ts
+++ b/src/server/auth/serialization.ts
@@ -8,7 +8,7 @@ import passport from 'passport';
 import * as accountMan from '../managers/account.js';
 
 // Models
-import { Account } from '../../common/interfaces/models/account.js';
+import { Account } from '../../common/models/account.js';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/common/interfaces/config.ts b/src/server/interfaces/config.ts
similarity index 100%
rename from src/common/interfaces/config.ts
rename to src/server/interfaces/config.ts
diff --git a/src/server/knex/seeds/admin_role.ts b/src/server/knex/seeds/admin_role.ts
index c5a31e79..af7d40f1 100644
--- a/src/server/knex/seeds/admin_role.ts
+++ b/src/server/knex/seeds/admin_role.ts
@@ -93,6 +93,6 @@ export async function seed(knex : Knex) : Promise<void>
             await knex('account_role').insert({ account_id: account.account_id, role_id: 2 });
         }
     }
-};
+}
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/knex/seeds/coc_references.ts b/src/server/knex/seeds/coc_references.ts
index 21a9d28a..f606bd1b 100644
--- a/src/server/knex/seeds/coc_references.ts
+++ b/src/server/knex/seeds/coc_references.ts
@@ -17,6 +17,6 @@ export async function seed(knex : Knex) : Promise<void>
         { name: 'Call of Cthulhu Keeper Rulebook', abbr: 'CoC-RK', product_code: 'CHA23135' },
         { name: 'Call of Cthulhu Investigator Handbook', abbr: 'CoC-IH', product_code: 'CHA23136' },
     ]);
-};
+}
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/knex/seeds/eote_attachments.ts b/src/server/knex/seeds/eote_attachments.ts
index 04a8cc9b..4714463b 100644
--- a/src/server/knex/seeds/eote_attachments.ts
+++ b/src/server/knex/seeds/eote_attachments.ts
@@ -318,6 +318,6 @@ export async function seed(knex : Knex) : Promise<void>
     // Inserts seed entries
     await Promise.all(eoteAttachments.map((attachment) => knex('eote_attachment').insert(attachment)));
     await Promise.all(genesysAttachments.map((attachment) => knex('genesys_attachment').insert(attachment)));
-};
+}
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/knex/seeds/eote_qualities.ts b/src/server/knex/seeds/eote_qualities.ts
index 32dc8d88..8f648478 100644
--- a/src/server/knex/seeds/eote_qualities.ts
+++ b/src/server/knex/seeds/eote_qualities.ts
@@ -106,6 +106,6 @@ export async function seed(knex : Knex) : Promise<void>
     // Inserts seed entries
     await Promise.all(eoteQualities.map((quality) => knex('eote_quality').insert(quality)));
     await Promise.all(genesysQualities.map((quality) => knex('genesys_quality').insert(quality)));
-};
+}
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/knex/seeds/eote_references.ts b/src/server/knex/seeds/eote_references.ts
index 4e879a19..2729f154 100644
--- a/src/server/knex/seeds/eote_references.ts
+++ b/src/server/knex/seeds/eote_references.ts
@@ -68,6 +68,6 @@ export async function seed(knex : Knex) : Promise<void>
         { name: 'Shadow of the Beanstalk', abbr: 'SotB', product_code: 'GNS04' },
         { name: 'Secrets of the Crucible', abbr: 'SotC', product_code: 'GNS12' },
     ]);
-};
+}
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/knex/seeds/eote_talents.ts b/src/server/knex/seeds/eote_talents.ts
index c21800ba..b8f47533 100644
--- a/src/server/knex/seeds/eote_talents.ts
+++ b/src/server/knex/seeds/eote_talents.ts
@@ -938,6 +938,6 @@ export async function seed(knex : Knex) : Promise<void>
     // Inserts seed entries
     await Promise.all(eoteTalents.map((talent) => knex('eote_talent').insert(talent)));
     await Promise.all(genesysTalents.map((talent) => knex('genesys_talent').insert(talent)));
-};
+}
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/managers/account.ts b/src/server/managers/account.ts
index 9444df8f..e8224c30 100644
--- a/src/server/managers/account.ts
+++ b/src/server/managers/account.ts
@@ -5,7 +5,7 @@
 import pMap from 'p-map';
 
 // Models
-import { Account, NewAccount } from '../../common/interfaces/models/account.js';
+import { Account, NewAccount } from '../../common/models/account.js';
 
 // Resource Access
 import * as accountRA from '../resource-access/account.js';
diff --git a/src/server/managers/character.ts b/src/server/managers/character.ts
index 73b475e5..c4ec582e 100644
--- a/src/server/managers/character.ts
+++ b/src/server/managers/character.ts
@@ -6,7 +6,7 @@
 import * as notebookMan from './notebook.js';
 
 // Models
-import { Character } from '../../common/interfaces/models/character.js';
+import { Character } from '../../common/models/index.js';
 
 // Resource Access
 import * as characterRA from '../resource-access/character.js';
diff --git a/src/server/managers/notebook.ts b/src/server/managers/notebook.ts
index cc5db1f1..e2fb7bdd 100644
--- a/src/server/managers/notebook.ts
+++ b/src/server/managers/notebook.ts
@@ -3,7 +3,7 @@
 // ---------------------------------------------------------------------------------------------------------------------
 
 // Models
-import { Notebook, NotebookPage } from '../../common/interfaces/models/notebook.js';
+import { Notebook, NotebookPage } from '../../common/models/notebook.js';
 
 // Resource Access
 import * as noteRA from '../resource-access/notebook.js';
diff --git a/src/server/managers/reference.ts b/src/server/managers/reference.ts
index 95cb66e3..ed7a1ab7 100644
--- a/src/server/managers/reference.ts
+++ b/src/server/managers/reference.ts
@@ -3,7 +3,7 @@
 //----------------------------------------------------------------------------------------------------------------------
 
 // Models
-import { Reference } from '../../common/interfaces/models/reference.js';
+import { Reference } from '../../common/models/reference.js';
 
 // Resource Access
 import * as referenceRA from '../resource-access/reference.js';
diff --git a/src/server/managers/role.ts b/src/server/managers/role.ts
index de9a0bda..723118cb 100644
--- a/src/server/managers/role.ts
+++ b/src/server/managers/role.ts
@@ -3,7 +3,7 @@
 // ---------------------------------------------------------------------------------------------------------------------
 
 // Models
-import { Role } from '../../common/interfaces/models/role.js';
+import { Role } from '../../common/models/role.js';
 
 // Resource Access
 import * as roleRA from '../resource-access/role.js';
diff --git a/src/server/managers/supplement.ts b/src/server/managers/supplement.ts
index f2c82842..6133f10c 100644
--- a/src/server/managers/supplement.ts
+++ b/src/server/managers/supplement.ts
@@ -3,8 +3,8 @@
 //----------------------------------------------------------------------------------------------------------------------
 
 // Models
-import { Account } from '../../common/interfaces/models/account.js';
-import { Supplement } from '../../common/interfaces/models/supplement.js';
+import { Account } from '../../common/models/account.js';
+import { Supplement } from '../../common/models/index.js';
 
 // Resource Access
 import * as suppRA from '../resource-access/supplement.js';
@@ -21,7 +21,7 @@ export async function get(id : number, type : string, systemPrefix : string, acc
 
 export async function list(
     filters : Record<string, FilterToken>,
-    type : string, 
+    type : string,
     systemPrefix : string,
     account ?: Account
 ) : Promise<Supplement[]>
@@ -36,7 +36,7 @@ export async function exists(id : number, type : string, systemPrefix : string,
 
 export async function add(
     newSupplement : Supplement,
-    type : string, 
+    type : string,
     systemPrefix : string,
     account ?: Account
 ) : Promise<Supplement>
@@ -48,7 +48,7 @@ export async function update(
     id : number,
     updateSup : Partial<Supplement>,
     type : string,
-    systemPrefix : string, 
+    systemPrefix : string,
     account ?: Account
 ) : Promise<Supplement>
 {
diff --git a/src/server/models/character.ts b/src/server/models/character.ts
index 8a11f7b6..9a30ea5b 100644
--- a/src/server/models/character.ts
+++ b/src/server/models/character.ts
@@ -5,7 +5,7 @@
 import * as JsonDecoder from 'decoders';
 
 // Models
-import { CharacterOptions, SystemDetails } from '../../common/interfaces/models/character.js';
+import { CharacterOptions, SystemDetails } from '../../common/models/index.js';
 
 // Decoders
 import { characterJsonDecoder, characterRecDecoder } from '../decoders/character.js';
diff --git a/src/server/resource-access/account.ts b/src/server/resource-access/account.ts
index 04c0c707..98b68d00 100644
--- a/src/server/resource-access/account.ts
+++ b/src/server/resource-access/account.ts
@@ -3,7 +3,7 @@
 // ---------------------------------------------------------------------------------------------------------------------
 
 // Models
-import { Account, NewAccount } from '../../common/interfaces/models/account.js';
+import { Account, NewAccount } from '../../common/models/account.js';
 
 // Transforms
 import * as AccountTransforms from './transforms/account.js';
diff --git a/src/server/resource-access/character.ts b/src/server/resource-access/character.ts
index 103ac310..f1e2eb95 100644
--- a/src/server/resource-access/character.ts
+++ b/src/server/resource-access/character.ts
@@ -3,7 +3,7 @@
 //----------------------------------------------------------------------------------------------------------------------
 
 // Models
-import { Character } from '../../common/interfaces/models/character.js';
+import { Character } from '../../common/models/index.js';
 
 // Transforms
 import * as CharTransforms from './transforms/character.js';
diff --git a/src/server/resource-access/notebook.ts b/src/server/resource-access/notebook.ts
index 71695284..1a7622c5 100644
--- a/src/server/resource-access/notebook.ts
+++ b/src/server/resource-access/notebook.ts
@@ -3,7 +3,7 @@
 // ---------------------------------------------------------------------------------------------------------------------
 
 // Models
-import { Notebook, NotebookPage } from '../../common/interfaces/models/notebook.js';
+import { Notebook, NotebookPage } from '../../common/models/notebook.js';
 
 // Transforms
 import * as NoteTransforms from './transforms/notebook.js';
@@ -15,7 +15,7 @@ import { MultipleResultsError, NotFoundError } from '../errors.js';
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export interface NoteFilters 
+export interface NoteFilters
 {
     id ?: string | string[],
     email ?: string | string[]
diff --git a/src/server/resource-access/reference.ts b/src/server/resource-access/reference.ts
index 597fc724..de111d4f 100644
--- a/src/server/resource-access/reference.ts
+++ b/src/server/resource-access/reference.ts
@@ -3,7 +3,7 @@
 //----------------------------------------------------------------------------------------------------------------------
 
 // Models
-import { Reference } from '../../common/interfaces/models/reference.js';
+import { Reference } from '../../common/models/reference.js';
 
 // Transforms
 import * as ReferenceTrans from './transforms/reference.js';
diff --git a/src/server/resource-access/role.ts b/src/server/resource-access/role.ts
index 5cad822c..54ba4566 100644
--- a/src/server/resource-access/role.ts
+++ b/src/server/resource-access/role.ts
@@ -2,7 +2,7 @@
 // Role Resource Access Layer
 // ---------------------------------------------------------------------------------------------------------------------
 
-import { Role } from '../../common/interfaces/models/role.js';
+import { Role } from '../../common/models/role.js';
 
 // Transforms
 import * as RoleTransforms from './transforms/role.js';
diff --git a/src/server/resource-access/supplement.ts b/src/server/resource-access/supplement.ts
index a6cd2f3a..55eaac95 100644
--- a/src/server/resource-access/supplement.ts
+++ b/src/server/resource-access/supplement.ts
@@ -7,8 +7,8 @@ import { Knex } from 'knex';
 import logging from '@strata-js/util-logging';
 
 // Models
-import { Account } from '../../common/interfaces/models/account.js';
-import { Supplement } from '../../common/interfaces/models/supplement.js';
+import { Account } from '../../common/models/account.js';
+import { Supplement } from '../../common/models/index.js';
 
 // Transforms
 import * as SuppTransforms from '../resource-access/transforms/supplement.js';
diff --git a/src/server/resource-access/system.ts b/src/server/resource-access/system.ts
index 8aa4ea98..cdd9ef92 100644
--- a/src/server/resource-access/system.ts
+++ b/src/server/resource-access/system.ts
@@ -11,7 +11,7 @@ import { EdgeOfTheEmpire, Genesys } from '../systems/eote/system.js';
 import { BaseSystem } from '../systems/base.js';
 
 // Models
-import { Character } from '../../common/interfaces/models/character.js';
+import { Character } from '../../common/models/index.js';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/server/resource-access/transforms/account.ts b/src/server/resource-access/transforms/account.ts
index 19ca54c3..f50a7dff 100644
--- a/src/server/resource-access/transforms/account.ts
+++ b/src/server/resource-access/transforms/account.ts
@@ -2,7 +2,7 @@
 // Account Database Transform
 // ---------------------------------------------------------------------------------------------------------------------
 
-import { Account, NewAccount } from '../../../common/interfaces/models/account.js';
+import { Account, NewAccount } from '../../../common/models/account.js';
 
 // ---------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/server/resource-access/transforms/character.ts b/src/server/resource-access/transforms/character.ts
index 85b6416c..c7548b57 100644
--- a/src/server/resource-access/transforms/character.ts
+++ b/src/server/resource-access/transforms/character.ts
@@ -2,7 +2,7 @@
 // Character Database Transform
 // ---------------------------------------------------------------------------------------------------------------------
 
-import { Character } from '../../../common/interfaces/models/character.js';
+import { Character } from '../../../common/models/index.js';
 
 // ---------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/server/resource-access/transforms/notebook.ts b/src/server/resource-access/transforms/notebook.ts
index a4bb1d5c..b78ffd00 100644
--- a/src/server/resource-access/transforms/notebook.ts
+++ b/src/server/resource-access/transforms/notebook.ts
@@ -2,7 +2,7 @@
 // Notebook Database Transforms
 // ---------------------------------------------------------------------------------------------------------------------
 
-import { Notebook, NotebookPage } from '../../../common/interfaces/models/notebook.js';
+import { Notebook, NotebookPage } from '../../../common/models/notebook.js';
 
 // ---------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/server/resource-access/transforms/reference.ts b/src/server/resource-access/transforms/reference.ts
index f9722a7f..76922645 100644
--- a/src/server/resource-access/transforms/reference.ts
+++ b/src/server/resource-access/transforms/reference.ts
@@ -2,11 +2,11 @@
 // Reference Database Transform
 // ---------------------------------------------------------------------------------------------------------------------
 
-import { Reference } from '../../../common/interfaces/models/reference.js';
+import { Reference } from '../../../common/models/reference.js';
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export interface ReferenceDBSchema 
+export interface ReferenceDBSchema
 {
     abbr : string;
     name : string;
diff --git a/src/server/resource-access/transforms/role.ts b/src/server/resource-access/transforms/role.ts
index 9c311aaa..e12efaed 100644
--- a/src/server/resource-access/transforms/role.ts
+++ b/src/server/resource-access/transforms/role.ts
@@ -2,7 +2,7 @@
 // Role Database Transform
 // ---------------------------------------------------------------------------------------------------------------------
 
-import { Role } from '../../../common/interfaces/models/role.js';
+import { Role } from '../../../common/models/role.js';
 
 // ---------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/server/resource-access/transforms/supplement.ts b/src/server/resource-access/transforms/supplement.ts
index 29424505..4dca4fce 100644
--- a/src/server/resource-access/transforms/supplement.ts
+++ b/src/server/resource-access/transforms/supplement.ts
@@ -2,7 +2,7 @@
 // Supplement Database Transform
 // ---------------------------------------------------------------------------------------------------------------------
 
-import { Supplement } from '../../../common/interfaces/models/supplement.js';
+import { Supplement } from '../../../common/models/index.js';
 import { camelCaseKeys, snakeCaseKeys } from '../../utils/misc.js';
 
 // ---------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/server.ts b/src/server/server.ts
index 77c6552f..0133fc5a 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -28,7 +28,7 @@ import { ConnectSessionKnexStore } from 'connect-session-knex';
 import GoogleAuth from './auth/google.js';
 
 // Interfaces
-import { ServerConfig } from '../common/interfaces/config.js';
+import { ServerConfig } from './interfaces/config.js';
 
 // Routes
 import authRouter from './routes/auth.js';
diff --git a/src/server/systems/base.ts b/src/server/systems/base.ts
index cfb33168..8c6e5b0f 100644
--- a/src/server/systems/base.ts
+++ b/src/server/systems/base.ts
@@ -3,8 +3,8 @@
 //----------------------------------------------------------------------------------------------------------------------
 
 // Models
-import { SupportStatus } from '../../common/interfaces/models/system.js';
-import { Character } from '../../common/interfaces/models/character.js';
+import { SupportStatus } from '../../common/models/system.js';
+import { Character } from '../../common/models/index.js';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/server/systems/coc/defaults.ts b/src/server/systems/coc/defaults.ts
index b34bc78d..bb9e65fd 100644
--- a/src/server/systems/coc/defaults.ts
+++ b/src/server/systems/coc/defaults.ts
@@ -1,8 +1,8 @@
 //----------------------------------------------------------------------------------------------------------------------
-// Fate Model Defaults
+// CoC Model Defaults
 //----------------------------------------------------------------------------------------------------------------------
 
-import { CoCSkill, CoCSystemDetails } from '../../../common/interfaces/systems/coc.js';
+import { CoCSkill, CoCSystemDetails } from '../../../common/models/systems/index.js';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/server/systems/coc/system.ts b/src/server/systems/coc/system.ts
index 5a89f26d..92bb07e5 100644
--- a/src/server/systems/coc/system.ts
+++ b/src/server/systems/coc/system.ts
@@ -10,7 +10,7 @@ import defaults from './defaults.js';
 
 // Logger
 import logging from '@strata-js/util-logging';
-import { SupportStatus } from '../../../common/interfaces/models/system.js';
+import { SupportStatus } from '../../../common/models/system.js';
 
 const logger = logging.getLogger('fate-system');
 
diff --git a/src/server/systems/eote/system.ts b/src/server/systems/eote/system.ts
index 81fad163..181fe077 100644
--- a/src/server/systems/eote/system.ts
+++ b/src/server/systems/eote/system.ts
@@ -6,9 +6,9 @@
 import { BaseSystem } from '../base.js';
 
 // Models
-import { SupportStatus } from '../../../common/interfaces/common.js';
+import { SupportStatus } from '../../../common/models/index.js';
 import { Character } from '../../models/character.js';
-import { EoteCharacter, GenesysCharacter } from '../../../common/interfaces/systems/eote.js';
+import { EoteCharacter, GenesysCharacter } from '../../../common/models/systems/eote.js';
 
 // Validations
 import { validateEoteDetails, validateGenesysDetails } from './validations.js';
diff --git a/src/server/systems/eote/validations.ts b/src/server/systems/eote/validations.ts
index 7566e6b2..8638c7f9 100644
--- a/src/server/systems/eote/validations.ts
+++ b/src/server/systems/eote/validations.ts
@@ -3,8 +3,8 @@
 //----------------------------------------------------------------------------------------------------------------------
 
 // Models
-import { Account } from '../../../common/interfaces/models/account.js';
-import { EoteCharacter, GenesysCharacter } from '../../../common/interfaces/systems/eote.js';
+import { Account } from '../../../common/models/account.js';
+import { EoteCharacter, GenesysCharacter } from '../../../common/models/systems/eote.js';
 
 // Managers
 import * as accountMan from '../../managers/account.js';
diff --git a/src/server/systems/wfrp/system.ts b/src/server/systems/wfrp/system.ts
index 18f08d1c..c80d7667 100644
--- a/src/server/systems/wfrp/system.ts
+++ b/src/server/systems/wfrp/system.ts
@@ -6,7 +6,7 @@
 import { BaseSystem } from '../base.js';
 
 // Models
-import { SupportStatus } from '../../../common/interfaces/common.js';
+import { SupportStatus } from '../../../common/models/index.js';
 
 // Defaults
 import defaults from './defaults.js';
diff --git a/src/server/utils/database.ts b/src/server/utils/database.ts
index 513f3524..e0af90fa 100644
--- a/src/server/utils/database.ts
+++ b/src/server/utils/database.ts
@@ -5,7 +5,7 @@
 import knex, { Knex } from 'knex';
 import configUtil from '@strata-js/util-config';
 import logging from '@strata-js/util-logging';
-import { DatabaseConfig, ServerConfig } from '../../common/interfaces/config.js';
+import { DatabaseConfig, ServerConfig } from '../interfaces/config.js';
 
 // ---------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/server/utils/permissions.ts b/src/server/utils/permissions.ts
index 115a7311..2513746b 100644
--- a/src/server/utils/permissions.ts
+++ b/src/server/utils/permissions.ts
@@ -5,10 +5,10 @@
 import tp from 'trivialperms';
 
 // Interfaces
-import { Role } from '../../common/interfaces/models/role.js';
+import { Role } from '../../common/models/role.js';
 
 // Models
-import { Account } from '../../common/interfaces/models/account.js';
+import { Account } from '../../common/models/account.js';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/server/utils/sio.ts b/src/server/utils/sio.ts
index 03856ef8..98c66c39 100644
--- a/src/server/utils/sio.ts
+++ b/src/server/utils/sio.ts
@@ -5,7 +5,7 @@
 import { Server } from 'socket.io';
 
 // Interfaces
-import { RPGKMessage } from '../../common/interfaces/common.js';
+import { RPGKMessage } from '../../common/models/index.js';
 
 //----------------------------------------------------------------------------------------------------------------------
 
diff --git a/vite.config.ts b/vite.config.ts
index 982ed65e..21059ec0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -11,7 +11,7 @@ import Components from 'unplugin-vue-components/vite';
 import { BootstrapVueNextResolver } from 'unplugin-vue-components/resolvers';
 
 // Interfaces
-import { ServerConfig } from './src/common/interfaces/config';
+import { ServerConfig } from './src/server/interfaces/config.ts';
 
 // Utils
 import configUtil from '@strata-js/util-config';

From 52f2be1167b5c9b7ce299a80d8ff500006f2ae23 Mon Sep 17 00:00:00 2001
From: "Christopher S. Case" <chris.case@g33xnexus.com>
Date: Tue, 10 Dec 2024 02:46:54 -0600
Subject: [PATCH 3/3] The last remnants of the old ~~Republic~~ decoder system
 have been swept away.

---
 package-lock.json                      |  23 --
 package.json                           |   1 -
 src/common/models/character.ts         |   5 +-
 src/common/models/index.ts             |   2 +-
 src/server/decoders/character.ts       |  38 ---
 src/server/decoders/systems/eote.ts    | 392 -------------------------
 src/server/decoders/systems/fate.ts    |  49 ----
 src/server/decoders/systems/index.ts   |  35 ---
 src/server/decoders/systems/risus.ts   |  44 ---
 src/server/decoders/systems/wfrp.ts    |  36 ---
 src/server/decoders/utils.ts           | 133 ---------
 src/server/models/character.ts         | 108 -------
 src/server/systems/eote/system.ts      |   7 +-
 src/server/systems/eote/validations.ts |   3 +-
 14 files changed, 6 insertions(+), 870 deletions(-)
 delete mode 100644 src/server/decoders/character.ts
 delete mode 100644 src/server/decoders/systems/eote.ts
 delete mode 100644 src/server/decoders/systems/fate.ts
 delete mode 100644 src/server/decoders/systems/index.ts
 delete mode 100644 src/server/decoders/systems/risus.ts
 delete mode 100644 src/server/decoders/systems/wfrp.ts
 delete mode 100644 src/server/decoders/utils.ts
 delete mode 100644 src/server/models/character.ts

diff --git a/package-lock.json b/package-lock.json
index 7fb2c6d0..66ca73ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,6 @@
         "body-parser": "^1.20.3",
         "connect-session-knex": "^5.0.0",
         "cookie-parser": "^1.4.6",
-        "decoders": "^1.23.3",
         "dotenv": "^16.4.5",
         "express": "^5.0.1",
         "express-session": "^1.18.0",
@@ -3491,12 +3490,6 @@
         "node": "*"
       }
     },
-    "node_modules/debrief": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/debrief/-/debrief-1.5.0.tgz",
-      "integrity": "sha512-3QaFxhEGguXBmBWbnqYOcgdfC7BUu2VQfnT25fs4g9VBHxug+echFCBeVoRw4Nk85GyBkwlKmAS6VzTZEAVnAw==",
-      "license": "MIT"
-    },
     "node_modules/debug": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@@ -3514,16 +3507,6 @@
         }
       }
     },
-    "node_modules/decoders": {
-      "version": "1.25.5",
-      "resolved": "https://registry.npmjs.org/decoders/-/decoders-1.25.5.tgz",
-      "integrity": "sha512-+vhqDkexYr35SFOhoPvn6S5Vz1qFq1MqlyblTKtt2KtYdy+IyfLuaI/QIpFfjApvXsppp0m8vIskAqgqrYctRg==",
-      "license": "MIT",
-      "dependencies": {
-        "debrief": "^1.5.0",
-        "lemons": "^1.4.0"
-      }
-    },
     "node_modules/decompress-response": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
@@ -5501,12 +5484,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/lemons": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/lemons/-/lemons-1.6.0.tgz",
-      "integrity": "sha512-nMnKQjqWp2G3odsHtwZD//WStAYnqCA6bM3JXLTLsQ1Mwkj2iLuaNQTJ6axt7wGqrZHMSt6tKDlHdjjJt9Cgxg==",
-      "license": "MIT"
-    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
diff --git a/package.json b/package.json
index 0ef6b53b..646bf514 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
     "body-parser": "^1.20.3",
     "connect-session-knex": "^5.0.0",
     "cookie-parser": "^1.4.6",
-    "decoders": "^1.23.3",
     "dotenv": "^16.4.5",
     "express": "^5.0.1",
     "express-session": "^1.18.0",
diff --git a/src/common/models/character.ts b/src/common/models/character.ts
index 75095f22..c16ce8ac 100644
--- a/src/common/models/character.ts
+++ b/src/common/models/character.ts
@@ -4,7 +4,7 @@
 
 export type SystemDetails = object;
 
-export interface CharacterOptions<Details extends SystemDetails = SystemDetails> 
+export interface Character<Details extends SystemDetails = SystemDetails>
 {
     id : string | null;
     system : string;
@@ -19,7 +19,4 @@ export interface CharacterOptions<Details extends SystemDetails = SystemDetails>
     details : Details
 }
 
-// FIXME: Once Models are removed, `CharacterOptions` should be named 'Character'.
-export type Character<Details extends SystemDetails = SystemDetails> = CharacterOptions<Details>;
-
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/src/common/models/index.ts b/src/common/models/index.ts
index 417d078e..30c33a3e 100644
--- a/src/common/models/index.ts
+++ b/src/common/models/index.ts
@@ -3,7 +3,7 @@
 // ---------------------------------------------------------------------------------------------------------------------
 
 export { AccountSettings, Account } from './account.js';
-export { CharacterOptions, SystemDetails, Character } from './character.js';
+export { SystemDetails, Character } from './character.js';
 export { DiceRoll } from './dice.js';
 export { Notebook, NotebookPage } from './notebook.js';
 export { Role } from './role.js';
diff --git a/src/server/decoders/character.ts b/src/server/decoders/character.ts
deleted file mode 100644
index dbafd9e3..00000000
--- a/src/server/decoders/character.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// ---------------------------------------------------------------------------------------------------------------------
-// Character Decoders
-// ---------------------------------------------------------------------------------------------------------------------
-
-import { inexact, object, optional, string } from 'decoders';
-import { hexColor, jsonObjectString, nullToUndefined, stringWithLength, withDefault } from './utils.js';
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-export const characterRecDecoder = object({
-    id: string,
-    system: stringWithLength(3, 255),
-    accountID: stringWithLength(3, 255),
-    noteID: stringWithLength(3, 255),
-    name: stringWithLength(1, 255),
-    description: optional(string),
-    portrait: optional(nullToUndefined(string)),
-    thumbnail: optional(string),
-    color: optional(hexColor),
-    campaign: optional(stringWithLength(0, 255)),
-    details: jsonObjectString(inexact({})),
-});
-
-export const characterJsonDecoder = object({
-    id: string,
-    system: stringWithLength(3, 255),
-    accountID: stringWithLength(3, 255),
-    noteID: stringWithLength(3, 255),
-    name: stringWithLength(1, 255),
-    description: optional(string),
-    portrait: optional(string),
-    thumbnail: optional(string),
-    color: optional(hexColor),
-    campaign: optional(stringWithLength(0, 255)),
-    details: withDefault(inexact({}), {}),
-});
-
-// ---------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/decoders/systems/eote.ts b/src/server/decoders/systems/eote.ts
deleted file mode 100644
index 5bc54c4b..00000000
--- a/src/server/decoders/systems/eote.ts
+++ /dev/null
@@ -1,392 +0,0 @@
-// ---------------------------------------------------------------------------------------------------------------------
-// EotE Decoders
-// ---------------------------------------------------------------------------------------------------------------------
-
-import {
-    Decoder,
-    array,
-    boolean,
-    either,
-    nullable,
-    object,
-    optional,
-    positiveInteger,
-    regex,
-    string,
-    truthy,
-} from 'decoders';
-
-// Defaults
-import defaults from '../../systems/eote/defaults.js';
-
-// Utils
-import {
-    boundedInteger,
-    enumStr,
-    jsonArrayString,
-    jsonObjectString,
-    nullToUndefined,
-    stringWithLength,
-    withDefault,
-} from '../utils.js';
-import { MissingDecoderError } from '../../errors.js';
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-const { genesys, eote } = defaults;
-
-const {
-    motivations,
-    characteristics,
-    experience,
-    defenses,
-    health,
-    abilities,
-    gear,
-    armor,
-    weapons,
-} = genesys.character;
-
-const { force } = eote.character;
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-export const eoteRangeDecoder = enumStr([ 'en', 's', 'm', 'l', 'ex' ]);
-export const referenceDecoder = withDefault(regex(/^[a-zA-z-]+:?\d*$/, 'Must be a valid reference string.'), 'HB');
-
-export const eoteCriticalInjury = object({
-    name: stringWithLength(1, 255),
-    value: positiveInteger,
-});
-
-export const motivationDecoder = object({
-    id: optional(positiveInteger),
-    name: stringWithLength(0, 255),
-    type: enumStr([ 'strength', 'flaw', 'desire', 'fear' ]),
-    description: string,
-    reference: referenceDecoder,
-    owner: nullToUndefined(optional(string)),
-    scope: withDefault(enumStr([ 'public', 'user' ]), 'user'),
-    official: withDefault(truthy, false), // This is 'truthy', because sqlite returns 0 or 1 for booleans.
-});
-
-// ---------------------------------------------------------------------------------------------------------------------
-// Supplements
-// ---------------------------------------------------------------------------------------------------------------------
-
-export const abilityDecoder = object({
-    id: optional(positiveInteger),
-    description: stringWithLength(1),
-    reference: referenceDecoder,
-    name: stringWithLength(1, 255),
-    owner: nullToUndefined(optional(string)),
-    scope: withDefault(enumStr([ 'public', 'user' ]), 'user'),
-    official: withDefault(truthy, false), // This is 'truthy', because sqlite returns 0 or 1 for booleans.
-});
-
-export const talentDecoder = object({
-    id: optional(positiveInteger),
-    description: stringWithLength(1),
-    activation: enumStr([ 'p', 'ai', 'aio', 'am', 'aa' ]),
-    ranked: truthy,
-    tier: boundedInteger(1, 5),
-    reference: referenceDecoder,
-    name: stringWithLength(1, 255),
-    owner: nullToUndefined(optional(string)),
-    scope: withDefault(enumStr([ 'public', 'user' ]), 'user'),
-    official: withDefault(truthy, false), // This is 'truthy', because sqlite returns 0 or 1 for booleans.
-});
-
-export const skillDecoder = object({
-    name: stringWithLength(1, 255),
-    characteristic: enumStr([ 'brawn', 'agility', 'intellect', 'cunning', 'willpower', 'presence' ]),
-    ranks: boundedInteger(0, 5),
-    career: truthy,
-    type: enumStr([ 'general', 'combat', 'magic', 'social', 'knowledge' ]),
-});
-
-export const gearDecoder = object({
-    id: optional(positiveInteger),
-    description: stringWithLength(1),
-    encumbrance: positiveInteger,
-    rarity: positiveInteger,
-    reference: referenceDecoder,
-    name: stringWithLength(1, 255),
-    owner: nullToUndefined(optional(string)),
-    scope: withDefault(enumStr([ 'public', 'user' ]), 'user'),
-    official: withDefault(truthy, false), // This is 'truthy', because sqlite returns 0 or 1 for booleans.
-});
-
-export const attachmentDecoder = object({
-    id: optional(positiveInteger),
-    description: optional(stringWithLength(1)),
-    useWith: stringWithLength(1, 255),
-    modifiers: stringWithLength(1),
-    hpRequired: boundedInteger(0, 50),
-    reference: referenceDecoder,
-    name: stringWithLength(1, 255),
-    owner: nullToUndefined(optional(string)),
-    scope: withDefault(enumStr([ 'public', 'user' ]), 'user'),
-    official: withDefault(truthy, false), // This is 'truthy', because sqlite returns 0 or 1 for booleans.
-});
-
-export const qualityDecoder = object({
-    id: optional(positiveInteger),
-    description: stringWithLength(1),
-    passive: truthy,
-    ranked: truthy,
-    reference: referenceDecoder,
-    name: stringWithLength(1, 255),
-    owner: nullToUndefined(optional(string)),
-    scope: withDefault(enumStr([ 'public', 'user' ]), 'user'),
-    official: withDefault(truthy, false), // This is 'truthy', because sqlite returns 0 or 1 for booleans.
-});
-
-export const armorDecoder = object({
-    id: optional(positiveInteger),
-    description: stringWithLength(1),
-    defense: positiveInteger,
-    soak: positiveInteger,
-    hardpoints: positiveInteger,
-    encumbrance: positiveInteger,
-    rarity: positiveInteger,
-    reference: referenceDecoder,
-    name: stringWithLength(1, 255),
-    owner: nullToUndefined(optional(string)),
-    scope: withDefault(enumStr([ 'public', 'user' ]), 'user'),
-    official: withDefault(truthy, false), // This is 'truthy', because sqlite returns 0 or 1 for booleans.
-});
-
-export const weaponDecoder = object({
-    id: optional(positiveInteger),
-    description: stringWithLength(1),
-    skill: stringWithLength(1, 255),
-    damage: positiveInteger,
-    criticalRating: positiveInteger,
-    range: eoteRangeDecoder,
-    encumbrance: positiveInteger,
-    rarity: positiveInteger,
-    qualities: withDefault(either(
-        jsonArrayString(object({ id: positiveInteger, ranks: optional(boundedInteger(1)) })),
-        array(object({ id: positiveInteger, ranks: optional(boundedInteger(1)) }))
-    ), []),
-    reference: referenceDecoder,
-    name: stringWithLength(1, 255),
-    owner: nullToUndefined(optional(string)),
-    scope: withDefault(enumStr([ 'public', 'user' ]), 'user'),
-    official: withDefault(truthy, false), // This is 'truthy', because sqlite returns 0 or 1 for booleans.
-});
-
-export const eoteTalentDecoder = object({
-    id: optional(positiveInteger),
-    description: stringWithLength(1),
-    activation: enumStr([ 'p', 'ai', 'aio', 'am', 'aa' ]),
-    ranked: truthy,
-    trees: stringWithLength(1),
-    reference: referenceDecoder,
-    name: stringWithLength(1, 255),
-    owner: nullToUndefined(optional(string)),
-    scope: withDefault(enumStr([ 'public', 'user' ]), 'user'),
-    official: withDefault(truthy, false), // This is 'truthy', because sqlite returns 0 or 1 for booleans.
-});
-
-export const eoteAttachmentDecoder = object({
-    id: optional(positiveInteger),
-    description: stringWithLength(1),
-    baseModifier: stringWithLength(1),
-    modOptions: stringWithLength(1),
-    hpRequired: boundedInteger(0, 50),
-    reference: referenceDecoder,
-    name: stringWithLength(1, 255),
-    owner: nullToUndefined(optional(string)),
-    scope: withDefault(enumStr([ 'public', 'user' ]), 'user'),
-    official: withDefault(truthy, false), // This is 'truthy', because sqlite returns 0 or 1 for booleans.
-});
-
-export const forcePowerUpgradeDecoder = object({
-    available: positiveInteger,
-    description: stringWithLength(1),
-});
-
-export const forcePowerDecoder = object({
-    id: optional(positiveInteger),
-    description: stringWithLength(1),
-    minRating: positiveInteger,
-    upgrades: withDefault(jsonObjectString(object({
-        strength: optional(forcePowerUpgradeDecoder),
-        magnitude: optional(forcePowerUpgradeDecoder),
-        duration: optional(forcePowerUpgradeDecoder),
-        range: optional(forcePowerUpgradeDecoder),
-        control: optional(array(object({ description: stringWithLength(1) }))),
-        mastery: optional(forcePowerUpgradeDecoder),
-    })), { strength: null, magnitude: null, duration: null, range: null, control: null, mastery: null }),
-    reference: referenceDecoder,
-    name: stringWithLength(1, 255),
-    owner: nullToUndefined(optional(string)),
-    scope: withDefault(enumStr([ 'public', 'user' ]), 'user'),
-    official: withDefault(truthy, false), // This is 'truthy', because sqlite returns 0 or 1 for booleans.
-});
-
-// ---------------------------------------------------------------------------------------------------------------------
-// Characters
-// ---------------------------------------------------------------------------------------------------------------------
-
-const baseSysDetailsPartial = {
-    career: stringWithLength(0, 255),
-    species: stringWithLength(0, 255),
-    characteristics: withDefault(object({
-        brawn: boundedInteger(0, 10),
-        agility: boundedInteger(0, 10),
-        intellect: boundedInteger(0, 10),
-        cunning: boundedInteger(0, 10),
-        willpower: boundedInteger(0, 10),
-        presence: boundedInteger(0, 10),
-    }), characteristics),
-    experience: withDefault(object({
-        total: positiveInteger,
-        available: positiveInteger,
-    }), experience),
-    defenses: withDefault(object({
-        soak: positiveInteger,
-        melee: positiveInteger,
-        ranged: positiveInteger,
-    }), defenses),
-    health: withDefault(object({
-        wounds: positiveInteger,
-        woundThreshold: positiveInteger,
-        strain: positiveInteger,
-        strainThreshold: positiveInteger,
-        criticalInjuries: array(eoteCriticalInjury),
-        stimsUsed: positiveInteger,
-        staggered: boolean,
-        immobilized: boolean,
-        disoriented: boolean,
-    }), health),
-    abilities: withDefault(array(positiveInteger), abilities),
-    gear: withDefault(array(gearDecoder), gear),
-    armor: withDefault(object({
-        name: stringWithLength(0, 255),
-        description: optional(stringWithLength(1)),
-        defense: positiveInteger,
-        soak: positiveInteger,
-        hardpoints: positiveInteger,
-        encumbrance: positiveInteger,
-        rarity: positiveInteger,
-        attachments: withDefault(array(positiveInteger), []),
-        qualities: array(object({ id: positiveInteger, ranks: optional(boundedInteger(1)) })),
-        notes: optional(string),
-    }), armor),
-    weapons: withDefault(array(object({
-        name: stringWithLength(1, 255),
-        description: optional(stringWithLength(1)),
-        skill: stringWithLength(1, 255),
-        damage: positiveInteger,
-        criticalRating: positiveInteger,
-        range: eoteRangeDecoder,
-        encumbrance: positiveInteger,
-        rarity: positiveInteger,
-        attachments: withDefault(array(positiveInteger), []),
-        qualities: array(object({ id: positiveInteger, ranks: optional(boundedInteger(1)) })),
-        notes: optional(string),
-    })), weapons),
-};
-
-export const genesysSysDetailsDecoder = object({
-    ...baseSysDetailsPartial,
-    motivations: withDefault(object({
-        strength: nullable(positiveInteger),
-        flaw: nullable(positiveInteger),
-        desire: nullable(positiveInteger),
-        fear: nullable(positiveInteger),
-    }), motivations),
-    skills: withDefault(array(skillDecoder), genesys.skills),
-    talents: withDefault(array(object({
-        id: positiveInteger,
-        ranks: optional(boundedInteger(1)),
-        notes: optional(string),
-    })), eote.character.talents),
-});
-
-export const eoteSysDetailsDecoder = object({
-    ...baseSysDetailsPartial,
-    specialization: optional(stringWithLength(0, 255)),
-    skills: withDefault(array(skillDecoder), eote.skills),
-    talents: withDefault(array(object({
-        id: positiveInteger,
-        ranks: optional(boundedInteger(1)),
-        notes: optional(string),
-    })), eote.character.talents),
-    force: withDefault(object({
-        rating: positiveInteger,
-        committed: positiveInteger, // TODO: The upper limit is really `rating`.
-        powers: array(object({
-            id: either(positiveInteger, stringWithLength(1)),
-            upgrades: withDefault(object({
-                strength: positiveInteger,
-                magnitude: positiveInteger,
-                duration: positiveInteger,
-                range: positiveInteger,
-                control: array(positiveInteger),
-                mastery: positiveInteger,
-            }), { strength: 0, magnitude: 0, duration: 0, range: 0, control: [], mastery: 0 }),
-        })),
-        sensitive: boolean,
-    }), force),
-});
-
-// ---------------------------------------------------------------------------------------------------------------------
-// Functions
-// ---------------------------------------------------------------------------------------------------------------------
-
-export function getGenesysSupplementDecoder(type : string, system = 'genesys') : Decoder<unknown>
-{
-    switch (type)
-    {
-        case 'ability':
-            return abilityDecoder;
-
-        case 'armor':
-            return armorDecoder;
-
-        case 'attachment':
-            return attachmentDecoder;
-
-        case 'gear':
-            return gearDecoder;
-
-        case 'quality':
-            return qualityDecoder;
-
-        case 'talent':
-            return talentDecoder;
-
-        case 'weapon':
-            return weaponDecoder;
-
-        case 'motivation':
-            return motivationDecoder;
-
-        default:
-            throw new MissingDecoderError(`${ system }/${ type }`);
-    }
-}
-
-export function getEotESupplementDecoder(type : string) : Decoder<unknown>
-{
-    switch (type)
-    {
-        case 'attachment':
-            return eoteAttachmentDecoder;
-
-        case 'talent':
-            return eoteTalentDecoder;
-
-        case 'forcepower':
-            return forcePowerDecoder;
-
-        default:
-            return getGenesysSupplementDecoder(type, 'eote');
-    }
-}
-
-// ---------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/decoders/systems/fate.ts b/src/server/decoders/systems/fate.ts
deleted file mode 100644
index 8d120c6a..00000000
--- a/src/server/decoders/systems/fate.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-// ---------------------------------------------------------------------------------------------------------------------
-// FATE Decoders
-// ---------------------------------------------------------------------------------------------------------------------
-
-import { array, boolean, object, optional, positiveInteger, string } from 'decoders';
-
-// Defaults
-import defaults from '../../systems/fate/defaults.js';
-
-// Utils
-import { arrayWithLength, enumStr, stringWithLength, withDefault } from '../utils.js';
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-const { aspects, fatePoints, mentalStress, physicalStress, skills, stunts } = defaults.character;
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-export const fateAspectDecoder = object({
-    type: enumStr([ 'aspect', 'high concept', 'trouble', 'consequence' ]),
-    detail: optional(string),
-    healing: optional(boolean),
-    value: optional(positiveInteger),
-});
-
-export const fateSkillsDecoder = object({
-    name: string,
-    rank: positiveInteger,
-});
-
-export const fateStuntsDecoder = object({
-    title: stringWithLength(1),
-    description: stringWithLength(1),
-});
-
-export const fateSysDetailsDecoder = object({
-    fatePoints: withDefault(object({
-        refresh: positiveInteger,
-        current: positiveInteger,
-    }), fatePoints),
-    aspects: withDefault(array(fateAspectDecoder), aspects as Record<string, unknown>[]),
-    skills: withDefault(array(fateSkillsDecoder), skills),
-    extras: string,
-    stunts: withDefault(array(fateStuntsDecoder), stunts),
-    physicalStress: withDefault(arrayWithLength(boolean, 4, 5), physicalStress),
-    mentalStress: withDefault(arrayWithLength(boolean, 4, 5), mentalStress),
-});
-
-// ---------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/decoders/systems/index.ts b/src/server/decoders/systems/index.ts
deleted file mode 100644
index f4263f77..00000000
--- a/src/server/decoders/systems/index.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// ---------------------------------------------------------------------------------------------------------------------
-// System Specific Decoders
-// ---------------------------------------------------------------------------------------------------------------------
-
-import { Decoder, fail } from 'decoders';
-
-// System Decoders
-import { wfrpSysDetailsDecoder } from './wfrp.js';
-import { risusSysDetailsDecoder } from './risus.js';
-import { fateSysDetailsDecoder } from './fate.js';
-import { eoteSysDetailsDecoder, genesysSysDetailsDecoder } from './eote.js';
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-export function sysDetailsDecoder(system : string) : Decoder<any>
-{
-    // Add an entry for every possible system type, and return the decoder for those system details.
-    switch (system)
-    {
-        case 'genesys':
-            return genesysSysDetailsDecoder;
-        case 'eote':
-            return eoteSysDetailsDecoder;
-        case 'fate':
-            return fateSysDetailsDecoder;
-        case 'risus':
-            return risusSysDetailsDecoder;
-        case 'wfrp':
-            return wfrpSysDetailsDecoder;
-        default:
-            return fail(`Unknown system '${ system }'.`);
-    }
-}
-
-// ---------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/decoders/systems/risus.ts b/src/server/decoders/systems/risus.ts
deleted file mode 100644
index c7554f47..00000000
--- a/src/server/decoders/systems/risus.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// ---------------------------------------------------------------------------------------------------------------------
-// Risus Decoders
-// ---------------------------------------------------------------------------------------------------------------------
-
-import { array, object, optional, positiveInteger, string } from 'decoders';
-
-import * as decoders from 'decoders';
-const nonEmptyString = decoders.nonEmptyString;
-
-// Defaults
-import defaults from '../../systems/risus/defaults.js';
-
-// Utils
-import { boundedInteger, withDefault } from '../utils.js';
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-const { cliches, hooks, luckyShots } = defaults.character;
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-export const risusClicheDecoder = object({
-    value: boundedInteger(1),
-    current: positiveInteger,
-    description: nonEmptyString,
-    tools: optional(string),
-});
-
-export const risusHooksDecoder = object({
-    description: nonEmptyString,
-});
-
-export const risusSysDetailsDecoder = object({
-    advancementPoints: positiveInteger,
-    ffDice: positiveInteger,
-    cliches: withDefault(array(risusClicheDecoder), cliches),
-    hooks: withDefault(array(risusHooksDecoder), hooks),
-    luckyShots: withDefault(object({
-        current: positiveInteger,
-        max: positiveInteger,
-    }), luckyShots),
-});
-
-// ---------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/decoders/systems/wfrp.ts b/src/server/decoders/systems/wfrp.ts
deleted file mode 100644
index e261803a..00000000
--- a/src/server/decoders/systems/wfrp.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// ---------------------------------------------------------------------------------------------------------------------
-// WFRP Decoders
-// ---------------------------------------------------------------------------------------------------------------------
-
-import { array, object } from 'decoders';
-import * as decoders from 'decoders';
-const nonEmptyString = decoders.nonEmptyString;
-
-// Defaults
-import defaults from '../../systems/wfrp/defaults.js';
-
-// Utils
-import { boundedInteger, withDefault } from '../utils.js';
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-const { stats, skills } = defaults.character;
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-export const wfrpStatsDecoder = object({
-    value: boundedInteger(0),
-    description: nonEmptyString,
-});
-
-export const wfrpSkillsDecoder = object({
-    value: boundedInteger(0),
-    description: nonEmptyString,
-});
-
-export const wfrpSysDetailsDecoder = object({
-    stats: withDefault(array(wfrpStatsDecoder), stats),
-    skills: withDefault(array(wfrpSkillsDecoder), skills),
-});
-
-// ---------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/decoders/utils.ts b/src/server/decoders/utils.ts
deleted file mode 100644
index c06da4ea..00000000
--- a/src/server/decoders/utils.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-// ---------------------------------------------------------------------------------------------------------------------
-// Utility Decoders
-// ---------------------------------------------------------------------------------------------------------------------
-
-import {
-    Decoder,
-    array,
-    compose,
-    either,
-    inexact,
-    integer,
-    map,
-    nullable,
-    optional,
-    predicate,
-    regex, string,
-} from 'decoders';
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-export const hexColor = regex(/^#(?:[0-9a-f]{3}){1,2}$/i, 'Must be a valid hex color code.');
-
-export function nullToUndefined<T>(itemDecoder : Decoder<T>) : Decoder<T | undefined>
-{
-    return map(
-        nullable(itemDecoder),
-        (val) => val ?? undefined
-    );
-}
-
-export function withDefault<T>(itemDecoder : Decoder<T>, defaultVal : T) : Decoder<T>
-{
-    return map(
-        optional(itemDecoder),
-        (val) => val ?? defaultVal
-    );
-} // withDefault
-
-export function jsonArrayString<T>(itemDecoder : Decoder<T>) : Decoder<T[]>
-{
-    const decodeJsonStr = map(
-        either(string, array(itemDecoder)),
-        (item) =>
-        {
-            return typeof item === 'string' ? JSON.parse(item) : item;
-        }
-    );
-
-    return compose(
-        decodeJsonStr,
-        array(itemDecoder)
-    );
-}
-
-export function jsonObjectString<T>(objectDecoder : Decoder<T>) : Decoder<T>
-{
-    const decodeJsonStr = map(
-        either(string, inexact({})),
-        (item) =>
-        {
-            return typeof item === 'string' ? JSON.parse(item) : item;
-        }
-    );
-
-    return compose(
-        decodeJsonStr,
-        objectDecoder
-    );
-}
-
-export function arrayWithLength<T>(itemDecoder : Decoder<T>, min : number, max = Infinity) : Decoder<T[]>
-{
-    let decoder = compose(
-        array(itemDecoder),
-        predicate((arr) => arr.length >= min, `Must have length greater than or equal to ${ min }.`)
-    );
-
-    if(max && max >= min)
-    {
-        decoder = compose(
-            decoder,
-            predicate((arr) => arr.length < max, `Must have length less than ${ max }.`)
-        );
-    }
-
-    return decoder;
-}
-
-export function stringWithLength(min : number, max = Infinity) : Decoder<string>
-{
-    let decoder = compose(
-        string,
-        predicate((str) => str.length >= min, `Must be greater than or equal to ${ min } characters.`)
-    );
-
-    if(max && max >= min)
-    {
-        decoder = compose(
-            decoder,
-            predicate((str) => str.length <= max, `Must be less than ${ max } characters.`)
-        );
-    }
-
-    return decoder;
-}
-
-export function boundedInteger(min : number, max = Infinity) : Decoder<number>
-{
-    let decoder = compose(
-        integer,
-        predicate((int) => int >= min, `Must be greater than or equal to ${ min }.`)
-    );
-
-    if(max && max >= min)
-    {
-        decoder = compose(
-            decoder,
-            predicate((int) => int <= max, `Must be less than ${ max }.`)
-        );
-    }
-
-    return decoder;
-}
-
-export function enumStr<T extends string>(options : string[]) : Decoder<T>
-{
-    return compose(
-        string,
-        predicate((str) => options.includes(str), `Must be a one of: ${ options.join(', ') }.`)
-    ) as Decoder<T>;
-}
-
-// ---------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/models/character.ts b/src/server/models/character.ts
deleted file mode 100644
index 9a30ea5b..00000000
--- a/src/server/models/character.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-//----------------------------------------------------------------------------------------------------------------------
-// Character
-//----------------------------------------------------------------------------------------------------------------------
-
-import * as JsonDecoder from 'decoders';
-
-// Models
-import { CharacterOptions, SystemDetails } from '../../common/models/index.js';
-
-// Decoders
-import { characterJsonDecoder, characterRecDecoder } from '../decoders/character.js';
-import { sysDetailsDecoder } from '../decoders/systems/index.js';
-
-//----------------------------------------------------------------------------------------------------------------------
-
-export class Character<Details extends SystemDetails = SystemDetails>
-{
-    public readonly id : string | null;
-    public readonly system : string;
-    public readonly accountID : string;
-    public readonly noteID : string;
-
-    public name : string;
-    public description ?: string;
-    public portrait ?: string;
-    public thumbnail ?: string;
-    public color ?: string;
-    public campaign ?: string;
-    public details : Details;
-
-    constructor(options : CharacterOptions<Details>)
-    {
-        this.id = options.id;
-        this.system = options.system;
-        this.accountID = options.accountID;
-        this.noteID = options.noteID;
-        this.name = options.name;
-        this.description = options.description;
-        this.portrait = options.portrait;
-        this.thumbnail = options.thumbnail;
-        this.color = options.color;
-        this.campaign = options.campaign;
-        this.details = options.details;
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Serialization
-    //------------------------------------------------------------------------------------------------------------------
-
-    public toJSON() : CharacterOptions
-    {
-        return {
-            id: this.id,
-            system: this.system,
-            accountID: this.accountID,
-            noteID: this.noteID,
-            name: this.name,
-            description: this.description,
-            portrait: this.portrait,
-            thumbnail: this.thumbnail,
-            color: this.color,
-            campaign: this.campaign,
-            details: this.details,
-        };
-    }
-
-    public toDB() : Record<string, unknown>
-    {
-        const { id, accountID, noteID, details, ...jsonObj } = this.toJSON();
-        return {
-            ...jsonObj,
-            details: JSON.stringify(details),
-            character_id: id,
-            account_id: accountID,
-            note_id: noteID,
-        };
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Deserialization
-    //------------------------------------------------------------------------------------------------------------------
-
-    static fromDB(characterRecord : Record<string, unknown>) : Character
-    {
-        const decoder = JsonDecoder.guard(characterRecDecoder);
-        const charOpts = decoder(characterRecord);
-
-        // Handle system specific details
-        const detailsDecoder = JsonDecoder.guard(sysDetailsDecoder(charOpts.system));
-        charOpts.details = detailsDecoder(charOpts.details) as Record<string, unknown>;
-
-        return new Character(charOpts);
-    }
-
-    static fromJSON(jsonObj : Record<string, unknown>) : Character
-    {
-        const decoder = JsonDecoder.guard(characterJsonDecoder);
-        const charOpts = decoder(jsonObj);
-
-        // Handle system specific details
-        const detailsDecoder = JsonDecoder.guard(sysDetailsDecoder(charOpts.system));
-        charOpts.details = detailsDecoder(charOpts.details) as Record<string, unknown>;
-
-        return new Character(charOpts);
-    }
-}
-
-//----------------------------------------------------------------------------------------------------------------------
diff --git a/src/server/systems/eote/system.ts b/src/server/systems/eote/system.ts
index 181fe077..a6c70fa8 100644
--- a/src/server/systems/eote/system.ts
+++ b/src/server/systems/eote/system.ts
@@ -6,8 +6,7 @@
 import { BaseSystem } from '../base.js';
 
 // Models
-import { SupportStatus } from '../../../common/models/index.js';
-import { Character } from '../../models/character.js';
+import { Character, SupportStatus } from '../../../common/models/index.js';
 import { EoteCharacter, GenesysCharacter } from '../../../common/models/systems/eote.js';
 
 // Validations
@@ -40,7 +39,7 @@ class GenesysSystem extends BaseSystem
 
     async validateCharacterDetails(character : GenesysCharacter) : Promise<Character>
     {
-        return validateGenesysDetails(character) as Promise<Character>;
+        return validateGenesysDetails(character);
     }
 }
 
@@ -59,7 +58,7 @@ class EOTESystem extends BaseSystem
 
     async validateCharacterDetails(character : EoteCharacter) : Promise<Character>
     {
-        return validateEoteDetails(character) as Promise<Character>;
+        return validateEoteDetails(character);
     }
 }
 
diff --git a/src/server/systems/eote/validations.ts b/src/server/systems/eote/validations.ts
index 8638c7f9..0532db3e 100644
--- a/src/server/systems/eote/validations.ts
+++ b/src/server/systems/eote/validations.ts
@@ -12,7 +12,6 @@ import * as suppMan from '../../managers/supplement.js';
 
 //----------------------------------------------------------------------------------------------------------------------
 
-interface Motivations { strength : number | null, flaw : number | null, desire : number | null, fear : number | null }
 interface SupplementRef { id : number, [ key : string ] : unknown }
 
 interface CharDetails
@@ -37,7 +36,7 @@ function isNumbers(array : number[] | SupplementRef[]) : array is number[]
 
 async function validateMotivations(character : GenesysCharacter, account : Account) : Promise<void>
 {
-    const motivations = character.details.motivations as Motivations;
+    const motivations = character.details.motivations;
 
     // Check strength
     if(motivations.strength !== null)