diff --git a/themes/ccchh/assets/scss/container.scss b/themes/ccchh/assets/scss/classes/container.scss
similarity index 100%
rename from themes/ccchh/assets/scss/container.scss
rename to themes/ccchh/assets/scss/classes/container.scss
diff --git a/themes/ccchh/assets/scss/document-typography.scss b/themes/ccchh/assets/scss/document/typography.scss
similarity index 100%
rename from themes/ccchh/assets/scss/document-typography.scss
rename to themes/ccchh/assets/scss/document/typography.scss
diff --git a/themes/ccchh/assets/scss/main.scss b/themes/ccchh/assets/scss/main.scss
index e831c66..e6c09d9 100644
--- a/themes/ccchh/assets/scss/main.scss
+++ b/themes/ccchh/assets/scss/main.scss
@@ -1,3 +1,8 @@
+// General variables.
 @import "variables.scss";
-@import "container.scss";
-@import "document-typography.scss";
+
+// General implicit document styling.
+@import "document/typography.scss";
+
+// Classes to be used explicitly.
+@import "classes/container.scss";