diff --git a/payment/uc_payment_pack/lib/Drupal/uc_payment_pack/Plugin/Ubercart/PaymentMethod/Check.php b/payment/uc_payment_pack/lib/Drupal/uc_payment_pack/Plugin/Ubercart/PaymentMethod/Check.php
new file mode 100644
index 0000000..c4914c9
--- /dev/null
+++ b/payment/uc_payment_pack/lib/Drupal/uc_payment_pack/Plugin/Ubercart/PaymentMethod/Check.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\uc_payment_pack\Plugin\Ubercart\PaymentMethod\Check.
+ */
+
+namespace Drupal\uc_payment_pack\Plugin\Ubercart\PaymentMethod;
+
+use Drupal\uc_order\UcOrderInterface;
+use Drupal\uc_payment\PaymentMethodPluginBase;
+
+/**
+ * Defines the check payment method.
+ *
+ * @Plugin(
+ *   id = "check",
+ *   name = @Translation("Check", context = "cheque"),
+ *   title = @Translation("Check or money order"),
+ *   description = @Translation("Pay by mailing a check or money order."),
+ *   callback = "uc_payment_method_check",
+ *   checkout = TRUE,
+ *   no_gateway = TRUE,
+ *   configurable = TRUE,
+ *   weight = 1,
+ * )
+ */
+class Check extends PaymentMethodPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function cartDetails(UcOrderInterface $order, array $form, array &$form_state) {
+    $check_config = \Drupal::config('uc_check.settings');
+
+    $build['instructions'] = array(
+      '#markup' => t('Checks should be made out to:')
+    );
+
+    if (!$check_config->get('mailing_street1')) {
+      $build['address'] = array(
+        '#markup' => uc_store_address(),
+        '#prefix' => '<p>',
+        '#suffix' => '</p>',
+      );
+    }
+    else {
+      $build['address'] = array(
+        '#markup' => uc_address_format(
+          $check_config->get('mailing_name'),
+          NULL,
+          $check_config->get('mailing_company'),
+          $check_config->get('mailing_street1'),
+          $check_config->get('mailing_street2'),
+          $check_config->get('mailing_city'),
+          $check_config->get('mailing_zone'),
+          $check_config->get('mailing_postal_code'),
+          $check_config->get('mailing_country')
+        ),
+        '#prefix' => '<p>',
+        '#suffix' => '</p>',
+      );
+    }
+
+    $build['policy'] = array(
+      '#markup' => '<p>' . $check_config->get('policy') . '</p>'
+    );
+
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function cartReview(UcOrderInterface $order) {
+    $check_config = \Drupal::config('uc_check.settings');
+
+    if (!$check_config->get('mailing_street1')) {
+      $review[] = array(
+        'title' => t('Mail to'),
+        'data' => uc_store_address(),
+      );
+    }
+    else {
+      $review[] = array(
+        'title' => t('Mail to'),
+        'data' => uc_address_format(
+          $check_config->get('mailing_name'),
+          NULL,
+          $check_config->get('mailing_company'),
+          $check_config->get('mailing_street1'),
+          $check_config->get('mailing_street2'),
+          $check_config->get('mailing_city'),
+          $check_config->get('mailing_zone'),
+          $check_config->get('mailing_postal_code'),
+          $check_config->get('mailing_country')
+        )
+      );
+    }
+
+    return $review;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function orderView(UcOrderInterface $order) {
+    $build = array('#suffix' => '<br />');
+
+    $result = db_query('SELECT clear_date FROM {uc_payment_check} WHERE order_id = :id ', array(':id' => $order->id()));
+    if ($clear_date = $result->fetchField()) {
+      $build['#markup'] = t('Clear Date:') . ' ' . format_date($clear_date, 'uc_store');
+    }
+    else {
+      $build['#markup'] = l(t('Receive Check'), 'admin/store/orders/' . $order->id() . '/receive_check');
+    }
+
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function customerView(UcOrderInterface $order) {
+    $build = array();
+
+    $result = db_query('SELECT clear_date FROM {uc_payment_check} WHERE order_id = :id ', array(':id' => $order->id()));
+    if ($clear_date = $result->fetchField()) {
+      $build['#markup'] = t('Check received') . '<br />' .
+        t('Expected clear date:') . '<br />' . format_date($clear_date, 'uc_store');
+    }
+
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, array &$form_state) {
+    $check_config = \Drupal::config('uc_check.settings');
+
+    $form['check_address_info'] = array(
+      '#markup' => '<div>' . t('Set the mailing address to display to customers who choose this payment method during checkout.') . '</div>',
+    );
+    $form['uc_check_mailing_name'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Contact'),
+      '#description' => t('Direct checks to a person or department.'),
+      '#default_value' => $check_config->get('mailing_name'),
+    );
+    $form['uc_check_address'] = array(
+      '#type' => 'uc_address',
+      '#default_value' => array(
+        'uc_check_mailing_company' => $check_config->get('mailing_company'),
+        'uc_check_mailing_street1' => $check_config->get('mailing_street1'),
+        'uc_check_mailing_street2' => $check_config->get('mailing_street2'),
+        'uc_check_mailing_city' => $check_config->get('mailing_city'),
+        'uc_check_mailing_zone' => $check_config->get('mailing_zone'),
+        'uc_check_mailing_country' => isset($form_state['values']['uc_check_mailing_country']) ? $form_state['values']['uc_check_mailing_country'] : $check_config->get('uc_check_mailing_country'),
+        'uc_check_mailing_postal_code' => $check_config->get('mailing_postal_code'),
+      ),
+      '#required' => FALSE,
+      '#key_prefix' => 'uc_check_mailing',
+    );
+    $form['uc_check_policy'] = array(
+      '#type' => 'textarea',
+      '#title' => t('Check payment policy', array(), array('context' => 'cheque')),
+      '#description' => t('Instructions for customers on the checkout page.'),
+      '#default_value' => $check_config->get('policy'),
+      '#rows' => 3,
+    );
+    return $form;
+  }
+
+}
diff --git a/payment/uc_payment_pack/uc_payment_pack.module b/payment/uc_payment_pack/uc_payment_pack.module
index 747eb41..16c8ff5 100644
--- a/payment/uc_payment_pack/uc_payment_pack.module
+++ b/payment/uc_payment_pack/uc_payment_pack.module
@@ -23,15 +23,6 @@ function uc_payment_pack_menu() {
  * Implements hook_uc_payment_method().
  */
 function uc_payment_pack_uc_payment_method() {
-  $methods['check'] = array(
-    'name'       => t('Check', array(), array('context' => 'cheque')),
-    'title'      => t('Check or money order'),
-    'desc'       => t('Pay by mailing a check or money order.'),
-    'callback'   => 'uc_payment_method_check',
-    'weight'     => 1,
-    'checkout'   => TRUE,
-    'no_gateway' => TRUE,
-  );
   $methods['cod'] = array(
     'name'       => t('COD'),
     'title'      => t('Cash on delivery'),
@@ -254,125 +245,3 @@ function uc_payment_method_cod_form($form, &$form_state, $order) {
 
   return $form;
 }
-
-/**
- * Payment method callback for the "Check" payment method.
- */
-function uc_payment_method_check($op, &$order, $form = NULL, &$form_state = NULL) {
-  $check_config = \Drupal::config('uc_check.settings');
-  switch ($op) {
-    case 'cart-details':
-      $build['instructions'] = array(
-        '#markup' => t('Checks should be made out to:')
-      );
-
-      if (!$check_config->get('mailing_street1')) {
-        $build['address'] = array(
-          '#markup' => uc_store_address(),
-          '#prefix' => '<p>',
-          '#suffix' => '</p>',
-        );
-      }
-      else {
-        $build['address'] = array(
-          '#markup' => uc_address_format(
-            $check_config->get('mailing_name'),
-            NULL,
-            $check_config->get('mailing_company'),
-            $check_config->get('mailing_street1'),
-            $check_config->get('mailing_street2'),
-            $check_config->get('mailing_city'),
-            $check_config->get('mailing_zone'),
-            $check_config->get('mailing_postal_code'),
-            $check_config->get('mailing_country')
-          ),
-          '#prefix' => '<p>',
-          '#suffix' => '</p>',
-        );
-      }
-
-      $build['policy'] = array(
-        '#markup' => '<p>' . $check_config->get('policy') . '</p>'
-      );
-      return $build;
-
-    case 'cart-review':
-      if (!$check_config->get('mailing_street1')) {
-        $review[] = array(
-          'title' => t('Mail to'),
-          'data' => uc_store_address(),
-        );
-      }
-      else {
-        $review[] = array(
-          'title' => t('Mail to'),
-          'data' => uc_address_format(
-            $check_config->get('mailing_name'),
-            NULL,
-            $check_config->get('mailing_company'),
-            $check_config->get('mailing_street1'),
-            $check_config->get('mailing_street2'),
-            $check_config->get('mailing_city'),
-            $check_config->get('mailing_zone'),
-            $check_config->get('mailing_postal_code'),
-            $check_config->get('mailing_country')
-          )
-        );
-      }
-      return $review;
-
-    case 'order-view':
-      $build = array('#suffix' => '<br />');
-
-      $result = db_query('SELECT clear_date FROM {uc_payment_check} WHERE order_id = :id ', array(':id' => $order->id()));
-      if ($clear_date = $result->fetchField()) {
-        $build['#markup'] = t('Clear Date:') . ' ' . format_date($clear_date, 'uc_store');
-      }
-      else {
-        $build['#markup'] = l(t('Receive Check'), 'admin/store/orders/' . $order->id() . '/receive_check');
-      }
-      return $build;
-
-    case 'customer-view':
-      $build = array();
-      $result = db_query('SELECT clear_date FROM {uc_payment_check} WHERE order_id = :id ', array(':id' => $order->id()));
-      if ($clear_date = $result->fetchField()) {
-        $build['#markup'] = t('Check received') . '<br />' .
-          t('Expected clear date:') . '<br />' . format_date($clear_date, 'uc_store');
-      }
-      return $build;
-
-    case 'settings':
-      $form['check_address_info'] = array(
-        '#markup' => '<div>' . t('Set the mailing address to display to customers who choose this payment method during checkout.') . '</div>',
-      );
-      $form['uc_check_mailing_name'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Contact'),
-        '#description' => t('Direct checks to a person or department.'),
-        '#default_value' => $check_config->get('mailing_name'),
-      );
-      $form['uc_check_address'] = array(
-        '#type' => 'uc_address',
-        '#default_value' => array(
-          'uc_check_mailing_company' => $check_config->get('mailing_company'),
-          'uc_check_mailing_street1' => $check_config->get('mailing_street1'),
-          'uc_check_mailing_street2' => $check_config->get('mailing_street2'),
-          'uc_check_mailing_city' => $check_config->get('mailing_city'),
-          'uc_check_mailing_zone' => $check_config->get('mailing_zone'),
-          'uc_check_mailing_country' => isset($form_state['values']['uc_check_mailing_country']) ? $form_state['values']['uc_check_mailing_country'] : $check_config->get('uc_check_mailing_country'),
-          'uc_check_mailing_postal_code' => $check_config->get('mailing_postal_code'),
-        ),
-        '#required' => FALSE,
-        '#key_prefix' => 'uc_check_mailing',
-      );
-      $form['uc_check_policy'] = array(
-        '#type' => 'textarea',
-        '#title' => t('Check payment policy', array(), array('context' => 'cheque')),
-        '#description' => t('Instructions for customers on the checkout page.'),
-        '#default_value' => $check_config->get('policy'),
-        '#rows' => 3,
-      );
-      return $form;
-  }
-}