diff --git a/core/themes/classy/classy.libraries.yml b/core/themes/classy/classy.libraries.yml
index 7118f86..683b6a6 100644
--- a/core/themes/classy/classy.libraries.yml
+++ b/core/themes/classy/classy.libraries.yml
@@ -8,22 +8,22 @@ book-navigation:
   version: VERSION
   css:
     theme:
-      css/navigation/book.theme.css: {}
+      css/components/book.theme.css: {}
 
 drupal.comment.threaded:
   version: VERSION
   css:
     theme:
-      css/comment/comment.theme.css: {}
+      css/components/comment.theme.css: {}
 
 search.results:
   version: VERSION
   css:
     theme:
-      css/search/search.theme.css: {}
+      css/components/search.theme.css: {}
 
 drupal.file:
   version: VERSION
   css:
     theme:
-      css/field/file.css: {}
+      css/components/file.css: {}
diff --git a/core/themes/classy/css/navigation/book.theme.css b/core/themes/classy/css/components/book.theme.css
similarity index 100%
rename from core/themes/classy/css/navigation/book.theme.css
rename to core/themes/classy/css/components/book.theme.css
diff --git a/core/themes/classy/css/comment/comment.theme.css b/core/themes/classy/css/components/comment.theme.css
similarity index 100%
rename from core/themes/classy/css/comment/comment.theme.css
rename to core/themes/classy/css/components/comment.theme.css
diff --git a/core/themes/classy/css/field/file.css b/core/themes/classy/css/components/file.css
similarity index 100%
rename from core/themes/classy/css/field/file.css
rename to core/themes/classy/css/components/file.css
diff --git a/core/themes/classy/css/search/search.theme.css b/core/themes/classy/css/components/search.theme.css
similarity index 100%
rename from core/themes/classy/css/search/search.theme.css
rename to core/themes/classy/css/components/search.theme.css
diff --git a/core/themes/classy/css/form/button.css b/core/themes/classy/css/form/button.css
deleted file mode 100644
index af6a753..0000000
--- a/core/themes/classy/css/form/button.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @file
- * Visual styles for buttons.
- */
-
-.button,
-.image-button {
-  margin-left: 1em;
-  margin-right: 1em;
-}
-.button:first-child,
-.image-button:first-child {
-  margin-left: 0;
-  margin-right: 0;
-}
diff --git a/core/themes/classy/css/navigation/action-links.css b/core/themes/classy/css/navigation/action-links.css
deleted file mode 100644
index 8ba7e60..0000000
--- a/core/themes/classy/css/navigation/action-links.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @file
- * Styles for link buttons and action links.
- */
-
-.action-links {
-  list-style: none;
-  padding: 0;
-  margin: 1em 0;
-}
-[dir="rtl"] .action-links {
-  /* This is required to win over specificity of [dir="rtl"] ul */
-  margin-right: 0;
-}
-.action-links li {
-  display: inline-block;
-  margin: 0 0.3em;
-}
-.action-links li:first-child {
-  margin-left: 0; /* LTR */
-}
-[dir="rtl"] .action-links li:first-child {
-  margin-left: 0.3em;
-  margin-right: 0;
-}
-.button-action {
-  display: inline-block;
-  line-height: 160%;
-  padding: 0.2em 0.5em 0.3em;
-  text-decoration: none;
-}
-.button-action:before {
-  content: '+';
-  font-weight: 900;
-  margin-left: -0.1em; /* LTR */
-  padding-right: 0.2em; /* LTR */
-}
-[dir="rtl"] .button-action:before {
-  margin-left: 0;
-  margin-right: -0.1em;
-  padding-left: 0.2em;
-  padding-right: 0;
-}
diff --git a/core/themes/classy/css/navigation/breadcrumb.css b/core/themes/classy/css/navigation/breadcrumb.css
deleted file mode 100644
index 465593e..0000000
--- a/core/themes/classy/css/navigation/breadcrumb.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @file
- * Styles for breadcrumbs.
- */
-
-.breadcrumb {
-  padding-bottom: 0.5em;
-}
-.breadcrumb ol {
-  margin: 0;
-  padding: 0;
-}
-[dir="rtl"] .breadcrumb ol {
-  /* This is required to win over specificity of [dir="rtl"] ol */
-  margin-right: 0;
-}
-.breadcrumb li {
-  display: inline;
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-}
-/* IE8 does not support :not() and :last-child. */
-.breadcrumb li:before {
-  content: ' \BB ';
-}
-.breadcrumb li:first-child:before {
-  content: none;
-}