diff --git a/core/themes/classy/templates/aggregator-block-item.html.twig b/core/themes/classy/templates/aggregator/aggregator-block-item.html.twig
similarity index 100%
rename from core/themes/classy/templates/aggregator-block-item.html.twig
rename to core/themes/classy/templates/aggregator/aggregator-block-item.html.twig
diff --git a/core/themes/classy/templates/aggregator-feed.html.twig b/core/themes/classy/templates/aggregator/aggregator-feed.html.twig
similarity index 100%
rename from core/themes/classy/templates/aggregator-feed.html.twig
rename to core/themes/classy/templates/aggregator/aggregator-feed.html.twig
diff --git a/core/themes/classy/templates/aggregator-item.html.twig b/core/themes/classy/templates/aggregator/aggregator-item.html.twig
similarity index 100%
rename from core/themes/classy/templates/aggregator-item.html.twig
rename to core/themes/classy/templates/aggregator/aggregator-item.html.twig
diff --git a/core/themes/classy/templates/block-list.html.twig b/core/themes/classy/templates/block/block-list.html.twig
similarity index 100%
rename from core/themes/classy/templates/block-list.html.twig
rename to core/themes/classy/templates/block/block-list.html.twig
diff --git a/core/themes/classy/templates/block.html.twig b/core/themes/classy/templates/block/block.html.twig
similarity index 100%
rename from core/themes/classy/templates/block.html.twig
rename to core/themes/classy/templates/block/block.html.twig
diff --git a/core/themes/classy/templates/book-all-books-block.html.twig b/core/themes/classy/templates/book/book-all-books-block.html.twig
similarity index 100%
rename from core/themes/classy/templates/book-all-books-block.html.twig
rename to core/themes/classy/templates/book/book-all-books-block.html.twig
diff --git a/core/themes/classy/templates/book-export-html.html.twig b/core/themes/classy/templates/book/book-export-html.html.twig
similarity index 100%
rename from core/themes/classy/templates/book-export-html.html.twig
rename to core/themes/classy/templates/book/book-export-html.html.twig
diff --git a/core/themes/classy/templates/book-navigation.html.twig b/core/themes/classy/templates/book/book-navigation.html.twig
similarity index 100%
rename from core/themes/classy/templates/book-navigation.html.twig
rename to core/themes/classy/templates/book/book-navigation.html.twig
diff --git a/core/themes/classy/templates/book-node-export-html.html.twig b/core/themes/classy/templates/book/book-node-export-html.html.twig
similarity index 100%
rename from core/themes/classy/templates/book-node-export-html.html.twig
rename to core/themes/classy/templates/book/book-node-export-html.html.twig
diff --git a/core/themes/classy/templates/book-tree.html.twig b/core/themes/classy/templates/book/book-tree.html.twig
similarity index 100%
rename from core/themes/classy/templates/book-tree.html.twig
rename to core/themes/classy/templates/book/book-tree.html.twig
diff --git a/core/themes/classy/templates/comment.html.twig b/core/themes/classy/templates/comment/comment.html.twig
similarity index 100%
rename from core/themes/classy/templates/comment.html.twig
rename to core/themes/classy/templates/comment/comment.html.twig
diff --git a/core/themes/classy/templates/field--comment.html.twig b/core/themes/classy/templates/comment/field--comment.html.twig
similarity index 100%
rename from core/themes/classy/templates/field--comment.html.twig
rename to core/themes/classy/templates/comment/field--comment.html.twig
diff --git a/core/themes/classy/templates/file-link.html.twig b/core/themes/classy/templates/file/file-link.html.twig
similarity index 100%
rename from core/themes/classy/templates/file-link.html.twig
rename to core/themes/classy/templates/file/file-link.html.twig
diff --git a/core/themes/classy/templates/file-managed-file.html.twig b/core/themes/classy/templates/file/file-managed-file.html.twig
similarity index 100%
rename from core/themes/classy/templates/file-managed-file.html.twig
rename to core/themes/classy/templates/file/file-managed-file.html.twig
diff --git a/core/themes/classy/templates/file-upload-help.html.twig b/core/themes/classy/templates/file/file-upload-help.html.twig
similarity index 100%
rename from core/themes/classy/templates/file-upload-help.html.twig
rename to core/themes/classy/templates/file/file-upload-help.html.twig
diff --git a/core/themes/classy/templates/file-widget-multiple.html.twig b/core/themes/classy/templates/file/file-widget-multiple.html.twig
similarity index 100%
rename from core/themes/classy/templates/file-widget-multiple.html.twig
rename to core/themes/classy/templates/file/file-widget-multiple.html.twig
diff --git a/core/themes/classy/templates/file-widget.html.twig b/core/themes/classy/templates/file/file-widget.html.twig
similarity index 100%
rename from core/themes/classy/templates/file-widget.html.twig
rename to core/themes/classy/templates/file/file-widget.html.twig
diff --git a/core/themes/classy/templates/filter-caption.html.twig b/core/themes/classy/templates/filter/filter-caption.html.twig
similarity index 100%
rename from core/themes/classy/templates/filter-caption.html.twig
rename to core/themes/classy/templates/filter/filter-caption.html.twig
diff --git a/core/themes/classy/templates/filter-guidelines.html.twig b/core/themes/classy/templates/filter/filter-guidelines.html.twig
similarity index 100%
rename from core/themes/classy/templates/filter-guidelines.html.twig
rename to core/themes/classy/templates/filter/filter-guidelines.html.twig
diff --git a/core/themes/classy/templates/filter-tips.html.twig b/core/themes/classy/templates/filter/filter-tips.html.twig
similarity index 100%
rename from core/themes/classy/templates/filter-tips.html.twig
rename to core/themes/classy/templates/filter/filter-tips.html.twig
diff --git a/core/themes/classy/templates/text-format-wrapper.html.twig b/core/themes/classy/templates/filter/text-format-wrapper.html.twig
similarity index 100%
rename from core/themes/classy/templates/text-format-wrapper.html.twig
rename to core/themes/classy/templates/filter/text-format-wrapper.html.twig
diff --git a/core/themes/classy/templates/forum-icon.html.twig b/core/themes/classy/templates/forum/forum-icon.html.twig
similarity index 100%
rename from core/themes/classy/templates/forum-icon.html.twig
rename to core/themes/classy/templates/forum/forum-icon.html.twig
diff --git a/core/themes/classy/templates/forum-list.html.twig b/core/themes/classy/templates/forum/forum-list.html.twig
similarity index 100%
rename from core/themes/classy/templates/forum-list.html.twig
rename to core/themes/classy/templates/forum/forum-list.html.twig
diff --git a/core/themes/classy/templates/forum-submitted.html.twig b/core/themes/classy/templates/forum/forum-submitted.html.twig
similarity index 100%
rename from core/themes/classy/templates/forum-submitted.html.twig
rename to core/themes/classy/templates/forum/forum-submitted.html.twig
diff --git a/core/themes/classy/templates/forums.html.twig b/core/themes/classy/templates/forum/forums.html.twig
similarity index 100%
rename from core/themes/classy/templates/forums.html.twig
rename to core/themes/classy/templates/forum/forums.html.twig
diff --git a/core/themes/classy/templates/image-anchor.html.twig b/core/themes/classy/templates/image/image-anchor.html.twig
similarity index 100%
rename from core/themes/classy/templates/image-anchor.html.twig
rename to core/themes/classy/templates/image/image-anchor.html.twig
diff --git a/core/themes/classy/templates/image-crop-summary.html.twig b/core/themes/classy/templates/image/image-crop-summary.html.twig
similarity index 100%
rename from core/themes/classy/templates/image-crop-summary.html.twig
rename to core/themes/classy/templates/image/image-crop-summary.html.twig
diff --git a/core/themes/classy/templates/image-formatter.html.twig b/core/themes/classy/templates/image/image-formatter.html.twig
similarity index 100%
rename from core/themes/classy/templates/image-formatter.html.twig
rename to core/themes/classy/templates/image/image-formatter.html.twig
diff --git a/core/themes/classy/templates/image-resize-summary.html.twig b/core/themes/classy/templates/image/image-resize-summary.html.twig
similarity index 100%
rename from core/themes/classy/templates/image-resize-summary.html.twig
rename to core/themes/classy/templates/image/image-resize-summary.html.twig
diff --git a/core/themes/classy/templates/image-rotate-summary.html.twig b/core/themes/classy/templates/image/image-rotate-summary.html.twig
similarity index 100%
rename from core/themes/classy/templates/image-rotate-summary.html.twig
rename to core/themes/classy/templates/image/image-rotate-summary.html.twig
diff --git a/core/themes/classy/templates/image-scale-summary.html.twig b/core/themes/classy/templates/image/image-scale-summary.html.twig
similarity index 100%
rename from core/themes/classy/templates/image-scale-summary.html.twig
rename to core/themes/classy/templates/image/image-scale-summary.html.twig
diff --git a/core/themes/classy/templates/image-style-preview.html.twig b/core/themes/classy/templates/image/image-style-preview.html.twig
similarity index 100%
rename from core/themes/classy/templates/image-style-preview.html.twig
rename to core/themes/classy/templates/image/image-style-preview.html.twig
diff --git a/core/themes/classy/templates/image-style.html.twig b/core/themes/classy/templates/image/image-style.html.twig
similarity index 100%
rename from core/themes/classy/templates/image-style.html.twig
rename to core/themes/classy/templates/image/image-style.html.twig
diff --git a/core/themes/classy/templates/image-widget.html.twig b/core/themes/classy/templates/image/image-widget.html.twig
similarity index 100%
rename from core/themes/classy/templates/image-widget.html.twig
rename to core/themes/classy/templates/image/image-widget.html.twig
diff --git a/core/themes/classy/templates/link-formatter-link-separate.html.twig b/core/themes/classy/templates/link/link-formatter-link-separate.html.twig
similarity index 100%
rename from core/themes/classy/templates/link-formatter-link-separate.html.twig
rename to core/themes/classy/templates/link/link-formatter-link-separate.html.twig
diff --git a/core/themes/classy/templates/field--node--created.html.twig b/core/themes/classy/templates/node/field--node--created.html.twig
similarity index 100%
rename from core/themes/classy/templates/field--node--created.html.twig
rename to core/themes/classy/templates/node/field--node--created.html.twig
diff --git a/core/themes/classy/templates/field--node--title.html.twig b/core/themes/classy/templates/node/field--node--title.html.twig
similarity index 100%
rename from core/themes/classy/templates/field--node--title.html.twig
rename to core/themes/classy/templates/node/field--node--title.html.twig
diff --git a/core/themes/classy/templates/field--node--uid.html.twig b/core/themes/classy/templates/node/field--node--uid.html.twig
similarity index 100%
rename from core/themes/classy/templates/field--node--uid.html.twig
rename to core/themes/classy/templates/node/field--node--uid.html.twig
diff --git a/core/themes/classy/templates/node-add-list.html.twig b/core/themes/classy/templates/node/node-add-list.html.twig
similarity index 100%
rename from core/themes/classy/templates/node-add-list.html.twig
rename to core/themes/classy/templates/node/node-add-list.html.twig
diff --git a/core/themes/classy/templates/node-edit-form.html.twig b/core/themes/classy/templates/node/node-edit-form.html.twig
similarity index 100%
rename from core/themes/classy/templates/node-edit-form.html.twig
rename to core/themes/classy/templates/node/node-edit-form.html.twig
diff --git a/core/themes/classy/templates/node.html.twig b/core/themes/classy/templates/node/node.html.twig
similarity index 100%
rename from core/themes/classy/templates/node.html.twig
rename to core/themes/classy/templates/node/node.html.twig
diff --git a/core/themes/classy/templates/rdf-metadata.html.twig b/core/themes/classy/templates/rdf/rdf-metadata.html.twig
similarity index 100%
rename from core/themes/classy/templates/rdf-metadata.html.twig
rename to core/themes/classy/templates/rdf/rdf-metadata.html.twig
diff --git a/core/themes/classy/templates/block--search-form-block.html.twig b/core/themes/classy/templates/search/block--search-form-block.html.twig
similarity index 100%
rename from core/themes/classy/templates/block--search-form-block.html.twig
rename to core/themes/classy/templates/search/block--search-form-block.html.twig
diff --git a/core/themes/classy/templates/search-result.html.twig b/core/themes/classy/templates/search/search-result.html.twig
similarity index 100%
rename from core/themes/classy/templates/search-result.html.twig
rename to core/themes/classy/templates/search/search-result.html.twig
diff --git a/core/modules/system/templates/block--system-branding-block.html.twig b/core/themes/classy/templates/system/block--system-branding-block.html.twig
similarity index 100%
copy from core/modules/system/templates/block--system-branding-block.html.twig
copy to core/themes/classy/templates/system/block--system-branding-block.html.twig
diff --git a/core/modules/system/templates/block--system-menu-block.html.twig b/core/themes/classy/templates/system/block--system-menu-block.html.twig
similarity index 100%
copy from core/modules/system/templates/block--system-menu-block.html.twig
copy to core/themes/classy/templates/system/block--system-menu-block.html.twig
diff --git a/core/modules/system/templates/breadcrumb.html.twig b/core/themes/classy/templates/system/breadcrumb.html.twig
similarity index 100%
copy from core/modules/system/templates/breadcrumb.html.twig
copy to core/themes/classy/templates/system/breadcrumb.html.twig
diff --git a/core/modules/system/templates/checkboxes.html.twig b/core/themes/classy/templates/system/checkboxes.html.twig
similarity index 100%
copy from core/modules/system/templates/checkboxes.html.twig
copy to core/themes/classy/templates/system/checkboxes.html.twig
diff --git a/core/modules/system/templates/confirm-form.html.twig b/core/themes/classy/templates/system/confirm-form.html.twig
similarity index 100%
copy from core/modules/system/templates/confirm-form.html.twig
copy to core/themes/classy/templates/system/confirm-form.html.twig
diff --git a/core/modules/system/templates/container.html.twig b/core/themes/classy/templates/system/container.html.twig
similarity index 100%
copy from core/modules/system/templates/container.html.twig
copy to core/themes/classy/templates/system/container.html.twig
diff --git a/core/modules/system/templates/datetime-form.html.twig b/core/themes/classy/templates/system/datetime-form.html.twig
similarity index 100%
copy from core/modules/system/templates/datetime-form.html.twig
copy to core/themes/classy/templates/system/datetime-form.html.twig
diff --git a/core/modules/system/templates/datetime-wrapper.html.twig b/core/themes/classy/templates/system/datetime-wrapper.html.twig
similarity index 100%
copy from core/modules/system/templates/datetime-wrapper.html.twig
copy to core/themes/classy/templates/system/datetime-wrapper.html.twig
diff --git a/core/modules/system/templates/details.html.twig b/core/themes/classy/templates/system/details.html.twig
similarity index 100%
copy from core/modules/system/templates/details.html.twig
copy to core/themes/classy/templates/system/details.html.twig
diff --git a/core/modules/system/templates/dropbutton-wrapper.html.twig b/core/themes/classy/templates/system/dropbutton-wrapper.html.twig
similarity index 100%
copy from core/modules/system/templates/dropbutton-wrapper.html.twig
copy to core/themes/classy/templates/system/dropbutton-wrapper.html.twig
diff --git a/core/modules/system/templates/feed-icon.html.twig b/core/themes/classy/templates/system/feed-icon.html.twig
similarity index 100%
copy from core/modules/system/templates/feed-icon.html.twig
copy to core/themes/classy/templates/system/feed-icon.html.twig
diff --git a/core/modules/system/templates/field-multiple-value-form.html.twig b/core/themes/classy/templates/system/field-multiple-value-form.html.twig
similarity index 100%
copy from core/modules/system/templates/field-multiple-value-form.html.twig
copy to core/themes/classy/templates/system/field-multiple-value-form.html.twig
diff --git a/core/modules/system/templates/field.html.twig b/core/themes/classy/templates/system/field.html.twig
similarity index 100%
copy from core/modules/system/templates/field.html.twig
copy to core/themes/classy/templates/system/field.html.twig
diff --git a/core/modules/system/templates/fieldset.html.twig b/core/themes/classy/templates/system/fieldset.html.twig
similarity index 100%
copy from core/modules/system/templates/fieldset.html.twig
copy to core/themes/classy/templates/system/fieldset.html.twig
diff --git a/core/modules/system/templates/form-element-label.html.twig b/core/themes/classy/templates/system/form-element-label.html.twig
similarity index 100%
copy from core/modules/system/templates/form-element-label.html.twig
copy to core/themes/classy/templates/system/form-element-label.html.twig
diff --git a/core/modules/system/templates/form-element.html.twig b/core/themes/classy/templates/system/form-element.html.twig
similarity index 100%
copy from core/modules/system/templates/form-element.html.twig
copy to core/themes/classy/templates/system/form-element.html.twig
diff --git a/core/modules/system/templates/form.html.twig b/core/themes/classy/templates/system/form.html.twig
similarity index 100%
copy from core/modules/system/templates/form.html.twig
copy to core/themes/classy/templates/system/form.html.twig
diff --git a/core/modules/system/templates/html.html.twig b/core/themes/classy/templates/system/html.html.twig
similarity index 100%
copy from core/modules/system/templates/html.html.twig
copy to core/themes/classy/templates/system/html.html.twig
diff --git a/core/modules/system/templates/image.html.twig b/core/themes/classy/templates/system/image.html.twig
similarity index 100%
copy from core/modules/system/templates/image.html.twig
copy to core/themes/classy/templates/system/image.html.twig
diff --git a/core/modules/system/templates/indentation.html.twig b/core/themes/classy/templates/system/indentation.html.twig
similarity index 100%
copy from core/modules/system/templates/indentation.html.twig
copy to core/themes/classy/templates/system/indentation.html.twig
diff --git a/core/modules/system/templates/input.html.twig b/core/themes/classy/templates/system/input.html.twig
similarity index 100%
copy from core/modules/system/templates/input.html.twig
copy to core/themes/classy/templates/system/input.html.twig
diff --git a/core/modules/system/templates/item-list.html.twig b/core/themes/classy/templates/system/item-list.html.twig
similarity index 100%
copy from core/modules/system/templates/item-list.html.twig
copy to core/themes/classy/templates/system/item-list.html.twig
diff --git a/core/themes/classy/templates/links.html.twig b/core/themes/classy/templates/system/links.html.twig
similarity index 100%
rename from core/themes/classy/templates/links.html.twig
rename to core/themes/classy/templates/system/links.html.twig
diff --git a/core/modules/system/templates/maintenance-page.html.twig b/core/themes/classy/templates/system/maintenance-page.html.twig
similarity index 100%
copy from core/modules/system/templates/maintenance-page.html.twig
copy to core/themes/classy/templates/system/maintenance-page.html.twig
diff --git a/core/modules/system/templates/mark.html.twig b/core/themes/classy/templates/system/mark.html.twig
similarity index 100%
copy from core/modules/system/templates/mark.html.twig
copy to core/themes/classy/templates/system/mark.html.twig
diff --git a/core/modules/system/templates/menu-local-action.html.twig b/core/themes/classy/templates/system/menu-local-action.html.twig
similarity index 100%
copy from core/modules/system/templates/menu-local-action.html.twig
copy to core/themes/classy/templates/system/menu-local-action.html.twig
diff --git a/core/modules/system/templates/menu-local-task.html.twig b/core/themes/classy/templates/system/menu-local-task.html.twig
similarity index 100%
copy from core/modules/system/templates/menu-local-task.html.twig
copy to core/themes/classy/templates/system/menu-local-task.html.twig
diff --git a/core/modules/system/templates/menu-local-tasks.html.twig b/core/themes/classy/templates/system/menu-local-tasks.html.twig
similarity index 100%
copy from core/modules/system/templates/menu-local-tasks.html.twig
copy to core/themes/classy/templates/system/menu-local-tasks.html.twig
diff --git a/core/modules/system/templates/menu.html.twig b/core/themes/classy/templates/system/menu.html.twig
similarity index 100%
copy from core/modules/system/templates/menu.html.twig
copy to core/themes/classy/templates/system/menu.html.twig
diff --git a/core/modules/system/templates/page.html.twig b/core/themes/classy/templates/system/page.html.twig
similarity index 100%
copy from core/modules/system/templates/page.html.twig
copy to core/themes/classy/templates/system/page.html.twig
diff --git a/core/modules/system/templates/pager.html.twig b/core/themes/classy/templates/system/pager.html.twig
similarity index 100%
copy from core/modules/system/templates/pager.html.twig
copy to core/themes/classy/templates/system/pager.html.twig
diff --git a/core/modules/system/templates/progress-bar.html.twig b/core/themes/classy/templates/system/progress-bar.html.twig
similarity index 100%
copy from core/modules/system/templates/progress-bar.html.twig
copy to core/themes/classy/templates/system/progress-bar.html.twig
diff --git a/core/modules/system/templates/radios.html.twig b/core/themes/classy/templates/system/radios.html.twig
similarity index 100%
copy from core/modules/system/templates/radios.html.twig
copy to core/themes/classy/templates/system/radios.html.twig
diff --git a/core/modules/system/templates/region.html.twig b/core/themes/classy/templates/system/region.html.twig
similarity index 100%
copy from core/modules/system/templates/region.html.twig
copy to core/themes/classy/templates/system/region.html.twig
diff --git a/core/modules/system/templates/select.html.twig b/core/themes/classy/templates/system/select.html.twig
similarity index 100%
copy from core/modules/system/templates/select.html.twig
copy to core/themes/classy/templates/system/select.html.twig
diff --git a/core/modules/system/templates/status-messages.html.twig b/core/themes/classy/templates/system/status-messages.html.twig
similarity index 100%
copy from core/modules/system/templates/status-messages.html.twig
copy to core/themes/classy/templates/system/status-messages.html.twig
diff --git a/core/modules/system/templates/table.html.twig b/core/themes/classy/templates/system/table.html.twig
similarity index 100%
copy from core/modules/system/templates/table.html.twig
copy to core/themes/classy/templates/system/table.html.twig
diff --git a/core/modules/system/templates/tablesort-indicator.html.twig b/core/themes/classy/templates/system/tablesort-indicator.html.twig
similarity index 100%
copy from core/modules/system/templates/tablesort-indicator.html.twig
copy to core/themes/classy/templates/system/tablesort-indicator.html.twig
diff --git a/core/modules/system/templates/textarea.html.twig b/core/themes/classy/templates/system/textarea.html.twig
similarity index 100%
copy from core/modules/system/templates/textarea.html.twig
copy to core/themes/classy/templates/system/textarea.html.twig
diff --git a/core/modules/system/templates/time.html.twig b/core/themes/classy/templates/system/time.html.twig
similarity index 100%
copy from core/modules/system/templates/time.html.twig
copy to core/themes/classy/templates/system/time.html.twig
diff --git a/core/modules/system/templates/vertical-tabs.html.twig b/core/themes/classy/templates/system/vertical-tabs.html.twig
similarity index 100%
copy from core/modules/system/templates/vertical-tabs.html.twig
copy to core/themes/classy/templates/system/vertical-tabs.html.twig
diff --git a/core/themes/classy/templates/taxonomy-term.html.twig b/core/themes/classy/templates/taxonomy/taxonomy-term.html.twig
similarity index 100%
rename from core/themes/classy/templates/taxonomy-term.html.twig
rename to core/themes/classy/templates/taxonomy/taxonomy-term.html.twig
diff --git a/core/themes/classy/templates/toolbar.html.twig b/core/themes/classy/templates/toolbar/toolbar.html.twig
similarity index 100%
rename from core/themes/classy/templates/toolbar.html.twig
rename to core/themes/classy/templates/toolbar/toolbar.html.twig
diff --git a/core/themes/classy/templates/user.html.twig b/core/themes/classy/templates/user/user.html.twig
similarity index 100%
rename from core/themes/classy/templates/user.html.twig
rename to core/themes/classy/templates/user/user.html.twig
diff --git a/core/themes/classy/templates/username.html.twig b/core/themes/classy/templates/user/username.html.twig
similarity index 100%
rename from core/themes/classy/templates/username.html.twig
rename to core/themes/classy/templates/user/username.html.twig