diff --git a/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerController.php b/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerController.php
new file mode 100644
index 0000000..9ee381d
--- /dev/null
+++ b/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerController.php
@@ -0,0 +1,193 @@
+<?php
+/**
+* @file
+* Contains \Drupal\tracker\Controller\TrackerController.
+*/
+
+namespace Drupal\tracker\Controller;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Entity\EntityManager;
+use Drupal\Core\ControllerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+* Controller routines for tracker routes.
+*/
+class TrackerController implements ControllerInterface {
+
+  /**
+   * The database connection object.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * The entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManager
+   */
+  protected $entityManager;
+
+  /**
+   * Constructs a TrackerController object.
+   *
+   * @param \Drupal\Core\Database\Connection $database
+   *   The database connection object.
+   * @param \Drupal\Core\Entity\EntityManager $entity_manager
+   *   The entity manager.
+   */
+  public function __construct(Connection $database, EntityManager $entity_manager) {
+    $this->database = $database;
+    $this->entityManager = $entity_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('database'),
+      $container->get('plugin.manager.entity')
+    );
+  }
+
+  /**
+   * Generates a page of tracked nodes for the site.
+   *
+   * Queries the database for info, adds RDFa info if applicable, and generates
+   * the render array that will be used to render the page.
+   *
+   * @return array
+   *   A renderable array.
+   *
+   */
+  public function trackerPage($account = NULL, $set_title = FALSE) {
+    if ($account) {
+      $query = $this->database->select('tracker_node', 't')
+        ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
+        ->condition('t.uid', $account->uid);
+
+      if ($set_title) {
+        // When viewed from user/%user/track, display the name of the user
+        // as page title -- the tab title remains Track so this needs to be done
+        // here and not in the menu definition.
+        drupal_set_title(user_format_name($account));
+      }
+    }
+    else {
+      $query = $this->database->select('tracker_node', 't', array('target' => 'slave'))
+        ->extend('Drupal\Core\Database\Query\PagerSelectExtender');
+    }
+
+    // This array acts as a placeholder for the data selected later
+    // while keeping the correct order.
+    $tracker_data = $query
+      ->addTag('node_access')
+      ->addMetaData('base_table', 'tracker_node')
+      ->fields('t', array('nid', 'changed'))
+      ->condition('t.published', 1)
+      ->orderBy('t.changed', 'DESC')
+      ->limit(25)
+      ->execute()
+      ->fetchAllAssoc('nid');
+
+    $rows = array();
+    if (!empty($tracker_data)) {
+      $nids = array_keys($tracker_data);
+      $nodes = $this->entityManager
+        ->getStorageController('node')
+        ->load($nids);
+      // Now, get the data and put into the placeholder array.
+      $select = $this->database->select('node', 'n', array('target' => 'slave'));
+      $select->join('node_comment_statistics', 'l', 'n.nid = l.nid');
+      $select->join('users', 'u', 'n.uid = u.uid');
+      $select->addField('n', 'nid');
+      $select->addField('l', 'comment_count');
+      $select->condition('n.nid', $nids, 'IN');
+      $result = $select->execute()->fetchAllKeyed();
+      foreach ($result as $nid => $comment_count) {
+        $nodes[$nid]->last_activity = $tracker_data[$nid]->changed;
+        $nodes[$nid]->comment_count = $comment_count;
+      }
+
+      // Display the data.
+      foreach ($nodes as $node) {
+        // Determine the number of comments.
+        $comments = 0;
+        if ($node->comment_count) {
+          $comments = $node->comment_count;
+
+          if ($new = comment_num_new($node->nid)) {
+            $comments .= '<br />';
+            $comments .= l(format_plural($new, '1 new', '@count new'), 'node/' . $node->nid, array('fragment' => 'new'));
+          }
+        }
+
+        $row = array(
+          'type' => check_plain(node_get_type_label($node)),
+          // Do not use $node->label(), because $node comes from the database.
+          'title' => array('data' => l($node->title, 'node/' . $node->nid) . ' ' . theme('mark', array('type' => node_mark($node->nid, $node->changed)))),
+          'author' => array('data' => theme('username', array('account' => $node))),
+          'replies' => array('class' => array('replies'), 'data' => $comments),
+          'last updated' => array('data' => t('!time ago', array('!time' => format_interval(REQUEST_TIME - $node->last_activity)))),
+        );
+
+        // Adds extra RDFa markup to the $row array if the RDF module is enabled.
+        if (function_exists('rdf_mapping_load')) {
+          // Each node is not loaded for performance reasons, as a result we need
+          // to retrieve the RDF mapping for each node type.
+          $mapping = rdf_mapping_load('node', $node->type);
+          // Adds RDFa markup to the title of the node. Because the RDFa markup is
+          // added to the td tag which might contain HTML code, we specify an
+          // empty datatype to ensure the value of the title read by the RDFa
+          // parsers is a plain literal.
+          $row['title'] += rdf_rdfa_attributes($mapping['title']) + array('datatype' => '');
+          // Annotates the td tag containing the author of the node.
+          $row['author'] += rdf_rdfa_attributes($mapping['uid']);
+          // Annotates the td tag containing the number of replies. We add the
+          // content attribute to ensure that only the comment count is used as
+          // the value for 'num_replies'. Otherwise, other text such as a link
+          // to the number of new comments could be included in the 'num_replies'
+          // value.
+          $row['replies'] += rdf_rdfa_attributes($mapping['comment_count']);
+          $row['replies'] += array('content' => $node->comment_count);
+          // If the node has no comments, we assume the node itself was modified
+          // and apply 'changed' in addition to 'last_activity'.  If there are
+          // comments present, we cannot infer whether the node itself was
+          // modified or a comment was posted, so we use only 'last_activity'.
+          $mapping_last_activity = rdf_rdfa_attributes($mapping['last_activity'], $node->last_activity);
+          if ($node->comment_count == 0) {
+            $mapping_changed = rdf_rdfa_attributes($mapping['changed'], $node->last_activity);
+            $mapping_last_activity['property'] = array_merge($mapping_last_activity['property'], $mapping_changed['property']);
+          }
+          $row['last updated'] += $mapping_last_activity;
+
+          // We need to add the about attribute on the tr tag to specify which
+          // node the RDFa annotations above apply to. We move the content of
+          // $row to a 'data' sub array so we can specify attributes for the row.
+          $row = array('data' => $row);
+          $row['about'] = url('node/' . $node->nid);
+        }
+        $rows[] = $row;
+      }
+    }
+
+    $page['tracker'] = array(
+      '#rows' => $rows,
+      '#header' => array(t('Type'), t('Title'), t('Author'), t('Replies'), t('Last updated')),
+      '#theme' => 'table',
+      '#empty' => t('No content available.'),
+    );
+    $page['pager'] = array(
+      '#theme' => 'pager',
+      '#quantity' => 25,
+      '#weight' => 10,
+    );
+    $page['#sorted'] = TRUE;
+
+    return $page;
+  }
+}
+?>
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index 125b5da..18b7cda 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -34,10 +34,8 @@ function tracker_help($path, $arg) {
 function tracker_menu() {
   $items['tracker'] = array(
     'title' => 'Recent content',
-    'page callback' => 'tracker_page',
-    'access arguments' => array('access content'),
+    'route_name' => 'tracker_page',
     'weight' => 1,
-    'file' => 'tracker.pages.inc',
   );
   $items['tracker/all'] = array(
     'title' => 'All recent content',
diff --git a/core/modules/tracker/tracker.routing.yml b/core/modules/tracker/tracker.routing.yml
new file mode 100644
index 0000000..b4c709e
--- /dev/null
+++ b/core/modules/tracker/tracker.routing.yml
@@ -0,0 +1,6 @@
+tracker_page:
+  pattern: '/tracker'
+  defaults:
+    _content: '\Drupal\tracker\Controller\TrackerController::trackerPage'
+  requirements:
+    _permission: 'access content'