diff --git a/core/themes/classy/classy.libraries.yml b/core/themes/classy/classy.libraries.yml
index 8ce88d0..6053174 100644
--- a/core/themes/classy/classy.libraries.yml
+++ b/core/themes/classy/classy.libraries.yml
@@ -8,13 +8,13 @@ book-navigation:
   version: VERSION
   css:
     theme:
-      css/components/book.css: {}
+      css/navigation/book.theme.css: {}
 
 drupal.comment.threaded:
   version: VERSION
   css:
     theme:
-      css/components/comment.css: {}
+      css/comment/comment.theme.css: {}
 
 node:
   version: VERSION
@@ -26,7 +26,7 @@ search.results:
   version: VERSION
   css:
     theme:
-      css/components/search.css: {}
+      css/search/search.theme.css: {}
 
 drupal.file:
   version: VERSION
diff --git a/core/themes/classy/css/comment/comment.theme.css b/core/themes/classy/css/comment/comment.theme.css
new file mode 100644
index 0000000..c702161
--- /dev/null
+++ b/core/themes/classy/css/comment/comment.theme.css
@@ -0,0 +1,16 @@
+
+/**
+ * @file
+ * Basic styling for comment module.
+ */
+
+/**
+ * Indent threaded comments.
+ */
+.indented {
+  margin-left: 25px; /* LTR */
+}
+[dir="rtl"] .indented {
+  margin-left: 0;
+  margin-right: 25px;
+}
diff --git a/core/themes/classy/css/components/book.css b/core/themes/classy/css/components/book.css
deleted file mode 100644
index 8f1f7de..0000000
--- a/core/themes/classy/css/components/book.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file
- * Styling for the Book module.
- */
-
-.book-navigation .menu {
-  padding-bottom: 0;
-  padding-top: 1em;
-}
-.book-navigation .book-pager {
-  margin: 0;
-  overflow: auto;
-  padding: 0.5em 0;
-}
-.book-pager__item {
-  display: inline-block;
-  list-style-type: none;
-  vertical-align: top;
-}
-.book-pager__item--previous {
-  text-align: left; /* LTR */
-  width: 45%;
-}
-[dir="rtl"] .book-pager__item--previous {
-  float: right;
-  text-align: right;
-}
-.book-pager__item--center {
-  text-align: center;
-  width: 8%;
-}
-.book-pager__item--next {
-  float: right; /* LTR */
-  text-align: right; /* LTR */
-  width: 45%;
-}
-[dir="rtl"] .book-pager__item--next {
-  float: left;
-  text-align: left;
-}
diff --git a/core/themes/classy/css/components/comment.css b/core/themes/classy/css/components/comment.css
deleted file mode 100644
index c702161..0000000
--- a/core/themes/classy/css/components/comment.css
+++ /dev/null
@@ -1,16 +0,0 @@
-
-/**
- * @file
- * Basic styling for comment module.
- */
-
-/**
- * Indent threaded comments.
- */
-.indented {
-  margin-left: 25px; /* LTR */
-}
-[dir="rtl"] .indented {
-  margin-left: 0;
-  margin-right: 25px;
-}
diff --git a/core/themes/classy/css/components/search.css b/core/themes/classy/css/components/search.css
deleted file mode 100644
index 7d9980a..0000000
--- a/core/themes/classy/css/components/search.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @file
- * Stylesheet for results generated by the Search module.
- */
-ol.search-results {
-  list-style: none;
-}
diff --git a/core/themes/classy/css/navigation/book.theme.css b/core/themes/classy/css/navigation/book.theme.css
new file mode 100644
index 0000000..8f1f7de
--- /dev/null
+++ b/core/themes/classy/css/navigation/book.theme.css
@@ -0,0 +1,40 @@
+/**
+ * @file
+ * Styling for the Book module.
+ */
+
+.book-navigation .menu {
+  padding-bottom: 0;
+  padding-top: 1em;
+}
+.book-navigation .book-pager {
+  margin: 0;
+  overflow: auto;
+  padding: 0.5em 0;
+}
+.book-pager__item {
+  display: inline-block;
+  list-style-type: none;
+  vertical-align: top;
+}
+.book-pager__item--previous {
+  text-align: left; /* LTR */
+  width: 45%;
+}
+[dir="rtl"] .book-pager__item--previous {
+  float: right;
+  text-align: right;
+}
+.book-pager__item--center {
+  text-align: center;
+  width: 8%;
+}
+.book-pager__item--next {
+  float: right; /* LTR */
+  text-align: right; /* LTR */
+  width: 45%;
+}
+[dir="rtl"] .book-pager__item--next {
+  float: left;
+  text-align: left;
+}
diff --git a/core/themes/classy/css/search/search.theme.css b/core/themes/classy/css/search/search.theme.css
new file mode 100644
index 0000000..7d9980a
--- /dev/null
+++ b/core/themes/classy/css/search/search.theme.css
@@ -0,0 +1,7 @@
+/**
+ * @file
+ * Stylesheet for results generated by the Search module.
+ */
+ol.search-results {
+  list-style: none;
+}