diff --git a/core/modules/comment/comment.admin.inc b/core/modules/comment/comment.admin.inc
index 488c2f9..9115d28 100644
--- a/core/modules/comment/comment.admin.inc
+++ b/core/modules/comment/comment.admin.inc
@@ -8,203 +8,6 @@
 use Drupal\comment\Plugin\Core\Entity\Comment;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- * Page callback: Presents an administrative comment listing.
- *
- * @param $type
- *   The type of the overview form ('approval' or 'new'). See
- *   comment_admin_overview() for details.
- *
- * @see comment_menu()
- * @see comment_multiple_delete_confirm()
- */
-function comment_admin($type = 'new') {
-  $edit = $_POST;
-
-  if (isset($edit['operation']) && ($edit['operation'] == 'delete') && isset($edit['comments']) && $edit['comments']) {
-    return drupal_get_form('comment_multiple_delete_confirm');
-  }
-  else {
-    return drupal_get_form('comment_admin_overview', $type);
-  }
-}
-
-/**
- * Form constructor for the comment overview administration form.
- *
- * @param $arg
- *   The type of overview form ('approval' or 'new').
- *
- * @ingroup forms
- * @see comment_admin()
- * @see comment_admin_overview_validate()
- * @see comment_admin_overview_submit()
- * @see theme_comment_admin_overview()
- */
-function comment_admin_overview($form, &$form_state, $arg) {
-  // Build an 'Update options' form.
-  $form['options'] = array(
-    '#type' => 'details',
-    '#title' => t('Update options'),
-    '#attributes' => array('class' => array('container-inline')),
-  );
-
-  if ($arg == 'approval') {
-    $options['publish'] = t('Publish the selected comments');
-  }
-  else {
-    $options['unpublish'] = t('Unpublish the selected comments');
-  }
-  $options['delete'] = t('Delete the selected comments');
-
-  $form['options']['operation'] = array(
-    '#type' => 'select',
-    '#title' => t('Operation'),
-    '#title_display' => 'invisible',
-    '#options' => $options,
-    '#default_value' => 'publish',
-  );
-  $form['options']['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Update'),
-  );
-
-  // Load the comments that need to be displayed.
-  $status = ($arg == 'approval') ? COMMENT_NOT_PUBLISHED : COMMENT_PUBLISHED;
-  $header = array(
-    'subject' => array('data' => t('Subject'), 'field' => 'subject'),
-    'author' => array('data' => t('Author'), 'field' => 'name', 'class' => array(RESPONSIVE_PRIORITY_MEDIUM)),
-    'posted_in' => array('data' => t('Posted in'), 'field' => 'node_title', 'class' => array(RESPONSIVE_PRIORITY_LOW)),
-    'changed' => array('data' => t('Updated'), 'field' => 'c.changed', 'sort' => 'desc', 'class' => array(RESPONSIVE_PRIORITY_LOW)),
-    'operations' => t('Operations'),
-  );
-
-  $query = db_select('comment', 'c')
-    ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
-    ->extend('Drupal\Core\Database\Query\TableSortExtender');
-  $query->join('node', 'n', 'n.nid = c.nid');
-  $query->addField('n', 'title', 'node_title');
-  $query->addTag('node_access');
-  $result = $query
-    ->fields('c', array('cid', 'subject', 'name', 'changed'))
-    ->condition('c.status', $status)
-    ->limit(50)
-    ->orderByHeader($header)
-    ->execute();
-
-  $cids = array();
-
-  // We collect a sorted list of node_titles during the query to attach to the
-  // comments later.
-  foreach ($result as $row) {
-    $cids[] = $row->cid;
-    $node_titles[] = $row->node_title;
-  }
-  $comments = comment_load_multiple($cids);
-
-  // Build a table listing the appropriate comments.
-  $options = array();
-  $destination = drupal_get_destination();
-
-  foreach ($comments as $comment) {
-    // Remove the first node title from the node_titles array and attach to
-    // the comment.
-    $node_title = array_shift($node_titles);
-    $options[$comment->id()] = array(
-      'subject' => array(
-        'data' => array(
-          '#type' => 'link',
-          '#title' => $comment->subject->value,
-          '#href' => 'comment/' . $comment->id(),
-          '#options' => array('attributes' => array('title' => truncate_utf8($comment->comment_body->value, 128)), 'fragment' => 'comment-' . $comment->id()),
-        ),
-      ),
-      'author' => theme('username', array('account' => comment_prepare_author($comment))),
-      'posted_in' => array(
-        'data' => array(
-          '#type' => 'link',
-          '#title' => $node_title,
-          '#href' => 'node/' . $comment->nid->target_id,
-        ),
-      ),
-      'changed' => format_date($comment->changed->value, 'short'),
-    );
-    $links = array();
-    $links['edit'] = array(
-      'title' => t('edit'),
-      'href' => 'comment/' . $comment->id() . '/edit',
-      'query' => $destination,
-    );
-    if (module_invoke('translation_entity', 'translate_access', $comment)) {
-      $links['translate'] = array(
-        'title' => t('translate'),
-        'href' => 'comment/' . $comment->id() . '/translations',
-        'query' => $destination,
-      );
-    }
-    $options[$comment->id()]['operations']['data'] = array(
-      '#type' => 'operations',
-      '#links' => $links,
-    );
-  }
-
-  $form['comments'] = array(
-    '#type' => 'tableselect',
-    '#header' => $header,
-    '#options' => $options,
-    '#empty' => t('No comments available.'),
-  );
-
-  $form['pager'] = array('#theme' => 'pager');
-
-  return $form;
-}
-
-/**
- * Form validation handler for comment_admin_overview().
- *
- * @see comment_admin_overview_submit()
- */
-function comment_admin_overview_validate($form, &$form_state) {
-  $form_state['values']['comments'] = array_diff($form_state['values']['comments'], array(0));
-  // We can't execute any 'Update options' if no comments were selected.
-  if (count($form_state['values']['comments']) == 0) {
-    form_set_error('', t('Select one or more comments to perform the update on.'));
-  }
-}
-
-/**
- * Form submission handler for comment_admin_overview().
- *
- * Executes the chosen 'Update option' on the selected comments, such as
- * publishing, unpublishing or deleting.
- *
- * @see comment_admin_overview_validate()
- */
-function comment_admin_overview_submit($form, &$form_state) {
-  $operation = $form_state['values']['operation'];
-  $cids = $form_state['values']['comments'];
-
-  if ($operation == 'delete') {
-    comment_delete_multiple($cids);
-  }
-  else {
-    foreach ($cids as $cid => $value) {
-      $comment = comment_load($value);
-
-      if ($operation == 'unpublish') {
-        $comment->status->value = COMMENT_NOT_PUBLISHED;
-      }
-      elseif ($operation == 'publish') {
-        $comment->status->value = COMMENT_PUBLISHED;
-      }
-      comment_save($comment);
-    }
-  }
-  drupal_set_message(t('The update has been performed.'));
-  $form_state['redirect'] = 'admin/content/comment';
-  cache_invalidate_tags(array('content' => TRUE));
-}
 
 /**
  * Form constructor for the confirmation form for bulk comment deletion.
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 5690c72..d31c8f2 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -223,10 +223,8 @@ function comment_menu() {
   $items['admin/content/comment'] = array(
     'title' => 'Comments',
     'description' => 'List and edit site comments and the comment approval queue.',
-    'page callback' => 'comment_admin',
-    'access arguments' => array('administer comments'),
+    'route_name' => 'comment_admin',
     'type' => MENU_LOCAL_TASK | MENU_NORMAL_ITEM,
-    'file' => 'comment.admin.inc',
   );
   // Tabs begin here.
   $items['admin/content/comment/new'] = array(
diff --git a/core/modules/comment/comment.routing.yml b/core/modules/comment/comment.routing.yml
new file mode 100644
index 0000000..15150e8
--- /dev/null
+++ b/core/modules/comment/comment.routing.yml
@@ -0,0 +1,12 @@
+comment_admin:
+  pattern: '/admin/content/comment'
+  defaults:
+    _controller: '\Drupal\comment\Controller\CommentController::adminOverview'
+  requirements:
+    _permission: 'administer comments'
+content_admin_type:
+  pattern: '/admin/content/comment/{type}'
+  defaults:
+    _controller: '\Drupal\comment\Controller\CommentController::adminOverview'
+  requirements:
+    _permission: 'administer comments'
diff --git a/core/modules/comment/comment.services.yml b/core/modules/comment/comment.services.yml
new file mode 100644
index 0000000..772a6ad
--- /dev/null
+++ b/core/modules/comment/comment.services.yml
@@ -0,0 +1,4 @@
+services:
+  comment.admin.form:
+    class: Drupal\comment\Form\AdminOverview
+    arguments: ['@database']
diff --git a/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php b/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
new file mode 100644
index 0000000..1d5f4e0
--- /dev/null
+++ b/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+* @file
+* Contains \Drupal\comment\Controller\CommentController.
+*/
+
+namespace Drupal\comment\Controller;
+
+use Drupal\Core\ControllerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+* Controller methods for comment routes.
+*/
+class CommentController implements ControllerInterface {
+
+  /**
+   * Dependancy container.
+   *
+   * @var Symfony\Component\DependencyInjection\ContainerInterface
+   */
+  private $container;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static($container);
+  }
+
+  /**
+   * Creates a new CommentController Object.
+   *
+   * @param Symfony\Component\DependencyInjection\ContainerInterface $container
+   *   Object container.
+   */
+  public function __construct(ContainerInterface $container) {
+    $this->container = $container;
+  }
+
+  /**
+   * Returns an administrative overview of comments.
+   *
+   * @return string
+   *   A HTML-formatted string with the administrative page content.
+   */
+  public function adminOverview($type = 'new') {
+    $edit = $_POST;
+
+    if (isset($edit['operation']) && ($edit['operation'] == 'delete') && isset($edit['comments']) && $edit['comments']) {
+      return drupal_get_form('comment_multiple_delete_confirm');
+    }
+    else {
+      return drupal_get_form($this->container->get('comment.admin.form'), $type);
+    }
+  }
+
+}
diff --git a/core/modules/comment/lib/Drupal/comment/Form/AdminOverview.php b/core/modules/comment/lib/Drupal/comment/Form/AdminOverview.php
new file mode 100644
index 0000000..5d56397
--- /dev/null
+++ b/core/modules/comment/lib/Drupal/comment/Form/AdminOverview.php
@@ -0,0 +1,199 @@
+<?php
+
+/**
+* @file
+* Contains \Drupal\comment\Form\AdminOverview.
+*/
+
+namespace Drupal\comment\Form;
+
+use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Database\Connection;
+
+/**
+ * Provides the comment admin overview form.
+ */
+class AdminOverview implements FormInterface {
+
+  /**
+   * Database Service Object.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * Constructs the AdminOverview object.
+   */
+  public function __construct(Connection $database) {
+    $this->database = $database;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, array &$form_state) {
+    // Build an 'Update options' form.
+    $form['options'] = array(
+      '#type' => 'details',
+      '#title' => t('Update options'),
+      '#attributes' => array('class' => array('container-inline')),
+    );
+
+    if ($form_state['build_info']['args'][0] == 'approval') {
+      $options['publish'] = t('Publish the selected comments');
+    }
+    else {
+      $options['unpublish'] = t('Unpublish the selected comments');
+    }
+    $options['delete'] = t('Delete the selected comments');
+
+    $form['options']['operation'] = array(
+      '#type' => 'select',
+      '#title' => t('Operation'),
+      '#title_display' => 'invisible',
+      '#options' => $options,
+      '#default_value' => 'publish',
+    );
+    $form['options']['submit'] = array(
+      '#type' => 'submit',
+      '#value' => t('Update'),
+    );
+
+    // Load the comments that need to be displayed.
+    $status = ($form_state['build_info']['args'][0] == 'approval') ? COMMENT_NOT_PUBLISHED : COMMENT_PUBLISHED;
+    $header = array(
+      'subject' => array('data' => t('Subject'), 'field' => 'subject'),
+      'author' => array('data' => t('Author'), 'field' => 'name', 'class' => array(RESPONSIVE_PRIORITY_MEDIUM)),
+      'posted_in' => array('data' => t('Posted in'), 'field' => 'node_title', 'class' => array(RESPONSIVE_PRIORITY_LOW)),
+      'changed' => array('data' => t('Updated'), 'field' => 'c.changed', 'sort' => 'desc', 'class' => array(RESPONSIVE_PRIORITY_LOW)),
+      'operations' => t('Operations'),
+    );
+
+    $query = $this->database->select('comment', 'c')
+      ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
+      ->extend('Drupal\Core\Database\Query\TableSortExtender');
+    $query->join('node', 'n', 'n.nid = c.nid');
+    $query->addField('n', 'title', 'node_title');
+    $query->addTag('node_access');
+    $result = $query
+      ->fields('c', array('cid', 'subject', 'name', 'changed'))
+      ->condition('c.status', $status)
+      ->limit(50)
+      ->orderByHeader($header)
+      ->execute();
+
+    $cids = array();
+
+    // We collect a sorted list of node_titles during the query to attach to the
+    // comments later.
+    foreach ($result as $row) {
+      $cids[] = $row->cid;
+      $node_titles[] = $row->node_title;
+    }
+    $comments = comment_load_multiple($cids);
+
+    // Build a table listing the appropriate comments.
+    $options = array();
+    $destination = drupal_get_destination();
+
+    foreach ($comments as $comment) {
+      // Remove the first node title from the node_titles array and attach to
+      // the comment.
+      $node_title = array_shift($node_titles);
+      $options[$comment->id()] = array(
+        'subject' => array(
+          'data' => array(
+            '#type' => 'link',
+            '#title' => $comment->subject->value,
+            '#href' => 'comment/' . $comment->id(),
+            '#options' => array('attributes' => array('title' => truncate_utf8($comment->comment_body->value, 128)), 'fragment' => 'comment-' . $comment->id()),
+          ),
+        ),
+        'author' => theme('username', array('account' => comment_prepare_author($comment))),
+        'posted_in' => array(
+          'data' => array(
+            '#type' => 'link',
+            '#title' => $node_title,
+            '#href' => 'node/' . $comment->nid->target_id,
+          ),
+        ),
+        'changed' => format_date($comment->changed->value, 'short'),
+      );
+      $links = array();
+      $links['edit'] = array(
+        'title' => t('edit'),
+        'href' => 'comment/' . $comment->id() . '/edit',
+        'query' => $destination,
+      );
+      if (module_invoke('translation_entity', 'translate_access', $comment)) {
+        $links['translate'] = array(
+          'title' => t('translate'),
+          'href' => 'comment/' . $comment->id() . '/translations',
+          'query' => $destination,
+        );
+      }
+      $options[$comment->id()]['operations']['data'] = array(
+        '#type' => 'operations',
+        '#links' => $links,
+      );
+    }
+
+    $form['comments'] = array(
+      '#type' => 'tableselect',
+      '#header' => $header,
+      '#options' => $options,
+      '#empty' => t('No comments available.'),
+    );
+
+    $form['pager'] = array('#theme' => 'pager');
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormID() {
+    return 'comment_admin_overview';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, array &$form_state) {
+    $operation = $form_state['values']['operation'];
+    $cids = $form_state['values']['comments'];
+
+    if ($operation == 'delete') {
+      comment_delete_multiple($cids);
+    }
+    else {
+      foreach ($cids as $cid => $value) {
+        $comment = comment_load($value);
+
+        if ($operation == 'unpublish') {
+          $comment->status->value = COMMENT_NOT_PUBLISHED;
+        }
+        elseif ($operation == 'publish') {
+          $comment->status->value = COMMENT_PUBLISHED;
+        }
+        comment_save($comment);
+      }
+    }
+    drupal_set_message(t('The update has been performed.'));
+    $form_state['redirect'] = 'admin/content/comment';
+    cache_invalidate_tags(array('content' => TRUE));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, array &$form_state) {
+    $form_state['values']['comments'] = array_diff($form_state['values']['comments'], array(0));
+    // We can't execute any 'Update options' if no comments were selected.
+    if (count($form_state['values']['comments']) == 0) {
+      form_set_error('', t('Select one or more comments to perform the update on.'));
+    }
+  }
+}