diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 2f9f09b4c6f4340daabbd558e46b24f3462fe78c..015ff2ce4ec71826c58378c451f3a342e01cc737 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -11,12 +11,17 @@
  *= require cal-heatmap
 */
 
-@import "main/*";
+
+@import "base/variables";
+@import "base/mixins";
+@import "base/layout";
+
 
 /**
  * Customized Twitter bootstrap
  */
-@import 'gl_bootstrap';
+@import 'base/gl_variables';
+@import 'base/gl_bootstrap';
 
 /**
  * NProgress load bar css
diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/base/gl_bootstrap.scss
similarity index 99%
rename from app/assets/stylesheets/gl_bootstrap.scss
rename to app/assets/stylesheets/base/gl_bootstrap.scss
index e8e58511f3ba602a553ea609e0a7373e2100f0e6..b0e2a678fc34333230e403a80addf45e72771d21 100644
--- a/app/assets/stylesheets/gl_bootstrap.scss
+++ b/app/assets/stylesheets/base/gl_bootstrap.scss
@@ -2,7 +2,6 @@
  * Twitter bootstrap with GitLab customizations/additions
  *
  */
-@import "gl_variables";
 
 // Core variables and mixins
 @import "bootstrap/variables";
diff --git a/app/assets/stylesheets/gl_variables.scss b/app/assets/stylesheets/base/gl_variables.scss
similarity index 100%
rename from app/assets/stylesheets/gl_variables.scss
rename to app/assets/stylesheets/base/gl_variables.scss
diff --git a/app/assets/stylesheets/main/layout.scss b/app/assets/stylesheets/base/layout.scss
similarity index 100%
rename from app/assets/stylesheets/main/layout.scss
rename to app/assets/stylesheets/base/layout.scss
diff --git a/app/assets/stylesheets/main/mixins.scss b/app/assets/stylesheets/base/mixins.scss
similarity index 100%
rename from app/assets/stylesheets/main/mixins.scss
rename to app/assets/stylesheets/base/mixins.scss
diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/base/variables.scss
similarity index 100%
rename from app/assets/stylesheets/main/variables.scss
rename to app/assets/stylesheets/base/variables.scss