diff --git a/daggerheart.mjs b/daggerheart.mjs
index 00e6f916..bcb058cb 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -72,12 +72,7 @@ Hooks.once('init', () => {
         base: models.DhpCombatant
     };
 
-    CONFIG.ChatMessage.dataModels = {
-        dualityRoll: models.DhpDualityRoll,
-        adversaryRoll: models.DhpAdversaryRoll,
-        damageRoll: models.DhpDamageRoll,
-        abilityUse: models.DhpAbilityUse
-    };
+    CONFIG.ChatMessage.dataModels = models.messages.config;
     CONFIG.ChatMessage.documentClass = applications.DhpChatMessage;
 
     CONFIG.Canvas.rulerClass = DhpRuler;
diff --git a/module/data/_module.mjs b/module/data/_module.mjs
index feaf12c7..198f6547 100644
--- a/module/data/_module.mjs
+++ b/module/data/_module.mjs
@@ -2,10 +2,7 @@ export { default as DhpPC } from './pc.mjs';
 export { default as DhpCombat } from './combat.mjs';
 export { default as DhpCombatant } from './combatant.mjs';
 export { default as DhpAdversary } from './adversary.mjs';
-export { default as DhpDualityRoll } from './dualityRoll.mjs';
-export { default as DhpAdversaryRoll } from './adversaryRoll.mjs';
-export { default as DhpDamageRoll } from './damageRoll.mjs';
-export { default as DhpAbilityUse } from './abilityUse.mjs';
 export { default as DhpEnvironment } from './environment.mjs';
 
-export * as items from "./items/_module.mjs";
+export * as items from "./item/_module.mjs";
+export * as messages from "./chat-message/_modules.mjs";
\ No newline at end of file
diff --git a/module/data/chat-message/_modules.mjs b/module/data/chat-message/_modules.mjs
new file mode 100644
index 00000000..0432a789
--- /dev/null
+++ b/module/data/chat-message/_modules.mjs
@@ -0,0 +1,18 @@
+import DHAbilityUse from "./abilityUse.mjs";
+import DHAdversaryRoll from "./adversaryRoll.mjs";
+import DHDamageRoll from "./damageRoll.mjs";
+import DHDualityRoll from "./dualityRoll.mjs";
+
+export {
+  DHAbilityUse,
+  DHAdversaryRoll,
+  DHDamageRoll,
+  DHDualityRoll,
+}
+
+export const config = {
+  abilityUse: DHAbilityUse,
+  adversaryRoll: DHAdversaryRoll,
+  damageRoll: DHDamageRoll,
+  dualityRoll: DHDualityRoll,
+};
\ No newline at end of file
diff --git a/module/data/abilityUse.mjs b/module/data/chat-message/abilityUse.mjs
similarity index 94%
rename from module/data/abilityUse.mjs
rename to module/data/chat-message/abilityUse.mjs
index c95a9ff3..c431f14a 100644
--- a/module/data/abilityUse.mjs
+++ b/module/data/chat-message/abilityUse.mjs
@@ -1,4 +1,4 @@
-export default class DhpAbilityUse extends foundry.abstract.TypeDataModel {
+export default class DHAbilityUse extends foundry.abstract.TypeDataModel {
     static defineSchema() {
         const fields = foundry.data.fields;
 
diff --git a/module/data/adversaryRoll.mjs b/module/data/chat-message/adversaryRoll.mjs
similarity index 97%
rename from module/data/adversaryRoll.mjs
rename to module/data/chat-message/adversaryRoll.mjs
index bdb09c68..d279d643 100644
--- a/module/data/adversaryRoll.mjs
+++ b/module/data/chat-message/adversaryRoll.mjs
@@ -1,4 +1,4 @@
-export default class DhpAdversaryRoll extends foundry.abstract.TypeDataModel {
+export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
     static defineSchema() {
         const fields = foundry.data.fields;
 
diff --git a/module/data/damageRoll.mjs b/module/data/chat-message/damageRoll.mjs
similarity index 95%
rename from module/data/damageRoll.mjs
rename to module/data/chat-message/damageRoll.mjs
index 20392b35..bacd4074 100644
--- a/module/data/damageRoll.mjs
+++ b/module/data/chat-message/damageRoll.mjs
@@ -1,4 +1,4 @@
-export default class DhpDamageRoll extends foundry.abstract.TypeDataModel {
+export default class DHDamageRoll extends foundry.abstract.TypeDataModel {
     static defineSchema() {
         const fields = foundry.data.fields;
 
diff --git a/module/data/dualityRoll.mjs b/module/data/chat-message/dualityRoll.mjs
similarity index 98%
rename from module/data/dualityRoll.mjs
rename to module/data/chat-message/dualityRoll.mjs
index 1c37f5e6..f82a913e 100644
--- a/module/data/dualityRoll.mjs
+++ b/module/data/chat-message/dualityRoll.mjs
@@ -7,7 +7,7 @@ const diceField = () =>
         value: new fields.NumberField({ integer: true })
     });
 
-export default class DhpDualityRoll extends foundry.abstract.TypeDataModel {
+export default class DHDualityRoll extends foundry.abstract.TypeDataModel {
     static dualityResult = {
         hope: 1,
         fear: 2,
diff --git a/module/data/items/_module.mjs b/module/data/item/_module.mjs
similarity index 100%
rename from module/data/items/_module.mjs
rename to module/data/item/_module.mjs
diff --git a/module/data/items/ancestry.mjs b/module/data/item/ancestry.mjs
similarity index 100%
rename from module/data/items/ancestry.mjs
rename to module/data/item/ancestry.mjs
diff --git a/module/data/items/armor.mjs b/module/data/item/armor.mjs
similarity index 100%
rename from module/data/items/armor.mjs
rename to module/data/item/armor.mjs
diff --git a/module/data/items/base.mjs b/module/data/item/base.mjs
similarity index 100%
rename from module/data/items/base.mjs
rename to module/data/item/base.mjs
diff --git a/module/data/items/class.mjs b/module/data/item/class.mjs
similarity index 100%
rename from module/data/items/class.mjs
rename to module/data/item/class.mjs
diff --git a/module/data/items/community.mjs b/module/data/item/community.mjs
similarity index 90%
rename from module/data/items/community.mjs
rename to module/data/item/community.mjs
index 7f5d763c..693b73b5 100644
--- a/module/data/items/community.mjs
+++ b/module/data/item/community.mjs
@@ -1,4 +1,3 @@
-import featuresSchema from '../interface/featuresSchema.mjs';
 import BaseDataItem from './base.mjs';
 
 export default class DHCommunity extends BaseDataItem {
diff --git a/module/data/items/consumable.mjs b/module/data/item/consumable.mjs
similarity index 100%
rename from module/data/items/consumable.mjs
rename to module/data/item/consumable.mjs
diff --git a/module/data/items/domainCard.mjs b/module/data/item/domainCard.mjs
similarity index 100%
rename from module/data/items/domainCard.mjs
rename to module/data/item/domainCard.mjs
diff --git a/module/data/items/feature.mjs b/module/data/item/feature.mjs
similarity index 100%
rename from module/data/items/feature.mjs
rename to module/data/item/feature.mjs
diff --git a/module/data/items/miscellaneous.mjs b/module/data/item/miscellaneous.mjs
similarity index 100%
rename from module/data/items/miscellaneous.mjs
rename to module/data/item/miscellaneous.mjs
diff --git a/module/data/items/subclass.mjs b/module/data/item/subclass.mjs
similarity index 100%
rename from module/data/items/subclass.mjs
rename to module/data/item/subclass.mjs
diff --git a/module/data/items/weapon.mjs b/module/data/item/weapon.mjs
similarity index 100%
rename from module/data/items/weapon.mjs
rename to module/data/item/weapon.mjs