diff --git a/config.rb b/config.rb
index f9a5c0ea..cdae5114 100644
--- a/config.rb
+++ b/config.rb
@@ -7,9 +7,9 @@
 ##
 
 # Location of the theme's resources.
+sass_dir = "sass"
 assets_dir = "source/assets"
 css_dir = assets_dir + "/css"
-sass_dir = assets_dir + "/sass"
 images_dir = assets_dir + "/images"
 generated_images_dir = images_dir + "/generated"
 javascripts_dir = assets_dir + "/js"
diff --git a/source/assets/sass/base/_base.scss b/sass/base/_base.scss
similarity index 100%
rename from source/assets/sass/base/_base.scss
rename to sass/base/_base.scss
diff --git a/source/assets/sass/base/_lists.scss b/sass/base/_lists.scss
similarity index 100%
rename from source/assets/sass/base/_lists.scss
rename to sass/base/_lists.scss
diff --git a/source/assets/sass/base/_tables.scss b/sass/base/_tables.scss
similarity index 100%
rename from source/assets/sass/base/_tables.scss
rename to sass/base/_tables.scss
diff --git a/source/assets/sass/components/_about-author.scss b/sass/components/_about-author.scss
similarity index 100%
rename from source/assets/sass/components/_about-author.scss
rename to sass/components/_about-author.scss
diff --git a/source/assets/sass/components/_footer.scss b/sass/components/_footer.scss
similarity index 100%
rename from source/assets/sass/components/_footer.scss
rename to sass/components/_footer.scss
diff --git a/source/assets/sass/components/_latest-posts.scss b/sass/components/_latest-posts.scss
similarity index 100%
rename from source/assets/sass/components/_latest-posts.scss
rename to sass/components/_latest-posts.scss
diff --git a/source/assets/sass/components/_navbar.scss b/sass/components/_navbar.scss
similarity index 100%
rename from source/assets/sass/components/_navbar.scss
rename to sass/components/_navbar.scss
diff --git a/source/assets/sass/components/blocks/_drupalcon-la.scss b/sass/components/blocks/_drupalcon-la.scss
similarity index 100%
rename from source/assets/sass/components/blocks/_drupalcon-la.scss
rename to sass/components/blocks/_drupalcon-la.scss
diff --git a/source/assets/sass/components/blocks/_meetups.scss b/sass/components/blocks/_meetups.scss
similarity index 100%
rename from source/assets/sass/components/blocks/_meetups.scss
rename to sass/components/blocks/_meetups.scss
diff --git a/source/assets/sass/components/pages/_blog-listing.scss b/sass/components/pages/_blog-listing.scss
similarity index 100%
rename from source/assets/sass/components/pages/_blog-listing.scss
rename to sass/components/pages/_blog-listing.scss
diff --git a/source/assets/sass/components/pages/_testimonials.scss b/sass/components/pages/_testimonials.scss
similarity index 100%
rename from source/assets/sass/components/pages/_testimonials.scss
rename to sass/components/pages/_testimonials.scss
diff --git a/source/assets/sass/styles.scss b/sass/styles.scss
similarity index 100%
rename from source/assets/sass/styles.scss
rename to sass/styles.scss
diff --git a/source/assets/sass/variables/_colours.scss b/sass/variables/_colours.scss
similarity index 100%
rename from source/assets/sass/variables/_colours.scss
rename to sass/variables/_colours.scss
diff --git a/source/assets/sass/variables/_typography.scss b/sass/variables/_typography.scss
similarity index 100%
rename from source/assets/sass/variables/_typography.scss
rename to sass/variables/_typography.scss