diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 201f7529..a9f0bf2a 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,4 +1,4 @@
 @import "bootstrap/scss/bootstrap";
-@import "scaffolds";
-@import "school_categories";
-@import "questions";
+@import "legacy_partials/scaffolds";
+@import "legacy_partials/school_categories";
+@import "legacy_partials/questions";
diff --git a/app/assets/stylesheets/questions.scss b/app/assets/stylesheets/legacy_partials/_questions.scss
similarity index 100%
rename from app/assets/stylesheets/questions.scss
rename to app/assets/stylesheets/legacy_partials/_questions.scss
diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/legacy_partials/_scaffolds.scss
similarity index 100%
rename from app/assets/stylesheets/scaffolds.scss
rename to app/assets/stylesheets/legacy_partials/_scaffolds.scss
diff --git a/app/assets/stylesheets/school_categories.scss b/app/assets/stylesheets/legacy_partials/_school_categories.scss
similarity index 100%
rename from app/assets/stylesheets/school_categories.scss
rename to app/assets/stylesheets/legacy_partials/_school_categories.scss
diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/legacy_partials/_variables.scss
similarity index 100%
rename from app/assets/stylesheets/_variables.scss
rename to app/assets/stylesheets/legacy_partials/_variables.scss
diff --git a/app/assets/stylesheets/overview.scss b/app/assets/stylesheets/overview.scss
index 22cd45f4..d9659843 100644
--- a/app/assets/stylesheets/overview.scss
+++ b/app/assets/stylesheets/overview.scss
@@ -1,8 +1,4 @@
 @import 'bootstrap/scss/bootstrap';
