diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index ca8720aca..b7c72797b 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -3,15 +3,10 @@
 @import "normalize";
 @import "font-awesome";
 
-@import "variables";
-@import "animations";
-@import "extends";
-@import "application/helpers";
+@import "base/base";
 
-@import "button_mixins";
+@import "application/helpers";
 
-@import "base";
-@import "buttons";
 @import "toggle_switch";
 @import "pages/pages";
 @import "accounts/show";
diff --git a/app/assets/stylesheets/_animations.scss b/app/assets/stylesheets/base/_animations.scss
similarity index 100%
rename from app/assets/stylesheets/_animations.scss
rename to app/assets/stylesheets/base/_animations.scss
diff --git a/app/assets/stylesheets/base/_base.scss b/app/assets/stylesheets/base/_base.scss
new file mode 100644
index 000000000..eb77b4239
--- /dev/null
+++ b/app/assets/stylesheets/base/_base.scss
@@ -0,0 +1,8 @@
+@import "variables";
+
+@import "animations";
+@import "button_mixins";
+@import "buttons";
+@import "extends";
+@import "helpers";
+@import "typography";
diff --git a/app/assets/stylesheets/_button_mixins.scss b/app/assets/stylesheets/base/_button_mixins.scss
similarity index 100%
rename from app/assets/stylesheets/_button_mixins.scss
rename to app/assets/stylesheets/base/_button_mixins.scss
diff --git a/app/assets/stylesheets/_buttons.scss b/app/assets/stylesheets/base/_buttons.scss
similarity index 100%
rename from app/assets/stylesheets/_buttons.scss
rename to app/assets/stylesheets/base/_buttons.scss
diff --git a/app/assets/stylesheets/_extends.scss b/app/assets/stylesheets/base/_extends.scss
similarity index 100%
rename from app/assets/stylesheets/_extends.scss
rename to app/assets/stylesheets/base/_extends.scss
diff --git a/app/assets/stylesheets/_helpers.scss b/app/assets/stylesheets/base/_helpers.scss
similarity index 100%
rename from app/assets/stylesheets/_helpers.scss
rename to app/assets/stylesheets/base/_helpers.scss
diff --git a/app/assets/stylesheets/_base.scss b/app/assets/stylesheets/base/_typography.scss
similarity index 100%
rename from app/assets/stylesheets/_base.scss
rename to app/assets/stylesheets/base/_typography.scss
diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/base/_variables.scss
similarity index 100%
rename from app/assets/stylesheets/_variables.scss
rename to app/assets/stylesheets/base/_variables.scss