diff --git a/package.json b/package.json
index e5f48ff..cbd8428 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "castlecss-core",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "CastleCSS a SCSS framework with modular building blocks for the web",
   "main": "index.js",
   "scripts": {
diff --git a/sass/defaults.scss b/sass/base/defaults.scss
similarity index 100%
rename from sass/defaults.scss
rename to sass/base/defaults.scss
diff --git a/sass/mixins.scss b/sass/base/mixins.scss
similarity index 100%
rename from sass/mixins.scss
rename to sass/base/mixins.scss
diff --git a/sass/reset.scss b/sass/base/reset.scss
similarity index 100%
rename from sass/reset.scss
rename to sass/base/reset.scss
diff --git a/sass/utility.scss b/sass/base/utility.scss
similarity index 100%
rename from sass/utility.scss
rename to sass/base/utility.scss
diff --git a/sass/utility_spacers.scss b/sass/base/utility_spacers.scss
similarity index 100%
rename from sass/utility_spacers.scss
rename to sass/base/utility_spacers.scss
diff --git a/sass/variables.scss b/sass/base/variables.scss
similarity index 100%
rename from sass/variables.scss
rename to sass/base/variables.scss
diff --git a/sass/grid.scss b/sass/layout/grid.scss
similarity index 100%
rename from sass/grid.scss
rename to sass/layout/grid.scss
diff --git a/sass/static_content.scss b/sass/layout/static_content.scss
similarity index 99%
rename from sass/static_content.scss
rename to sass/layout/static_content.scss
index 1b22708..9c130f2 100644
--- a/sass/static_content.scss
+++ b/sass/layout/static_content.scss
@@ -31,4 +31,4 @@
 	.container {
 		width: $b5-container;
 	}
-}
+}
\ No newline at end of file
diff --git a/sass/main.scss b/sass/main.scss
index 5ace1c4..c8e457e 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -1,7 +1,11 @@
-@import 'reset';
-@import 'variables';
-@import 'grid';
-@import 'defaults';
-@import 'mixins';
-@import 'utility';
-@import 'utility_spacers';
\ No newline at end of file
+/* Base */
+@import 'base/reset';
+@import 'base/variables';
+@import 'base/defaults';
+@import 'base/mixins';
+@import 'base/utility';
+@import 'base/utility_spacers';
+
+/* Layout */
+@import 'layout/grid';
+@import 'layout/static_content';
\ No newline at end of file