diff --git a/module/Apps/ActorSheets/HeroSkillsCardV1.mjs b/module/Apps/ActorSheets/HeroSkillsCardV1.mjs
index 799e604..9b55105 100644
--- a/module/Apps/ActorSheets/HeroSkillsCardV1.mjs
+++ b/module/Apps/ActorSheets/HeroSkillsCardV1.mjs
@@ -32,7 +32,7 @@ export class HeroSkillsCardV1 extends GenericAppMixin(HandlebarsApplicationMixin
 
 	static PARTS = {
 		content: {
-			template: filePath(`Apps/HeroSkillsCardV1/content.hbs`),
+			template: filePath(`templates/Apps/HeroSkillsCardV1/content.hbs`),
 		},
 	};
 	// #endregion
diff --git a/module/Apps/ActorSheets/HeroSummaryCardV1.mjs b/module/Apps/ActorSheets/HeroSummaryCardV1.mjs
index f342355..c38b6f4 100644
--- a/module/Apps/ActorSheets/HeroSummaryCardV1.mjs
+++ b/module/Apps/ActorSheets/HeroSummaryCardV1.mjs
@@ -31,7 +31,7 @@ export class HeroSummaryCardV1 extends GenericAppMixin(HandlebarsApplicationMixi
 
 	static PARTS = {
 		content: {
-			template: filePath(`Apps/HeroSummaryCardV1/content.hbs`),
+			template: filePath(`templates/Apps/HeroSummaryCardV1/content.hbs`),
 		},
 	};
 	// #endregion
diff --git a/module/Apps/CryptApp.mjs b/module/Apps/CryptApp.mjs
index 0669b27..a4c3053 100644
--- a/module/Apps/CryptApp.mjs
+++ b/module/Apps/CryptApp.mjs
@@ -19,7 +19,7 @@ export class CryptApp extends GenericAppMixin(HandlebarsApplicationMixin(Applica
 
 	static PARTS = {
 		main: {
-			template: filePath(`Apps/CryptApp/main.hbs`),
+			template: filePath(`templates/Apps/CryptApp/main.hbs`),
 		},
 	};
 	// #endregion
diff --git a/module/Apps/elements/Icon.mjs b/module/Apps/elements/Icon.mjs
index 3caaece..722ee36 100644
--- a/module/Apps/elements/Icon.mjs
+++ b/module/Apps/elements/Icon.mjs
@@ -11,7 +11,7 @@ export class RipCryptIcon extends StyledShadowElement(HTMLElement) {
 	static formAssociated = false;
 
 	/* Stuff for the mixin to use */
-	static _stylePath = `components/icon.css`;
+	static _stylePath = `css/components/icon.css`;
 
 
 	static _cache = new Map();
diff --git a/module/Apps/elements/mixins/StyledShadowElement.mjs b/module/Apps/elements/mixins/StyledShadowElement.mjs
index 19ce403..c645111 100644
--- a/module/Apps/elements/mixins/StyledShadowElement.mjs
+++ b/module/Apps/elements/mixins/StyledShadowElement.mjs
@@ -60,7 +60,7 @@ export function StyledShadowElement(Base) {
 			if (this.constructor._styles) {
 				this._style.innerHTML = this.constructor._styles;
 			} else {
-				fetch(`./systems/${game.system.id}/Apps/${this.constructor._stylePath}`)
+				fetch(`./systems/${game.system.id}/templates/${this.constructor._stylePath}`)
 					.then(r => r.text())
 					.then(t => {
 						this.constructor._styles = t;
diff --git a/system.json b/system.json
index 30a907e..c717ddc 100644
--- a/system.json
+++ b/system.json
@@ -18,8 +18,8 @@
 		"module/main.mjs"
 	],
 	"styles": [
-		"Apps/common.css",
-		"Apps/apps.css"
+		"templates/css/common.css",
+		"templates/Apps/apps.css"
 	],
 	"languages": [
 		{
diff --git a/Apps/CryptApp/main.hbs b/templates/Apps/CryptApp/main.hbs
similarity index 100%
rename from Apps/CryptApp/main.hbs
rename to templates/Apps/CryptApp/main.hbs
diff --git a/Apps/HeroSkillsCardV1/content.hbs b/templates/Apps/HeroSkillsCardV1/content.hbs
similarity index 100%
rename from Apps/HeroSkillsCardV1/content.hbs
rename to templates/Apps/HeroSkillsCardV1/content.hbs
diff --git a/Apps/HeroSkillsCardV1/style.css b/templates/Apps/HeroSkillsCardV1/style.css
similarity index 100%
rename from Apps/HeroSkillsCardV1/style.css
rename to templates/Apps/HeroSkillsCardV1/style.css
diff --git a/Apps/HeroSummaryCardV1/content.hbs b/templates/Apps/HeroSummaryCardV1/content.hbs
similarity index 100%
rename from Apps/HeroSummaryCardV1/content.hbs
rename to templates/Apps/HeroSummaryCardV1/content.hbs
diff --git a/Apps/HeroSummaryCardV1/style.css b/templates/Apps/HeroSummaryCardV1/style.css
similarity index 100%
rename from Apps/HeroSummaryCardV1/style.css
rename to templates/Apps/HeroSummaryCardV1/style.css
diff --git a/Apps/apps.css b/templates/Apps/apps.css
similarity index 100%
rename from Apps/apps.css
rename to templates/Apps/apps.css
diff --git a/templates/chat/roll.hbs b/templates/chat/roll.hbs
new file mode 100644
index 0000000..ff9c893
--- /dev/null
+++ b/templates/chat/roll.hbs
@@ -0,0 +1,3 @@
+<div class="dice-roll">
+	HELLO
+</div>
\ No newline at end of file
diff --git a/Apps/common.css b/templates/css/common.css
similarity index 100%
rename from Apps/common.css
rename to templates/css/common.css
diff --git a/Apps/components/icon.css b/templates/css/components/icon.css
similarity index 100%
rename from Apps/components/icon.css
rename to templates/css/components/icon.css
diff --git a/Apps/elements/button.css b/templates/css/elements/button.css
similarity index 100%
rename from Apps/elements/button.css
rename to templates/css/elements/button.css
diff --git a/Apps/elements/input.css b/templates/css/elements/input.css
similarity index 100%
rename from Apps/elements/input.css
rename to templates/css/elements/input.css
diff --git a/Apps/elements/lists.css b/templates/css/elements/lists.css
similarity index 100%
rename from Apps/elements/lists.css
rename to templates/css/elements/lists.css
diff --git a/Apps/elements/select.css b/templates/css/elements/select.css
similarity index 100%
rename from Apps/elements/select.css
rename to templates/css/elements/select.css
diff --git a/Apps/elements/span.css b/templates/css/elements/span.css
similarity index 100%
rename from Apps/elements/span.css
rename to templates/css/elements/span.css
diff --git a/Apps/elements/table.css b/templates/css/elements/table.css
similarity index 100%
rename from Apps/elements/table.css
rename to templates/css/elements/table.css
diff --git a/Apps/themes/dark.css b/templates/css/themes/dark.css
similarity index 100%
rename from Apps/themes/dark.css
rename to templates/css/themes/dark.css
diff --git a/Apps/themes/light.css b/templates/css/themes/light.css
similarity index 100%
rename from Apps/themes/light.css
rename to templates/css/themes/light.css
diff --git a/Apps/vars.css b/templates/css/vars.css
similarity index 100%
rename from Apps/vars.css
rename to templates/css/vars.css