diff --git a/core/themes/bartik/templates/block--search-form-block.html.twig b/core/themes/bartik/templates/block--search-form-block.html.twig
index 3c262d3..b2af1ed 100644
--- a/core/themes/bartik/templates/block--search-form-block.html.twig
+++ b/core/themes/bartik/templates/block--search-form-block.html.twig
@@ -1,4 +1,4 @@
-{% extends "@classy/search/block--search-form-block.html.twig" %}
+{% extends "@classy/block/block--search-form-block.html.twig" %}
{#
/**
* @file
diff --git a/core/themes/bartik/templates/block--system-menu-block.html.twig b/core/themes/bartik/templates/block--system-menu-block.html.twig
index 7934001..97f2ca4 100644
--- a/core/themes/bartik/templates/block--system-menu-block.html.twig
+++ b/core/themes/bartik/templates/block--system-menu-block.html.twig
@@ -1,4 +1,4 @@
-{% extends "@classy/system/block--system-menu-block.html.twig" %}
+{% extends "@classy/block/block--system-menu-block.html.twig" %}
{#
/**
* @file
diff --git a/core/themes/classy/templates/block/block-list.html.twig b/core/themes/classy/templates/admin/block-list.html.twig
similarity index 100%
rename from core/themes/classy/templates/block/block-list.html.twig
rename to core/themes/classy/templates/admin/block-list.html.twig
diff --git a/core/themes/classy/templates/file/file-managed-file.html.twig b/core/themes/classy/templates/admin/file-managed-file.html.twig
similarity index 100%
rename from core/themes/classy/templates/file/file-managed-file.html.twig
rename to core/themes/classy/templates/admin/file-managed-file.html.twig
diff --git a/core/themes/classy/templates/file/file-upload-help.html.twig b/core/themes/classy/templates/admin/file-upload-help.html.twig
similarity index 100%
rename from core/themes/classy/templates/file/file-upload-help.html.twig
rename to core/themes/classy/templates/admin/file-upload-help.html.twig
diff --git a/core/themes/classy/templates/file/file-widget-multiple.html.twig b/core/themes/classy/templates/admin/file-widget-multiple.html.twig
similarity index 100%
rename from core/themes/classy/templates/file/file-widget-multiple.html.twig
rename to core/themes/classy/templates/admin/file-widget-multiple.html.twig
diff --git a/core/themes/classy/templates/file/file-widget.html.twig b/core/themes/classy/templates/admin/file-widget.html.twig
similarity index 100%
rename from core/themes/classy/templates/file/file-widget.html.twig
rename to core/themes/classy/templates/admin/file-widget.html.twig
diff --git a/core/themes/classy/templates/filter/filter-caption.html.twig b/core/themes/classy/templates/admin/filter-caption.html.twig
similarity index 100%
rename from core/themes/classy/templates/filter/filter-caption.html.twig
rename to core/themes/classy/templates/admin/filter-caption.html.twig
diff --git a/core/themes/classy/templates/filter/filter-guidelines.html.twig b/core/themes/classy/templates/admin/filter-guidelines.html.twig
similarity index 100%
rename from core/themes/classy/templates/filter/filter-guidelines.html.twig
rename to core/themes/classy/templates/admin/filter-guidelines.html.twig
diff --git a/core/themes/classy/templates/filter/filter-tips.html.twig b/core/themes/classy/templates/admin/filter-tips.html.twig
similarity index 100%
rename from core/themes/classy/templates/filter/filter-tips.html.twig
rename to core/themes/classy/templates/admin/filter-tips.html.twig
diff --git a/core/themes/classy/templates/image/image-anchor.html.twig b/core/themes/classy/templates/admin/image-anchor.html.twig
similarity index 100%
rename from core/themes/classy/templates/image/image-anchor.html.twig
rename to core/themes/classy/templates/admin/image-anchor.html.twig
diff --git a/core/themes/classy/templates/image/image-crop-summary.html.twig b/core/themes/classy/templates/admin/image-crop-summary.html.twig
similarity index 100%
rename from core/themes/classy/templates/image/image-crop-summary.html.twig
rename to core/themes/classy/templates/admin/image-crop-summary.html.twig
diff --git a/core/themes/classy/templates/image/image-resize-summary.html.twig b/core/themes/classy/templates/admin/image-resize-summary.html.twig
similarity index 100%
rename from core/themes/classy/templates/image/image-resize-summary.html.twig
rename to core/themes/classy/templates/admin/image-resize-summary.html.twig
diff --git a/core/themes/classy/templates/image/image-rotate-summary.html.twig b/core/themes/classy/templates/admin/image-rotate-summary.html.twig
similarity index 100%
rename from core/themes/classy/templates/image/image-rotate-summary.html.twig
rename to core/themes/classy/templates/admin/image-rotate-summary.html.twig
diff --git a/core/themes/classy/templates/image/image-scale-summary.html.twig b/core/themes/classy/templates/admin/image-scale-summary.html.twig
similarity index 100%
rename from core/themes/classy/templates/image/image-scale-summary.html.twig
rename to core/themes/classy/templates/admin/image-scale-summary.html.twig
diff --git a/core/themes/classy/templates/image/image-style-preview.html.twig b/core/themes/classy/templates/admin/image-style-preview.html.twig
similarity index 100%
rename from core/themes/classy/templates/image/image-style-preview.html.twig
rename to core/themes/classy/templates/admin/image-style-preview.html.twig
diff --git a/core/themes/classy/templates/image/image-widget.html.twig b/core/themes/classy/templates/admin/image-widget.html.twig
similarity index 100%
rename from core/themes/classy/templates/image/image-widget.html.twig
rename to core/themes/classy/templates/admin/image-widget.html.twig
diff --git a/core/themes/classy/templates/system/indentation.html.twig b/core/themes/classy/templates/admin/indentation.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/indentation.html.twig
rename to core/themes/classy/templates/admin/indentation.html.twig
diff --git a/core/themes/classy/templates/system/maintenance-page.html.twig b/core/themes/classy/templates/admin/maintenance-page.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/maintenance-page.html.twig
rename to core/themes/classy/templates/admin/maintenance-page.html.twig
diff --git a/core/themes/classy/templates/node/node-add-list.html.twig b/core/themes/classy/templates/admin/node-add-list.html.twig
similarity index 100%
rename from core/themes/classy/templates/node/node-add-list.html.twig
rename to core/themes/classy/templates/admin/node-add-list.html.twig
diff --git a/core/themes/classy/templates/node/node-edit-form.html.twig b/core/themes/classy/templates/admin/node-edit-form.html.twig
similarity index 100%
rename from core/themes/classy/templates/node/node-edit-form.html.twig
rename to core/themes/classy/templates/admin/node-edit-form.html.twig
diff --git a/core/themes/classy/templates/filter/text-format-wrapper.html.twig b/core/themes/classy/templates/admin/text-format-wrapper.html.twig
similarity index 100%
rename from core/themes/classy/templates/filter/text-format-wrapper.html.twig
rename to core/themes/classy/templates/admin/text-format-wrapper.html.twig
diff --git a/core/themes/classy/templates/aggregator/aggregator-block-item.html.twig b/core/themes/classy/templates/block/aggregator-block-item.html.twig
similarity index 100%
rename from core/themes/classy/templates/aggregator/aggregator-block-item.html.twig
rename to core/themes/classy/templates/block/aggregator-block-item.html.twig
diff --git a/core/themes/classy/templates/search/block--search-form-block.html.twig b/core/themes/classy/templates/block/block--search-form-block.html.twig
similarity index 100%
rename from core/themes/classy/templates/search/block--search-form-block.html.twig
rename to core/themes/classy/templates/block/block--search-form-block.html.twig
diff --git a/core/themes/classy/templates/system/block--system-branding-block.html.twig b/core/themes/classy/templates/block/block--system-branding-block.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/block--system-branding-block.html.twig
rename to core/themes/classy/templates/block/block--system-branding-block.html.twig
diff --git a/core/themes/classy/templates/system/block--system-menu-block.html.twig b/core/themes/classy/templates/block/block--system-menu-block.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/block--system-menu-block.html.twig
rename to core/themes/classy/templates/block/block--system-menu-block.html.twig
diff --git a/core/themes/classy/templates/aggregator/aggregator-feed.html.twig b/core/themes/classy/templates/component/aggregator-feed.html.twig
similarity index 100%
rename from core/themes/classy/templates/aggregator/aggregator-feed.html.twig
rename to core/themes/classy/templates/component/aggregator-feed.html.twig
diff --git a/core/themes/classy/templates/aggregator/aggregator-item.html.twig b/core/themes/classy/templates/component/aggregator-item.html.twig
similarity index 100%
rename from core/themes/classy/templates/aggregator/aggregator-item.html.twig
rename to core/themes/classy/templates/component/aggregator-item.html.twig
diff --git a/core/themes/classy/templates/comment/comment.html.twig b/core/themes/classy/templates/component/comment.html.twig
similarity index 100%
rename from core/themes/classy/templates/comment/comment.html.twig
rename to core/themes/classy/templates/component/comment.html.twig
diff --git a/core/themes/classy/templates/forum/forum-list.html.twig b/core/themes/classy/templates/component/forum-list.html.twig
similarity index 100%
rename from core/themes/classy/templates/forum/forum-list.html.twig
rename to core/themes/classy/templates/component/forum-list.html.twig
diff --git a/core/themes/classy/templates/forum/forums.html.twig b/core/themes/classy/templates/component/forums.html.twig
similarity index 100%
rename from core/themes/classy/templates/forum/forums.html.twig
rename to core/themes/classy/templates/component/forums.html.twig
diff --git a/core/themes/classy/templates/system/mark.html.twig b/core/themes/classy/templates/component/mark.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/mark.html.twig
rename to core/themes/classy/templates/component/mark.html.twig
diff --git a/core/themes/classy/templates/node/node.html.twig b/core/themes/classy/templates/component/node.html.twig
similarity index 100%
rename from core/themes/classy/templates/node/node.html.twig
rename to core/themes/classy/templates/component/node.html.twig
diff --git a/core/themes/classy/templates/search/search-result.html.twig b/core/themes/classy/templates/component/search-result.html.twig
similarity index 97%
rename from core/themes/classy/templates/search/search-result.html.twig
rename to core/themes/classy/templates/component/search-result.html.twig
index 732489b..2797520 100644
--- a/core/themes/classy/templates/search/search-result.html.twig
+++ b/core/themes/classy/templates/component/search-result.html.twig
@@ -59,15 +59,15 @@
*/
#}
{{ title_prefix }}
-
+
{{ title_suffix }}
-
+
{% if snippet %}
{{ snippet }}
{% endif %}
{% if info %}
{{ info }}
{% endif %}
-
+
diff --git a/core/themes/classy/templates/taxonomy/taxonomy-term.html.twig b/core/themes/classy/templates/component/taxonomy-term.html.twig
similarity index 90%
rename from core/themes/classy/templates/taxonomy/taxonomy-term.html.twig
rename to core/themes/classy/templates/component/taxonomy-term.html.twig
index 2fbffa5..ad7e379 100644
--- a/core/themes/classy/templates/taxonomy/taxonomy-term.html.twig
+++ b/core/themes/classy/templates/component/taxonomy-term.html.twig
@@ -31,13 +31,13 @@
'vocabulary-' ~ term.bundle|clean_class,
]
%}
-
+
{{ title_prefix }}
{% if not page %}
{% endif %}
{{ title_suffix }}
-
+
diff --git a/core/themes/classy/templates/comment/field--comment.html.twig b/core/themes/classy/templates/field/field--comment.html.twig
similarity index 100%
rename from core/themes/classy/templates/comment/field--comment.html.twig
rename to core/themes/classy/templates/field/field--comment.html.twig
diff --git a/core/themes/classy/templates/node/field--node--created.html.twig b/core/themes/classy/templates/field/field--node--created.html.twig
similarity index 100%
rename from core/themes/classy/templates/node/field--node--created.html.twig
rename to core/themes/classy/templates/field/field--node--created.html.twig
diff --git a/core/themes/classy/templates/node/field--node--title.html.twig b/core/themes/classy/templates/field/field--node--title.html.twig
similarity index 100%
rename from core/themes/classy/templates/node/field--node--title.html.twig
rename to core/themes/classy/templates/field/field--node--title.html.twig
diff --git a/core/themes/classy/templates/node/field--node--uid.html.twig b/core/themes/classy/templates/field/field--node--uid.html.twig
similarity index 100%
rename from core/themes/classy/templates/node/field--node--uid.html.twig
rename to core/themes/classy/templates/field/field--node--uid.html.twig
diff --git a/core/themes/classy/templates/system/field.html.twig b/core/themes/classy/templates/field/field.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/field.html.twig
rename to core/themes/classy/templates/field/field.html.twig
diff --git a/core/themes/classy/templates/file/file-link.html.twig b/core/themes/classy/templates/field/file-link.html.twig
similarity index 100%
rename from core/themes/classy/templates/file/file-link.html.twig
rename to core/themes/classy/templates/field/file-link.html.twig
diff --git a/core/themes/classy/templates/image/image-formatter.html.twig b/core/themes/classy/templates/field/image-formatter.html.twig
similarity index 100%
rename from core/themes/classy/templates/image/image-formatter.html.twig
rename to core/themes/classy/templates/field/image-formatter.html.twig
diff --git a/core/themes/classy/templates/image/image-style.html.twig b/core/themes/classy/templates/field/image-style.html.twig
similarity index 100%
rename from core/themes/classy/templates/image/image-style.html.twig
rename to core/themes/classy/templates/field/image-style.html.twig
diff --git a/core/themes/classy/templates/system/image.html.twig b/core/themes/classy/templates/field/image.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/image.html.twig
rename to core/themes/classy/templates/field/image.html.twig
diff --git a/core/themes/classy/templates/link/link-formatter-link-separate.html.twig b/core/themes/classy/templates/field/link-formatter-link-separate.html.twig
similarity index 100%
rename from core/themes/classy/templates/link/link-formatter-link-separate.html.twig
rename to core/themes/classy/templates/field/link-formatter-link-separate.html.twig
diff --git a/core/themes/classy/templates/system/time.html.twig b/core/themes/classy/templates/field/time.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/time.html.twig
rename to core/themes/classy/templates/field/time.html.twig
diff --git a/core/themes/classy/templates/system/checkboxes.html.twig b/core/themes/classy/templates/form/checkboxes.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/checkboxes.html.twig
rename to core/themes/classy/templates/form/checkboxes.html.twig
diff --git a/core/themes/classy/templates/system/confirm-form.html.twig b/core/themes/classy/templates/form/confirm-form.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/confirm-form.html.twig
rename to core/themes/classy/templates/form/confirm-form.html.twig
diff --git a/core/themes/classy/templates/system/container.html.twig b/core/themes/classy/templates/form/container.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/container.html.twig
rename to core/themes/classy/templates/form/container.html.twig
diff --git a/core/themes/classy/templates/system/datetime-form.html.twig b/core/themes/classy/templates/form/datetime-form.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/datetime-form.html.twig
rename to core/themes/classy/templates/form/datetime-form.html.twig
diff --git a/core/themes/classy/templates/system/datetime-wrapper.html.twig b/core/themes/classy/templates/form/datetime-wrapper.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/datetime-wrapper.html.twig
rename to core/themes/classy/templates/form/datetime-wrapper.html.twig
diff --git a/core/themes/classy/templates/system/details.html.twig b/core/themes/classy/templates/form/details.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/details.html.twig
rename to core/themes/classy/templates/form/details.html.twig
diff --git a/core/themes/classy/templates/system/dropbutton-wrapper.html.twig b/core/themes/classy/templates/form/dropbutton-wrapper.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/dropbutton-wrapper.html.twig
rename to core/themes/classy/templates/form/dropbutton-wrapper.html.twig
diff --git a/core/themes/classy/templates/system/field-multiple-value-form.html.twig b/core/themes/classy/templates/form/field-multiple-value-form.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/field-multiple-value-form.html.twig
rename to core/themes/classy/templates/form/field-multiple-value-form.html.twig
diff --git a/core/themes/classy/templates/system/fieldset.html.twig b/core/themes/classy/templates/form/fieldset.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/fieldset.html.twig
rename to core/themes/classy/templates/form/fieldset.html.twig
diff --git a/core/themes/classy/templates/system/form-element-label.html.twig b/core/themes/classy/templates/form/form-element-label.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/form-element-label.html.twig
rename to core/themes/classy/templates/form/form-element-label.html.twig
diff --git a/core/themes/classy/templates/system/form-element.html.twig b/core/themes/classy/templates/form/form-element.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/form-element.html.twig
rename to core/themes/classy/templates/form/form-element.html.twig
diff --git a/core/themes/classy/templates/system/form.html.twig b/core/themes/classy/templates/form/form.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/form.html.twig
rename to core/themes/classy/templates/form/form.html.twig
diff --git a/core/themes/classy/templates/system/input.html.twig b/core/themes/classy/templates/form/input.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/input.html.twig
rename to core/themes/classy/templates/form/input.html.twig
diff --git a/core/themes/classy/templates/system/radios.html.twig b/core/themes/classy/templates/form/radios.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/radios.html.twig
rename to core/themes/classy/templates/form/radios.html.twig
diff --git a/core/themes/classy/templates/system/select.html.twig b/core/themes/classy/templates/form/select.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/select.html.twig
rename to core/themes/classy/templates/form/select.html.twig
diff --git a/core/themes/classy/templates/system/textarea.html.twig b/core/themes/classy/templates/form/textarea.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/textarea.html.twig
rename to core/themes/classy/templates/form/textarea.html.twig
diff --git a/core/themes/classy/templates/system/html.html.twig b/core/themes/classy/templates/layout/html.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/html.html.twig
rename to core/themes/classy/templates/layout/html.html.twig
diff --git a/core/themes/classy/templates/system/page.html.twig b/core/themes/classy/templates/layout/page.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/page.html.twig
rename to core/themes/classy/templates/layout/page.html.twig
diff --git a/core/themes/classy/templates/system/region.html.twig b/core/themes/classy/templates/layout/region.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/region.html.twig
rename to core/themes/classy/templates/layout/region.html.twig
diff --git a/core/themes/classy/templates/book/book-export-html.html.twig b/core/themes/classy/templates/misc/book-export-html.html.twig
similarity index 100%
rename from core/themes/classy/templates/book/book-export-html.html.twig
rename to core/themes/classy/templates/misc/book-export-html.html.twig
diff --git a/core/themes/classy/templates/book/book-node-export-html.html.twig b/core/themes/classy/templates/misc/book-node-export-html.html.twig
similarity index 100%
rename from core/themes/classy/templates/book/book-node-export-html.html.twig
rename to core/themes/classy/templates/misc/book-node-export-html.html.twig
diff --git a/core/themes/classy/templates/system/feed-icon.html.twig b/core/themes/classy/templates/misc/feed-icon.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/feed-icon.html.twig
rename to core/themes/classy/templates/misc/feed-icon.html.twig
diff --git a/core/themes/classy/templates/forum/forum-icon.html.twig b/core/themes/classy/templates/misc/forum-icon.html.twig
similarity index 100%
rename from core/themes/classy/templates/forum/forum-icon.html.twig
rename to core/themes/classy/templates/misc/forum-icon.html.twig
diff --git a/core/themes/classy/templates/system/item-list.html.twig b/core/themes/classy/templates/misc/item-list.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/item-list.html.twig
rename to core/themes/classy/templates/misc/item-list.html.twig
diff --git a/core/themes/classy/templates/system/progress-bar.html.twig b/core/themes/classy/templates/misc/progress-bar.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/progress-bar.html.twig
rename to core/themes/classy/templates/misc/progress-bar.html.twig
diff --git a/core/themes/classy/templates/rdf/rdf-metadata.html.twig b/core/themes/classy/templates/misc/rdf-metadata.html.twig
similarity index 100%
rename from core/themes/classy/templates/rdf/rdf-metadata.html.twig
rename to core/themes/classy/templates/misc/rdf-metadata.html.twig
diff --git a/core/themes/classy/templates/system/status-messages.html.twig b/core/themes/classy/templates/misc/status-messages.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/status-messages.html.twig
rename to core/themes/classy/templates/misc/status-messages.html.twig
diff --git a/core/themes/classy/templates/system/table.html.twig b/core/themes/classy/templates/misc/table.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/table.html.twig
rename to core/themes/classy/templates/misc/table.html.twig
diff --git a/core/themes/classy/templates/system/tablesort-indicator.html.twig b/core/themes/classy/templates/misc/tablesort-indicator.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/tablesort-indicator.html.twig
rename to core/themes/classy/templates/misc/tablesort-indicator.html.twig
diff --git a/core/themes/classy/templates/book/book-all-books-block.html.twig b/core/themes/classy/templates/navigation/book-all-books-block.html.twig
similarity index 100%
rename from core/themes/classy/templates/book/book-all-books-block.html.twig
rename to core/themes/classy/templates/navigation/book-all-books-block.html.twig
diff --git a/core/themes/classy/templates/book/book-navigation.html.twig b/core/themes/classy/templates/navigation/book-navigation.html.twig
similarity index 100%
rename from core/themes/classy/templates/book/book-navigation.html.twig
rename to core/themes/classy/templates/navigation/book-navigation.html.twig
diff --git a/core/themes/classy/templates/book/book-tree.html.twig b/core/themes/classy/templates/navigation/book-tree.html.twig
similarity index 100%
rename from core/themes/classy/templates/book/book-tree.html.twig
rename to core/themes/classy/templates/navigation/book-tree.html.twig
diff --git a/core/themes/classy/templates/system/breadcrumb.html.twig b/core/themes/classy/templates/navigation/breadcrumb.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/breadcrumb.html.twig
rename to core/themes/classy/templates/navigation/breadcrumb.html.twig
diff --git a/core/themes/classy/templates/system/links.html.twig b/core/themes/classy/templates/navigation/links.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/links.html.twig
rename to core/themes/classy/templates/navigation/links.html.twig
diff --git a/core/themes/classy/templates/system/menu-local-action.html.twig b/core/themes/classy/templates/navigation/menu-local-action.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/menu-local-action.html.twig
rename to core/themes/classy/templates/navigation/menu-local-action.html.twig
diff --git a/core/themes/classy/templates/system/menu-local-task.html.twig b/core/themes/classy/templates/navigation/menu-local-task.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/menu-local-task.html.twig
rename to core/themes/classy/templates/navigation/menu-local-task.html.twig
diff --git a/core/themes/classy/templates/system/menu-local-tasks.html.twig b/core/themes/classy/templates/navigation/menu-local-tasks.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/menu-local-tasks.html.twig
rename to core/themes/classy/templates/navigation/menu-local-tasks.html.twig
diff --git a/core/themes/classy/templates/system/menu.html.twig b/core/themes/classy/templates/navigation/menu.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/menu.html.twig
rename to core/themes/classy/templates/navigation/menu.html.twig
diff --git a/core/themes/classy/templates/system/pager.html.twig b/core/themes/classy/templates/navigation/pager.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/pager.html.twig
rename to core/themes/classy/templates/navigation/pager.html.twig
diff --git a/core/themes/classy/templates/toolbar/toolbar.html.twig b/core/themes/classy/templates/navigation/toolbar.html.twig
similarity index 100%
rename from core/themes/classy/templates/toolbar/toolbar.html.twig
rename to core/themes/classy/templates/navigation/toolbar.html.twig
diff --git a/core/themes/classy/templates/system/vertical-tabs.html.twig b/core/themes/classy/templates/navigation/vertical-tabs.html.twig
similarity index 100%
rename from core/themes/classy/templates/system/vertical-tabs.html.twig
rename to core/themes/classy/templates/navigation/vertical-tabs.html.twig
diff --git a/core/themes/classy/templates/forum/forum-submitted.html.twig b/core/themes/classy/templates/user/forum-submitted.html.twig
similarity index 100%
rename from core/themes/classy/templates/forum/forum-submitted.html.twig
rename to core/themes/classy/templates/user/forum-submitted.html.twig