diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..7219842
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "assets/scss/vendor/simple-grid"]
+    path = assets/scss/vendor/simple-grid
+    url = https://github.com/pdcreis/simple-grid.git
\ No newline at end of file
diff --git a/assets/.DS_Store b/assets/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/assets/.DS_Store differ
diff --git a/assets/scss/.DS_Store b/assets/scss/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/assets/scss/.DS_Store differ
diff --git a/assets/scss/barebones.scss b/assets/scss/barebones.scss
index c47adc6..0a533f6 100755
--- a/assets/scss/barebones.scss
+++ b/assets/scss/barebones.scss
@@ -4,22 +4,38 @@ Theme URI: http://github.com/benchmarkstudios/barebones
 Author: Benchmark
 */
 
-@import 'defaults';
+// 1. Vendors
+@import
+  'vendor/simple-grid/simple-grid';
 
-@import 'utilities/mixins';
-@import 'utilities/reset';
-@import 'utilities/a11y';
-@import 'utilities/responsive';
-@import 'utilities/wordpress';
+// 2. Configuration and helpers
+@import
+    'utilities/variables',
+    'utilities/mixins',
+    'utilities/reset',
+    'utilities/a11y',
+    'utilities/responsive',
+    'utilities/wordpress';
 
-@import 'vendor/simple-grid/simple-grid';
+// 3. Base stuff
+@import
+    'base/shared',
+    'base/images',
+    'base/forms',
+    'base/lists',
+    'base/headings',
+    'base/links';
 
-@import 'base/shared';
-@import 'base/images';
-@import 'base/forms';
-@import 'base/lists';
-@import 'base/headings';
-@import 'base/links';
+// 4. Layout-related sections
+@import
+  'layout/header',
+  'layout/footer';
 
-@import 'modules/nav';
-@import 'modules/buttons';;
+// 5. Components
+@import
+  'modules/buttons',
+  'modules/nav';
+
+// 6. Page-specific styles
+@import
+  'pages/home';
\ No newline at end of file
diff --git a/assets/scss/layout/_footer.scss b/assets/scss/layout/_footer.scss
new file mode 100644
index 0000000..e69de29
diff --git a/assets/scss/layout/_header.scss b/assets/scss/layout/_header.scss
new file mode 100644
index 0000000..e69de29
diff --git a/assets/scss/pages/_home.scss b/assets/scss/pages/_home.scss
new file mode 100644
index 0000000..e69de29
diff --git a/assets/scss/_defaults.scss b/assets/scss/utilities/_variables.scss
similarity index 100%
rename from assets/scss/_defaults.scss
rename to assets/scss/utilities/_variables.scss