diff --git a/core/modules/views/lib/Drupal/views/Plugin/Type/PluginManager.php b/core/modules/views/lib/Drupal/views/Plugin/Type/PluginManager.php
index f5f6f6e..9a163a2 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Type/PluginManager.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Type/PluginManager.php
@@ -37,8 +37,8 @@ public function processDefinition(&$definition, $plugin_id) {
     // Setup automatic path/file finding for theme registration.
     if ($definition['module'] == 'views' || isset($definition['theme'])) {
       $definition += array(
-        'theme path' => drupal_get_path('module', 'views') . '/theme',
-        'theme file' => 'theme.inc',
+        'theme path' => drupal_get_path('module', 'views') . '/templates',
+        'theme file' => 'views.theme.inc',
       );
     }
   }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index e8b2327..eff0143 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -1928,7 +1928,7 @@ public function buildOptionsForm(&$form, &$form_state) {
 
         // Field templates aren't registered the normal way...and they're always
         // this one, anyhow.
-        $output .= '<pre>' . check_plain(file_get_contents(drupal_get_path('module', 'views') . '/theme/views-view-field.tpl.php')) . '</pre>';
+        $output .= '<pre>' . check_plain(file_get_contents(drupal_get_path('module', 'views') . '/templates/views-view-field.tpl.php')) . '</pre>';
 
         $form['analysis'] = array(
           '#markup' => '<div class="form-item">' . $output . '</div>',
diff --git a/core/modules/views/theme/views-exposed-form.tpl.php b/core/modules/views/templates/views-exposed-form.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-exposed-form.tpl.php
rename to core/modules/views/templates/views-exposed-form.tpl.php
diff --git a/core/modules/views/theme/views-more.tpl.php b/core/modules/views/templates/views-more.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-more.tpl.php
rename to core/modules/views/templates/views-more.tpl.php
diff --git a/core/modules/views/theme/views-view-field.tpl.php b/core/modules/views/templates/views-view-field.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-field.tpl.php
rename to core/modules/views/templates/views-view-field.tpl.php
diff --git a/core/modules/views/theme/views-view-fields.tpl.php b/core/modules/views/templates/views-view-fields.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-fields.tpl.php
rename to core/modules/views/templates/views-view-fields.tpl.php
diff --git a/core/modules/views/theme/views-view-grid.tpl.php b/core/modules/views/templates/views-view-grid.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-grid.tpl.php
rename to core/modules/views/templates/views-view-grid.tpl.php
diff --git a/core/modules/views/theme/views-view-grouping.tpl.php b/core/modules/views/templates/views-view-grouping.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-grouping.tpl.php
rename to core/modules/views/templates/views-view-grouping.tpl.php
diff --git a/core/modules/views/theme/views-view-list.tpl.php b/core/modules/views/templates/views-view-list.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-list.tpl.php
rename to core/modules/views/templates/views-view-list.tpl.php
diff --git a/core/modules/views/theme/views-view-row-comment.tpl.php b/core/modules/views/templates/views-view-row-comment.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-row-comment.tpl.php
rename to core/modules/views/templates/views-view-row-comment.tpl.php
diff --git a/core/modules/views/theme/views-view-row-rss.tpl.php b/core/modules/views/templates/views-view-row-rss.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-row-rss.tpl.php
rename to core/modules/views/templates/views-view-row-rss.tpl.php
diff --git a/core/modules/views/theme/views-view-rss.tpl.php b/core/modules/views/templates/views-view-rss.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-rss.tpl.php
rename to core/modules/views/templates/views-view-rss.tpl.php
diff --git a/core/modules/views/theme/views-view-summary-unformatted.tpl.php b/core/modules/views/templates/views-view-summary-unformatted.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-summary-unformatted.tpl.php
rename to core/modules/views/templates/views-view-summary-unformatted.tpl.php
diff --git a/core/modules/views/theme/views-view-summary.tpl.php b/core/modules/views/templates/views-view-summary.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-summary.tpl.php
rename to core/modules/views/templates/views-view-summary.tpl.php
diff --git a/core/modules/views/theme/views-view-table.tpl.php b/core/modules/views/templates/views-view-table.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-table.tpl.php
rename to core/modules/views/templates/views-view-table.tpl.php
diff --git a/core/modules/views/theme/views-view-unformatted.tpl.php b/core/modules/views/templates/views-view-unformatted.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view-unformatted.tpl.php
rename to core/modules/views/templates/views-view-unformatted.tpl.php
diff --git a/core/modules/views/theme/views-view.tpl.php b/core/modules/views/templates/views-view.tpl.php
similarity index 100%
rename from core/modules/views/theme/views-view.tpl.php
rename to core/modules/views/templates/views-view.tpl.php
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 6e72762..6969eb1 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -108,13 +108,12 @@ function views_pre_render_view_element($element) {
  * Implement hook_theme(). Register views theming functions.
  */
 function views_theme($existing, $type, $theme, $path) {
-  $path = drupal_get_path('module', 'views');
-  module_load_include('inc', 'views', 'theme/theme');
+  module_load_include('inc', 'views', 'views.theme');
 
   // Some quasi clever array merging here.
   $base = array(
-    'file' => 'theme.inc',
-    'path' => $path . '/theme',
+    'file' => 'views.theme.inc',
+    'path' => drupal_get_path('module', 'views') . '/templates',
   );
 
   // Our extra version of pager from pager.inc
@@ -1990,7 +1989,7 @@ function views_exposed_form_cache($views_name, $display_name, $form_output = NUL
  * Build a list of theme function names for use most everywhere.
  */
 function views_theme_functions($hook, ViewExecutable $view, $display = NULL) {
-  module_load_include('inc', 'views', 'theme/theme');
+  module_load_include('inc', 'views', 'views.theme');
   return _views_theme_functions($hook, $view, $display);
 }
 
diff --git a/core/modules/views/theme/theme.inc b/core/modules/views/views.theme.inc
similarity index 100%
rename from core/modules/views/theme/theme.inc
rename to core/modules/views/views.theme.inc
diff --git a/core/modules/views/views_ui/theme/views-ui-display-tab-bucket.tpl.php b/core/modules/views/views_ui/templates/views-ui-display-tab-bucket.tpl.php
similarity index 100%
rename from core/modules/views/views_ui/theme/views-ui-display-tab-bucket.tpl.php
rename to core/modules/views/views_ui/templates/views-ui-display-tab-bucket.tpl.php
diff --git a/core/modules/views/views_ui/theme/views-ui-display-tab-setting.tpl.php b/core/modules/views/views_ui/templates/views-ui-display-tab-setting.tpl.php
similarity index 100%
rename from core/modules/views/views_ui/theme/views-ui-display-tab-setting.tpl.php
rename to core/modules/views/views_ui/templates/views-ui-display-tab-setting.tpl.php
diff --git a/core/modules/views/views_ui/theme/views-ui-edit-item.tpl.php b/core/modules/views/views_ui/templates/views-ui-edit-item.tpl.php
similarity index 100%
rename from core/modules/views/views_ui/theme/views-ui-edit-item.tpl.php
rename to core/modules/views/views_ui/templates/views-ui-edit-item.tpl.php
diff --git a/core/modules/views/views_ui/theme/views-ui-edit-view.tpl.php b/core/modules/views/views_ui/templates/views-ui-edit-view.tpl.php
similarity index 100%
rename from core/modules/views/views_ui/theme/views-ui-edit-view.tpl.php
rename to core/modules/views/views_ui/templates/views-ui-edit-view.tpl.php
diff --git a/core/modules/views/views_ui/views_ui.module b/core/modules/views/views_ui/views_ui.module
index 34b05fe..a45b935 100644
--- a/core/modules/views/views_ui/views_ui.module
+++ b/core/modules/views/views_ui/views_ui.module
@@ -181,55 +181,43 @@ function views_ui_menu() {
  * Implements hook_theme().
  */
 function views_ui_theme() {
-  $path = drupal_get_path('module', 'views_ui');
+  $base = array(
+    'file' => 'views_ui.theme.inc',
+    'path' => drupal_get_path('module', 'views_ui') . '/templates',
+  );
 
   return array(
     // edit a view
-    'views_ui_display_tab_setting' => array(
+    'views_ui_display_tab_setting' => $base + array(
       'variables' => array('description' => '', 'link' => '', 'settings_links' => array(), 'overridden' => FALSE, 'defaulted' => FALSE, 'description_separator' => TRUE, 'class' => array()),
       'template' => 'views-ui-display-tab-setting',
-      'path' => "$path/theme",
-      'file' => 'theme.inc',
     ),
-    'views_ui_display_tab_bucket' => array(
+    'views_ui_display_tab_bucket' => $base + array(
       'render element' => 'element',
       'template' => 'views-ui-display-tab-bucket',
-      'path' => "$path/theme",
-      'file' => 'theme.inc',
     ),
-    'views_ui_edit_item' => array(
+    'views_ui_edit_item' => $base + array(
       'variables' => array('type' => NULL, 'view' => NULL, 'display' => NULL, 'no_fields' => FALSE),
       'template' => 'views-ui-edit-item',
-      'path' => "$path/theme",
     ),
-    'views_ui_rearrange_form' => array(
+    'views_ui_rearrange_form' => $base + array(
       'render element' => 'form',
-      'path' => "$path/theme",
-      'file' => 'theme.inc',
     ),
-    'views_ui_rearrange_filter_form' => array(
+    'views_ui_rearrange_filter_form' => $base + array(
       'render element' => 'form',
-      'path' => "$path/theme",
-      'file' => 'theme.inc',
     ),
-    'views_ui_expose_filter_form' => array(
+    'views_ui_expose_filter_form' => $base + array(
       'render element' => 'form',
-      'path' => "$path/theme",
-      'file' => 'theme.inc',
     ),
 
     // list views
-    'views_ui_view_info' => array(
+    'views_ui_view_info' => $base + array(
       'variables' => array('view' => NULL, 'base' => NULL),
-      'path' => "$path/theme",
-      'file' => 'theme.inc',
     ),
 
     // Group of filters.
-    'views_ui_build_group_filter_form' => array(
+    'views_ui_build_group_filter_form' => $base + array(
       'render element' => 'form',
-      'path' => "$path/theme",
-      'file' => 'theme.inc',
     ),
 
     // tab themes
@@ -239,32 +227,24 @@ function views_ui_theme() {
     'views_tab' => array(
       'variables' => array('body' => NULL),
     ),
-    'views_ui_reorder_displays_form' => array(
+    'views_ui_reorder_displays_form' => $base + array(
       'render element' => 'form',
-      'path' => "$path/theme",
-      'file' => 'theme.inc',
     ),
 
     // On behalf of a plugin
-    'views_ui_style_plugin_table' => array(
+    'views_ui_style_plugin_table' => $base + array(
       'render element' => 'form',
-      'path' => "$path/theme",
-      'file' => 'theme.inc',
     ),
 
     // When previewing a view.
-    'views_ui_view_preview_section' => array(
+    'views_ui_view_preview_section' => $base + array(
       'variables' => array('view' => NULL, 'section' => NULL, 'content' => NULL, 'links' => ''),
-      'path' => "$path/theme",
-      'file' => 'theme.inc',
     ),
 
     // Generic container wrapper, to use instead of theme_container when an id
     // is not desired.
-    'views_ui_container' => array(
+    'views_ui_container' => $base + array(
       'render element' => 'element',
-      'path' => "$path/theme",
-      'file' => 'theme.inc',
     ),
   );
 }
diff --git a/core/modules/views/views_ui/theme/theme.inc b/core/modules/views/views_ui/views_ui.theme.inc
similarity index 100%
rename from core/modules/views/views_ui/theme/theme.inc
rename to core/modules/views/views_ui/views_ui.theme.inc