diff --git a/module/Apps/ActorSheets/CombinedHeroSheet.mjs b/module/Apps/ActorSheets/CombinedHeroSheet.mjs
index b81923a..25f01e4 100644
--- a/module/Apps/ActorSheets/CombinedHeroSheet.mjs
+++ b/module/Apps/ActorSheets/CombinedHeroSheet.mjs
@@ -1,6 +1,6 @@
 import { CraftCardV1 } from "./CraftCardV1.mjs";
 import { filePath } from "../../consts.mjs";
-import { GenericAppMixin } from "../GenericApp.mjs";
+import { GenericAppMixin } from "../mixins/GenericApp.mjs";
 import { SkillsCardV1 } from "./SkillsCardV1.mjs";
 import { StatsCardV1 } from "./StatsCardV1.mjs";
 
diff --git a/module/Apps/ActorSheets/CraftCardV1.mjs b/module/Apps/ActorSheets/CraftCardV1.mjs
index 4a650df..560a08e 100644
--- a/module/Apps/ActorSheets/CraftCardV1.mjs
+++ b/module/Apps/ActorSheets/CraftCardV1.mjs
@@ -1,7 +1,7 @@
 import { deleteItemFromElement, editItemFromElement } from "../utils.mjs";
 import { documentSorter, filePath } from "../../consts.mjs";
 import { gameTerms } from "../../gameTerms.mjs";
-import { GenericAppMixin } from "../GenericApp.mjs";
+import { GenericAppMixin } from "../mixins/GenericApp.mjs";
 import { localizer } from "../../utils/Localizer.mjs";
 import { Logger } from "../../utils/Logger.mjs";
 
diff --git a/module/Apps/ActorSheets/SkillsCardV1.mjs b/module/Apps/ActorSheets/SkillsCardV1.mjs
index b0231f3..048536c 100644
--- a/module/Apps/ActorSheets/SkillsCardV1.mjs
+++ b/module/Apps/ActorSheets/SkillsCardV1.mjs
@@ -2,7 +2,7 @@ import { deleteItemFromElement, editItemFromElement } from "../utils.mjs";
 import { documentSorter, filePath } from "../../consts.mjs";
 import { AmmoTracker } from "../popovers/AmmoTracker.mjs";
 import { gameTerms } from "../../gameTerms.mjs";
-import { GenericAppMixin } from "../GenericApp.mjs";
+import { GenericAppMixin } from "../mixins/GenericApp.mjs";
 import { ItemFlags } from "../../flags/item.mjs";
 import { localizer } from "../../utils/Localizer.mjs";
 import { Logger } from "../../utils/Logger.mjs";
diff --git a/module/Apps/ActorSheets/StatsCardV1.mjs b/module/Apps/ActorSheets/StatsCardV1.mjs
index cd44ead..8f05344 100644
--- a/module/Apps/ActorSheets/StatsCardV1.mjs
+++ b/module/Apps/ActorSheets/StatsCardV1.mjs
@@ -2,7 +2,7 @@ import { deleteItemFromElement, editItemFromElement } from "../utils.mjs";
 import { DelveDiceHUD } from "../DelveDiceHUD.mjs";
 import { filePath } from "../../consts.mjs";
 import { gameTerms } from "../../gameTerms.mjs";
-import { GenericAppMixin } from "../GenericApp.mjs";
+import { GenericAppMixin } from "../mixins/GenericApp.mjs";
 import { localizer } from "../../utils/Localizer.mjs";
 import { Logger } from "../../utils/Logger.mjs";
 
diff --git a/module/Apps/DicePool.mjs b/module/Apps/DicePool.mjs
index 7418a3c..99eb70f 100644
--- a/module/Apps/DicePool.mjs
+++ b/module/Apps/DicePool.mjs
@@ -1,5 +1,5 @@
 import { filePath } from "../consts.mjs";
-import { GenericAppMixin } from "./GenericApp.mjs";
+import { GenericAppMixin } from "./mixins/GenericApp.mjs";
 import { localizer } from "../utils/Localizer.mjs";
 import { Logger } from "../utils/Logger.mjs";
 
diff --git a/module/Apps/ItemSheets/AllItemSheetV1.mjs b/module/Apps/ItemSheets/AllItemSheetV1.mjs
index 0608fde..6ec5fe5 100644
--- a/module/Apps/ItemSheets/AllItemSheetV1.mjs
+++ b/module/Apps/ItemSheets/AllItemSheetV1.mjs
@@ -1,5 +1,5 @@
 import { filePath } from "../../consts.mjs";
-import { GenericAppMixin } from "../GenericApp.mjs";
+import { GenericAppMixin } from "../mixins/GenericApp.mjs";
 import { Logger } from "../../utils/Logger.mjs";
 
 const { HandlebarsApplicationMixin } = foundry.applications.api;
diff --git a/module/Apps/ItemSheets/ArmourSheet.mjs b/module/Apps/ItemSheets/ArmourSheet.mjs
index 7570413..bec8a14 100644
--- a/module/Apps/ItemSheets/ArmourSheet.mjs
+++ b/module/Apps/ItemSheets/ArmourSheet.mjs
@@ -1,6 +1,6 @@
 import { filePath } from "../../consts.mjs";
 import { gameTerms } from "../../gameTerms.mjs";
-import { GenericAppMixin } from "../GenericApp.mjs";
+import { GenericAppMixin } from "../mixins/GenericApp.mjs";
 
 const { HandlebarsApplicationMixin } = foundry.applications.api;
 const { ItemSheetV2 } = foundry.applications.sheets;
diff --git a/module/Apps/ItemSheets/TraitSheet.mjs b/module/Apps/ItemSheets/TraitSheet.mjs
index 1d8c78d..c835d01 100644
--- a/module/Apps/ItemSheets/TraitSheet.mjs
+++ b/module/Apps/ItemSheets/TraitSheet.mjs
@@ -1,5 +1,5 @@
 import { filePath } from "../../consts.mjs";
-import { GenericAppMixin } from "../GenericApp.mjs";
+import { GenericAppMixin } from "../mixins/GenericApp.mjs";
 
 const { HandlebarsApplicationMixin } = foundry.applications.api;
 const { ItemSheetV2 } = foundry.applications.sheets;
diff --git a/module/Apps/GenericApp.mjs b/module/Apps/mixins/GenericApp.mjs
similarity index 95%
rename from module/Apps/GenericApp.mjs
rename to module/Apps/mixins/GenericApp.mjs
index 0be30e4..b0c2553 100644
--- a/module/Apps/GenericApp.mjs
+++ b/module/Apps/mixins/GenericApp.mjs
@@ -1,7 +1,7 @@
-import { createItemFromElement, deleteItemFromElement, editItemFromElement, updateForeignDocumentFromEvent } from "./utils.mjs";
-import { DicePool } from "./DicePool.mjs";
-import { RichEditor } from "./RichEditor.mjs";
-import { toBoolean } from "../consts.mjs";
+import { createItemFromElement, deleteItemFromElement, editItemFromElement, updateForeignDocumentFromEvent } from "../utils.mjs";
+import { DicePool } from "../DicePool.mjs";
+import { RichEditor } from "../RichEditor.mjs";
+import { toBoolean } from "../../consts.mjs";
 
 /**
  * A mixin that takes the class from HandlebarsApplicationMixin and combines it