diff --git a/crafty.config.js b/crafty.config.js
index fac7822..613fa62 100644
--- a/crafty.config.js
+++ b/crafty.config.js
@@ -7,11 +7,10 @@ module.exports = {
         "@swissquote/crafty-preset-postcss",
         "@swissquote/crafty-runner-gulp"
     ],
-    destination_css: "themes",
+    destination_css: ".",
     destination_js: ".",
     stylelint_pattern: [
-        "themes/daux/scss/**/*.scss",
-        "themes/daux_singlepage/scss/**/*.scss",
+        "src/css/**/*.scss",
         "!*.min.css",
         "!**/vendor/**/*.scss"
     ],
@@ -35,29 +34,24 @@ module.exports = {
     },
     css: {
         theme_blue: {
-            source: "themes/daux/scss/theme-blue.scss",
-            destination: "daux/css/theme-blue.min.css",
-            watch: ["themes/daux/scss/**"]
+            source: "src/css/theme_daux/theme-blue.scss",
+            destination: "themes/daux/css/theme-blue.min.css"
         },
         theme_green: {
-            source: "themes/daux/scss/theme-green.scss",
-            destination: "daux/css/theme-green.min.css",
-            watch: ["themes/daux/scss/**"]
+            source: "src/css/theme_daux/theme-green.scss",
+            destination: "themes/daux/css/theme-green.min.css"
         },
         theme_navy: {
-            source: "themes/daux/scss/theme-navy.scss",
-            destination: "daux/css/theme-navy.min.css",
-            watch: ["themes/daux/scss/**"]
+            source: "src/css/theme_daux/theme-navy.scss",
+            destination: "themes/daux/css/theme-navy.min.css"
         },
         theme_red: {
-            source: "themes/daux/scss/theme-red.scss",
-            destination: "daux/css/theme-red.min.css",
-            watch: ["themes/daux/scss/**"]
+            source: "src/css/theme_daux/theme-red.scss",
+            destination: "themes/daux/css/theme-red.min.css"
         },
         daux_singlepage: {
-            source: "themes/daux_singlepage/scss/main.scss",
-            destination: "daux_singlepage/css/main.min.css",
-            watch: ["themes/daux_singlepage/scss/**"]
+            source: "src/css/theme_daux_singlepage/main.scss",
+            destination: "themes/daux_singlepage/css/main.min.css"
         }
     }
 };
diff --git a/themes/daux/scss/_components.scss b/src/css/theme_daux/_components.scss
similarity index 100%
rename from themes/daux/scss/_components.scss
rename to src/css/theme_daux/_components.scss
diff --git a/themes/daux/scss/_fonts.scss b/src/css/theme_daux/_fonts.scss
similarity index 100%
rename from themes/daux/scss/_fonts.scss
rename to src/css/theme_daux/_fonts.scss
diff --git a/themes/daux/scss/_homepage.scss b/src/css/theme_daux/_homepage.scss
similarity index 100%
rename from themes/daux/scss/_homepage.scss
rename to src/css/theme_daux/_homepage.scss
diff --git a/themes/daux/scss/_mixins.scss b/src/css/theme_daux/_mixins.scss
similarity index 100%
rename from themes/daux/scss/_mixins.scss
rename to src/css/theme_daux/_mixins.scss
diff --git a/themes/daux/scss/_print.scss b/src/css/theme_daux/_print.scss
similarity index 100%
rename from themes/daux/scss/_print.scss
rename to src/css/theme_daux/_print.scss
diff --git a/themes/daux/scss/_structure.scss b/src/css/theme_daux/_structure.scss
similarity index 100%
rename from themes/daux/scss/_structure.scss
rename to src/css/theme_daux/_structure.scss
diff --git a/themes/daux/scss/_typography.scss b/src/css/theme_daux/_typography.scss
similarity index 100%
rename from themes/daux/scss/_typography.scss
rename to src/css/theme_daux/_typography.scss
diff --git a/themes/daux/scss/_variables.scss b/src/css/theme_daux/_variables.scss
similarity index 100%
rename from themes/daux/scss/_variables.scss
rename to src/css/theme_daux/_variables.scss
diff --git a/themes/daux/scss/theme-blue.scss b/src/css/theme_daux/theme-blue.scss
similarity index 100%
rename from themes/daux/scss/theme-blue.scss
rename to src/css/theme_daux/theme-blue.scss
diff --git a/themes/daux/scss/theme-green.scss b/src/css/theme_daux/theme-green.scss
similarity index 100%
rename from themes/daux/scss/theme-green.scss
rename to src/css/theme_daux/theme-green.scss
diff --git a/themes/daux/scss/theme-navy.scss b/src/css/theme_daux/theme-navy.scss
similarity index 100%
rename from themes/daux/scss/theme-navy.scss
rename to src/css/theme_daux/theme-navy.scss
diff --git a/themes/daux/scss/theme-red.scss b/src/css/theme_daux/theme-red.scss
similarity index 100%
rename from themes/daux/scss/theme-red.scss
rename to src/css/theme_daux/theme-red.scss
diff --git a/themes/daux/scss/theme.scss b/src/css/theme_daux/theme.scss
similarity index 100%
rename from themes/daux/scss/theme.scss
rename to src/css/theme_daux/theme.scss
diff --git a/themes/daux/scss/vendor/highlight.scss b/src/css/theme_daux/vendor/highlight.scss
similarity index 100%
rename from themes/daux/scss/vendor/highlight.scss
rename to src/css/theme_daux/vendor/highlight.scss
diff --git a/themes/daux/scss/vendor/normalize.scss b/src/css/theme_daux/vendor/normalize.scss
similarity index 100%
rename from themes/daux/scss/vendor/normalize.scss
rename to src/css/theme_daux/vendor/normalize.scss
diff --git a/themes/daux_singlepage/scss/_fonts.scss b/src/css/theme_daux_singlepage/_fonts.scss
similarity index 100%
rename from themes/daux_singlepage/scss/_fonts.scss
rename to src/css/theme_daux_singlepage/_fonts.scss
diff --git a/themes/daux_singlepage/scss/_print.scss b/src/css/theme_daux_singlepage/_print.scss
similarity index 100%
rename from themes/daux_singlepage/scss/_print.scss
rename to src/css/theme_daux_singlepage/_print.scss
diff --git a/themes/daux_singlepage/scss/_typography.scss b/src/css/theme_daux_singlepage/_typography.scss
similarity index 100%
rename from themes/daux_singlepage/scss/_typography.scss
rename to src/css/theme_daux_singlepage/_typography.scss
diff --git a/themes/daux_singlepage/scss/main.scss b/src/css/theme_daux_singlepage/main.scss
similarity index 100%
rename from themes/daux_singlepage/scss/main.scss
rename to src/css/theme_daux_singlepage/main.scss
diff --git a/themes/daux_singlepage/scss/vendor/highlight.scss b/src/css/theme_daux_singlepage/vendor/highlight.scss
similarity index 100%
rename from themes/daux_singlepage/scss/vendor/highlight.scss
rename to src/css/theme_daux_singlepage/vendor/highlight.scss