diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 2f732b2adda9ebd264c1cca9bcb3f82ed2c9704e..d91eec4f4f82e3174d3109e3bfe6e6bd36993a25 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -9,8 +9,9 @@
  *= require_self
 */
 
-/** Override bootstrap variables **/
-$font-size-base: 13px !default;
+@import "main/variables.scss";
+@import "main/mixins.scss";
+@import "main/fonts.scss";
 
 /**
  * Twitter bootstrap:
@@ -28,6 +29,10 @@ $font-size-base: 13px !default;
  */
 @import "generic.scss";
 
+
+/**
+ * Unrefactored css
+ */
 @import "common.scss";
 
 
diff --git a/app/assets/stylesheets/generic.scss b/app/assets/stylesheets/generic.scss
index 4f7716113e0888625f2ccb771ff5335cd0f1ae4a..4c59358ced4a14e701d9944fcdfb23616b1c8ccc 100644
--- a/app/assets/stylesheets/generic.scss
+++ b/app/assets/stylesheets/generic.scss
@@ -1,6 +1,3 @@
-@import "generic/variables.scss";
-@import "generic/fonts.scss";
-@import "generic/mixins.scss";
 @import "generic/avatar.scss";
 @import "generic/nav.scss";
 @import "generic/common.scss";
diff --git a/app/assets/stylesheets/generic/fonts.scss b/app/assets/stylesheets/main/fonts.scss
similarity index 100%
rename from app/assets/stylesheets/generic/fonts.scss
rename to app/assets/stylesheets/main/fonts.scss
diff --git a/app/assets/stylesheets/generic/mixins.scss b/app/assets/stylesheets/main/mixins.scss
similarity index 100%
rename from app/assets/stylesheets/generic/mixins.scss
rename to app/assets/stylesheets/main/mixins.scss
diff --git a/app/assets/stylesheets/generic/variables.scss b/app/assets/stylesheets/main/variables.scss
similarity index 71%
rename from app/assets/stylesheets/generic/variables.scss
rename to app/assets/stylesheets/main/variables.scss
index aeabe7ad2e83be87ee201e6971e182ff27b4162e..86b207f02cc548e2290776d877b81b6c556fc0ea 100644
--- a/app/assets/stylesheets/generic/variables.scss
+++ b/app/assets/stylesheets/main/variables.scss
@@ -1,3 +1,6 @@
+/** Override bootstrap variables **/
+$font-size-base: 13px !default;
+
 /**
  * General Colors
  */