diff --git a/core/core.services.yml b/core/core.services.yml
index f73d453..95c56a8 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -304,6 +304,10 @@ services:
     class: Drupal\Core\Access\DefaultAccessCheck
     tags:
       - { name: access_check }
+  access_check.entity:
+    class: Drupal\Core\Entity\EntityAccessCheck
+    tags:
+      - { name: access_check }
   maintenance_mode_subscriber:
     class: Drupal\Core\EventSubscriber\MaintenanceModeSubscriber
     tags:
diff --git a/core/lib/Drupal/Core/Entity/EntityAccessCheck.php b/core/lib/Drupal/Core/Entity/EntityAccessCheck.php
new file mode 100644
index 0000000..f55567e
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/EntityAccessCheck.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Entity\EntityAccessCheck.
+ */
+
+namespace Drupal\Core\Entity;
+
+use Drupal\Core\Entity\EntityInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\HttpFoundation\Request;
+use Drupal\Core\Access\AccessCheckInterface;
+
+/**
+ * Provides a generic access checker for entities.
+ */
+class EntityAccessCheck implements AccessCheckInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies(Route $route) {
+    return array_key_exists('_entity_access', $route->getRequirements());
+  }
+
+  /**
+   * Implements \Drupal\Core\Access\AccessCheckInterface::access().
+   *
+   * The value of the '_entity_access' key must be in the pattern
+   * 'entity_type.operation.' The entity type must match the {entity_type}
+   * parameter in the route pattern. This will check a node for 'update' access:
+   * @code
+   * pattern: '/foo/{node}/bar'
+   * requirements:
+   *   _entity_access: 'node.update'
+   * @endcode
+   * Available operations are 'view', 'update', 'create', and 'delete'.
+   */
+  public function access(Route $route, Request $request) {
+    // Split the entity type and the operation.
+    $requirement = $route->getRequirement('_entity_access');
+    list($entity_type, $operation) = explode('.', $requirement);
+    // If there is valid entity of the given entity type, check its access.
+    if ($request->attributes->has($entity_type)) {
+      $entity = $request->attributes->get($entity_type);
+      if ($entity instanceof EntityInterface) {
+        return $entity->access($operation);
+      }
+    }
+    // No opinion, so other access checks should decide if access should be
+    // allowed or not.
+    return NULL;
+  }
+
+}
diff --git a/core/modules/forum/forum.admin.inc b/core/modules/forum/forum.admin.inc
index 001dd97..8ac5f22 100644
--- a/core/modules/forum/forum.admin.inc
+++ b/core/modules/forum/forum.admin.inc
@@ -5,6 +5,8 @@
  * Administrative page callbacks for the Forum module.
  */
 
