diff --git a/app/sass/component/_flash-box.sass b/app/sass/component/flash/_flash-box.sass
similarity index 100%
rename from app/sass/component/_flash-box.sass
rename to app/sass/component/flash/_flash-box.sass
diff --git a/app/sass/component/_flash-message.sass b/app/sass/component/flash/_flash-message.sass
similarity index 100%
rename from app/sass/component/_flash-message.sass
rename to app/sass/component/flash/_flash-message.sass
diff --git a/app/sass/component/_button-bar.sass b/app/sass/component/global/_button-bar.sass
similarity index 100%
rename from app/sass/component/_button-bar.sass
rename to app/sass/component/global/_button-bar.sass
diff --git a/app/sass/component/_button.sass b/app/sass/component/global/_button.sass
similarity index 100%
rename from app/sass/component/_button.sass
rename to app/sass/component/global/_button.sass
diff --git a/app/sass/component/_container.sass b/app/sass/component/global/_container.sass
similarity index 100%
rename from app/sass/component/_container.sass
rename to app/sass/component/global/_container.sass
diff --git a/app/sass/component/_message.sass b/app/sass/component/global/_message.sass
similarity index 100%
rename from app/sass/component/_message.sass
rename to app/sass/component/global/_message.sass
diff --git a/app/sass/component/_team-form.sass b/app/sass/component/team/_team-form.sass
similarity index 100%
rename from app/sass/component/_team-form.sass
rename to app/sass/component/team/_team-form.sass
diff --git a/app/sass/component/_team.sass b/app/sass/component/team/_team.sass
similarity index 100%
rename from app/sass/component/_team.sass
rename to app/sass/component/team/_team.sass
diff --git a/app/sass/component/_node.sass b/app/sass/component/tree/_node.sass
similarity index 100%
rename from app/sass/component/_node.sass
rename to app/sass/component/tree/_node.sass
diff --git a/app/sass/component/_tree.sass b/app/sass/component/tree/_tree.sass
similarity index 100%
rename from app/sass/component/_tree.sass
rename to app/sass/component/tree/_tree.sass
diff --git a/app/sass/style.sass b/app/sass/style.sass
index e8e6e733..2527aa00 100644
--- a/app/sass/style.sass
+++ b/app/sass/style.sass
@@ -3,13 +3,16 @@
 @import 'ext/mixins'
 @import 'ext/fonts'
 
-@import 'component/node'
-@import 'component/tree'
-@import 'component/flash-box'
-@import 'component/flash-message'
-@import 'component/team'
-@import 'component/container'
-@import 'component/team-form'
-@import 'component/button'
-@import 'component/button-bar'
-@import 'component/message'
+@import 'component/global/container'
+@import 'component/global/button'
+@import 'component/global/button-bar'
+@import 'component/global/message'
+
+@import 'component/tree/tree'
+@import 'component/tree/node'
+
+@import 'component/flash/flash-box'
+@import 'component/flash/flash-message'
+
+@import 'component/team/team'
+@import 'component/team/team-form'