diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/LinkFormatter.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/LinkFormatter.php
new file mode 100644
index 0000000..fd5aa4c
--- /dev/null
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/LinkFormatter.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\taxonomy\Plugin\field\formatter\LinkFormatter.
+ */
+
+namespace Drupal\taxonomy\Plugin\field\formatter;
+
+use Drupal\Core\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
+use Drupal\field\Plugin\Type\Formatter\FormatterBase;
+use Drupal\taxonomy\Plugin\field\formatter\TaxonomyFormatterBase;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Plugin implementation of the 'taxonomy_term_reference_link' formatter.
+ *
+ * @Plugin(
+ *   id = "taxonomy_term_reference_link",
+ *   module = "taxonomy",
+ *   label = @Translation("Link"),
+ *   field_types = {
+ *     "taxonomy_term_reference"
+ *   }
+ * )
+ */
+class LinkFormatter extends TaxonomyFormatterBase {
+
+  /**
+   * Implements Drupal\field\Plugin\Type\Formatter\FormatterInterface::viewElements().
+   */
+  public function viewElements(EntityInterface $entity, $langcode, array $items) {
+    $elements = array();
+
+    // Terms whose tid is 'autocreate' do not exist
+    // yet and $item['taxonomy_term'] is not set. Theme such terms as
+    // just their name.
+    foreach ($items as $delta => $item) {
+      if ($item['tid'] == 'autocreate') {
+        $elements[$delta] = array(
+          '#markup' => check_plain($item['name']),
+        );
+      }
+      else {
+        $term = $item['taxonomy_term'];
+        $uri = $term->uri();
+        $elements[$delta] = array(
+          '#type' => 'link',
+          '#title' => $term->label(),
+          '#href' => $uri['path'],
+          '#options' => $uri['options'],
+        );
+      }
+    }
+
+    return $elements;
+  }
+
+}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/PlainFormatter.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/PlainFormatter.php
new file mode 100644
index 0000000..5ac65b2
--- /dev/null
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/PlainFormatter.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\taxonomy\Plugin\field\formatter\PlainFormatter.
+ */
+
+namespace Drupal\taxonomy\Plugin\field\formatter;
+
+use Drupal\Core\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
+use Drupal\field\Plugin\Type\Formatter\FormatterBase;
+use Drupal\taxonomy\Plugin\field\formatter\TaxonomyFormatterBase;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Plugin implementation of the 'taxonomy_term_reference_plain' formatter.
+ *
+ * @Plugin(
+ *   id = "taxonomy_term_reference_plain",
+ *   module = "taxonomy",
+ *   label = @Translation("Plain text"),
+ *   field_types = {
+ *     "taxonomy_term_reference"
+ *   }
+ * )
+ */
+class PlainFormatter extends TaxonomyFormatterBase {
+
+  /**
+   * Implements Drupal\field\Plugin\Type\Formatter\FormatterInterface::viewElements().
+   */
+  public function viewElements(EntityInterface $entity, $langcode, array $items) {
+    $elements = array();
+
+    // Terms whose tid is 'autocreate' do not exist
+    // yet and $item['taxonomy_term'] is not set. Theme such terms as
+    // just their name.
+    foreach ($items as $delta => $item) {
+      $name = ($item['tid'] != 'autocreate' ? $item['taxonomy_term']->label() : $item['name']);
+      $elements[$delta] = array(
+        '#markup' => check_plain($name),
+      );
+    }
+
+    return $elements;
+  }
+
+}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/RSSCategoryFormatter.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/RSSCategoryFormatter.php
new file mode 100644
index 0000000..a70cc49
--- /dev/null
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/RSSCategoryFormatter.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\taxonomy\Plugin\field\formatter\RSSCategoryFormatter.
+ */
+
+namespace Drupal\taxonomy\Plugin\field\formatter;
+
+use Drupal\Core\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
+use Drupal\field\Plugin\Type\Formatter\FormatterBase;
+use Drupal\taxonomy\Plugin\field\formatter\TaxonomyFormatterBase;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Plugin implementation of the 'taxonomy_term_reference_rss_category' formatter.
+ *
+ * @Plugin(
+ *   id = "taxonomy_term_reference_rss_category",
+ *   module = "taxonomy",
+ *   label = @Translation("RSS category"),
+ *   field_types = {
+ *     "taxonomy_term_reference"
+ *   }
+ * )
+ */
+class RSSCategoryFormatter extends TaxonomyFormatterBase {
+
+  /**
+   * Implements Drupal\field\Plugin\Type\Formatter\FormatterInterface::viewElements().
+   */
+  public function viewElements(EntityInterface $entity, $langcode, array $items) {
+    // Terms whose tid is 'autocreate' do not exist
+    // yet and $item['taxonomy_term'] is not set. Theme such terms as
+    // just their name.
+    foreach ($items as $item) {
+      if ($item['tid'] != 'autocreate') {
+        $value = $item['taxonomy_term']->label();
+
+        $uri = $item['taxonomy_term']->uri();
+        $uri['options']['absolute'] = TRUE;
+        $domain = url($uri['path'], $uri['options']);
+      }
+      else {
+        $value = $item['name'];
+        $domain = '';
+      }
+      $entity->rss_elements[] = array(
+        'key' => 'category',
+        'value' => $value,
+        'attributes' => array(
+          'domain' => $domain,
+        ),
+      );
+    }
+  }
+
+}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php
new file mode 100644
index 0000000..3d75f2b
--- /dev/null
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\taxonomy\Plugin\field\formatter\TaxonomyFormatterBase.
+ */
+
+namespace Drupal\taxonomy\Plugin\field\formatter;
+
+use Drupal\Core\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
+use Drupal\field\Plugin\Type\Formatter\FormatterBase;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Base class for the taxonomy_term formatters.
+ */
+class TaxonomyFormatterBase extends FormatterBase {
+
+  /**
+   * Implements Drupal\field\Plugin\Type\Formatter\FormatterInterface::viewElements().
+   */
+  public function viewElements(EntityInterface $entity, $langcode, array $items) {}
+
+  /**
+   * Implements Drupal\field\Plugin\Type\Formatter\FormatterInterface::prepareView().
+   *
+   * This preloads all taxonomy terms for multiple loaded objects at once and
+   * unsets values for invalid terms that do not exist.
+   */
+  public function prepareView(array $entities, $langcode, array &$items) {
+    $tids = array();
+
+    // Collect every possible term attached to any of the fieldable entities.
+    foreach ($entities as $id => $entity) {
+      foreach ($items[$id] as $delta => $item) {
+        // Force the array key to prevent duplicates.
+        if ($item['tid'] != 'autocreate') {
+          $tids[$item['tid']] = $item['tid'];
+        }
+      }
+    }
+    if ($tids) {
+      $terms = taxonomy_term_load_multiple($tids);
+
+      // Iterate through the fieldable entities again to attach the loaded term data.
+      foreach ($entities as $id => $entity) {
+        $rekey = FALSE;
+
+        foreach ($items[$id] as $delta => $item) {
+          // Check whether the taxonomy term field instance value could be loaded.
+          if (isset($terms[$item['tid']])) {
+            // Replace the instance value with the term data.
+            $items[$id][$delta]['taxonomy_term'] = $terms[$item['tid']];
+          }
+          // Terms to be created are not in $terms, but are still legitimate.
+          elseif ($item['tid'] == 'autocreate') {
+            // Leave the item in place.
+          }
+          // Otherwise, unset the instance value, since the term does not exist.
+          else {
+            unset($items[$id][$delta]);
+            $rekey = TRUE;
+          }
+        }
+
+        if ($rekey) {
+          // Rekey the items array.
+          $items[$id] = array_values($items[$id]);
+        }
+      }
+    }
+  }
+
+}
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index c92ce64..3c4452e 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -1111,82 +1111,6 @@ function taxonomy_field_is_empty($item, $field) {
 }
 
 /**
- * Implements hook_field_formatter_info().
- */
-function taxonomy_field_formatter_info() {
-  return array(
-    'taxonomy_term_reference_link' => array(
-      'label' => t('Link'),
-      'field types' => array('taxonomy_term_reference'),
-    ),
-    'taxonomy_term_reference_plain' => array(
-      'label' => t('Plain text'),
-      'field types' => array('taxonomy_term_reference'),
-    ),
-    'taxonomy_term_reference_rss_category' => array(
-      'label' => t('RSS category'),
-      'field types' => array('taxonomy_term_reference'),
-    ),
-  );
-}
-
-/**
- * Implements hook_field_formatter_view().
- */
-function taxonomy_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
-  $element = array();
-
-  // Terms whose tid is 'autocreate' do not exist
-  // yet and $item['taxonomy_term'] is not set. Theme such terms as
-  // just their name.
-
-  switch ($display['type']) {
-    case 'taxonomy_term_reference_link':
-      foreach ($items as $delta => $item) {
-        if ($item['tid'] == 'autocreate') {
-          $element[$delta] = array(
-            '#markup' => check_plain($item['name']),
-          );
-        }
-        else {
-          $term = $item['taxonomy_term'];
-          $uri = $term->uri();
-          $element[$delta] = array(
-            '#type' => 'link',
-            '#title' => $term->label(),
-            '#href' => $uri['path'],
-            '#options' => $uri['options'],
-          );
-        }
-      }
-      break;
-
-    case 'taxonomy_term_reference_plain':
-      foreach ($items as $delta => $item) {
-        $name = ($item['tid'] != 'autocreate' ? $item['taxonomy_term']->label() : $item['name']);
-        $element[$delta] = array(
-          '#markup' => check_plain($name),
-        );
-      }
-      break;
-
-    case 'taxonomy_term_reference_rss_category':
-      foreach ($items as $delta => $item) {
-        $entity->rss_elements[] = array(
-          'key' => 'category',
-          'value' => $item['tid'] != 'autocreate' ? $item['taxonomy_term']->label() : $item['name'],
-          'attributes' => array(
-            'domain' => $item['tid'] != 'autocreate' ? url('taxonomy/term/' . $item['tid'], array('absolute' => TRUE)) : '',
-          ),
-        );
-      }
-      break;
-  }
-
-  return $element;
-}
-
-/**
  * Returns the set of valid terms for a taxonomy field.
  *
  * @param $field
@@ -1219,56 +1143,6 @@ function taxonomy_allowed_values($field, $instance, $entity_type, $entity) {
 }
 
 /**
- * Implements hook_field_formatter_prepare_view().
- *
- * This preloads all taxonomy terms for multiple loaded objects at once and
- * unsets values for invalid terms that do not exist.
- */
-function taxonomy_field_formatter_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $displays) {
-  $tids = array();
-
-  // Collect every possible term attached to any of the fieldable entities.
-  foreach ($entities as $id => $entity) {
-    foreach ($items[$id] as $delta => $item) {
-      // Force the array key to prevent duplicates.
-      if ($item['tid'] != 'autocreate') {
-        $tids[$item['tid']] = $item['tid'];
-      }
-    }
-  }
-  if ($tids) {
-    $terms = taxonomy_term_load_multiple($tids);
-
-    // Iterate through the fieldable entities again to attach the loaded term data.
-    foreach ($entities as $id => $entity) {
-      $rekey = FALSE;
-
-      foreach ($items[$id] as $delta => $item) {
-        // Check whether the taxonomy term field instance value could be loaded.
-        if (isset($terms[$item['tid']])) {
-          // Replace the instance value with the term data.
-          $items[$id][$delta]['taxonomy_term'] = $terms[$item['tid']];
-        }
-        // Terms to be created are not in $terms, but are still legitimate.
-        elseif ($item['tid'] == 'autocreate') {
-          // Leave the item in place.
-        }
-        // Otherwise, unset the instance value, since the term does not exist.
-        else {
-          unset($items[$id][$delta]);
-          $rekey = TRUE;
-        }
-      }
-
-      if ($rekey) {
-        // Rekey the items array.
-        $items[$id] = array_values($items[$id]);
-      }
-    }
-  }
-}
-
-/**
  * Title callback for term pages.
  *
  * @param Drupal\taxonomy\Term $term