-@import 'bootstrap-overrides';
-@import 'colors';
-@import 'fonts';
-@import 'borders';
 
 .graph-header {
   @extend .font-bitter;
diff --git a/app/assets/stylesheets/bootstrap-overrides.scss b/app/assets/stylesheets/partials/_bootstrap-overrides.scss
similarity index 97%
rename from app/assets/stylesheets/bootstrap-overrides.scss
rename to app/assets/stylesheets/partials/_bootstrap-overrides.scss
index 31b84d37..03a224f2 100644
--- a/app/assets/stylesheets/bootstrap-overrides.scss
+++ b/app/assets/stylesheets/partials/_bootstrap-overrides.scss
@@ -1,5 +1,5 @@
 @import 'colors';
-@import 'fonts';
+/* @import 'partials/fonts'; */
 
 $spacer: 0.5rem;
 $spacers: (
diff --git a/app/assets/stylesheets/borders.scss b/app/assets/stylesheets/partials/_borders.scss
similarity index 79%
rename from app/assets/stylesheets/borders.scss
rename to app/assets/stylesheets/partials/_borders.scss
index 31a52887..91f5290a 100644
--- a/app/assets/stylesheets/borders.scss
+++ b/app/assets/stylesheets/partials/_borders.scss
@@ -1,4 +1,4 @@
-@import 'colors';
+/* @import 'colors'; */
 
 .border-radius-8 {
   border-radius: 8px;
diff --git a/app/assets/stylesheets/buttons.scss b/app/assets/stylesheets/partials/_buttons.scss
similarity index 89%
rename from app/assets/stylesheets/buttons.scss
rename to app/assets/stylesheets/partials/_buttons.scss
index 0ecf979a..c7e359f7 100644
--- a/app/assets/stylesheets/buttons.scss
+++ b/app/assets/stylesheets/partials/_buttons.scss
@@ -1,4 +1,4 @@
-@import "colors";
+/* @import "colors"; */
 
 .view-details {
   background-color: $blue;
diff --git a/app/assets/stylesheets/clear-margin-padding.scss b/app/assets/stylesheets/partials/_clear-margin-padding.scss
similarity index 100%
rename from app/assets/stylesheets/clear-margin-padding.scss
rename to app/assets/stylesheets/partials/_clear-margin-padding.scss
diff --git a/app/assets/stylesheets/colors.scss b/app/assets/stylesheets/partials/_colors.scss
similarity index 100%
rename from app/assets/stylesheets/colors.scss
rename to app/assets/stylesheets/partials/_colors.scss
diff --git a/app/assets/stylesheets/_fonts.scss b/app/assets/stylesheets/partials/_fonts.scss
similarity index 97%
rename from app/assets/stylesheets/_fonts.scss
rename to app/assets/stylesheets/partials/_fonts.scss
index 9ddacdaf..79e67d1f 100644
--- a/app/assets/stylesheets/_fonts.scss
+++ b/app/assets/stylesheets/partials/_fonts.scss
@@ -1,5 +1,3 @@
-@import 'colors';
-
 .font-bitter {
   font-family: 'Bitter', serif;
 }
diff --git a/app/assets/stylesheets/_footer.scss b/app/assets/stylesheets/partials/_footer.scss
similarity index 76%
rename from app/assets/stylesheets/_footer.scss
rename to app/assets/stylesheets/partials/_footer.scss
index 1bb7eaaa..57b4a0ca 100644
--- a/app/assets/stylesheets/_footer.scss
+++ b/app/assets/stylesheets/partials/_footer.scss
@@ -1,6 +1,3 @@
-@import "colors";
-@import "fonts";
-
 .footer-item {
   margin: 40px 12px;
   color: $gray-1;
diff --git a/app/assets/stylesheets/_forms.scss b/app/assets/stylesheets/partials/_forms.scss
similarity index 100%
rename from app/assets/stylesheets/_forms.scss
rename to app/assets/stylesheets/partials/_forms.scss
diff --git a/app/assets/stylesheets/navigation.scss b/app/assets/stylesheets/partials/_navigation.scss
similarity index 87%
rename from app/assets/stylesheets/navigation.scss
rename to app/assets/stylesheets/partials/_navigation.scss
index 5ae3acf2..bc0fb110 100644
--- a/app/assets/stylesheets/navigation.scss
+++ b/app/assets/stylesheets/partials/_navigation.scss
@@ -1,5 +1,5 @@
-@import 'colors';
-@import 'fonts';
+/* @import 'colors'; */
+/* @import 'fonts'; */
 
 a:focus {
   outline: none;
diff --git a/app/assets/stylesheets/sqm_bootstrap.scss b/app/assets/stylesheets/partials/_sqm_bootstrap.scss
similarity index 98%
rename from app/assets/stylesheets/sqm_bootstrap.scss
rename to app/assets/stylesheets/partials/_sqm_bootstrap.scss
index 0a2fd089..646617c0 100644
--- a/app/assets/stylesheets/sqm_bootstrap.scss
+++ b/app/assets/stylesheets/partials/_sqm_bootstrap.scss
@@ -1,4 +1,4 @@
-@import "colors";
+/* @import "colors"; */
 @import "bootstrap-overrides";
 
 // Configuration
diff --git a/app/assets/stylesheets/sqm_application.scss b/app/assets/stylesheets/sqm_application.scss
index 23dbc579..2921abd8 100644
--- a/app/assets/stylesheets/sqm_application.scss
+++ b/app/assets/stylesheets/sqm_application.scss
@@ -1,15 +1,16 @@
-@import "sqm_bootstrap";
-@import "clear-margin-padding";
-@import "colors";
-@import "fonts";
-@import "borders";
+@import "partials/colors";
+@import "partials/sqm_bootstrap";
+@import "partials/bootstrap-overrides";
+@import "partials/clear-margin-padding";
+@import "partials/fonts";
+@import "partials/borders";
 @import "overview";
-@import "navigation";
-@import "buttons";
+@import "partials/navigation";
+@import "partials/buttons";
 @import "@fortawesome/fontawesome-free/scss/fontawesome";
 @import "@fortawesome/fontawesome-free/scss/solid";
-@import "footer";
-@import "forms";
+@import "partials/footer";
+@import "partials/forms";
 
 .height-56 {
   height: 56px;
diff --git a/app/assets/stylesheets/welcome.scss b/app/assets/stylesheets/welcome.scss
index 89fab14f..0e21a402 100644
--- a/app/assets/stylesheets/welcome.scss
+++ b/app/assets/stylesheets/welcome.scss
@@ -1,10 +1,10 @@
-@import "bootstrap-overrides";
+@import "partials/colors";
 @import "bootstrap/scss/bootstrap";
-@import "clear-margin-padding";
-@import "colors";
-@import "fonts";
-@import "borders";
-@import "footer";
+@import "partials/bootstrap-overrides";
+@import "partials/clear-margin-padding";
+@import "partials/fonts";
+@import "partials/borders";
+@import "partials/footer";
 
 .hero-image {
   background-image: url("hero.png");