diff --git a/src/style/_assets.scss b/src/style/atoms/_assets.scss
similarity index 100%
rename from src/style/_assets.scss
rename to src/style/atoms/_assets.scss
diff --git a/src/style/_colours.scss b/src/style/atoms/_colours.scss
similarity index 100%
rename from src/style/_colours.scss
rename to src/style/atoms/_colours.scss
diff --git a/src/style/_numbers.scss b/src/style/atoms/_numbers.scss
similarity index 100%
rename from src/style/_numbers.scss
rename to src/style/atoms/_numbers.scss
diff --git a/src/style/_attributes.scss b/src/style/molecules/_attributes.scss
similarity index 97%
rename from src/style/_attributes.scss
rename to src/style/molecules/_attributes.scss
index 1b3fd95a..12830c1f 100644
--- a/src/style/_attributes.scss
+++ b/src/style/molecules/_attributes.scss
@@ -1,6 +1,6 @@
-@use "./_colours";
-@use "./_numbers";
-@use "./_assets";
+@use "../atoms/colours";
+@use "../atoms/numbers";
+@use "../atoms/assets";
 @use "sass:color";
 
 .dsa41.sheet.actor.character {
diff --git a/src/style/_lists.scss b/src/style/molecules/_lists.scss
similarity index 100%
rename from src/style/_lists.scss
rename to src/style/molecules/_lists.scss
diff --git a/src/style/_liturgy-banner.scss b/src/style/molecules/_liturgy-banner.scss
similarity index 97%
rename from src/style/_liturgy-banner.scss
rename to src/style/molecules/_liturgy-banner.scss
index c1b3366c..c2ce6d46 100644
--- a/src/style/_liturgy-banner.scss
+++ b/src/style/molecules/_liturgy-banner.scss
@@ -1,7 +1,7 @@
 @use "sass:map";
 @use "sass:color";
-@use "colours" as colour;
-@use "numbers";
+@use "../atoms/colours" as colour;
+@use "../atoms/numbers";
 
 $deity_colours_border: (
         "Praios": orange,
@@ -96,7 +96,7 @@ $deity_colours_tint: (
           &::before {
             position: absolute;
             content: '';
-            background-image: url("../assets/velvet_strip.png");
+            background-image: url("../../assets/velvet_strip.png");
             background-repeat: repeat-y;
             background-size: cover;
             width: 86px;
diff --git a/src/style/_paperdoll.scss b/src/style/molecules/_paperdoll.scss
similarity index 100%
rename from src/style/_paperdoll.scss
rename to src/style/molecules/_paperdoll.scss
diff --git a/src/style/_player-action.scss b/src/style/molecules/_player-action.scss
similarity index 92%
rename from src/style/_player-action.scss
rename to src/style/molecules/_player-action.scss
index 181080bb..dddba46e 100644
--- a/src/style/_player-action.scss
+++ b/src/style/molecules/_player-action.scss
@@ -1,5 +1,5 @@
-@use "./_colours";
-@use "./_numbers";
+@use "../atoms/colours";
+@use "../atoms/numbers";
 @use "sass:color";
 
 .dsa41.sheet {
diff --git a/src/style/_richtext-editor.scss b/src/style/molecules/_richtext-editor.scss
similarity index 100%
rename from src/style/_richtext-editor.scss
rename to src/style/molecules/_richtext-editor.scss
diff --git a/src/style/_rollable.scss b/src/style/molecules/_rollable.scss
similarity index 98%
rename from src/style/_rollable.scss
rename to src/style/molecules/_rollable.scss
index 5a294533..de8f7ac2 100644
--- a/src/style/_rollable.scss
+++ b/src/style/molecules/_rollable.scss
@@ -1,7 +1,7 @@
 @use 'sass:color';
 @use 'sass:map';
-@use "_colours" as colour;
-@use "_numbers" as numbers;
+@use "../atoms/colours" as colour;
+@use "../atoms/numbers" as numbers;
 
 $rollable_colours: (
         "nachteil": colour.$nachteil-color,
diff --git a/src/style/_sidebar-elements.scss b/src/style/molecules/_sidebar-elements.scss
similarity index 96%
rename from src/style/_sidebar-elements.scss
rename to src/style/molecules/_sidebar-elements.scss
index f774031b..c75bf25c 100644
--- a/src/style/_sidebar-elements.scss
+++ b/src/style/molecules/_sidebar-elements.scss
@@ -60,7 +60,7 @@
           left: 0;
           top: 0;
           bottom: 0;
-          background: url('../assets/gradient.png');
+          background: url('../../assets/gradient.png');
           background-size: 32px 100%;
 
           &::after {
diff --git a/src/style/_tabs.scss b/src/style/molecules/_tabs.scss
similarity index 96%
rename from src/style/_tabs.scss
rename to src/style/molecules/_tabs.scss
index 5b6a99d5..cfc7b9ec 100644
--- a/src/style/_tabs.scss
+++ b/src/style/molecules/_tabs.scss
@@ -1,6 +1,6 @@
-@use "./numbers";
-@use "./colours";
-@use "./assets";
+@use "../atoms/numbers";
+@use "../atoms/colours";
+@use "../atoms/assets";
 
 .dsa41.sheet {
 
diff --git a/src/style/_active-effect-sheet.scss b/src/style/organisms/_active-effect-sheet.scss
similarity index 100%
rename from src/style/_active-effect-sheet.scss
rename to src/style/organisms/_active-effect-sheet.scss
diff --git a/src/style/_advantage-sheet.scss b/src/style/organisms/_advantage-sheet.scss
similarity index 100%
rename from src/style/_advantage-sheet.scss
rename to src/style/organisms/_advantage-sheet.scss
diff --git a/src/style/_character-sheet.scss b/src/style/organisms/_character-sheet.scss
similarity index 98%
rename from src/style/_character-sheet.scss
rename to src/style/organisms/_character-sheet.scss
index 6c88c78b..6750bdde 100644
--- a/src/style/_character-sheet.scss
+++ b/src/style/organisms/_character-sheet.scss
@@ -1,6 +1,6 @@
 @use "sass:color";
-@use "_numbers";
-@use "_colours" as colour;
+@use "../atoms/numbers";
+@use "../atoms/colours" as colour;
 
 
 .dsa41.sheet.actor.character {
@@ -192,7 +192,7 @@
             padding: 0 8px;
             margin-left: 0;
             margin-bottom: 4px;
-            background-image: url("../assets/velvet_button.png");
+            background-image: url("../../assets/velvet_button.png");
             background-repeat: repeat-y;
             background-size: cover;
 
@@ -320,7 +320,7 @@
 
         .filled-segment {
           border: 1px solid black;
-          background-image: url('../assets/gradient.png');
+          background-image: url('../../assets/gradient.png');
           background-size: 24px 100%;
           position: relative;
           flex: 1;
@@ -336,7 +336,7 @@
 
         .empty-segment {
           border: 1px solid black;
-          background-image: url('../assets/gradient.png');
+          background-image: url('../../assets/gradient.png');
           background-size: 32px 100%;
           position: relative;
           flex: 1;
diff --git a/src/style/_creature-sheet.scss b/src/style/organisms/_creature-sheet.scss
similarity index 98%
rename from src/style/_creature-sheet.scss
rename to src/style/organisms/_creature-sheet.scss
index 6c222a63..2ea8acd1 100644
--- a/src/style/_creature-sheet.scss
+++ b/src/style/organisms/_creature-sheet.scss
@@ -1,6 +1,6 @@
-@use "_colours" as colour;
+@use "../atoms/colours" as colour;
 @use 'sass:color';
-@use "_numbers";
+@use "../atoms/numbers";
 
 .dsa41.sheet.actor.creature {
 
diff --git a/src/style/_equipment-sheet.scss b/src/style/organisms/_equipment-sheet.scss
similarity index 98%
rename from src/style/_equipment-sheet.scss
rename to src/style/organisms/_equipment-sheet.scss
index 859793e5..a565df70 100644
--- a/src/style/_equipment-sheet.scss
+++ b/src/style/organisms/_equipment-sheet.scss
@@ -1,5 +1,5 @@
-@use "./_colours";
-@use "./_numbers";
+@use "../atoms/colours";
+@use "../atoms/numbers";
 
 .application.sheet.dsa41.item.equipment {
 
diff --git a/src/style/_group-sheet.scss b/src/style/organisms/_group-sheet.scss
similarity index 100%
rename from src/style/_group-sheet.scss
rename to src/style/organisms/_group-sheet.scss
diff --git a/src/style/_modify-liturgy.scss b/src/style/organisms/_modify-liturgy.scss
similarity index 100%
rename from src/style/_modify-liturgy.scss
rename to src/style/organisms/_modify-liturgy.scss
diff --git a/src/style/_skill-sheet.scss b/src/style/organisms/_skill-sheet.scss
similarity index 100%
rename from src/style/_skill-sheet.scss
rename to src/style/organisms/_skill-sheet.scss
diff --git a/src/style/styles.scss b/src/style/styles.scss
index ea91cf78..8cd4c662 100644
--- a/src/style/styles.scss
+++ b/src/style/styles.scss
@@ -1,17 +1,17 @@
-@use "_rollable";
-@use "_lists";
-@use "_attributes";
-@use "_sidebar-elements";
-@use "_character-sheet";
-@use "_group-sheet";
-@use "_tabs";
-@use "_equipment-sheet";
-@use "_paperdoll";
-@use "_creature-sheet";
-@use "_player-action";
-@use "_modify-liturgy";
-@use "_liturgy-banner";
-@use "_skill-sheet";
-@use "_active-effect-sheet";
-@use "_advantage-sheet";
-@use "_richtext-editor";
\ No newline at end of file
+@use "molecules/rollable";
+@use "molecules/lists";
+@use "molecules/attributes";
+@use "molecules/sidebar-elements";
+@use "organisms/character-sheet";
+@use "organisms/group-sheet";
+@use "molecules/tabs";
+@use "organisms/equipment-sheet";
+@use "molecules/paperdoll";
+@use "organisms/creature-sheet";
+@use "molecules/player-action";
+@use "organisms/modify-liturgy";
+@use "molecules/liturgy-banner";
+@use "organisms/skill-sheet";
+@use "organisms/active-effect-sheet";
+@use "organisms/advantage-sheet";
+@use "molecules/richtext-editor";
\ No newline at end of file