diff --git a/payment/uc_payment_pack/lib/Drupal/uc_payment_pack/Plugin/Ubercart/PaymentMethod/CashOnDelivery.php b/payment/uc_payment_pack/lib/Drupal/uc_payment_pack/Plugin/Ubercart/PaymentMethod/CashOnDelivery.php
new file mode 100644
index 0000000..e09924f
--- /dev/null
+++ b/payment/uc_payment_pack/lib/Drupal/uc_payment_pack/Plugin/Ubercart/PaymentMethod/CashOnDelivery.php
@@ -0,0 +1,224 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\uc_payment_pack\Plugin\Ubercart\PaymentMethod\CashOnDelivery.
+ */
+
+namespace Drupal\uc_payment_pack\Plugin\Ubercart\PaymentMethod;
+
+use Drupal\uc_order\UcOrderInterface;
+use Drupal\uc_payment\PaymentMethodPluginBase;
+
+/**
+ * Defines the cash on delivery payment method.
+ *
+ * @Plugin(
+ *   id = "cod",
+ *   name = @Translation("Cash on delivery"),
+ *   title = @Translation("Cash on delivery"),
+ *   description = @Translation("Pay cash on delivery on pick-up."),
+ *   checkout = FALSE,
+ *   no_gateway = TRUE,
+ *   configurable = TRUE,
+ *   weight = 1,
+ * )
+ */
+class CashOnDelivery extends PaymentMethodPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function cartDetails(UcOrderInterface $order, array $form, array &$form_state) {
+    $cod_config = \Drupal::config('uc_cod.settings');
+
+    $build['policy'] = array(
+      '#markup' => '<p>' . $cod_config->get('policy') . '</p>'
+    );
+
+    if (($max = $cod_config->get('max_order')) > 0 && is_numeric($max)) {
+      $build['eligibility'] = array(
+        '#markup' => '<p>' . t('Orders totalling more than !number are <b>not eligible</b> for COD.', array('!number' => uc_currency_format($max))) . '</p>'
+      );
+    }
+
+    if ($cod_config->get('delivery_date')) {
+      $build += $this->deliveryDateForm($order);
+    }
+
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function cartProcess(UcOrderInterface $order, array $form, array &$form_state) {
+    $cod_config = \Drupal::config('uc_cod.settings');
+
+    if ($cod_config->get('delivery_date')) {
+      $order->payment_details = $form_state['values']['panes']['payment']['details'];
+    }
+
+    return TRUE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function cartReview(UcOrderInterface $order) {
+    $cod_config = \Drupal::config('uc_cod.settings');
+
+    $review = array();
+
+    if ($cod_config->get('delivery_date')) {
+      $date = uc_date_format(
+        $order->payment_details['delivery_month'],
+        $order->payment_details['delivery_day'],
+        $order->payment_details['delivery_year']
+      );
+      $review[] = array('title' => t('Delivery date'), 'data' => $date);
+    }
+
+    return $review;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function orderView(UcOrderInterface $order) {
+    $cod_config = \Drupal::config('uc_cod.settings');
+
+    $build = array();
+
+    if ($cod_config->get('delivery_date') &&
+      isset($order->payment_details['delivery_month']) &&
+      isset($order->payment_details['delivery_day']) &&
+      isset($order->payment_details['delivery_year'])) {
+      $build['#markup'] = t('Desired delivery date:') . '<br />' .
+        uc_date_format(
+          $order->payment_details['delivery_month'],
+          $order->payment_details['delivery_day'],
+          $order->payment_details['delivery_year']
+        );
+    }
+
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function orderEditDetails(UcOrderInterface $order) {
+    $cod_config = \Drupal::config('uc_cod.settings');
+
+    $build = array();
+
+    if ($cod_config->get('delivery_date')) {
+      $build = $this->deliveryDateForm($order);
+    }
+
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function orderLoad(UcOrderInterface $order) {
+    $result = db_query('SELECT * FROM {uc_payment_cod} WHERE order_id = :id', array(':id' => $order->id()));
+    if ($row = $result->fetchObject()) {
+      $order->payment_details = array(
+        'delivery_month' => $row->delivery_month,
+        'delivery_day'   => $row->delivery_day,
+        'delivery_year'  => $row->delivery_year,
+      );
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function orderSave(UcOrderInterface $order) {
+    if (isset($order->payment_details['delivery_month']) &&
+        isset($order->payment_details['delivery_day']) &&
+        isset($order->payment_details['delivery_year'])) {
+      db_merge('uc_payment_cod')
+        ->key(array('order_id' => $order->id()))
+        ->fields(array(
+          'delivery_month' => $order->payment_details['delivery_month'],
+          'delivery_day'   => $order->payment_details['delivery_day'],
+          'delivery_year'  => $order->payment_details['delivery_year'],
+        ))
+        ->execute();
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function orderSubmit(UcOrderInterface $order) {
+    $cod_config = \Drupal::config('uc_cod.settings');
+    $max = $cod_config->get('max_order');
+
+    if ($max > 0 && $order->getTotal() > $max) {
+      $result[] = array(
+        'pass' => FALSE,
+        'message' => t('Your final order total exceeds the maximum for COD payment.  Please go back and select a different method of payment.')
+      );
+      return $result;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function orderDelete(UcOrderInterface $order) {
+    db_delete('uc_payment_cod')
+      ->condition('order_id', $order->id())
+      ->execute();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, array &$form_state) {
+    $cod_config = \Drupal::config('uc_cod.settings');
+
+    $form['uc_cod_policy'] = array(
+      '#type' => 'textarea',
+      '#title' => t('Policy message'),
+      '#default_value' => $cod_config->get('policy'),
+      '#description' => t('Help message shown at checkout.'),
+    );
+    $form['uc_cod_max_order'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Maximum order total eligible for COD'),
+      '#default_value' => $cod_config->get('max_order'),
+      '#description' => t('Set to 0 for no maximum order limit.'),
+    );
+    $form['uc_cod_delivery_date'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Let customers enter a desired delivery date.'),
+      '#default_value' => $cod_config->get('delivery_date'),
+    );
+    return $form;
+  }
+
+  /**
+   * Collect additional information for the "Cash on Delivery" payment method.
+   */
+  protected function deliveryDateForm($order) {
+    $month = !empty($order->payment_details['delivery_month']) ? $order->payment_details['delivery_month'] : format_date(REQUEST_TIME, 'custom', 'n');
+    $day   = !empty($order->payment_details['delivery_day'])   ? $order->payment_details['delivery_day']   : format_date(REQUEST_TIME, 'custom', 'j');
+    $year  = !empty($order->payment_details['delivery_year'])  ? $order->payment_details['delivery_year']  : format_date(REQUEST_TIME, 'custom', 'Y');
+
+    $form['description'] = array(
+      '#markup' => '<div>' . t('Enter a desired delivery date:') . '</div>',
+    );
+    $form['delivery_month'] = uc_select_month(NULL, $month);
+    $form['delivery_day']   = uc_select_day(NULL, $day);
+    $form['delivery_year']  = uc_select_year(NULL, $year, format_date(REQUEST_TIME, 'custom', 'Y'), format_date(REQUEST_TIME, 'custom', 'Y') + 1);
+
+    return $form;
+  }
+
+}
diff --git a/payment/uc_payment_pack/lib/Drupal/uc_payment_pack/Tests/PaymentPackTest.php b/payment/uc_payment_pack/lib/Drupal/uc_payment_pack/Tests/PaymentPackTest.php
index ed8d23b..406dab3 100644
--- a/payment/uc_payment_pack/lib/Drupal/uc_payment_pack/Tests/PaymentPackTest.php
+++ b/payment/uc_payment_pack/lib/Drupal/uc_payment_pack/Tests/PaymentPackTest.php
@@ -89,4 +89,39 @@ class PaymentPackTest extends UbercartTestBase {
     $this->assertText($formatted, 'Check clear date found.');
   }
 
+  public function testCashOnDelivery() {
+    $this->drupalGet('admin/store/settings/payment');
+    $this->assertText('Cash on delivery', 'COD payment method found.');
+    $this->assertFieldByName('methods[cod][status]', 0, 'COD payment method is disabled by default.');
+    $edit = array(
+      'methods[cod][status]' => 1,
+      'methods[cod][weight]' => -10,
+    );
+    $this->drupalPostForm(NULL, $edit, 'Save configuration');
+
+    $this->drupalGet('admin/store/settings/payment/method/cod');
+    $this->assertTitle('Cash on delivery settings | Drupal');
+    // @todo: Fix and test the settings page
+
+    $this->drupalGet('cart/checkout');
+    $this->assertFieldByName('panes[payment][payment_method]', 'cod', 'COD payment method is selected at checkout.');
+    // @todo: Test the settings
+    // $this->assertText('Full payment is expected upon delivery or prior to pick-up.');
+
+    $this->drupalPostForm(NULL, array(), 'Review order');
+    $this->assertText('Cash on delivery', 'COD payment method found on review page.');
+    // @todo: Test the settings
+
+    $this->drupalPostForm(NULL, array(), 'Submit order');
+
+    $order = entity_load('uc_order', 1);
+    $this->assertEqual($order->getPaymentMethodId(), 'cod', 'Order has COD payment method.');
+
+    $this->drupalGet('user/' . $order->getUserId() . '/orders/' . $order->id());
+    $this->assertText('Method: Cash on delivery', 'COD payment method displayed.');
+
+    $this->drupalGet('admin/store/orders/' . $order->id());
+    $this->assertText('Method: Cash on delivery', 'COD payment method displayed.');
+  }
+
 }
diff --git a/payment/uc_payment_pack/uc_payment_pack.module b/payment/uc_payment_pack/uc_payment_pack.module
index aa9530f..39ac723 100644
--- a/payment/uc_payment_pack/uc_payment_pack.module
+++ b/payment/uc_payment_pack/uc_payment_pack.module
@@ -10,15 +10,6 @@
  * Implements hook_uc_payment_method().
  */
 function uc_payment_pack_uc_payment_method() {
-  $methods['cod'] = array(
-    'name'       => t('COD'),
-    'title'      => t('Cash on delivery'),
-    'desc'       => t('Pay cash on delivery on pick-up.'),
-    'callback'   => 'uc_payment_method_cod',
-    'weight'     => 1,
-    'checkout'   => FALSE,
-    'no_gateway' => TRUE,
-  );
   $methods['other'] = array(
     'name'       => t('Other'),
     'title'      => t('Other'),
@@ -81,154 +72,3 @@ function uc_payment_method_other($op, &$order) {
       break;
   }
 }
-
-/**
- * Payment method callback for the "Cash on Delivery" payment method.
- */
-function uc_payment_method_cod($op, &$order, $form = NULL, $form_state = NULL) {
-  $cod_config = \Drupal::config('uc_cod.settings');
-  switch ($op) {
-    case 'cart-details':
-      $build['policy'] = array(
-        '#markup' => '<p>' . $cod_config->get('policy') . '</p>'
-      );
-
-      if (($max = $cod_config->get('max_order')) > 0 && is_numeric($max)) {
-        $build['eligibility'] = array(
-          '#markup' => '<p>' . t('Orders totalling more than !number are <b>not eligible</b> for COD.', array('!number' => uc_currency_format($max))) . '</p>'
-        );
-      }
-
-      if ($cod_config->get('delivery_date')) {
-        $build += uc_payment_method_cod_form(array(), $form_state, $order);
-      }
-      return $build;
-
-    case 'cart-process':
-      if ($cod_config->get('delivery_date')) {
-        $order->payment_details = $form_state['values']['panes']['payment']['details'];
-      }
-      return TRUE;
-
-    case 'cart-review':
-      $review = array();
-      if ($cod_config->get('delivery_date')) {
-        $date = uc_date_format(
-          $order->payment_details['delivery_month'],
-          $order->payment_details['delivery_day'],
-          $order->payment_details['delivery_year']
-        );
-        $review[] = array('title' => t('Delivery date'), 'data' => $date);
-      }
-      return $review;
-
-    case 'order-view':
-    case 'customer-view':
-      $build = array('#markup' => '');
-      if ($cod_config->get('delivery_date') &&
-          isset($order->payment_details['delivery_month']) &&
-          isset($order->payment_details['delivery_day']) &&
-          isset($order->payment_details['delivery_year'])) {
-        $build['#markup'] = t('Desired delivery date:') . '<br />' .
-          uc_date_format(
-            $order->payment_details['delivery_month'],
-            $order->payment_details['delivery_day'],
-            $order->payment_details['delivery_year']
-          );
-      }
-      return $build;
-
-    case 'order-details':
-      $build = array();
-      if ($cod_config->get('delivery_date')) {
-        $build = uc_payment_method_cod_form(array(), $form_state, $order);
-      }
-      return $build;
-
-    case 'order-load':
-      $result = db_query('SELECT * FROM {uc_payment_cod} WHERE order_id = :id', array(':id' => $order->id()));
-      if ($row = $result->fetchObject()) {
-        $order->payment_details = array(
-          'delivery_month' => $row->delivery_month,
-          'delivery_day'   => $row->delivery_day,
-          'delivery_year'  => $row->delivery_year,
-        );
-      }
-      break;
-
-    case 'order-submit':
-      if ($order->getPaymentMethodId() == 'cod' &&
-          ($max = $cod_config->get('max_order')) > 0 &&
-          is_numeric($max) &&
-          $order->getTotal() > $max) {
-        $result[] = array(
-          'pass' => FALSE,
-          'message' => t('Your final order total exceeds the maximum for COD payment.  Please go back and select a different method of payment.')
-        );
-        return $result;
-      }
-      // TODO: This falls through to the order-save case - is this deliberate?
-      // If so, it should be documented.
-
-    case 'order-save':
-      if (isset($order->payment_details['delivery_month']) &&
-          isset($order->payment_details['delivery_day'])   &&
-          isset($order->payment_details['delivery_year'])    ) {
-        db_merge('uc_payment_cod')
-          ->key(array('order_id' => $order->id()))
-          ->fields(array(
-            'delivery_month' => $order->payment_details['delivery_month'],
-            'delivery_day'   => $order->payment_details['delivery_day'],
-            'delivery_year'  => $order->payment_details['delivery_year'],
-          ))
-          ->execute();
-      }
-      break;
-
-    case 'order-delete':
-      db_delete('uc_payment_cod')
-        ->condition('order_id', $order->id())
-        ->execute();
-      break;
-
-    case 'settings':
-      $form['uc_cod_policy'] = array(
-        '#type' => 'textarea',
-        '#title' => t('Policy message'),
-        '#default_value' => $cod_config->get('policy'),
-        '#description' => t('Help message shown at checkout.'),
-      );
-      $form['uc_cod_max_order'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Maximum order total eligible for COD'),
-        '#default_value' => $cod_config->get('max_order'),
-        '#description' => t('Set to 0 for no maximum order limit.'),
-      );
-      $form['uc_cod_delivery_date'] = array(
-        '#type' => 'checkbox',
-        '#title' => t('Let customers enter a desired delivery date.'),
-        '#default_value' => $cod_config->get('delivery_date'),
-      );
-      return $form;
-  }
-}
-
-/**
- * Collect additional information for the "Cash on Delivery" payment method.
- *
- * @ingroup forms
- */
-function uc_payment_method_cod_form($form, &$form_state, $order) {
-  $month = !empty($order->payment_details['delivery_month']) ? $order->payment_details['delivery_month'] : format_date(REQUEST_TIME, 'custom', 'n');
-  $day   = !empty($order->payment_details['delivery_day'])   ? $order->payment_details['delivery_day']   : format_date(REQUEST_TIME, 'custom', 'j');
-  $year  = !empty($order->payment_details['delivery_year'])  ? $order->payment_details['delivery_year']  : format_date(REQUEST_TIME, 'custom', 'Y');
-
-  $form['description'] = array(
-    '#markup' => '<div>' . t('Enter a desired delivery date:') . '</div>',
-  );
-  $form['delivery_month'] = uc_select_month(NULL, $month);
-  $form['delivery_day']   = uc_select_day(NULL, $day);
-  $form['delivery_year']  = uc_select_year(NULL, $year, format_date(REQUEST_TIME, 'custom', 'Y'), format_date(REQUEST_TIME, 'custom', 'Y') + 1);
-
-  return $form;
-}