diff --git a/.gitignore b/.gitignore
index 9a1d2a5..aa204cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-.sass-cache/*
+.sass-cache
 node_modules
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 8156e06..0795a82 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "scss/normalize"]
-	path = scss/normalize
+	path = src/scss/normalize
 	url = https://github.com/nickpack/normalize.scss.git
diff --git a/Gruntfile.js b/Gruntfile.js
index 8f6301f..9ab3dfc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,7 +6,7 @@ module.exports = function(grunt) {
     sass: {
         dist: {
             files: {
-                'css/Ribs.css': 'scss/Ribs.scss',
+                'build/css/Ribs.css': 'src/scss/Ribs.scss',
             }
         }
     },
@@ -16,7 +16,7 @@ module.exports = function(grunt) {
           import: false,
           csslintrc: '.csslintrc'
         },
-        src: ['css/Ribs.css']
+        src: ['build/css/Ribs.css']
       }
     },
     cssmin: {
@@ -25,12 +25,12 @@ module.exports = function(grunt) {
           banner: '/* <%= pkg.name %> <%= pkg.version %> - https://github.com/nickpack/Ribs - <%= grunt.template.today("dd-mm-yyyy") %> */'
         },
         files: {
-          'css/Ribs.min.css': 'css/Ribs.css'
+          'build/css/Ribs.min.css': 'build/css/Ribs.css'
         }
       },
     },
     watch: {
-      files: 'scss/**/*',
+      files: 'src/scss/**/*',
       tasks: ['sass', 'csslint', 'cssmin']
     }
   });
diff --git a/css/Ribs.css b/build/css/Ribs.css
similarity index 100%
rename from css/Ribs.css
rename to build/css/Ribs.css
diff --git a/css/Ribs.min.css b/build/css/Ribs.min.css
similarity index 100%
rename from css/Ribs.min.css
rename to build/css/Ribs.min.css
diff --git a/img/apple-touch-icon-114x114.png b/build/img/apple-touch-icon-114x114.png
similarity index 100%
rename from img/apple-touch-icon-114x114.png
rename to build/img/apple-touch-icon-114x114.png
diff --git a/img/apple-touch-icon-72x72.png b/build/img/apple-touch-icon-72x72.png
similarity index 100%
rename from img/apple-touch-icon-72x72.png
rename to build/img/apple-touch-icon-72x72.png
diff --git a/img/apple-touch-icon.png b/build/img/apple-touch-icon.png
similarity index 100%
rename from img/apple-touch-icon.png
rename to build/img/apple-touch-icon.png
diff --git a/img/favicon.ico b/build/img/favicon.ico
similarity index 100%
rename from img/favicon.ico
rename to build/img/favicon.ico
diff --git a/index.html b/build/index.html
similarity index 100%
rename from index.html
rename to build/index.html
diff --git a/scss/Ribs.scss b/src/scss/Ribs.scss
similarity index 100%
rename from scss/Ribs.scss
rename to src/scss/Ribs.scss
diff --git a/scss/_forms.scss b/src/scss/_forms.scss
similarity index 100%
rename from scss/_forms.scss
rename to src/scss/_forms.scss
diff --git a/scss/_grid.scss b/src/scss/_grid.scss
similarity index 100%
rename from scss/_grid.scss
rename to src/scss/_grid.scss
diff --git a/scss/_images.scss b/src/scss/_images.scss
similarity index 100%
rename from scss/_images.scss
rename to src/scss/_images.scss
diff --git a/scss/_links.scss b/src/scss/_links.scss
similarity index 100%
rename from scss/_links.scss
rename to src/scss/_links.scss
diff --git a/scss/_lists.scss b/src/scss/_lists.scss
similarity index 100%
rename from scss/_lists.scss
rename to src/scss/_lists.scss
diff --git a/scss/_mixins.scss b/src/scss/_mixins.scss
similarity index 100%
rename from scss/_mixins.scss
rename to src/scss/_mixins.scss
diff --git a/scss/_typography.scss b/src/scss/_typography.scss
similarity index 100%
rename from scss/_typography.scss
rename to src/scss/_typography.scss
diff --git a/scss/_variables.scss b/src/scss/_variables.scss
similarity index 100%
rename from scss/_variables.scss
rename to src/scss/_variables.scss