+use Drupal\taxonomy\Form\OverviewTerms;
+
 /**
  * Page callback: Returns a form for creating a new forum or container.
  *
@@ -235,7 +237,9 @@ function forum_overview($form, &$form_state) {
 
   $vid = $config->get('vocabulary');
   $vocabulary = taxonomy_vocabulary_load($vid);
-  $form = taxonomy_overview_terms($form, $form_state, $vocabulary);
+  // @todo temporary, will be fixed in http://drupal.org/node/1974210.
+  $overview = OverviewTerms::create(Drupal::getContainer());
+  $form = $overview->buildForm($form, $form_state, $vocabulary);
 
   foreach (element_children($form['terms']) as $key) {
     if (isset($form['terms'][$key]['#term'])) {
@@ -263,11 +267,13 @@ function forum_overview($form, &$form_state) {
   unset($form['actions']['reset_alphabetical']);
 
   // The form needs to have submit and validate handlers set explicitly.
-  $form['#submit'] = array('taxonomy_overview_terms_submit'); // Use the existing taxonomy overview submit handler.
+  // Use the existing taxonomy overview submit handler.
+  $form['#submit'] = array(array($overview, 'submitForm'));
   $form['terms']['#empty'] = t('No containers or forums available. <a href="@container">Add container</a> or <a href="@forum">Add forum</a>.', array('@container' => url('admin/structure/forum/add/container'), '@forum' => url('admin/structure/forum/add/forum')));
   return $form;
 }
 
+
 /**
  * Returns a select box for available parent terms.
  *
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkDeleteAccessCheck.php b/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkDeleteAccessCheck.php
new file mode 100644
index 0000000..d6b454a
--- /dev/null
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkDeleteAccessCheck.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\shortcut\Access\LinkDeleteAccessCheck.
+ */
+
+namespace Drupal\shortcut\Access;
+
+use Drupal\Core\Access\AccessCheckInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Provides an access check for shortcut link delete routes.
+ */
+class LinkDeleteAccessCheck implements AccessCheckInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies(Route $route) {
+    return array_key_exists('_access_shortcut_link_delete', $route->getRequirements());
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function access(Route $route, Request $request) {
+    $menu_link = $request->attributes->get('menu_link');
+    $set_name = str_replace('shortcut-', '', $menu_link['menu_name']);
+    if ($shortcut_set = shortcut_set_load($set_name)) {
+      return shortcut_set_edit_access($shortcut_set);
+    }
+  }
+
+}
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php
new file mode 100644
index 0000000..e61713b
--- /dev/null
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\shortcut\Form\LinkDelete.
+ */
+
+namespace Drupal\shortcut\Form;
+
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\menu_link\Plugin\Core\Entity\MenuLink;
+
+/**
+ * Builds the shortcut link deletion form.
+ */
+class LinkDelete extends ConfirmFormBase {
+
+  /**
+   * The menu link to delete.
+   *
+   * @var \Drupal\menu_link\Plugin\Core\Entity\MenuLink
+   */
+  protected $menuLink;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormID() {
+    return 'shortcut_link_delete';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getQuestion() {
+    return t('Are you sure you want to delete the shortcut %title?', array('%title' => $this->menuLink->link_title));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getCancelPath() {
+    return 'admin/config/user-interface/shortcut/manage/' . $this->menuLink->menu_name;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getConfirmText() {
+    return t('Delete');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, array &$form_state, MenuLink $menu_link = NULL) {
+    $this->menuLink = $menu_link;
+
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, array &$form_state) {
+    menu_link_delete($this->menuLink->mlid);
+    $set_name = str_replace('shortcut-', '' , $this->menuLink->menu_name);
+    $form_state['redirect'] = 'admin/config/user-interface/shortcut/manage/' . $set_name;
+    drupal_set_message(t('The shortcut %title has been deleted.', array('%title' => $this->menuLink->link_title)));
+  }
+
+}
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetDelete.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetDelete.php
new file mode 100644
index 0000000..70e4e24
--- /dev/null
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetDelete.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\shortcut\Form\SetDelete.
+ */
+
+namespace Drupal\shortcut\Form;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\ControllerInterface;
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\shortcut\Plugin\Core\Entity\Shortcut;
+
+/**
+ * Builds the shortcut set deletion form.
+ */
+class SetDelete extends ConfirmFormBase implements ControllerInterface {
+
+  /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * The module handler service.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * The shortcut set being deleted.
+   *
+   * @var \Drupal\shortcut\Plugin\Core\Entity\Shortcut
+   */
+  protected $shortcut;
+
+  /**
+   * Constructs a SetDelete object.
+   */
+  public function __construct(Connection $database, ModuleHandlerInterface $module_handler) {
+
+    $this->database = $database;
+    $this->moduleHandler = $module_handler;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('database'),
+      $container->get('module_handler')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormID() {
+    return 'shortcut_set_delete_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getQuestion() {
+    return t('Are you sure you want to delete the shortcut set %title?', array('%title' => $this->shortcut->label()));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getCancelPath() {
+    return 'admin/config/user-interface/shortcut/manage/' . $this->shortcut->id();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getConfirmText() {
+    return t('Delete');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, array &$form_state, Shortcut $shortcut = NULL) {
+    $this->shortcut = $shortcut;
+
+    // Find out how many users are directly assigned to this shortcut set, and
+    // make a message.
+    $number = $this->database->query('SELECT COUNT(*) FROM {shortcut_set_users} WHERE set_name = :name', array(':name' => $this->shortcut->id()))->fetchField();
+    $info = '';
+    if ($number) {
+      $info .= '<p>' . format_plural($number,
+        '1 user has chosen or been assigned to this shortcut set.',
+        '@count users have chosen or been assigned to this shortcut set.') . '</p>';
+    }
+
+    // Also, if a module implements hook_shortcut_default_set(), it's possible
+    // that this set is being used as a default set. Add a message about that too.
+    if ($this->moduleHandler->getImplementations('shortcut_default_set')) {
+      $info .= '<p>' . t('If you have chosen this shortcut set as the default for some or all users, they may also be affected by deleting it.') . '</p>';
+    }
+
+    $form['info'] = array(
+      '#markup' => $info,
+    );
+
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, array &$form_state) {
+    $this->shortcut->delete();
+    $form_state['redirect'] = 'admin/config/user-interface/shortcut';
+    drupal_set_message(t('The shortcut set %title has been deleted.', array('%title' => $this->shortcut->label())));
+  }
+
+}
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutAccessController.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutAccessController.php
new file mode 100644
index 0000000..a95a0e0
--- /dev/null
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutAccessController.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\shortcut\ShortcutAccessController.
+ */
+
+namespace Drupal\shortcut;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityAccessController;
+use Drupal\user\Plugin\Core\Entity\User;
+
+/**
+ * Defines the access controller for the shortcut entity type.
+ */
+class ShortcutAccessController extends EntityAccessController {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function deleteAccess(EntityInterface $entity, $langcode = LANGUAGE_DEFAULT, User $account = NULL) {
+    if (!user_access('administer shortcuts')) {
+      return FALSE;
+    }
+
+    return $entity->id() != 'default';
+  }
+
+}
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutFormController.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutFormController.php
index 059de38..db600fd 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutFormController.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutFormController.php
@@ -53,7 +53,7 @@ public function form(array $form, array &$form_state, EntityInterface $entity) {
   protected function actions(array $form, array &$form_state) {
     // Disable delete of default shortcut set.
     $actions = parent::actions($form, $form_state);
-    $actions['delete']['#access'] = shortcut_set_delete_access($this->getEntity($form_state));
+    $actions['delete']['#access'] = $this->getEntity($form_state)->access('delete');
     return $actions;
   }
 
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php
index 6cf8f9d8..f1aaa60 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php
@@ -38,7 +38,7 @@ public function getOperations(EntityInterface $entity) {
       'options' => $uri['options'],
       'weight' => 10,
     );
-    if (shortcut_set_delete_access($entity)) {
+    if ($entity->access('delete')) {
       $operations['delete'] = array(
         'title' => t('Delete set'),
         'href' => $uri['path'] . '/delete',
diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc
index 0e43052..dec4dbd 100644
--- a/core/modules/shortcut/shortcut.admin.inc
+++ b/core/modules/shortcut/shortcut.admin.inc
@@ -472,113 +472,6 @@ function shortcut_admin_add_link($shortcut_link, &$shortcut_set) {
 }
 
 /**
- * Form callback: builds the confirmation form for deleting a shortcut set.
- *
- * @param $form
- *   An associative array containing the structure of the form.
- * @param $form_state
- *   An associative array containing the current state of the form.
- * @param $shortcut_set Drupal\shortcut\Plugin\Core\Entity\Shortcut
- *   An object representing the shortcut set, as returned from
- *   shortcut_set_load().
- *
- * @return
- *   An array representing the form definition.
- *
- * @ingroup forms
- * @see shortcut_set_delete_form_submit()
- */
-function shortcut_set_delete_form($form, &$form_state, $shortcut_set) {
-  $form['shortcut_set'] = array(
-    '#type' => 'value',
-    '#value' => $shortcut_set->id(),
-  );
-
-  // Find out how many users are directly assigned to this shortcut set, and
-  // make a message.
-  $number = db_query('SELECT COUNT(*) FROM {shortcut_set_users} WHERE set_name = :name', array(':name' => $shortcut_set->id()))->fetchField();
-  $info = '';
-  if ($number) {
-    $info .= '<p>' . format_plural($number,
-      '1 user has chosen or been assigned to this shortcut set.',
-      '@count users have chosen or been assigned to this shortcut set.') . '</p>';
-  }
-
-  // Also, if a module implements hook_shortcut_default_set(), it's possible
-  // that this set is being used as a default set. Add a message about that too.
-  if (count(module_implements('shortcut_default_set')) > 0) {
-    $info .= '<p>' . t('If you have chosen this shortcut set as the default for some or all users, they may also be affected by deleting it.') . '</p>';
-  }
-
-  $form['info'] = array(
-    '#markup' => $info,
-  );
-
-  return confirm_form(
-    $form,
-    t('Are you sure you want to delete the shortcut set %title?', array('%title' => $shortcut_set->label())),
-    'admin/config/user-interface/shortcut/manage/' . $shortcut_set->id(),
-    t('This action cannot be undone.'),
-    t('Delete'),
-    t('Cancel')
-  );
-}
-
-/**
- * Submit handler for shortcut_set_delete_form().
- */
-function shortcut_set_delete_form_submit($form, &$form_state) {
-  $shortcut_set = shortcut_set_load($form_state['values']['shortcut_set']);
-  $label = $shortcut_set->label();
-  $shortcut_set->delete();
-  $form_state['redirect'] = 'admin/config/user-interface/shortcut';
-  drupal_set_message(t('The shortcut set %title has been deleted.', array('%title' => $label)));
-}
-
-/**
- * Form callback: builds the confirmation form for deleting a shortcut link.
- *
- * @param $form
- *   An associative array containing the structure of the form.
- * @param $form_state
- *   An associative array containing the current state of the form.
- * @param $shortcut_link
- *   An array representing the link that will be deleted.
- *
- * @return
- *   An array representing the form definition.
- *
- * @ingroup forms
- * @see shortcut_link_delete_submit()
- */
-function shortcut_link_delete($form, &$form_state, $shortcut_link) {
-  $form['shortcut_link'] = array(
-    '#type' => 'value',
-    '#value' => $shortcut_link,
-  );
-
-  return confirm_form(
-    $form,
-    t('Are you sure you want to delete the shortcut %title?', array('%title' => $shortcut_link['link_title'])),
-    'admin/config/user-interface/shortcut/manage/' . $shortcut_link['menu_name'],
-    t('This action cannot be undone.'),
-    t('Delete'),
-    t('Cancel')
-  );
-}
-
-/**
- * Submit handler for shortcut_link_delete_submit().
- */
-function shortcut_link_delete_submit($form, &$form_state) {
-  $shortcut_link = $form_state['values']['shortcut_link'];
-  menu_link_delete($shortcut_link['mlid']);
-  $set_name = str_replace('shortcut-', '' , $shortcut_link['menu_name']);
-  $form_state['redirect'] = 'admin/config/user-interface/shortcut/manage/' . $set_name;
-  drupal_set_message(t('The shortcut %title has been deleted.', array('%title' => $shortcut_link['link_title'])));
-}
-
-/**
  * Menu page callback: creates a new link in the provided shortcut set.
  *
  * After completion, redirects the user back to where they came from.
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 25a04c7..47beafa 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -101,11 +101,7 @@ function shortcut_menu() {
   );
   $items['admin/config/user-interface/shortcut/manage/%shortcut_set/delete'] = array(
     'title' => 'Delete shortcut set',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('shortcut_set_delete_form', 5),
-    'access callback' => 'shortcut_set_delete_access',
-    'access arguments' => array(5),
-    'file' => 'shortcut.admin.inc',
+    'route_name' => 'shortcut_set_delete',
   );
   $items['admin/config/user-interface/shortcut/manage/%shortcut_set/add-link'] = array(
     'title' => 'Add shortcut',
@@ -135,11 +131,7 @@ function shortcut_menu() {
   );
   $items['admin/config/user-interface/shortcut/link/%menu_link/delete'] = array(
     'title' => 'Delete shortcut',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('shortcut_link_delete', 5),
-    'access callback' => 'shortcut_link_access',
-    'access arguments' => array(5),
-    'file' => 'shortcut.admin.inc',
+    'route_name' => 'shortcut_link_delete',
   );
   $items['user/%user/shortcuts'] = array(
     'title' => 'Shortcuts',
@@ -200,30 +192,6 @@ function shortcut_set_edit_access($shortcut_set = NULL) {
 }
 
 /**
- * Access callback for deleting a shortcut set.
- *
- * @param $shortcut_set Drupal\shortcut\Plugin\Core\Entity\Shortcut
- *   The shortcut set to be deleted.
- *
- * @return
- *   TRUE if the current user has access to delete shortcut sets and this is
- *   not the site-wide default set; FALSE otherwise.
- */
-function shortcut_set_delete_access($shortcut_set) {
-  // Only admins can delete sets.
-  if (!user_access('administer shortcuts')) {
-    return FALSE;
-  }
-
-  // Never let the default shortcut set be deleted.
-  if ($shortcut_set->id() == 'default') {
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-/**
  * Access callback for switching the shortcut set assigned to a user account.
  *
  * @param object $account
@@ -259,6 +227,8 @@ function shortcut_set_switch_access($account = NULL) {
 
 /**
  * Access callback for editing a link in a shortcut set.
+ *
+ * @deprecated, use \Drupal\shortcut\Access\LinkDeleteAccessCheck instead.
  */
 function shortcut_link_access($menu_link) {
   // The link must belong to a shortcut set that the current user has access
diff --git a/core/modules/shortcut/shortcut.routing.yml b/core/modules/shortcut/shortcut.routing.yml
new file mode 100644
index 0000000..277853f
--- /dev/null
+++ b/core/modules/shortcut/shortcut.routing.yml
@@ -0,0 +1,13 @@
+shortcut_link_delete:
+  pattern: '/admin/config/user-interface/shortcut/link/{menu_link}/delete'
+  defaults:
+    _form: 'Drupal\shortcut\Form\LinkDelete'
+  requirements:
+    _access_shortcut_link_delete: 'TRUE'
+
+shortcut_set_delete:
+  pattern: '/admin/config/user-interface/shortcut/manage/{shortcut}/delete'
+  defaults:
+    _form: 'Drupal\shortcut\Form\SetDelete'
+  requirements:
+    _entity_access: 'shortcut.delete'
diff --git a/core/modules/shortcut/shortcut.services.yml b/core/modules/shortcut/shortcut.services.yml
new file mode 100644
index 0000000..bb95f49
--- /dev/null
+++ b/core/modules/shortcut/shortcut.services.yml
@@ -0,0 +1,5 @@
+services:
+  access_check.shortcut.link:
+    class: Drupal\shortcut\Access\LinkDeleteAccessCheck
+    tags:
+      - { name: access_check }
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
new file mode 100644
index 0000000..2f737ff
--- /dev/null
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
@@ -0,0 +1,498 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\taxonomy\Form\OverviewTerms
+ */
+
+namespace Drupal\taxonomy\Form;
+
+use Drupal\Core\Form\FormInterface;
+use Drupal\Core\ControllerInterface;
+use Drupal\Core\Entity\EntityManager;
+use Drupal\Core\Config\ConfigFactory;
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Extension\ModuleHandler;
+use Drupal\taxonomy\Plugin\Core\Entity\Vocabulary;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class OverviewTerms implements ControllerInterface, FormInterface {
+
+  /**
+   * Entity Manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManager
+   */
+  protected $entityManager;
+
+  /**
+   * Taxonomy config.
+   *
+   * @var \Drupal\Core\Config\Config
+   */
+  protected $config;
+
+  /**
+   * Current database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * Current request.
+   *
+   * @var \Symfony\Component\HttpFoundation\Request
+   */
+  protected $request;
+
+  /**
+   * Constructs an OverviewTerms object.
+   *
+   * @param \Drupal\Core\Entity\EntityManager $entity_manager
+   *   The entity manager service.
+   * @param \Drupal\Core\Config\ConfigFactory $config_factory
+   *   The config factory service.
+   * @param \Drupal\Core\Database\Connection $connection
+   *   The current database connection.
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The current request.
+   * @param \Drupal\Core\Extension\ModuleHandler $module_handler
+   *   The module handler service.
+   */
+  public function __construct(EntityManager $entity_manager, ConfigFactory $config_factory, Connection $connection, Request $request, ModuleHandler $module_handler) {
+    $this->entityManager = $entity_manager;
+    $this->config = $config_factory->get('taxonomy.settings');
+    $this->database = $connection;
+    $this->request = $request;
+    $this->moduleHandler = $module_handler;
+  }
+
+  /**
+   * Injects plugin manager.
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('plugin.manager.entity'),
+      $container->get('config.factory'),
+      $container->get('database'),
+      $container->get('request'),
+      $container->get('module_handler')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'taxonomy_overview_terms';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, array &$form_state, Vocabulary $taxonomy_vocabulary = NULL) {
+    // @todo entity_page_label does not work with new routing system.
+    drupal_set_title($taxonomy_vocabulary->label());
+    global $pager_page_array, $pager_total, $pager_total_items;
+
+    // Check for confirmation forms.
+    if (isset($form_state['confirm_reset_alphabetical'])) {
+      // @todo this needs to be a separate route/controller for a confirm form.
+      //   Will be fixed in http://drupal.org/node/1976296.
+      $this->moduleHandler->loadInclude('taxonomy', 'admin.inc');
+      return taxonomy_vocabulary_confirm_reset_alphabetical($form, $form_state, $taxonomy_vocabulary->id());
+    }
+
+    $form_state['taxonomy']['vocabulary'] = $taxonomy_vocabulary;
+    $parent_fields = FALSE;
+
+    $page            = isset($_GET['page']) ? $_GET['page'] : 0;
+    // Number of terms per page.
+    $page_increment  = $this->config->get('terms_per_page_admin');
+    // Elements shown on this page.
+    $page_entries    = 0;
+    // Elements at the root level before this page.
+    $before_entries  = 0;
+    // Elements at the root level after this page.
+    $after_entries   = 0;
+    // Elements at the root level on this page.
+    $root_entries    = 0;
+
+    // Terms from previous and next pages are shown if the term tree would have
+    // been cut in the middle. Keep track of how many extra terms we show on each
+    // page of terms.
+    $back_step    = NULL;
+    $forward_step = 0;
+
+    // An array of the terms to be displayed on this page.
+    $current_page = array();
+
+    $delta = 0;
+    $term_deltas = array();
+    // @todo taxonomy_get_tree needs to be converted to a service and injected.
+    //   Will be fixed in http://drupal.org/node/1976298.
+    $tree = taxonomy_get_tree($taxonomy_vocabulary->id(), 0, NULL, TRUE);
+    $term = current($tree);
+    do {
+      // In case this tree is completely empty.
+      if (empty($term)) {
+        break;
+      }
+      $delta++;
+      // Count entries before the current page.
+      if ($page && ($page * $page_increment) > $before_entries && !isset($back_step)) {
+        $before_entries++;
+        continue;
+      }
+      // Count entries after the current page.
+      elseif ($page_entries > $page_increment && isset($complete_tree)) {
+        $after_entries++;
+        continue;
+      }
+
+      // Do not let a term start the page that is not at the root.
+      if (isset($term->depth) && ($term->depth > 0) && !isset($back_step)) {
+        $back_step = 0;
+        while ($pterm = prev($tree)) {
+          $before_entries--;
+          $back_step++;
+          if ($pterm->depth == 0) {
+            prev($tree);
+            // Jump back to the start of the root level parent.
+            continue 2;
+          }
+        }
+      }
+      $back_step = isset($back_step) ? $back_step : 0;
+
+      // Continue rendering the tree until we reach the a new root item.
+      if ($page_entries >= $page_increment + $back_step + 1 && $term->depth == 0 && $root_entries > 1) {
+        $complete_tree = TRUE;
+        // This new item at the root level is the first item on the next page.
+        $after_entries++;
+        continue;
+      }
+      if ($page_entries >= $page_increment + $back_step) {
+        $forward_step++;
+      }
+
+      // Finally, if we've gotten down this far, we're rendering a term on this page.
+      $page_entries++;
+      $term_deltas[$term->tid] = isset($term_deltas[$term->tid]) ? $term_deltas[$term->tid] + 1 : 0;
+      $key = 'tid:' . $term->tid . ':' . $term_deltas[$term->tid];
+
+      // Keep track of the first term displayed on this page.
+      if ($page_entries == 1) {
+        $form['#first_tid'] = $term->tid;
+      }
+      // Keep a variable to make sure at least 2 root elements are displayed.
+      if ($term->parents[0] == 0) {
+        $root_entries++;
+      }
+      $current_page[$key] = $term;
+    } while ($term = next($tree));
+
+    // Because we didn't use a pager query, set the necessary pager variables.
+    $total_entries = $before_entries + $page_entries + $after_entries;
+    $pager_total_items[0] = $total_entries;
+    $pager_page_array[0] = $page;
+    $pager_total[0] = ceil($total_entries / $page_increment);
+
+    // If this form was already submitted once, it's probably hit a validation
+    // error. Ensure the form is rebuilt in the same order as the user submitted.
+    if (!empty($form_state['input'])) {
+      // Get the $_POST order.
+      $order = array_flip(array_keys($form_state['input']['terms']));
+      // Update our form with the new order.
+      $current_page = array_merge($order, $current_page);
+      foreach ($current_page as $key => $term) {
+        // Verify this is a term for the current page and set at the current
+        // depth.
+        if (is_array($form_state['input']['terms'][$key]) && is_numeric($form_state['input']['terms'][$key]['term']['tid'])) {
+          $current_page[$key]->depth = $form_state['input']['terms'][$key]['term']['depth'];
+        }
+        else {
+          unset($current_page[$key]);
+        }
+      }
+    }
+
+    $errors = form_get_errors() != FALSE ? form_get_errors() : array();
+    $destination = drupal_get_destination();
+    $row_position = 0;
+    // Build the actual form.
+    $form['terms'] = array(
+      '#type' => 'table',
+      '#header' => array(t('Name'), t('Weight'), t('Operations')),
+      '#empty' => t('No terms available. <a href="@link">Add term</a>.', array('@link' => url('admin/structure/taxonomy/' . $taxonomy_vocabulary->id() . '/add'))),
+      '#attributes' => array(
+        'id' => 'taxonomy',
+      ),
+    );
+    foreach ($current_page as $key => $term) {
+      // Save the term for the current page so we don't have to load it a second
+      // time.
+      $form['terms'][$key]['#term'] = (array) $term;
+      if (isset($term->parents)) {
+        $form['terms'][$key]['#term']['parent'] = $term->parent = $term->parents[0];
+        unset($form['terms'][$key]['#term']['parents'], $term->parents);
+      }
+
+      $form['terms'][$key]['term'] = array(
+        '#prefix' => isset($term->depth) && $term->depth > 0 ? theme('indentation', array('size' => $term->depth)) : '',
+        '#type' => 'link',
+        '#title' => $term->label(),
+        '#href' => "taxonomy/term/$term->tid",
+      );
+      if ($taxonomy_vocabulary->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE && count($tree) > 1) {
+        $parent_fields = TRUE;
+        $form['terms'][$key]['term']['tid'] = array(
+          '#type' => 'hidden',
+          '#value' => $term->tid,
+          '#attributes' => array(
+            'class' => array('term-id'),
+          ),
+        );
+        $form['terms'][$key]['term']['parent'] = array(
+          '#type' => 'hidden',
+          // Yes, default_value on a hidden. It needs to be changeable by the
+          // javascript.
+          '#default_value' => $term->parent,
+          '#attributes' => array(
+            'class' => array('term-parent'),
+          ),
+        );
+        $form['terms'][$key]['term']['depth'] = array(
+          '#type' => 'hidden',
+          // Same as above, the depth is modified by javascript, so it's a
+          // default_value.
+          '#default_value' => $term->depth,
+          '#attributes' => array(
+            'class' => array('term-depth'),
+          ),
+        );
+      }
+      $form['terms'][$key]['weight'] = array(
+        '#type' => 'weight',
+        '#delta' => $delta,
+        '#title_display' => 'invisible',
+        '#title' => t('Weight for added term'),
+        '#default_value' => $term->weight,
+        '#attributes' => array(
+          'class' => array('term-weight'),
+        ),
+      );
+      $operations = array(
+        'edit' => array(
+          'title' => t('edit'),
+          'href' => 'taxonomy/term/' . $term->tid . '/edit',
+          'query' => $destination,
+        ),
+        'delete' => array(
+          'title' => t('delete'),
+          'href' => 'taxonomy/term/' . $term->tid . '/delete',
+          'query' => $destination,
+        ),
+      );
+      if (module_invoke('translation_entity', 'translate_access', $term)) {
+        $operations['translate'] = array(
+          'title' => t('translate'),
+          'href' => 'taxonomy/term/' . $term->tid . '/translations',
+          'query' => $destination,
+        );
+      }
+      $form['terms'][$key]['operations'] = array(
+        '#type' => 'operations',
+        '#links' => $operations,
+      );
+
+      $form['terms'][$key]['#attributes']['class'] = array();
+      if ($parent_fields) {
+        $form['terms'][$key]['#attributes']['class'][] = 'draggable';
+      }
+
+      // Add classes that mark which terms belong to previous and next pages.
+      if ($row_position < $back_step || $row_position >= $page_entries - $forward_step) {
+        $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-preview';
+      }
+
+      if ($row_position !== 0 && $row_position !== count($tree) - 1) {
+        if ($row_position == $back_step - 1 || $row_position == $page_entries - $forward_step - 1) {
+          $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-divider-top';
+        }
+        elseif ($row_position == $back_step || $row_position == $page_entries - $forward_step) {
+          $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-divider-bottom';
+        }
+      }
+
+      // Add an error class if this row contains a form error.
+      foreach ($errors as $error_key => $error) {
+        if (strpos($error_key, $key) === 0) {
+          $form['terms'][$key]['#attributes']['class'][] = 'error';
+        }
+      }
+      $row_position++;
+    }
+
+    if ($parent_fields) {
+      $form['terms']['#tabledrag'][] = array(
+        'match',
+        'parent',
+        'term-parent',
+        'term-parent',
+        'term-id',
+        FALSE
+      );
+      $form['terms']['#tabledrag'][] = array(
+        'depth',
+        'group',
+        'term-depth',
+        NULL,
+        NULL,
+        FALSE
+      );
+      $form['terms']['#attached']['library'][] = array('taxonomy', 'drupal.taxonomy');
+      $form['terms']['#attached']['js'][] = array(
+        'data' => array('taxonomy' => array('backStep' => $back_step, 'forwardStep' => $forward_step)),
+        'type' => 'setting',
+      );
+    }
+    $form['terms']['#tabledrag'][] = array('order', 'sibling', 'term-weight');
+
+    if ($taxonomy_vocabulary->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE && count($tree) > 1) {
+      $form['actions'] = array('#type' => 'actions', '#tree' => FALSE);
+      $form['actions']['submit'] = array(
+        '#type' => 'submit',
+        '#value' => t('Save'),
+        '#button_type' => 'primary',
+      );
+      $form['actions']['reset_alphabetical'] = array(
+        '#type' => 'submit',
+        '#value' => t('Reset to alphabetical')
+      );
+      $form_state['redirect'] = array($this->request->attributes->get('system_path'), (isset($_GET['page']) ? array('query' => array('page' => $_GET['page'])) : array()));
+    }
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, array &$form_state) {}
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, array &$form_state) {
+    // @todo this needs to be in its own method.
+    if ($form_state['triggering_element']['#value'] == t('Reset to alphabetical')) {
+      // Execute the reset action.
+      if ($form_state['values']['reset_alphabetical'] === TRUE) {
+        // @todo this needs to be a method on the vocabulary storage controller.
+        //   Will be fixed in http://drupal.org/node/1976296.
+        $this->moduleHandler->loadInclude('taxonomy', 'admin.inc');
+        return taxonomy_vocabulary_confirm_reset_alphabetical_submit($form, $form_state);
+      }
+      // Rebuild the form to confirm the reset action.
+      $form_state['rebuild'] = TRUE;
+      $form_state['confirm_reset_alphabetical'] = TRUE;
+      return;
+    }
+
+    // Sort term order based on weight.
+    uasort($form_state['values']['terms'], 'drupal_sort_weight');
+
+    $vocabulary = $form_state['taxonomy']['vocabulary'];
+    // Update the current hierarchy type as we go.
+    $hierarchy = TAXONOMY_HIERARCHY_DISABLED;
+
+    $changed_terms = array();
+    // @todo convert taxonomy_get_tree() to a service and inject it.
+    //   Will be fixed in http://drupal.org/node/1976298.
+    $tree = taxonomy_get_tree($vocabulary->id());
+
+    if (empty($tree)) {
+      return;
+    }
+
+    // Build a list of all terms that need to be updated on previous pages.
+    $weight = 0;
+    $term = (array) $tree[0];
+    while ($term['tid'] != $form['#first_tid']) {
+      if ($term['parents'][0] == 0 && $term['weight'] != $weight) {
+        $term['parent'] = $term['parents'][0];
+        $term['weight'] = $weight;
+        $changed_terms[$term['tid']] = $term;
+      }
+      $weight++;
+      $hierarchy = $term['parents'][0] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
+      $term = (array) $tree[$weight];
+    }
+
+    // Renumber the current page weights and assign any new parents.
+    $level_weights = array();
+    foreach ($form_state['values']['terms'] as $tid => $values) {
+      if (isset($form['terms'][$tid]['#term'])) {
+        $term = $form['terms'][$tid]['#term'];
+        // Give terms at the root level a weight in sequence with terms on previous pages.
+        if ($values['term']['parent'] == 0 && $term['weight'] != $weight) {
+          $term['weight'] = $weight;
+          $changed_terms[$term['tid']] = $term;
+        }
+        // Terms not at the root level can safely start from 0 because they're all on this page.
+        elseif ($values['term']['parent'] > 0) {
+          $level_weights[$values['term']['parent']] = isset($level_weights[$values['term']['parent']]) ? $level_weights[$values['term']['parent']] + 1 : 0;
+          if ($level_weights[$values['term']['parent']] != $term['weight']) {
+            $term['weight'] = $level_weights[$values['term']['parent']];
+            $changed_terms[$term['tid']] = $term;
+          }
+        }
+        // Update any changed parents.
+        if ($values['term']['parent'] != $term['parent']) {
+          $term['parent'] = $values['term']['parent'];
+          $changed_terms[$term['tid']] = $term;
+        }
+        $hierarchy = $term['parent'] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
+        $weight++;
+      }
+    }
+
+    // Build a list of all terms that need to be updated on following pages.
+    for ($weight; $weight < count($tree); $weight++) {
+      $term = (array) $tree[$weight];
+      if ($term['parents'][0] == 0 && $term['weight'] != $weight) {
+        $term['parent'] = $term['parents'][0];
+        $term['weight'] = $weight;
+        $changed_terms[$term['tid']] = $term;
+      }
+      $hierarchy = $term['parents'][0] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
+    }
+
+    // Save all updated terms.
+    foreach ($changed_terms as $changed) {
+      $term = (object) $changed;
+      // Update term_hierachy and term_data directly since we don't have a
+      // fully populated term object to save.
+      $this->database->update('taxonomy_term_hierarchy')
+        ->fields(array('parent' => $term->parent))
+        ->condition('tid', $term->tid, '=')
+        ->execute();
+
+      $this->database->update('taxonomy_term_data')
+        ->fields(array('weight' => $term->weight))
+        ->condition('tid', $term->tid, '=')
+        ->execute();
+    }
+
+    // Update the vocabulary hierarchy to flat or single hierarchy.
+    if ($vocabulary->hierarchy != $hierarchy) {
+      $vocabulary->hierarchy = $hierarchy;
+      $vocabulary->save();
+    }
+    drupal_set_message(t('The configuration options have been saved.'));
+  }
+
+}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
index 6785335..3b19851 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
@@ -24,6 +24,10 @@ public function form(array $form, array &$form_state, EntityInterface $vocabular
     if (isset($form_state['confirm_delete']) && isset($form_state['values']['vid'])) {
       return taxonomy_vocabulary_confirm_delete($form, $form_state, $form_state['values']['vid']);
     }
+    // @todo Title callbacks don't work with routes.
+    if ($vocabulary->name) {
+      drupal_set_title($vocabulary->name);
+    }
     $form['name'] = array(
       '#type' => 'textfield',
       '#title' => t('Name'),
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index d26501f..5d03c00 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -103,395 +103,6 @@ function taxonomy_vocabulary_add() {
 }
 
 /**
- * Form builder for the taxonomy terms overview.
- *
- * Display a tree of all the terms in a vocabulary, with options to edit
- * each one. The form is made drag and drop by the theme function.
- *
- * @param Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary
- *   The taxonomy vocabulary entity to list terms for.
- *
- * @ingroup forms
- * @see taxonomy_overview_terms_submit()
- * @see theme_taxonomy_overview_terms()
- */
-function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
-  global $pager_page_array, $pager_total, $pager_total_items;
-
-  // Check for confirmation forms.
-  if (isset($form_state['confirm_reset_alphabetical'])) {
-    return taxonomy_vocabulary_confirm_reset_alphabetical($form, $form_state, $vocabulary->id());
-  }
-
-  $form_state['taxonomy']['vocabulary'] = $vocabulary;
-  $parent_fields = FALSE;
-
-  $page            = isset($_GET['page']) ? $_GET['page'] : 0;
-  $page_increment  = config('taxonomy.settings')->get('terms_per_page_admin');  // Number of terms per page.
-  $page_entries    = 0;   // Elements shown on this page.
-  $before_entries  = 0;   // Elements at the root level before this page.
-  $after_entries   = 0;   // Elements at the root level after this page.
-  $root_entries    = 0;   // Elements at the root level on this page.
-
-  // Terms from previous and next pages are shown if the term tree would have
-  // been cut in the middle. Keep track of how many extra terms we show on each
-  // page of terms.
-  $back_step    = NULL;
-  $forward_step = 0;
-
-  // An array of the terms to be displayed on this page.
-  $current_page = array();
-
-  $delta = 0;
-  $term_deltas = array();
-  $tree = taxonomy_get_tree($vocabulary->id(), 0, NULL, TRUE);
-  $term = current($tree);
-  do {
-    // In case this tree is completely empty.
-    if (empty($term)) {
-      break;
-    }
-    $delta++;
-    // Count entries before the current page.
-    if ($page && ($page * $page_increment) > $before_entries && !isset($back_step)) {
-      $before_entries++;
-      continue;
-    }
-    // Count entries after the current page.
-    elseif ($page_entries > $page_increment && isset($complete_tree)) {
-      $after_entries++;
-      continue;
-    }
-
-    // Do not let a term start the page that is not at the root.
-    if (isset($term->depth) && ($term->depth > 0) && !isset($back_step)) {
-      $back_step = 0;
-      while ($pterm = prev($tree)) {
-        $before_entries--;
-        $back_step++;
-        if ($pterm->depth == 0) {
-          prev($tree);
-          continue 2; // Jump back to the start of the root level parent.
-       }
-      }
-    }
-    $back_step = isset($back_step) ? $back_step : 0;
-
-    // Continue rendering the tree until we reach the a new root item.
-    if ($page_entries >= $page_increment + $back_step + 1 && $term->depth == 0 && $root_entries > 1) {
-      $complete_tree = TRUE;
-      // This new item at the root level is the first item on the next page.
-      $after_entries++;
-      continue;
-    }
-    if ($page_entries >= $page_increment + $back_step) {
-      $forward_step++;
-    }
-
-    // Finally, if we've gotten down this far, we're rendering a term on this page.
-    $page_entries++;
-    $term_deltas[$term->tid] = isset($term_deltas[$term->tid]) ? $term_deltas[$term->tid] + 1 : 0;
-    $key = 'tid:' . $term->tid . ':' . $term_deltas[$term->tid];
-
-    // Keep track of the first term displayed on this page.
-    if ($page_entries == 1) {
-      $form['#first_tid'] = $term->tid;
-    }
-    // Keep a variable to make sure at least 2 root elements are displayed.
-    if ($term->parents[0] == 0) {
-      $root_entries++;
-    }
-    $current_page[$key] = $term;
-  } while ($term = next($tree));
-
-  // Because we didn't use a pager query, set the necessary pager variables.
-  $total_entries = $before_entries + $page_entries + $after_entries;
-  $pager_total_items[0] = $total_entries;
-  $pager_page_array[0] = $page;
-  $pager_total[0] = ceil($total_entries / $page_increment);
-
-  // If this form was already submitted once, it's probably hit a validation
-  // error. Ensure the form is rebuilt in the same order as the user submitted.
-  if (!empty($form_state['input'])) {
-    $order = array_flip(array_keys($form_state['input']['terms'])); // Get the $_POST order.
-    $current_page = array_merge($order, $current_page); // Update our form with the new order.
-    foreach ($current_page as $key => $term) {
-      // Verify this is a term for the current page and set at the current
-      // depth.
-      if (is_array($form_state['input']['terms'][$key]) && is_numeric($form_state['input']['terms'][$key]['term']['tid'])) {
-        $current_page[$key]->depth = $form_state['input']['terms'][$key]['term']['depth'];
-      }
-      else {
-        unset($current_page[$key]);
-      }
-    }
-  }
-
-  $errors = form_get_errors() != FALSE ? form_get_errors() : array();
-  $destination = drupal_get_destination();
-  $row_position = 0;
-  // Build the actual form.
-  $form['terms'] = array(
-    '#type' => 'table',
-    '#header' => array(t('Name'), t('Weight'), t('Operations')),
-    '#empty' => t('No terms available. <a href="@link">Add term</a>.', array('@link' => url('admin/structure/taxonomy/' . $vocabulary->id() . '/add'))),
-    '#attributes' => array(
-      'id' => 'taxonomy',
-    ),
-  );
-  foreach ($current_page as $key => $term) {
-    // Save the term for the current page so we don't have to load it a second
-    // time.
-    $form['terms'][$key]['#term'] = (array) $term;
-    if (isset($term->parents)) {
-      $form['terms'][$key]['#term']['parent'] = $term->parent = $term->parents[0];
-      unset($form['terms'][$key]['#term']['parents'], $term->parents);
-    }
-
-    $form['terms'][$key]['term'] = array(
-      '#prefix' => isset($term->depth) && $term->depth > 0 ? theme('indentation', array('size' => $term->depth)) : '',
-      '#type' => 'link',
-      '#title' => $term->label(),
-      '#href' => "taxonomy/term/$term->tid",
-    );
-    if ($vocabulary->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE && count($tree) > 1) {
-      $parent_fields = TRUE;
-      $form['terms'][$key]['term']['tid'] = array(
-        '#type' => 'hidden',
-        '#value' => $term->tid,
-        '#attributes' => array(
-          'class' => array('term-id'),
-        ),
-      );
-      $form['terms'][$key]['term']['parent'] = array(
-        '#type' => 'hidden',
-        // Yes, default_value on a hidden. It needs to be changeable by the
-        // javascript.
-        '#default_value' => $term->parent,
-        '#attributes' => array(
-          'class' => array('term-parent'),
-        ),
-      );
-      $form['terms'][$key]['term']['depth'] = array(
-        '#type' => 'hidden',
-        // Same as above, the depth is modified by javascript, so it's a
-        // default_value.
-        '#default_value' => $term->depth,
-        '#attributes' => array(
-          'class' => array('term-depth'),
-        ),
-      );
-    }
-    $form['terms'][$key]['weight'] = array(
-      '#type' => 'weight',
-      '#delta' => $delta,
-      '#title_display' => 'invisible',
-      '#title' => t('Weight for added term'),
-      '#default_value' => $term->weight,
-      '#attributes' => array(
-        'class' => array('term-weight'),
-      ),
-    );
-    $operations = array(
-      'edit' => array(
-        'title' => t('edit'),
-        'href' => 'taxonomy/term/' . $term->tid . '/edit',
-        'query' => $destination,
-      ),
-      'delete' => array(
-        'title' => t('delete'),
-        'href' => 'taxonomy/term/' . $term->tid . '/delete',
-        'query' => $destination,
-      ),
-    );
-    if (module_invoke('translation_entity', 'translate_access', $term)) {
-      $operations['translate'] = array(
-        'title' => t('translate'),
-        'href' => 'taxonomy/term/' . $term->tid . '/translations',
-        'query' => $destination,
-      );
-    }
-    $form['terms'][$key]['operations'] = array(
-      '#type' => 'operations',
-      '#links' => $operations,
-    );
-
-    $form['terms'][$key]['#attributes']['class'] = array();
-    if ($parent_fields) {
-      $form['terms'][$key]['#attributes']['class'][] = 'draggable';
-    }
-
-    // Add classes that mark which terms belong to previous and next pages.
-    if ($row_position < $back_step || $row_position >= $page_entries - $forward_step) {
-      $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-preview';
-    }
-
-    if ($row_position !== 0 && $row_position !== count($tree) - 1) {
-      if ($row_position == $back_step - 1 || $row_position == $page_entries - $forward_step - 1) {
-        $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-divider-top';
-      }
-      elseif ($row_position == $back_step || $row_position == $page_entries - $forward_step) {
-        $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-divider-bottom';
-      }
-    }
-
-    // Add an error class if this row contains a form error.
-    foreach ($errors as $error_key => $error) {
-      if (strpos($error_key, $key) === 0) {
-        $form['terms'][$key]['#attributes']['class'][] = 'error';
-      }
-    }
-    $row_position++;
-  }
-
-
-  if ($parent_fields) {
-    $form['terms']['#tabledrag'][] = array('match', 'parent', 'term-parent', 'term-parent', 'term-id', FALSE);
-    $form['terms']['#tabledrag'][] = array('depth', 'group', 'term-depth', NULL, NULL, FALSE);
-    $form['terms']['#attached']['library'][] = array('taxonomy', 'drupal.taxonomy');
-    $form['terms']['#attached']['js'][] = array(
-      'data' => array('taxonomy' => array('backStep' => $back_step, 'forwardStep' => $forward_step)),
-      'type' => 'setting',
-    );
-  }
-  $form['terms']['#tabledrag'][] = array('order', 'sibling', 'term-weight');
-
-  if ($vocabulary->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE && count($tree) > 1) {
-    $form['actions'] = array('#type' => 'actions', '#tree' => FALSE);
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Save'),
-      '#button_type' => 'primary',
-    );
-    $form['actions']['reset_alphabetical'] = array(
-      '#type' => 'submit',
-      '#value' => t('Reset to alphabetical')
-    );
-    $form_state['redirect'] = array(current_path(), (isset($_GET['page']) ? array('query' => array('page' => $_GET['page'])) : array()));
-  }
-
-  return $form;
-}
-
-/**
- * Submit handler for terms overview form.
- *
- * Rather than using a textfield or weight field, this form depends entirely
- * upon the order of form elements on the page to determine new weights.
- *
- * Because there might be hundreds or thousands of taxonomy terms that need to
- * be ordered, terms are weighted from 0 to the number of terms in the
- * vocabulary, rather than the standard -10 to 10 scale. Numbers are sorted
- * lowest to highest, but are not necessarily sequential. Numbers may be skipped
- * when a term has children so that reordering is minimal when a child is
- * added or removed from a term.
- *
- * @see taxonomy_overview_terms()
- */
-function taxonomy_overview_terms_submit($form, &$form_state) {
-  if ($form_state['triggering_element']['#value'] == t('Reset to alphabetical')) {
-    // Execute the reset action.
-    if ($form_state['values']['reset_alphabetical'] === TRUE) {
-      return taxonomy_vocabulary_confirm_reset_alphabetical_submit($form, $form_state);
-    }
-    // Rebuild the form to confirm the reset action.
-    $form_state['rebuild'] = TRUE;
-    $form_state['confirm_reset_alphabetical'] = TRUE;
-    return;
-  }
-
-  // Sort term order based on weight.
-  uasort($form_state['values']['terms'], 'drupal_sort_weight');
-
-  $vocabulary = $form_state['taxonomy']['vocabulary'];
-  // Update the current hierarchy type as we go.
-  $hierarchy = TAXONOMY_HIERARCHY_DISABLED;
-
-  $changed_terms = array();
-  $tree = taxonomy_get_tree($vocabulary->id());
-
-  if (empty($tree)) {
-    return;
-  }
-
-  // Build a list of all terms that need to be updated on previous pages.
-  $weight = 0;
-  $term = (array) $tree[0];
-  while ($term['tid'] != $form['#first_tid']) {
-    if ($term['parents'][0] == 0 && $term['weight'] != $weight) {
-      $term['parent'] = $term['parents'][0];
-      $term['weight'] = $weight;
-      $changed_terms[$term['tid']] = $term;
-    }
-    $weight++;
-    $hierarchy = $term['parents'][0] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
-    $term = (array) $tree[$weight];
-  }
-
-  // Renumber the current page weights and assign any new parents.
-  $level_weights = array();
-  foreach ($form_state['values']['terms'] as $tid => $values) {
-    if (isset($form['terms'][$tid]['#term'])) {
-      $term = $form['terms'][$tid]['#term'];
-      // Give terms at the root level a weight in sequence with terms on previous pages.
-      if ($values['term']['parent'] == 0 && $term['weight'] != $weight) {
-        $term['weight'] = $weight;
-        $changed_terms[$term['tid']] = $term;
-      }
-      // Terms not at the root level can safely start from 0 because they're all on this page.
-      elseif ($values['term']['parent'] > 0) {
-        $level_weights[$values['term']['parent']] = isset($level_weights[$values['term']['parent']]) ? $level_weights[$values['term']['parent']] + 1 : 0;
-        if ($level_weights[$values['term']['parent']] != $term['weight']) {
-          $term['weight'] = $level_weights[$values['term']['parent']];
-          $changed_terms[$term['tid']] = $term;
-        }
-      }
-      // Update any changed parents.
-      if ($values['term']['parent'] != $term['parent']) {
-        $term['parent'] = $values['term']['parent'];
-        $changed_terms[$term['tid']] = $term;
-      }
-      $hierarchy = $term['parent'] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
-      $weight++;
-    }
-  }
-
-  // Build a list of all terms that need to be updated on following pages.
-  for ($weight; $weight < count($tree); $weight++) {
-    $term = (array) $tree[$weight];
-    if ($term['parents'][0] == 0 && $term['weight'] != $weight) {
-      $term['parent'] = $term['parents'][0];
-      $term['weight'] = $weight;
-      $changed_terms[$term['tid']] = $term;
-    }
-    $hierarchy = $term['parents'][0] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
-  }
-
-  // Save all updated terms.
-  foreach ($changed_terms as $changed) {
-    $term = (object) $changed;
-    // Update term_hierachy and term_data directly since we don't have a
-    // fully populated term object to save.
-    db_update('taxonomy_term_hierarchy')
-      ->fields(array('parent' => $term->parent))
-      ->condition('tid', $term->tid, '=')
-      ->execute();
-
-    db_update('taxonomy_term_data')
-      ->fields(array('weight' => $term->weight))
-      ->condition('tid', $term->tid, '=')
-      ->execute();
-  }
-
-  // Update the vocabulary hierarchy to flat or single hierarchy.
-  if ($vocabulary->hierarchy != $hierarchy) {
-    $vocabulary->hierarchy = $hierarchy;
-    taxonomy_vocabulary_save($vocabulary);
-  }
-  drupal_set_message(t('The configuration options have been saved.'));
-}
-
-/**
  * Returns a rendered edit form to create a new term associated to the given vocabulary.
  */
 function taxonomy_term_add($vocabulary) {
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 89f334b..48f7b1a 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -327,13 +327,7 @@ function taxonomy_menu() {
   );
 
   $items['admin/structure/taxonomy/%taxonomy_vocabulary'] = array(
-    'title callback' => 'entity_page_label',
-    'title arguments' => array(3),
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('taxonomy_overview_terms', 3),
-    'access callback' => 'entity_page_access',
-    'access arguments' => array(3, 'view'),
-    'file' => 'taxonomy.admin.inc',
+    'route_name' => 'taxonomy_overview_terms',
   );
   $items['admin/structure/taxonomy/%taxonomy_vocabulary/list'] = array(
     'title' => 'List',
diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml
new file mode 100644
index 0000000..f886eb3
--- /dev/null
+++ b/core/modules/taxonomy/taxonomy.routing.yml
@@ -0,0 +1,8 @@
+taxonomy_overview_terms:
+  pattern: admin/structure/taxonomy/{taxonomy_vocabulary}
+  defaults:
+    _form: 'Drupal\taxonomy\Form\OverviewTerms'
+  requirements:
+    _entity_access: 'taxonomy_vocabulary.view'
+    # Don't allow add or list.
+    taxonomy_vocabulary: "^(?:(?!add|list).)*"
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
new file mode 100644
index 0000000..a1604aa
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Entity\EntityAccessCheckTest.
+ */
+
+namespace Drupal\Tests\Core\Entity;
+
+// @todo Remove once http://drupal.org/node/1620010 is committed.
+if (!defined('LANGUAGE_DEFAULT')) {
+  define('LANGUAGE_DEFAULT', 'und');
+}
+if (!defined('LANGUAGE_NOT_SPECIFIED')) {
+  define('LANGUAGE_NOT_SPECIFIED', 'und');
+}
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Route;
+use Drupal\Core\Entity\EntityAccessCheck;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * Tests the entity access controller.
+ *
+ * @group Entity
+ */
+class EntityAccessCheckTest extends UnitTestCase {
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Entity access check test',
+      'description' => 'Unit test of entity access checking system.',
+      'group' => 'Entity'
+    );
+  }
+
+  /**
+   * Tests the method for checking if the access check applies to a route.
+   */
+  public function testApplies() {
+    $applies_check = new EntityAccessCheck();
+
+    $route = $this->getMockBuilder('Symfony\Component\Routing\Route')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $route->expects($this->any())
+      ->method('getRequirements')
+      ->will($this->returnValue(array('_entity_access' => '')));
+    $res = $applies_check->applies($route);
+    $this->assertEquals(TRUE, $res);
+
+    $route = $this->getMockBuilder('Symfony\Component\Routing\Route')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $route->expects($this->any())
+      ->method('getRequirements')
+      ->will($this->returnValue(array()));
+    $res = $applies_check->applies($route);
+    $this->assertEquals(FALSE, $res);
+  }
+
+  /**
+   * Tests the method for checking access to routes.
+   */
+  public function testAccess() {
+    $route = new Route('/foo', array(), array('_entity_access' => 'node.update'));
+    $request = new Request();
+    $node = $this->getMockBuilder('Drupal\node\Plugin\Core\Entity\Node')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $node->expects($this->any())
+      ->method('access')
+      ->will($this->returnValue(TRUE));
+    $access_check = new EntityAccessCheck();
+    $request->attributes->set('node', $node);
+    $access = $access_check->access($route, $request);
+    $this->assertEquals(TRUE, $access);
+  }
+
+}