diff --git a/Gemfile b/Gemfile
index 8697b7a2f39c5ee5bbe4c8f362e6acf879f6fbc8..e7bcf37cfd41aa9775bd5b9f9f6c072bf1ec0387 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,5 +7,6 @@ group :development do
   gem 'compass'                 # Framework built on Sass.
   gem 'susy'                    # Susy grid framework.
   gem 'breakpoint'              # Manages CSS media queries.
-
+  gem 'sass-globbing'           # Allows you to import many sass or scss files
+                                # in a single import statement.
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b3e20829461dcf3e239aec16e947b69c2703d0a..0cd1c90c851511c4c0ebf191a1fa0c99303f6216 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,6 +11,8 @@ GEM
       sass (~> 3.1)
     fssm (0.2.10)
     sass (3.2.9)
+    sass-globbing (1.1.0)
+      sass (>= 3.1)
     susy (1.0.9)
       compass (>= 0.12.2)
       sass (>= 3.2.0)
@@ -22,4 +24,5 @@ DEPENDENCIES
   breakpoint
   compass
   sass
+  sass-globbing
   susy
diff --git a/config.rb b/config.rb
index 48b57a7000ec7f14d7a32b8418111de569190b14..0eadf8b1b5d56263855d7c7f24144342146dbaf9 100644
--- a/config.rb
+++ b/config.rb
@@ -5,6 +5,7 @@ end
 # Require any additional compass plugins here.
 require 'susy'
 require 'breakpoint'
+require 'sass-globbing'
 
 # Set this to the root of your project when deployed:
 http_path = "/sites/all/themes/bluecheese/"
diff --git a/sass/partials/common/_common.scss b/sass/partials/common/_common.scss
deleted file mode 100644
index 18d8ecc878e5fcd10c93bce838b3429f471253cb..0000000000000000000000000000000000000000
--- a/sass/partials/common/_common.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-////////////////////////
-// Common Styles Partial
-//
-// Common styles for all *.drupal.org sites.
-// Drupal.org specific styles should be under Drupal.org partial
-////////////////////////
-
-@import 'api';
-@import 'autocomplete';
-@import 'basic-elements';
-@import 'block';
-@import 'book';
-@import 'buttons';
-@import 'comment';
-@import 'content';
-@import 'footer';
-@import 'forms';
-@import 'global';
-@import 'header';
-@import 'jquery';
-@import 'lists';
-@import 'messages';
-@import 'narrow-box';
-@import 'navigation';
-@import 'node';
-@import 'page';
-@import 'pager';
-@import 'search';
-@import 'search-advanced';
-@import 'search-help';
-@import 'search-results';
-@import 'site-status';
-@import 'sprites';
-@import 'table';
-@import 'tabs';
-@import 'tags';
-@import 'taxonomy';
-@import 'user-profile';
diff --git a/sass/partials/drupalorg/_drupalorg.scss b/sass/partials/drupalorg/_drupalorg.scss
deleted file mode 100644
index 8ecaa5b147af68f1fbf0aace9e185265bcfa1e38..0000000000000000000000000000000000000000
--- a/sass/partials/drupalorg/_drupalorg.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-////////////////////////
-// Drupal.org Styles Partial
-//
-// Drupal.org specific styles. 
-// Styles used on multiple sections/sites should be under Common partial
-////////////////////////
-
-@import 'about';
-@import 'ads';
-@import 'book-listing';
-@import 'casestudies';
-@import 'community';
-@import 'dashboard';
-@import 'documentation';
-@import 'download';
-@import 'features';
-@import 'forums';
-@import 'front';
-@import 'front-tabs';
-@import 'getting-involved';
-@import 'getting-started';
-@import 'git';
-@import 'issue-comments';
-@import 'issue-mine';
-@import 'issue-page';
-@import 'issue-queue';
-@import 'maps';
-@import 'marketplace';
-@import 'member-directory';
-@import 'news';
-@import 'planet';
-@import 'project-listing';
-@import 'project-listing-search';
-@import 'project-page';
-@import 'project-page-sidebar';
-@import 'association';
diff --git a/sass/partials/utilities/_utilities.scss b/sass/partials/utilities/_utilities.scss
deleted file mode 100644
index f82f7af0c0bb55321c632af605fec69fadb84ae5..0000000000000000000000000000000000000000
--- a/sass/partials/utilities/_utilities.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 
- * Files with extension .css are derived from .scss files. Do not edit .css
- * files directly! The .scss files can be found in the sass directory, and
- * are compiled with compass. See http://drupal.org/node/1751078 for more
- * information.
- */
-
-////////////////////////
-// Utilities Partial
-//
-// This should contain helper functions, mixins, and variables. 
-// There should be no element styling here
-////////////////////////
-
-////////////////////////
-// Compass Imports
-////////////////////////
-@import 'compass';
-@import 'compass/reset';
-@import 'compass/utilities/general/clearfix';
-@import 'compass/typography/text/replacement';
-@import 'compass/css3';
-
-////////////////////////
-// Extension Imports
-////////////////////////
-@import 'susy';
-@import 'breakpoint';
-
-////////////////////////
-// Local Imports
-////////////////////////
-@import 'variables';
-@import 'mixins';
-@import 'extendables';
-//@import 'debug';
-
-////////////////////////
-// Cheating at CSS
-////////////////////////
-* {@include box-sizing('border-box');}
diff --git a/sass/styles.scss b/sass/styles.scss
index bb347c20f79d11f3a8bef967b397404f4188c695..980d3eeafd18b00a6159d1a72519b40dd7530740 100644
--- a/sass/styles.scss
+++ b/sass/styles.scss
@@ -1,14 +1,31 @@
+////////////////////////
+// Compass Imports
+////////////////////////
+@import 'compass';
+@import 'compass/reset';
+@import 'compass/utilities/general/clearfix';
+@import 'compass/typography/text/replacement';
+@import 'compass/css3';
+@import 'susy';
+@import 'breakpoint';
+
+////////////////////////
+// Cheating at CSS
+////////////////////////
+* {@include box-sizing('border-box');}
+
+
 //////////////////////////////
 // Import Utilities
 //////////////////////////////
-@import 'partials/utilities/utilities';
+@import 'partials/utilities/**/*';
 
 //////////////////////////////
 // Import Common Styles
 //////////////////////////////
-@import 'partials/common/common';
+@import 'partials/common/**/*';
 
 //////////////////////////////
 // Import Drupal.org Styles
 //////////////////////////////
-@import 'partials/drupalorg/drupalorg';
+@import 'partials/drupalorg/**/*';