diff --git a/app/styles/_variables.sass b/app/styles/_variables.sass
deleted file mode 100644
index 545902e..0000000
--- a/app/styles/_variables.sass
+++ /dev/null
@@ -1,2 +0,0 @@
-$blue: #0088cc
-$green: #a4c540
diff --git a/app/styles/app.sass b/app/styles/app.sass
index 76886e5..92865b3 100644
--- a/app/styles/app.sass
+++ b/app/styles/app.sass
@@ -1,13 +1,17 @@
 @import compass/reset
 @import compass/css3
 
-@import variables
-@import mixins
-@import layout
-@import modal
-@import header
-@import footer
-@import users
-@import media
-@import popover
-@import glyphicons-filetypes
+@import base/variables
+@import base/mixins
+@import base/element_defaults
+@import base/glyphicons_filetypes
+
+@import modules/modules
+@import modules/modal
+@import modules/users
+@import modules/popover
+
+@import layout/header
+@import layout/footer
+@import layout/media
+
diff --git a/app/styles/base/_element_defaults.sass b/app/styles/base/_element_defaults.sass
new file mode 100644
index 0000000..136cd32
--- /dev/null
+++ b/app/styles/base/_element_defaults.sass
@@ -0,0 +1,23 @@
+*
+  +box-sizing(border-box)
+  &::before, &::after
+    +box-sizing(border-box)
+
+html
+  height: 100%
+  font-family: $font-family
+  font-size: 10px
+
+body
+  height: 100%
+
+a
+  text-decoration: none
+
+b, strong
+  font-weight: bold
+
+.invisible
+  height: 0
+  width: 0
+  opacity: 0
diff --git a/app/styles/_glyphicons-filetypes.sass b/app/styles/base/_glyphicons_filetypes.sass
similarity index 100%
rename from app/styles/_glyphicons-filetypes.sass
rename to app/styles/base/_glyphicons_filetypes.sass
diff --git a/app/styles/_mixins.sass b/app/styles/base/_mixins.sass
similarity index 89%
rename from app/styles/_mixins.sass
rename to app/styles/base/_mixins.sass
index 499f454..a54e078 100644
--- a/app/styles/_mixins.sass
+++ b/app/styles/base/_mixins.sass
@@ -12,7 +12,7 @@
   outline: none
   width: auto
   cursor: pointer
-  font-family: Helvetica, Arial, sans-serif
+  font-family: $font-family
 
 =circle($size)
   display: inline-block
diff --git a/app/styles/base/_variables.sass b/app/styles/base/_variables.sass
new file mode 100644
index 0000000..4d57ad2
--- /dev/null
+++ b/app/styles/base/_variables.sass
@@ -0,0 +1,4 @@
+$font-family: "Helvetica Neue", sans-serif
+
+$blue: #0088cc
+$green: #a4c540
diff --git a/app/styles/_footer.sass b/app/styles/layout/_footer.sass
similarity index 100%
rename from app/styles/_footer.sass
rename to app/styles/layout/_footer.sass
diff --git a/app/styles/_header.sass b/app/styles/layout/_header.sass
similarity index 94%
rename from app/styles/_header.sass
rename to app/styles/layout/_header.sass
index 04647a1..7d2f65d 100644
--- a/app/styles/_header.sass
+++ b/app/styles/layout/_header.sass
@@ -6,7 +6,7 @@
     width: 100%
     height: 60px
     background: transparent
-    color: #000
+    color: black
     +user-select(none)
     .logo
       position: relative
@@ -37,13 +37,13 @@
         a
           display: inline-block
           transition: opacity .2s linear
-          color: #000
+          color: black
           img
             vertical-align: middle
 
     .about
       +circle(18px)
-      border: 1px solid #000
+      border: 1px solid black
       font-size: 12px
       opacity: .18
       margin-top: -2px
diff --git a/app/styles/_media.sass b/app/styles/layout/_media.sass
similarity index 100%
rename from app/styles/_media.sass
rename to app/styles/layout/_media.sass
diff --git a/app/styles/_modal.sass b/app/styles/modules/_modal.sass
similarity index 100%
rename from app/styles/_modal.sass
rename to app/styles/modules/_modal.sass
diff --git a/app/styles/_layout.sass b/app/styles/modules/_modules.sass
similarity index 76%
rename from app/styles/_layout.sass
rename to app/styles/modules/_modules.sass
index 0373772..b26c7fe 100644
--- a/app/styles/_layout.sass
+++ b/app/styles/modules/_modules.sass
@@ -1,22 +1,3 @@
-*
-  +box-sizing(border-box)
-  &::before, &::after
-    +box-sizing(border-box)
-
-html
-  height: 100%
-  font-family: "Helvetica Neue", sans-serif
-  font-size: 10px
-
-body
-  height: 100%
-
-a
-  text-decoration: none
-
-b, strong
-  font-weight: bold
-
 .preloader
   position: absolute
   left: 0
@@ -40,11 +21,6 @@ b, strong
   .preloader
     opacity: 0
 
-.invisible
-  height: 0
-  width: 0
-  opacity: 0
-
 .error
   position: absolute
   top: 0
diff --git a/app/styles/_popover.sass b/app/styles/modules/_popover.sass
similarity index 100%
rename from app/styles/_popover.sass
rename to app/styles/modules/_popover.sass
diff --git a/app/styles/_users.sass b/app/styles/modules/_users.sass
similarity index 99%
rename from app/styles/_users.sass
rename to app/styles/modules/_users.sass
index f3467fb..2bd115a 100644
--- a/app/styles/_users.sass
+++ b/app/styles/modules/_users.sass
@@ -143,8 +143,6 @@ $user-size: 76px
           &::after
             opacity: 1
 
-
-
 +keyframes(shadow)
   0%
     opacity: 0