diff --git a/client/scss/all.scss b/client/scss/all.scss
index ad15d73d..ac375ae1 100644
--- a/client/scss/all.scss
+++ b/client/scss/all.scss
@@ -1,16 +1,16 @@
-@import '_variables';
-@import '_reset';
-@import '_font';
-@import '_html';
+@import '~variables/_variables';
+@import '~reset/_reset';
+@import '~fontStyle/_font';
+@import '~html/_html';
 @import '~body/_body';
-@import '_react-app';
-@import '_text';
+@import '~react-app/_react-app';
+@import '~text/_text';
 
-@import '_link';
-@import '_input';
-@import '_select';
-@import '_textarea';
-@import '_video';
+@import '~link/_link';
+@import '~input/_input';
+@import '~select/_select';
+@import '~textarea/_textarea';
+@import '~video/_video';
 
 @import 'components/_asset-display';
 @import 'components/_asset-preview';
@@ -42,6 +42,6 @@
 @import 'containers/_publish-status';
 @import 'containers/_publish-disabled-message';
 
-@import '_media-queries';
+@import '~media-queries/_media-queries';
 
 
diff --git a/client/scss/_font.scss b/client/scss/fontStyle/_font.scss
similarity index 59%
rename from client/scss/_font.scss
rename to client/scss/fontStyle/_font.scss
index d3c8fe32..fbc135c5 100644
--- a/client/scss/_font.scss
+++ b/client/scss/fontStyle/_font.scss
@@ -1,18 +1,18 @@
 @font-face {
   font-family: 'Lekton';
-  src: url('font/Lekton/Lekton-Regular.ttf');
+  src: url('../font/Lekton/Lekton-Regular.ttf');
 }
 
 @font-face {
   font-family: 'Lekton';
-  src: url('font/Lekton/Lekton-Bold.ttf');
+  src: url('../font/Lekton/Lekton-Bold.ttf');
   font-weight: bold;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Lekton';
-  src: url('font/Lekton/Lekton-Italic.ttf');
+  src: url('../font/Lekton/Lekton-Italic.ttf');
   font-weight: normal;
   font-style: italic;
 }
diff --git a/client/scss/_html.scss b/client/scss/html/_html.scss
similarity index 100%
rename from client/scss/_html.scss
rename to client/scss/html/_html.scss
diff --git a/client/scss/_input.scss b/client/scss/input/_input.scss
similarity index 100%
rename from client/scss/_input.scss
rename to client/scss/input/_input.scss
diff --git a/client/scss/_link.scss b/client/scss/link/_link.scss
similarity index 100%
rename from client/scss/_link.scss
rename to client/scss/link/_link.scss
diff --git a/client/scss/_media-queries.scss b/client/scss/media-queries/_media-queries.scss
similarity index 100%
rename from client/scss/_media-queries.scss
rename to client/scss/media-queries/_media-queries.scss
diff --git a/client/scss/_react-app.scss b/client/scss/react-app/_react-app.scss
similarity index 100%
rename from client/scss/_react-app.scss
rename to client/scss/react-app/_react-app.scss
diff --git a/client/scss/_reset.scss b/client/scss/reset/_reset.scss
similarity index 100%
rename from client/scss/_reset.scss
rename to client/scss/reset/_reset.scss
diff --git a/client/scss/_select.scss b/client/scss/select/_select.scss
similarity index 82%
rename from client/scss/_select.scss
rename to client/scss/select/_select.scss
index 66a312e2..51fa4528 100644
--- a/client/scss/_select.scss
+++ b/client/scss/select/_select.scss
@@ -10,7 +10,7 @@ select {
 .select--arrow {
   -moz-appearance:none;
   -webkit-appearance: none;
-  background: url('icon/downArrow.svg') no-repeat right;
+  background: url('../icon/downArrow.svg') no-repeat right;
   cursor: pointer;
   padding-right: 1.5em;
   padding-left: $input-padding
diff --git a/client/scss/_text.scss b/client/scss/text/_text.scss
similarity index 100%
rename from client/scss/_text.scss
rename to client/scss/text/_text.scss
diff --git a/client/scss/_textarea.scss b/client/scss/textarea/_textarea.scss
similarity index 100%
rename from client/scss/_textarea.scss
rename to client/scss/textarea/_textarea.scss
diff --git a/client/scss/_variables.scss b/client/scss/variables/_variables.scss
similarity index 100%
rename from client/scss/_variables.scss
rename to client/scss/variables/_variables.scss
diff --git a/client/scss/_video.scss b/client/scss/video/_video.scss
similarity index 100%
rename from client/scss/_video.scss
rename to client/scss/video/_video.scss