diff --git a/payment/uc_2checkout/lib/Drupal/uc_2checkout/Controller/CheckoutController.php b/payment/uc_2checkout/lib/Drupal/uc_2checkout/Controller/CheckoutController.php
index 0cf0267..d1ae66c 100644
--- a/payment/uc_2checkout/lib/Drupal/uc_2checkout/Controller/CheckoutController.php
+++ b/payment/uc_2checkout/lib/Drupal/uc_2checkout/Controller/CheckoutController.php
@@ -53,21 +53,11 @@ class CheckoutController extends ControllerBase {
 
     $order->billing_street1 = $_REQUEST['street_address'];
     $order->billing_street2 = $_REQUEST['street_address2'];
-    $order->city = $_REQUEST['city'];
+    $order->billing_city = $_REQUEST['city'];
     $order->billing_postal_code = $_REQUEST['zip'];
     $order->billing_phone = $_REQUEST['phone'];
-
-    $zone_id = db_query("SELECT zone_id FROM {uc_zones} WHERE zone_code LIKE :code", array(':code' => $_REQUEST['state']))->fetchField();
-    if (!empty($zone_id)) {
-      $order->billing_zone = $zone_id;
-    }
-
-    $country_id = db_query("SELECT country_id FROM {uc_countries} WHERE country_name LIKE :name", array(':name' => $_REQUEST['country']))->fetchField();
-    if (!empty($country_id)) {
-      $order->billing_country = $country_id;
-    }
-
-    // Save changes to order without it's completion.
+    $order->billing_zone = $_REQUEST['state'];
+    $order->billing_country = $_REQUEST['country'];
     $order->save();
 
     if (Unicode::strtolower($_REQUEST['email']) !== Unicode::strtolower($order->getEmail())) {
diff --git a/payment/uc_2checkout/uc_2checkout.module b/payment/uc_2checkout/uc_2checkout.module
index ab58284..cf69572 100644
--- a/payment/uc_2checkout/uc_2checkout.module
+++ b/payment/uc_2checkout/uc_2checkout.module
@@ -161,10 +161,7 @@ function uc_payment_method_2checkout($op, &$order, $form = NULL, &$form_state =
  */
 function uc_2checkout_form($form, &$form_state, $order) {
   $module_config = \Drupal::config('uc_2checkout.settings');
-  $country = uc_get_country_data(array('country_id' => $order->billing_country));
-  if ($country === FALSE) {
-    $country = array(0 => array('country_iso_code_3' => 'USA'));
-  }
+  $country = entity_load('uc_country', $order->billing_country);
 
   $data = array(
     'sid' => $module_config->get('sid'),
@@ -180,9 +177,9 @@ function uc_2checkout_form($form, &$form_state, $order) {
     'street_address' => Unicode::substr($order->billing_street1, 0, 64),
     'street_address2' => Unicode::substr($order->billing_street2, 0, 64),
     'city' => Unicode::substr($order->billing_city, 0, 64),
-    'state' => uc_get_zone_code($order->billing_zone),
+    'state' => $order->billing_zone,
     'zip' => Unicode::substr($order->billing_postal_code, 0, 16),
-    'country' => $country[0]['country_iso_code_3'],
+    'country' => $country ? $country->iso3 : 'USA',
     'email' => Unicode::substr($order->getEmail(), 0, 64),
     'phone' => Unicode::substr($order->billing_phone, 0, 16),
     'id_type' => 1,
diff --git a/payment/uc_authorizenet/uc_authorizenet.module b/payment/uc_authorizenet/uc_authorizenet.module
index 08805e2..7400ea5 100644
--- a/payment/uc_authorizenet/uc_authorizenet.module
+++ b/payment/uc_authorizenet/uc_authorizenet.module
@@ -454,9 +454,6 @@ function _uc_authorizenet_charge($order, $amount, $data) {
     $delivery_address .= ', ' . $order->delivery_street2;
   }
 
-  $billing_country = uc_get_country_data(array('country_id' => $order->billing_country));
-  $delivery_country = uc_get_country_data(array('country_id' => $order->delivery_country));
-
   // Build the POST data for the transaction.
   $submit_data = array(
     // Merchant information.
@@ -488,9 +485,9 @@ function _uc_authorizenet_charge($order, $amount, $data) {
     'x_company' => substr($order->billing_company, 0, 50),
     'x_address' => substr($billing_address, 0, 60),
     'x_city' => substr($order->billing_city, 0, 40),
-    'x_state' => substr(uc_get_zone_code($order->billing_zone), 0, 40),
+    'x_state' => substr($order->billing_zone, 0, 40),
     'x_zip' => substr($order->billing_postal_code, 0, 20),
-    'x_country' => !$billing_country ? '' : $billing_country[0]['country_iso_code_2'],
+    'x_country' => $order->billing_country,
     'x_phone' => substr($order->billing_phone, 0, 25),
     // 'x_fax' => substr('', 0, 25),
     'x_email' => substr($order->getEmail(), 0, 255),
@@ -503,9 +500,9 @@ function _uc_authorizenet_charge($order, $amount, $data) {
     'x_ship_to_company' => substr($order->delivery_company, 0, 50),
     'x_ship_to_address' => substr($delivery_address, 0, 60),
     'x_ship_to_city' => substr($order->delivery_city, 0, 40),
-    'x_ship_to_state' => substr(uc_get_zone_code($order->delivery_zone), 0, 40),
+    'x_ship_to_state' => substr($order->delivery_zone, 0, 40),
     'x_ship_to_zip' => substr($order->delivery_postal_code, 0, 20),
-    'x_ship_to_country' => !$delivery_country ? '' : $delivery_country[0]['country_iso_code_2'],
+    'x_ship_to_country' => $order->delivery_country,
 
     // Extra information.
     'x_delim_data' => 'TRUE',
@@ -742,10 +739,6 @@ function uc_authorizenet_arb_create($order, $fee) {
     return FALSE;
   }
 
-  // Get the country data for the billing and shipping information.
-  $billing_country = uc_get_country_data(array('country_id' => $order->billing_country));
-  $delivery_country = uc_get_country_data(array('country_id' => $order->delivery_country));
-
   // Build the data array for the request.
   $data = array(
     'refId' => substr($order->id() . '-' . REQUEST_TIME, 0, 20),
@@ -779,9 +772,9 @@ function uc_authorizenet_arb_create($order, $fee) {
         'company' => substr($order->billing_company, 0, 50),
         'address' => substr($order->billing_street1, 0, 60),
         'city' => substr($order->billing_city, 0, 40),
-        'state' => substr(uc_get_zone_code($order->billing_zone), 0, 2),
+        'state' => substr($order->billing_zone, 0, 2),
         'zip' => substr($order->billing_postal_code, 0, 20),
-        'country' => !$billing_country ? '' : $billing_country[0]['country_iso_code_2'],
+        'country' => $order->billing_country,
       ),
       'shipTo' => array(
         'firstName' => substr($order->delivery_first_name, 0, 50),
@@ -789,9 +782,9 @@ function uc_authorizenet_arb_create($order, $fee) {
         'company' => substr($order->delivery_company, 0, 50),
         'address' => substr($order->delivery_street1, 0, 60),
         'city' => substr($order->delivery_city, 0, 40),
-        'state' => substr(uc_get_zone_code($order->delivery_zone), 0, 2),
+        'state' => substr($order->delivery_zone, 0, 2),
         'zip' => substr($order->delivery_postal_code, 0, 20),
-        'country' => !$delivery_country ? '' : $delivery_country[0]['country_iso_code_2'],
+        'country' => $order->delivery_country,
       ),
     ),
   );
@@ -1112,16 +1105,15 @@ function _uc_authorizenet_txn_map($type) {
  * Maps an order's billing information to an array for later XML conversion.
  */
 function _uc_authorize_cim_xml_billto($order) {
-  $billing_country = uc_get_country_data(array('country_id' => $order->billing_country));
   return array(
     'firstName' => substr($order->billing_first_name, 0, 50),
     'lastName' => substr($order->billing_last_name, 0, 50),
     'company' => substr($order->billing_company, 0, 50),
     'address' => substr($order->billing_street1, 0, 60),
     'city' => substr($order->billing_city, 0, 40),
-    'state' => substr(uc_get_zone_code($order->billing_zone), 0, 2),
+    'state' => substr($order->billing_zone, 0, 2),
     'zip' => substr($order->billing_postal_code, 0, 20),
-    'country' => !$billing_country ? '' : $billing_country[0]['country_iso_code_2'],
+    'country' => $order->billing_country,
     'phoneNumber' => substr($order->billing_phone, 0, 25),
   );
 }
@@ -1130,16 +1122,15 @@ function _uc_authorize_cim_xml_billto($order) {
  * Maps an order's shipping information to an array for later XML conversion.
  */
 function _uc_authorize_cim_xml_shipto($order) {
-  $delivery_country = uc_get_country_data(array('country_id' => $order->delivery_country));
   return array(
     'firstName' => substr($order->delivery_first_name, 0, 50),
     'lastName' => substr($order->delivery_last_name, 0, 50),
     'company' => substr($order->delivery_company, 0, 50),
     'address' => substr($order->delivery_street1, 0, 60),
     'city' => substr($order->delivery_city, 0, 40),
-    'state' => substr(uc_get_zone_code($order->delivery_zone), 0, 2),
+    'state' => substr($order->delivery_zone, 0, 2),
     'zip' => substr($order->delivery_postal_code, 0, 20),
-    'country' => !$delivery_country ? '' : $delivery_country[0]['country_iso_code_2'],
+    'country' => $order->delivery_country,
   );
 }
 
diff --git a/payment/uc_cybersource/uc_cybersource.module b/payment/uc_cybersource/uc_cybersource.module
index 7838660..ae51a1f 100644
--- a/payment/uc_cybersource/uc_cybersource.module
+++ b/payment/uc_cybersource/uc_cybersource.module
@@ -308,15 +308,13 @@ function uc_cybersource_hop_form($form, $form_state, $order) {
     return array('success' => FALSE);
   }
 
-  $billing_country = uc_get_country_data(array('country_id' => $order->billing_country));
-  $delivery_country = uc_get_country_data(array('country_id' => $order->delivery_country));
   $data = array(
     'billTo_firstName' => $order->billing_first_name,
     'billTo_lastName' => $order->billing_last_name,
     'billTo_street1' => $order->billing_street1,
     'billTo_city' => $order->billing_city,
-    'billTo_country' => $billing_country[0]['country_iso_code_2'],
-    'billTo_state' => uc_get_zone_code($order->billing_zone),
+    'billTo_country' => $order->billing_country,
+    'billTo_state' => $order->billing_zone,
     'billTo_postalCode' => $order->billing_postal_code,
     'billTo_email' => $order->getEmail(),
     'billTo_phoneNumber' => $order->billing_phone,
@@ -328,8 +326,8 @@ function uc_cybersource_hop_form($form, $form_state, $order) {
       'shipTo_street1' => $order->delivery_street1,
       'shipTo_street2' => $order->delivery_street2,
       'shipTo_city' => $order->delivery_city,
-      'shipTo_country' => $delivery_country[0]['country_iso_code_2'],
-      'shipTo_state' => uc_get_zone_code($order->delivery_zone),
+      'shipTo_country' => $order->delivery_country,
+      'shipTo_state' => $order->delivery_zone,
       'shipTo_postalCode' => $order->delivery_postal_code,
     );
   }
@@ -442,23 +440,18 @@ function uc_cybersource_charge($order_id, $amount, $data) {
     }
   }
 
-  $country = uc_get_country_data(array('country_id' => $order->billing_country));
-  if ($country === FALSE) {
-    $country = array(0 => array('country_iso_code_2' => 'US'));
-  }
-
   // Process the charge differently depending on the CyberSource method.
   switch (variable_get('uc_cybersource_method', 'post')) {
     // Support for the Silent Order POST.
     case 'post':
-      return _uc_cybersource_post_charge($order, $amount, $data, $cc_type, $country);
+      return _uc_cybersource_post_charge($order, $amount, $data, $cc_type);
 
     // Support for the SOAP Toolkit API.
     case 'soap':
       // TODO: Refactor to use separate function for each API type.
       // - i.e. _uc_cybersource_charge_request_soap($order, $amount, $data);
       // require_once(drupal_get_path('module', 'uc_cybersource') . '/SOAP.php');
-      return _uc_cybersource_soap_charge($order, $amount, $data, $cc_type, $country);
+      return _uc_cybersource_soap_charge($order, $amount, $data, $cc_type);
 
     case 'api':
       $config = cybs_load_config('cybs.ini');
@@ -484,7 +477,7 @@ function uc_cybersource_charge($order_id, $amount, $data) {
 /**
  * POSTs transaction to CyberSource.
  */
-function _uc_cybersource_post_charge($order, $amount, $data, $cc_type, $country) {
+function _uc_cybersource_post_charge($order, $amount, $data, $cc_type) {
   // Include the HOP.php per the module instructions.
   if (!uc_cybersource_hop_include()) {
     drupal_set_message(t('Silent Order POST requires the HOP.php provided by CyberSource.'));
@@ -496,8 +489,8 @@ function _uc_cybersource_post_charge($order, $amount, $data, $cc_type, $country)
     'billTo_lastName' => $order->billing_last_name,
     'billTo_street1' => $order->billing_street1,
     'billTo_city' => $order->billing_city,
-    'billTo_country' => $country[0]['country_iso_code_2'],
-    'billTo_state' => uc_get_zone_code($order->billing_zone),
+    'billTo_country' => $order->billing_country,
+    'billTo_state' => $order->billing_zone,
     'billTo_postalCode' => $order->billing_postal_code,
     'billTo_email' => $order->getEmail(),
     'card_accountNumber' => $order->payment_details['cc_number'],
@@ -595,7 +588,7 @@ function _uc_cybersource_post_charge($order, $amount, $data, $cc_type, $country)
 /**
  * Handles the SOAP charge request and Ubercart order save.
  */
-function _uc_cybersource_soap_charge($order, $amount, $data, $cc_type, $country) {
+function _uc_cybersource_soap_charge($order, $amount, $data, $cc_type) {
   global $user;
 
   // Set the URL for the CyberSource SOAP Toolkit API WSDL.
@@ -609,9 +602,6 @@ function _uc_cybersource_soap_charge($order, $amount, $data, $cc_type, $country)
   // Variable currency... not used at the moment.
   $currency = variable_get('uc_cybersource_currency', 'usd');
 
-  $billing_country = uc_get_country_data(array('country_id' => $order->billing_country));
-  $delivery_country = uc_get_country_data(array('country_id' => $order->delivery_country));
-
   try {
     $soapClient = new \Drupal\uc_cybersource\SoapClient($url, array());
 
@@ -687,9 +677,9 @@ function _uc_cybersource_soap_charge($order, $amount, $data, $cc_type, $country)
       $billTo->street2 = $order->billing_street2;
     }
     $billTo->city = $order->billing_city;
-    $billTo->state = uc_get_zone_code($order->billing_zone);
+    $billTo->state = $order->billing_zone;
     $billTo->postalCode = $order->billing_postal_code;
-    $billTo->country = $billing_country[0]['country_iso_code_2'];
+    $billTo->country = $order->billing_country;
     if ($order->billing_phone) {
       $billTo->phoneNumber = $order->billing_phone;
     }
@@ -897,9 +887,6 @@ function uc_cybersource_uc_calculate_tax($order) {
   // Variable currency... not used at the moment.
   $currency = variable_get('uc_cybersource_currency', 'usd');
 
-  $billing_country = uc_get_country_data(array('country_id' => $order->billing_country));
-  $delivery_country = uc_get_country_data(array('country_id' => $order->delivery_country));
-
   try {
     $soapClient = new \Drupal\uc_cybersource\SoapClient($url, array());
 
@@ -922,9 +909,9 @@ function uc_cybersource_uc_calculate_tax($order) {
       $billTo->street2 = $order->billing_street2;
     }
     $billTo->city = $order->billing_city;
-    $billTo->state = uc_get_zone_code($order->billing_zone);
+    $billTo->state = $order->billing_zone;
     $billTo->postalCode = $order->billing_postal_code;
-    $billTo->country = $billing_country[0]['country_iso_code_2'];
+    $billTo->country = $order->billing_country;
     if ($order->billing_phone) {
       $billTo->phoneNumber = $order->billing_phone;
     }
@@ -941,9 +928,9 @@ function uc_cybersource_uc_calculate_tax($order) {
       $shipTo->street2 = $order->delivery_street2;
     }
     $shipTo->city = $order->delivery_city;
-    $shipTo->state = uc_get_zone_code($order->delivery_zone);
+    $shipTo->state = $order->delivery_zone;
     $shipTo->postalCode = $order->delivery_postal_code;
-    $shipTo->country = $delivery_country[0]['country_iso_code_2'];
+    $shipTo->country = $order->delivery_country;
     $shipTo->email = $order->getEmail();
     $request->shipTo = $shipTo;
 
diff --git a/payment/uc_payment_pack/config/uc_check.settings.yml b/payment/uc_payment_pack/config/uc_check.settings.yml
index 439c45f..eab4006 100644
--- a/payment/uc_payment_pack/config/uc_check.settings.yml
+++ b/payment/uc_payment_pack/config/uc_check.settings.yml
@@ -6,4 +6,4 @@ mailing_street2: ''
 mailing_city: ''
 mailing_zone: ''
 mailing_postal_code: ''
-mailing_country: 840
+mailing_country: US
diff --git a/payment/uc_paypal/uc_paypal.module b/payment/uc_paypal/uc_paypal.module
index 997e329..acfb1c9 100644
--- a/payment/uc_paypal/uc_paypal.module
+++ b/payment/uc_paypal/uc_paypal.module
@@ -222,15 +222,6 @@ function uc_paypal_wpp_charge($order_id, $amount, $data) {
       }
     }
 
-    $billing_country = uc_get_country_data(array('country_id' => $order->billing_country));
-    if ($billing_country === FALSE) {
-      $billing_country = array(0 => array('country_iso_code_2' => 'US'));
-    }
-    $delivery_country = uc_get_country_data(array('country_id' => $order->delivery_country));
-    if ($delivery_country === FALSE) {
-      $delivery_country = array(0 => array('country_iso_code_2' => 'US'));
-    }
-
     // Paypal doesn't accept IPv6 addresses.
     $ip_address = ltrim(Drupal::request()->getClientIp(), '::ffff:');
 
@@ -248,9 +239,9 @@ function uc_paypal_wpp_charge($order_id, $amount, $data) {
       'STREET' => substr($order->billing_street1, 0, 100),
       'STREET2' => substr($order->billing_street2, 0, 100),
       'CITY' => substr($order->billing_city, 0, 40),
-      'STATE' => uc_get_zone_code($order->billing_zone),
+      'STATE' => $order->billing_zone,
       'ZIP' => $order->billing_postal_code,
-      'COUNTRYCODE' => $billing_country[0]['country_iso_code_2'],
+      'COUNTRYCODE' => $order->billing_country,
       'CURRENCYCODE' => variable_get('uc_paypal_wpp_currency', 'USD'),
       'DESC' => substr($desc, 0, 127),
       'INVNUM' => $order_id . '-' . REQUEST_TIME,
@@ -266,9 +257,9 @@ function uc_paypal_wpp_charge($order_id, $amount, $data) {
         'SHIPTOSTREET' => substr($order->delivery_street1, 0, 100),
         'SHIPTOSTREET2' => substr($order->delivery_street2, 0, 100),
         'SHIPTOCITY' => substr($order->delivery_city, 0, 40),
-        'SHIPTOSTATE' => uc_get_zone_code($order->delivery_zone),
+        'SHIPTOSTATE' => $order->delivery_zone,
         'SHIPTOZIP' => $order->delivery_postal_code,
-        'SHIPTOCOUNTRYCODE' => $delivery_country[0]['country_iso_code_2'],
+        'SHIPTOCOUNTRYCODE' => $order->delivery_country,
       );
       $nvp_request += $shipdata;
     }
@@ -616,11 +607,6 @@ function uc_paypal_ec_checkout($form, &$form_state) {
 
   list($desc, $subtotal) = _uc_paypal_product_details($order->products);
 
-  $country = uc_get_country_data(array('country_id' => $order->billing_country));
-  if ($country === FALSE) {
-    $country = array(0 => array('country_iso_code_2' => 'US'));
-  }
-
   $nvp_request = array(
     'METHOD' => 'SetExpressCheckout',
     'RETURNURL' => url('cart/echeckout/selected', array('absolute' => TRUE)),
@@ -638,8 +624,8 @@ function uc_paypal_ec_checkout($form, &$form_state) {
     'SHIPTOSTREET' => substr($order->delivery_street1, 0, 100),
     'SHIPTOSTREET2' => substr($order->delivery_street2, 0, 100),
     'SHIPTOCITY' => substr($order->delivery_city, 0, 40),
-    'SHIPTOSTATE' => uc_get_zone_code($order->delivery_zone),
-    'SHIPTOCOUNTRYCODE' => $country[0]['country_iso_code_2'],
+    'SHIPTOSTATE' => $order->delivery_zone,
+    'SHIPTOCOUNTRYCODE' => $order->delivery_country,
     'SHIPTOZIP' => substr($order->delivery_postal_code, 0, 20),
     'PHONENUM' => substr($order->delivery_phone, 0, 20),
     'LANDINGPAGE' => variable_get('uc_paypal_ec_landingpage_style', 'Billing'),
@@ -767,11 +753,6 @@ function uc_paypal_ec_submit_form_submit($form, &$form_state) {
 
   $subtotal = $order->getTotal() - $tax - $shipping;
 
-  $country = uc_get_country_data(array('country_id' => $order->billing_country));
-  if ($country === FALSE) {
-    $country = array(0 => array('country_iso_code_2' => 'US'));
-  }
-
   $nvp_request = array(
     'METHOD' => 'DoExpressCheckoutPayment',
     'TOKEN' => $_SESSION['TOKEN'],
@@ -815,12 +796,7 @@ function uc_paypal_wps_form($form, &$form_state, $order) {
   }
 
   $address = variable_get('uc_paypal_wps_address_selection', 'billing');
-
-  $country = uc_get_country_data(array('country_id' => $order->{$address . '_country'}));
-  if ($country === FALSE) {
-    $country = array(0 => array('country_iso_code_2' => 'US'));
-  }
-
+  $country = $order->{$address . '_country'};
   $phone = '';
   for ($i = 0; $i < strlen($order->{$address . '_phone'}); $i++) {
     if (is_numeric($order->{$address . '_phone'}[$i])) {
@@ -837,7 +813,7 @@ function uc_paypal_wps_form($form, &$form_state, $order) {
    * night_phone_c: The four-digit phone number for U.S. phone numbers.
    *                (Not Used for UK numbers)
    */
-  if ($country[0]['country_iso_code_2'] == 'US' || $country[0]['country_iso_code_2'] == 'CA') {
+  if ($country == 'US' || $country == 'CA') {
     $phone = substr($phone, -10);
     $phone_a = substr($phone, 0, 3);
     $phone_b = substr($phone, 3, 3);
@@ -880,11 +856,11 @@ function uc_paypal_wps_form($form, &$form_state, $order) {
     'address1' => substr($order->{$address . '_street1'}, 0, 100),
     'address2' => substr($order->{$address . '_street2'}, 0, 100),
     'city' => substr($order->{$address . '_city'}, 0, 40),
-    'country' => $country[0]['country_iso_code_2'],
+    'country' => $country,
     'email' => $order->getEmail(),
     'first_name' => substr($order->{$address . '_first_name'}, 0, 32),
     'last_name' => substr($order->{$address . '_last_name'}, 0, 64),
-    'state' => uc_get_zone_code($order->{$address . '_zone'}),
+    'state' => $order->{$address . '_zone'},
     'zip' => $order->{$address . '_postal_code'},
     'night_phone_a' => $phone_a,
     'night_phone_b' => $phone_b,
diff --git a/payment/uc_paypal/uc_paypal.pages.inc b/payment/uc_paypal/uc_paypal.pages.inc
index ccf5e2a..1e5193b 100644
--- a/payment/uc_paypal/uc_paypal.pages.inc
+++ b/payment/uc_paypal/uc_paypal.pages.inc
@@ -223,20 +223,12 @@ function uc_paypal_ec_review() {
       $order->delivery_last_name = '';
     }
 
-    $country_id = db_query("SELECT country_id FROM {uc_countries} WHERE country_iso_code_2 = :code", array(':code' => $nvp_response['SHIPTOCOUNTRYCODE']))->fetchField();
-    $zone_id = 0;
-
-    if (!empty($country_id) && isset($nvp_response['SHIPTOSTATE'])) {
-      $zone = $nvp_response['SHIPTOSTATE'];
-      $zone_id = db_query("SELECT zone_id FROM {uc_zones} WHERE zone_country_id = :id AND (zone_code = :code OR zone_name = :name)", array(':id' => $country_id, ':code' => $zone, ':name' => $zone))->fetchField();
-    }
-
     $order->delivery_street1 = check_plain($nvp_response['SHIPTOSTREET']);
     $order->delivery_street2 = isset($nvp_response['SHIPTOSTREET2']) ? check_plain($nvp_response['SHIPTOSTREET2']) : '';
     $order->delivery_city = check_plain($nvp_response['SHIPTOCITY']);
-    $order->delivery_zone = !empty($zone_id) ? $zone_id : 0;
+    $order->delivery_zone = $nvp_response['SHIPTOSTATE'];
     $order->delivery_postal_code = check_plain($nvp_response['SHIPTOZIP']);
-    $order->delivery_country = !empty($country_id) ? $country_id : 840;
+    $order->delivery_country = $nvp_response['SHIPTOCOUNTRYCODE'];
 
     $order->billing_first_name = check_plain($nvp_response['FIRSTNAME']);
     $order->billing_last_name = check_plain($nvp_response['LASTNAME']);
diff --git a/shipping/uc_quote/config/uc_quote.settings.yml b/shipping/uc_quote/config/uc_quote.settings.yml
index 6509fff..ec8a692 100644
--- a/shipping/uc_quote/config/uc_quote.settings.yml
+++ b/shipping/uc_quote/config/uc_quote.settings.yml
@@ -11,8 +11,8 @@ store_default_address:
   street1: ''
   street2: ''
   city: ''
-  zone: 0
-  country: 840
+  zone: ''
+  country: US
   postal_code: ''
   phone: ''
 
diff --git a/shipping/uc_quote/lib/Drupal/uc_quote/Tests/QuoteTest.php b/shipping/uc_quote/lib/Drupal/uc_quote/Tests/QuoteTest.php
index 3820805..263582d 100644
--- a/shipping/uc_quote/lib/Drupal/uc_quote/Tests/QuoteTest.php
+++ b/shipping/uc_quote/lib/Drupal/uc_quote/Tests/QuoteTest.php
@@ -160,7 +160,7 @@ class QuoteTest extends UbercartTestBase {
       'AND' => array( array(
         'data_is' => array(
           'data' => array('order:delivery-address:country'),
-          'value' => '840',
+          'value' => 'US',
         ),
       )),
     ));
diff --git a/shipping/uc_shipping/uc_shipping.admin.inc b/shipping/uc_shipping/uc_shipping.admin.inc
index cd2a6f3..c47612d 100644
--- a/shipping/uc_shipping/uc_shipping.admin.inc
+++ b/shipping/uc_shipping/uc_shipping.admin.inc
@@ -510,7 +510,7 @@ function uc_shipping_order_shipments($order) {
     $row[] = $shipment->sid;
     $row[] = check_plain($shipment->d_first_name) . ' ' . check_plain($shipment->d_last_name);
     $row[] = check_plain($shipment->d_company);
-    $row[] = check_plain($shipment->d_city) . ', ' . uc_get_zone_code($shipment->d_zone) . ' ' . check_plain($shipment->d_postal_code);
+    $row[] = check_plain($shipment->d_city) . ', ' . $shipment->d_zone . ' ' . check_plain($shipment->d_postal_code);
     $row[] = format_date($shipment->ship_date, 'uc_store');
     $row[] = format_date($shipment->expected_delivery, 'uc_store');
     $row[] = is_null($shipment->tracking_number) ? t('n/a') : check_plain($shipment->tracking_number);
diff --git a/shipping/uc_ups/uc_ups.module b/shipping/uc_ups/uc_ups.module
index 9bbad54..45cbaf3 100644
--- a/shipping/uc_ups/uc_ups.module
+++ b/shipping/uc_ups/uc_ups.module
@@ -356,17 +356,14 @@ function uc_ups_shipping_quote($packages, $origin, $destination, $ups_service) {
   $pkg_types = \Drupal\uc_ups\UPSUtilities::packageTypes();
 
   $store_config = \Drupal::config('uc_store.settings');
-  $shipper_zone = uc_get_zone_code($store_config->get('address.zone'));
-  $shipper_country = uc_get_country_data(array('country_id' => $store_config->get('address.country')));
-  $shipper_country = $shipper_country[0]['country_iso_code_2'];
+  $shipper_zone = $store_config->get('address.zone');
+  $shipper_country =$store_config->get('address.country');
   $shipper_zip = $store_config->get('address.postal_code');
-  $shipto_zone = uc_get_zone_code($destination->zone);
-  $shipto_country = uc_get_country_data(array('country_id' => $destination->country));
-  $shipto_country = $shipto_country[0]['country_iso_code_2'];
+  $shipto_zone = $destination->zone;
+  $shipto_country =$destination->country;
   $shipto_zip = $destination->postal_code;
-  $shipfrom_zone = uc_get_zone_code($origin->zone);
-  $shipfrom_country = uc_get_country_data(array('country_id' => $origin->country));
-  $shipfrom_country = $shipfrom_country[0]['country_iso_code_2'];
+  $shipfrom_zone = $origin->zone;
+  $shipfrom_country = $origin->country;
   $shipfrom_zip = $origin->postal_code;
 
   $ups_units = $ups_config->get('unit_system');
diff --git a/shipping/uc_ups/uc_ups.ship.inc b/shipping/uc_ups/uc_ups.ship.inc
index d01bfdb..0cc11c8 100644
--- a/shipping/uc_ups/uc_ups.ship.inc
+++ b/shipping/uc_ups/uc_ups.ship.inc
@@ -363,17 +363,14 @@ function uc_ups_shipment_request($packages, $origin, $destination, $ups_service)
   $pkg_types = \Drupal\uc_ups\UPSUtilities::packageTypes();
 
   $store_config = \Drupal::config('uc_store.settings');
-  $shipper_zone = uc_get_zone_code($store_config->get('address.zone'));
-  $shipper_country = uc_get_country_data(array('country_id' => $store_config->get('address.country')));
-  $shipper_country = $shipper_country[0]['country_iso_code_2'];
+  $shipper_zone = $store_config->get('address.zone');
+  $shipper_country = $store_config->get('address.country');
   $shipper_zip = $store_config->get('address.postal_code');
-  $shipto_zone = uc_get_zone_code($destination->zone);
-  $shipto_country = uc_get_country_data(array('country_id' => $destination->country));
-  $shipto_country = $shipto_country[0]['country_iso_code_2'];
+  $shipto_zone = $destination->zone;
+  $shipto_country = $destination->country;
   $shipto_zip = $destination->postal_code;
-  $shipfrom_zone = uc_get_zone_code($origin->zone);
-  $shipfrom_country = uc_get_country_data(array('country_id' => $origin->country));
-  $shipfrom_country = $shipfrom_country[0]['country_iso_code_2'];
+  $shipfrom_zone = $origin->zone;
+  $shipfrom_country = $origin->country;
   $shipfrom_zip = $origin->postal_code;
 
   $ups_units = $ups_config('unit_system');
diff --git a/shipping/uc_usps/uc_usps.module b/shipping/uc_usps/uc_usps.module
index d1c6970..c806c23 100644
--- a/shipping/uc_usps/uc_usps.module
+++ b/shipping/uc_usps/uc_usps.module
@@ -269,7 +269,7 @@ function uc_usps_quote($products, $details, $method) {
   }
 
   // Shipments to the US also need zone and postal_code.
-  if (($destination->country == 840) &&
+  if (($destination->country == 'US') &&
       (empty($destination->zone) || empty($destination->postal_code))) {
     // Skip this shipping method.
     return array();
@@ -291,11 +291,11 @@ function uc_usps_quote($products, $details, $method) {
     $orig = $addresses[$key];
     $orig->email = uc_store_email();
 
-    if (strpos($method['id'], 'intl') && ($destination->country != 840)) {
+    if (strpos($method['id'], 'intl') && ($destination->country != 'US')) {
       // Build XML for international rate request.
       $request = uc_usps_intl_rate_request($ship_packages, $orig, $destination);
     }
-    elseif ($destination->country == 840) {
+    elseif ($destination->country == 'US') {
       // Build XML for domestic rate request.
       $request = uc_usps_rate_request($ship_packages, $orig, $destination);
     }
diff --git a/shipping/uc_usps/uc_usps.rules_defaults.inc b/shipping/uc_usps/uc_usps.rules_defaults.inc
index e9837a9..00f93de 100644
--- a/shipping/uc_usps/uc_usps.rules_defaults.inc
+++ b/shipping/uc_usps/uc_usps.rules_defaults.inc
@@ -15,11 +15,11 @@ function uc_usps_default_rules_configuration_alter(&$configs) {
 
   // Domestic areas include U.S., American Samoa, Guam, Puerto Rico, and the Virgin Islands
   $countries = array(
-    16 => t('American Samoa'),
-    316 => t('Guam'),
-    630 => t('Puerto Rico'),
-    840 => t('United States'),
-    850 => t('Virgin Islands (US)'),
+    'AS' => t('American Samoa'),
+    'GU' => t('Guam'),
+    'PR' => t('Puerto Rico'),
+    'US' => t('United States'),
+    'VI' => t('Virgin Islands (US)'),
   );
 
   $domestic = rules_or();
diff --git a/uc_googleanalytics/uc_googleanalytics.module b/uc_googleanalytics/uc_googleanalytics.module
index b8b619e..4217036 100644
--- a/uc_googleanalytics/uc_googleanalytics.module
+++ b/uc_googleanalytics/uc_googleanalytics.module
@@ -102,18 +102,6 @@ function uc_googleanalytics_display() {
 function uc_googleanalytics_ecommerce_js($order) {
   $script = '';
 
-  // Lookup the name of the country or default to the ID if it can't be found
-  // for some reason.
-  if ($country_data = uc_get_country_data(array('country_id' => $order->billing_country))) {
-    $order->billing_country_name = $country_data[0]['country_name'];
-  }
-  else {
-    $order->billing_country_name = $order->billing_country;
-  }
-
-  // Lookup the name of the zone.
-  $order->billing_zone_name = uc_zone_get_by_id($order->billing_zone);
-
   // Calculate order tax and shipping totals.
   $order->tax_total = 0;
   $order->shipping_total = 0;
@@ -128,6 +116,7 @@ function uc_googleanalytics_ecommerce_js($order) {
   }
 
   // Build the transaction arguments.
+  $country = entity_load('uc_country', $order->billing_country);
   $trans = array(
     'order_id' => $order->id(),
     'store' => uc_store_name(),
@@ -135,8 +124,8 @@ function uc_googleanalytics_ecommerce_js($order) {
     'tax' => $order->tax_total,
     'shipping' => $order->shipping_total,
     'city' => $order->billing_city,
-    'state' => $order->billing_zone_name,
-    'country' => $order->billing_country_name,
+    'state' => $country->zones[$order->billing_zone_name],
+    'country' => $country->name,
   );
 
   // Allow modules to alter the transaction arguments.
diff --git a/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php b/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php
index 536c4c8..e9d3e3e 100644
--- a/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php
+++ b/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php
@@ -121,12 +121,6 @@ class UcOrder extends ContentEntityBase implements UcOrderInterface {
   public function preSave(EntityStorageControllerInterface $storage_controller) {
     $this->order_total->value = $this->getTotal();
     $this->product_count->value = $this->getProductCount();
-    if (is_null($this->delivery_country->value) || $this->delivery_country->value == 0) {
-      $this->delivery_country->value = \Drupal::config('uc_store.settings')->get('address.country');
-    }
-    if (is_null($this->billing_country->value) || $this->billing_country->value == 0) {
-      $this->billing_country->value = \Drupal::config('uc_store.settings')->get('address.country');
-    }
     $this->host->value = \Drupal::request()->getClientIp();
     $this->modified->value = REQUEST_TIME;
 
@@ -440,13 +434,13 @@ class UcOrder extends ContentEntityBase implements UcOrderInterface {
     $fields['delivery_city'] = FieldDefinition::create('string')
       ->setLabel(t('Delivery city'))
       ->setDescription(t('The city of the delivery location.'));
-    $fields['delivery_zone'] = FieldDefinition::create('integer')
+    $fields['delivery_zone'] = FieldDefinition::create('string')
       ->setLabel(t('Delivery state/province'))
       ->setDescription(t('The state/zone/province id of the delivery location.'));
     $fields['delivery_postal_code'] = FieldDefinition::create('string')
       ->setLabel(t('Delivery postal code'))
       ->setDescription(t('The postal code of the delivery location.'));
-    $fields['delivery_country'] = FieldDefinition::create('integer')
+    $fields['delivery_country'] = FieldDefinition::create('string')
       ->setLabel(t('Delivery country'))
       ->setDescription(t('The country ID of the delivery location.'));
     $fields['billing_first_name'] = FieldDefinition::create('string')
@@ -470,13 +464,13 @@ class UcOrder extends ContentEntityBase implements UcOrderInterface {
     $fields['billing_city'] = FieldDefinition::create('string')
       ->setLabel(t('Billing city'))
       ->setDescription(t('The city where the bill will be sent.'));
-    $fields['billing_zone'] = FieldDefinition::create('integer')
+    $fields['billing_zone'] = FieldDefinition::create('string')
       ->setLabel(t('Billing state/province'))
       ->setDescription(t('The state/zone/province ID where the bill will be sent.'));
     $fields['billing_postal_code'] = FieldDefinition::create('string')
       ->setLabel(t('Billing postal code'))
       ->setDescription(t('The postal code where the bill will be sent.'));
-    $fields['billing_country'] = FieldDefinition::create('integer')
+    $fields['billing_country'] = FieldDefinition::create('string')
       ->setLabel(t('Billing country'))
       ->setDescription(t('The country ID where the bill will be sent.'));
     $fields['payment_method'] = FieldDefinition::create('string')
diff --git a/uc_order/uc_order.install b/uc_order/uc_order.install
index a2ae767..fbe393d 100644
--- a/uc_order/uc_order.install
+++ b/uc_order/uc_order.install
@@ -107,9 +107,8 @@ function uc_order_schema() {
       ),
       'delivery_zone' => array(
         'description' => 'The state/zone/province id of the delivery location.',
-        'type' => 'int',
-        'size' => 'medium',
-        'unsigned' => TRUE,
+        'type' => 'varchar',
+        'length' => 255,
         'not null' => TRUE,
         'default' => 0,
       ),
@@ -122,9 +121,8 @@ function uc_order_schema() {
       ),
       'delivery_country' => array(
         'description' => 'The country ID of the delivery location.',
-        'type' => 'int',
-        'size' => 'medium',
-        'unsigned' => TRUE,
+        'type' => 'char',
+        'length' => 2,
         'not null' => TRUE,
         'default' => 0,
       ),
@@ -179,9 +177,8 @@ function uc_order_schema() {
       ),
       'billing_zone' => array(
         'description' => 'The state/zone/province ID where the bill will be sent.',
-        'type' => 'int',
-        'size' => 'medium',
-        'unsigned' => TRUE,
+        'type' => 'varchar',
+        'length' => 255,
         'not null' => TRUE,
         'default' => 0,
       ),
@@ -194,9 +191,8 @@ function uc_order_schema() {
       ),
       'billing_country' => array(
         'description' => 'The country ID where the bill will be sent.',
-        'type' => 'int',
-        'size' => 'medium',
-        'unsigned' => TRUE,
+        'type' => 'char',
+        'length' => 2,
         'not null' => TRUE,
         'default' => 0,
       ),
diff --git a/uc_store/config/uc_store.country.AD.yml b/uc_store/config/uc_store.country.AD.yml
new file mode 100644
index 0000000..1c7ad79
--- /dev/null
+++ b/uc_store/config/uc_store.country.AD.yml
@@ -0,0 +1,14 @@
+iso2: AD
+iso3: AND
+name: Andorra
+numeric: 20
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !postal_code\r\n!country_name_if"
+zones:
+    AN: 'Andorra La Vella'
+    CA: Canillo
+    EE: 'Escaldes Engordany'
+    EN: Encamp
+    JL: 'Sant Julià de Lòria'
+    MA: 'La Massana'
+    OR: Ordino
diff --git a/uc_store/config/uc_store.country.AE.yml b/uc_store/config/uc_store.country.AE.yml
new file mode 100644
index 0000000..507909c
--- /dev/null
+++ b/uc_store/config/uc_store.country.AE.yml
@@ -0,0 +1,13 @@
+iso2: AE
+iso3: ARE
+name: 'United Arab Emirates'
+numeric: 784
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code\r\n!country_name_if"
+zones:
+    ABU: 'Abu dhabi'
+    Ala: 'Al Ain'
+    DXB: Dubai
+    FUJ: Fujairah
+    SHJ: Sharjah
+    UAQ: 'UM Al Quwain'
diff --git a/uc_store/config/uc_store.country.AF.yml b/uc_store/config/uc_store.country.AF.yml
new file mode 100644
index 0000000..156e6b6
--- /dev/null
+++ b/uc_store/config/uc_store.country.AF.yml
@@ -0,0 +1,39 @@
+iso2: AF
+iso3: AFG
+name: Afghanistan
+numeric: 4
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if"
+zones:
+    BAL: Balkh
+    BAM: Bamian
+    BDG: Badghis
+    BDS: Badakhshan
+    BGL: Baghlan
+    FRA: Farah
+    FYB: Faryab
+    GHA: Ghazni
+    GHO: Ghowr
+    HEL: Helmand
+    HER: Herat
+    JOW: Jowzjan
+    KAB: Kabul
+    KAN: Kandahar
+    KAP: Kapisa
+    KDZ: Kondoz
+    KHO: Khost
+    KNR: Konar
+    LAG: Laghman
+    LOW: Lowgar
+    NAN: Nangrahar
+    NIM: Nimruz
+    NUR: Nurestan
+    ORU: Oruzgan
+    PAR: Parwan
+    PIA: Paktia
+    PKA: Paktika
+    SAM: Samangan
+    SAR: 'Sar-e Pol'
+    TAK: Takhar
+    WAR: Wardak
+    ZAB: Zabol
diff --git a/uc_store/config/uc_store.country.AG.yml b/uc_store/config/uc_store.country.AG.yml
new file mode 100644
index 0000000..bc38650
--- /dev/null
+++ b/uc_store/config/uc_store.country.AG.yml
@@ -0,0 +1,15 @@
+iso2: AG
+iso3: ATG
+name: 'Antigua and Barbuda'
+numeric: 28
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if"
+zones:
+    BB: Barbuda
+    GE: 'St. George'
+    JO: 'St. John'
+    MA: 'St. Mary'
+    PA: 'St. Paul'
+    PE: 'St. Peter'
+    PH: 'St. Philip'
+    RD: Redonda
diff --git a/uc_store/config/uc_store.country.AI.yml b/uc_store/config/uc_store.country.AI.yml
new file mode 100644
index 0000000..b0053e4
--- /dev/null
+++ b/uc_store/config/uc_store.country.AI.yml
@@ -0,0 +1,21 @@
+iso2: AI
+iso3: AIA
+name: Anguilla
+numeric: 660
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if"
+zones:
+    BP: 'Blowing Point'
+    EE: 'East End'
+    GH: 'George Hill'
+    IH: 'Island Harbour'
+    NH: 'North Hill'
+    NS: 'North Side'
+    SG: 'Sandy Ground'
+    SH: 'Sandy Hill'
+    SO: 'South Hill'
+    ST: 'Stoney Ground'
+    TF: 'The Farrington'
+    TQ: 'The Quarter (including Rey Hill)'
+    TV: 'The Valley (including Upper & South Valley)'
+    WE: 'West End (including Long Bay)'
diff --git a/uc_store/config/uc_store.country.AL.yml b/uc_store/config/uc_store.country.AL.yml
new file mode 100644
index 0000000..4afc665
--- /dev/null
+++ b/uc_store/config/uc_store.country.AL.yml
@@ -0,0 +1,19 @@
+iso2: AL
+iso3: ALB
+name: Albania
+numeric: 8
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    1: 'Berat county'
+    10: 'Shkoder county'
+    11: 'Tirane county'
+    12: 'Vlore county'
+    2: 'Durres county'
+    3: 'Elbasan county'
+    4: 'Fier county'
+    5: 'Gjirokaster county'
+    6: 'Korce county'
+    7: 'Kukes county'
+    8: 'Lezhe county'
+    9: 'Diber county'
diff --git a/uc_store/config/uc_store.country.AM.yml b/uc_store/config/uc_store.country.AM.yml
new file mode 100644
index 0000000..f76f103
--- /dev/null
+++ b/uc_store/config/uc_store.country.AM.yml
@@ -0,0 +1,18 @@
+iso2: AM
+iso3: ARM
+name: Armenia
+numeric: 51
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AG: Araqacotn
+    AR: Ararat
+    AV: Armavir
+    ER: Erevan
+    GR: Geqarkunik
+    KT: Kotayk
+    LO: Lory
+    SH: Sirak
+    SU: Syunik
+    TV: Tavus
+    VD: 'Vayoc Jor'
diff --git a/uc_store/config/uc_store.country.AO.yml b/uc_store/config/uc_store.country.AO.yml
new file mode 100644
index 0000000..46c22dc
--- /dev/null
+++ b/uc_store/config/uc_store.country.AO.yml
@@ -0,0 +1,25 @@
+iso2: AO
+iso3: AGO
+name: Angola
+numeric: 24
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    BGO: Bengo
+    BGU: Benguela
+    BIE: Bie
+    CAB: Cabinda
+    CCU: 'Cuando Cubango'
+    CNN: Cunene
+    CNO: 'Cuanza Norte'
+    CUS: 'Cuanza Sul'
+    HUA: Huambo
+    HUI: Huila
+    LNO: 'Lunda Norte'
+    LSU: 'Lunda Sul'
+    LUA: Luanda
+    MAL: Malanje
+    MOX: Moxico
+    NAM: Namibe
+    UIG: Uige
+    ZAI: Zaire
diff --git a/uc_store/config/uc_store.country.AQ.yml b/uc_store/config/uc_store.country.AQ.yml
new file mode 100644
index 0000000..20164ba
--- /dev/null
+++ b/uc_store/config/uc_store.country.AQ.yml
@@ -0,0 +1,6 @@
+iso2: AQ
+iso3: ATA
+name: Antarctica
+numeric: 10
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.AR.yml b/uc_store/config/uc_store.country.AR.yml
new file mode 100644
index 0000000..685de1b
--- /dev/null
+++ b/uc_store/config/uc_store.country.AR.yml
@@ -0,0 +1,31 @@
+iso2: AR
+iso3: ARG
+name: Argentina
+numeric: 32
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !zone_name\r\n!country_name"
+zones:
+    A: Salta
+    B: 'Buenos Aires Province'
+    C: 'Capital Federal'
+    D: 'San Luis'
+    E: 'Entre Ríos'
+    F: 'La Rioja'
+    G: 'Santiago del Estero'
+    H: Chaco
+    J: 'San Juan'
+    K: Catamarca
+    L: 'La Pampa'
+    M: Mendoza
+    N: Misiones
+    P: Formosa
+    Q: Neuquén
+    R: 'Río Negro'
+    S: 'Santa Fe'
+    T: Tucumán
+    U: Chubut
+    V: 'Tierra del Fuego'
+    W: Corrientes
+    X: Córdoba
+    Y: Jujuy
+    Z: 'Santa Cruz'
diff --git a/uc_store/config/uc_store.country.AS.yml b/uc_store/config/uc_store.country.AS.yml
new file mode 100644
index 0000000..d83802a
--- /dev/null
+++ b/uc_store/config/uc_store.country.AS.yml
@@ -0,0 +1,6 @@
+iso2: AS
+iso3: ASM
+name: 'American Samoa'
+numeric: 16
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.AT.yml b/uc_store/config/uc_store.country.AT.yml
new file mode 100644
index 0000000..6bef223
--- /dev/null
+++ b/uc_store/config/uc_store.country.AT.yml
@@ -0,0 +1,16 @@
+iso2: AT
+iso3: AUT
+name: Austria
+numeric: 40
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    BUR: Burgenland
+    KAR: Kärnten
+    NOS: Niederöesterreich
+    OOS: Oberöesterreich
+    SAL: Salzburg
+    STE: Steiermark
+    TIR: Tirol
+    VOR: Vorarlberg
+    WIE: Wien
diff --git a/uc_store/config/uc_store.country.AU.yml b/uc_store/config/uc_store.country.AU.yml
new file mode 100644
index 0000000..dc573d8
--- /dev/null
+++ b/uc_store/config/uc_store.country.AU.yml
@@ -0,0 +1,15 @@
+iso2: AU
+iso3: AUS
+name: Australia
+numeric: 36
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    ACT: 'Australian Capital Territory'
+    NSW: 'New South Wales'
+    NT: 'Northern Territory'
+    QLD: Queensland
+    SA: 'South Australia'
+    TAS: Tasmania
+    VIC: Victoria
+    WA: 'Western Australia'
diff --git a/uc_store/config/uc_store.country.AW.yml b/uc_store/config/uc_store.country.AW.yml
new file mode 100644
index 0000000..aa3c9d7
--- /dev/null
+++ b/uc_store/config/uc_store.country.AW.yml
@@ -0,0 +1,6 @@
+iso2: AW
+iso3: ABW
+name: Aruba
+numeric: 533
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.AX.yml b/uc_store/config/uc_store.country.AX.yml
new file mode 100644
index 0000000..4b4f2f6
--- /dev/null
+++ b/uc_store/config/uc_store.country.AX.yml
@@ -0,0 +1,6 @@
+iso2: AX
+iso3: ALA
+name: 'Åland Islands'
+numeric: 248
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.AZ.yml b/uc_store/config/uc_store.country.AZ.yml
new file mode 100644
index 0000000..a8cd0bc
--- /dev/null
+++ b/uc_store/config/uc_store.country.AZ.yml
@@ -0,0 +1,84 @@
+iso2: AZ
+iso3: AZE
+name: Azerbaijan
+numeric: 31
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name !postal_code\r\n!country_name_if"
+zones:
+    AB: Ali-Bairamly
+    ABS: Absheron
+    AGA: Aghstafa
+    AGC: Aghjabedi
+    AGM: Aghdam
+    AGS: Aghdash
+    AGU: Aghsu
+    AST: Astara
+    BA: Baku
+    BAB: Babek
+    BAL: Balaken
+    BAR: Barda
+    BEY: Beilagan
+    BIL: Bilasuvar
+    CAB: Jebrail
+    CAL: Jalilabad
+    CUL: Julfa
+    DAS: Dashkesan
+    DAV: Devechi
+    FUZ: Fizuli
+    GA: Ganja
+    GAD: Gadabey
+    GOR: Geranboy
+    GOY: Goychay
+    HAC: Hacuqabul
+    IMI: Imishli
+    ISM: Ismailly
+    KAL: Kelbajar
+    KUR: Kyurdamir
+    LA: 'Lankaran city'
+    LAC: Lachin
+    LAN: 'Lankaran district'
+    LER: Lerik
+    MAS: Masally
+    MI: Mingechevir
+    NA: Naftalan
+    NEF: Neftchala
+    NX: Nakhchivan
+    OGU: Oghuz
+    ORD: Ordubad
+    QAB: Gabala
+    QAX: Gakh
+    QAZ: Gazakh
+    QBA: Guba
+    QBI: Gubadly
+    QOB: Gobustan
+    QUS: Gusar
+    SA: 'Sheki city'
+    SAB: Sabirabad
+    SAD: Sedarak
+    SAH: Shahbuz
+    SAK: 'Sheki district'
+    SAL: Salyan
+    SAR: Sherur
+    SAT: Saatly
+    SIY: Siazan
+    SKR: Shamkir
+    SM: Sumgayit
+    SMI: Shamakhy
+    SMX: Samuh
+    SS: 'Shusha city'
+    SUS: 'Shusha district'
+    TAR: Terter
+    TOV: Tovuz
+    UCA: Ujar
+    XA: Khankendy
+    XAC: Khachmaz
+    XAN: Khanlar
+    XCI: Khojaly
+    XIZ: Khyzy
+    XVD: Khojavend
+    YAR: Yardymly
+    YE: 'Yevlakh city'
+    YEV: 'Yevlakh district'
+    ZAN: Zangilan
+    ZAQ: Zagatala
+    ZAR: Zerdab
diff --git a/uc_store/config/uc_store.country.BA.yml b/uc_store/config/uc_store.country.BA.yml
new file mode 100644
index 0000000..5419918
--- /dev/null
+++ b/uc_store/config/uc_store.country.BA.yml
@@ -0,0 +1,19 @@
+iso2: BA
+iso3: BIH
+name: 'Bosnia and Herzegovina'
+numeric: 70
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '01': 'Unsko-Sanski Kanton'
+    '02': 'Posavski Kanton'
+    '03': 'Tuzlanski Kanton'
+    '04': 'Zenicko-Dobojski Kanton'
+    '05': 'Bosansko-Podrinjski Kanton'
+    '06': 'Srednjobosanski Kanton'
+    '07': 'Hercegovacko-Neretvanski Kanton'
+    '08': 'Zapadno-Hercegovacki Kanton'
+    '09': 'Kanton Sarajevo'
+    10: 'Hercegovacko-Bosanski Kanton'
+    BIH: 'Federacija Bosna i Hercegovina'
+    SRP: 'Republika Srpska'
diff --git a/uc_store/config/uc_store.country.BB.yml b/uc_store/config/uc_store.country.BB.yml
new file mode 100644
index 0000000..2295b8b
--- /dev/null
+++ b/uc_store/config/uc_store.country.BB.yml
@@ -0,0 +1,18 @@
+iso2: BB
+iso3: BRB
+name: Barbados
+numeric: 52
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '01': 'Christ Church'
+    '02': 'Saint Andrew'
+    '03': 'Saint George'
+    '04': 'Saint James'
+    '05': 'Saint John'
+    '06': 'Saint Joseph'
+    '07': 'Saint Lucy'
+    '08': 'Saint Michael'
+    '09': 'Saint Peter'
+    10: 'Saint Philip'
+    11: 'Saint Thomas'
diff --git a/uc_store/config/uc_store.country.BD.yml b/uc_store/config/uc_store.country.BD.yml
new file mode 100644
index 0000000..6224b5e
--- /dev/null
+++ b/uc_store/config/uc_store.country.BD.yml
@@ -0,0 +1,13 @@
+iso2: BD
+iso3: BGD
+name: Bangladesh
+numeric: 50
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    1: Barisal
+    2: Chittagong
+    3: Dhaka
+    4: Khulna
+    5: Rajshahi
+    6: Sylhet
diff --git a/uc_store/config/uc_store.country.BE.yml b/uc_store/config/uc_store.country.BE.yml
new file mode 100644
index 0000000..caec035
--- /dev/null
+++ b/uc_store/config/uc_store.country.BE.yml
@@ -0,0 +1,18 @@
+iso2: BE
+iso3: BEL
+name: Belgium
+numeric: 56
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    BRU: Brussel/Bruxelles
+    VAN: Antwerpen
+    VBR: Vlaams-Brabant
+    VLI: Limburg
+    VOV: Oost-Vlaanderen
+    VWV: West-Vlaanderen
+    WBW: Brabant-Wallon
+    WHT: Hainaut
+    WLG: Liège
+    WLX: Luxembourg
+    WNA: Namur
diff --git a/uc_store/config/uc_store.country.BF.yml b/uc_store/config/uc_store.country.BF.yml
new file mode 100644
index 0000000..9c8e009
--- /dev/null
+++ b/uc_store/config/uc_store.country.BF.yml
@@ -0,0 +1,52 @@
+iso2: BF
+iso3: BFA
+name: 'Burkina Faso'
+numeric: 854
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code  !postal_code\r\n!country_name_if"
+zones:
+    BAL: Bale
+    BAM: Bam
+    BAN: Banwa
+    BAZ: Bazega
+    BGR: Bougouriba
+    BLG: Boulgou
+    BLK: Boulkiemde
+    COM: Comoe
+    GAN: Ganzourgou
+    GNA: Gnagna
+    GOU: Gourma
+    HOU: Houet
+    IOB: Ioba
+    KAD: Kadiogo
+    KEN: Kenedougou
+    KMD: Komandjoari
+    KMP: Kompienga
+    KOP: Koulpelogo
+    KOS: Kossi
+    KOT: Kouritenga
+    KOW: Kourweogo
+    LER: Leraba
+    LOR: Loroum
+    MOU: Mouhoun
+    NAM: Namentenga
+    NAO: Nahouri
+    NAY: Nayala
+    NOU: Noumbiel
+    OUB: Oubritenga
+    OUD: Oudalan
+    PAS: Passore
+    PON: Poni
+    SEN: Seno
+    SIS: Sissili
+    SMT: Sanmatenga
+    SNG: Sanguie
+    SOM: Soum
+    SOR: Sourou
+    TAP: Tapoa
+    TUI: Tuy
+    YAG: Yagha
+    YAT: Yatenga
+    ZIR: Ziro
+    ZON: Zondoma
+    ZOU: Zoundweogo
diff --git a/uc_store/config/uc_store.country.BG.yml b/uc_store/config/uc_store.country.BG.yml
new file mode 100644
index 0000000..2d303ef
--- /dev/null
+++ b/uc_store/config/uc_store.country.BG.yml
@@ -0,0 +1,6 @@
+iso2: BG
+iso3: BGR
+name: Bulgaria
+numeric: 100
+status: 0
+format: "!first_name !last_name\r\n!company\r\n!street1\r\n!street2\r\n!zone_name\r\n!postal_code !city !country_name_if"
diff --git a/uc_store/config/uc_store.country.BH.yml b/uc_store/config/uc_store.country.BH.yml
new file mode 100644
index 0000000..8fd6bd2
--- /dev/null
+++ b/uc_store/config/uc_store.country.BH.yml
@@ -0,0 +1,12 @@
+iso2: BH
+iso3: BHR
+name: Bahrain
+numeric: 48
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1 !street2\r\n!zone_name !postal_code\r\n\r\n!country_name_if"
+zones:
+    BH-13: 'Al Manamah'
+    BH-14: 'Al Janubiyah'
+    BH-15: 'Al Muharraq'
+    BH-16: 'Al Wusta'
+    BH-17: 'Ash Shamaliyah'
diff --git a/uc_store/config/uc_store.country.BI.yml b/uc_store/config/uc_store.country.BI.yml
new file mode 100644
index 0000000..2cad064
--- /dev/null
+++ b/uc_store/config/uc_store.country.BI.yml
@@ -0,0 +1,24 @@
+iso2: BI
+iso3: BDI
+name: Burundi
+numeric: 108
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code  !postal_code\r\n!country_name_if"
+zones:
+    BB: Bubanza
+    BJ: 'Bujumbura Rural'
+    BM: 'Bujumbura Mairie'
+    BR: Bururi
+    CA: Cankuzo
+    CI: Cibitoke
+    GI: Gitega
+    KI: Kirundo
+    KR: Karuzi
+    KY: Kayanza
+    MA: Makamba
+    MU: Muramvya
+    MW: Mwaro
+    MY: Muyinga
+    NG: Ngozi
+    RT: Rutana
+    RY: Ruyigi
diff --git a/uc_store/config/uc_store.country.BJ.yml b/uc_store/config/uc_store.country.BJ.yml
new file mode 100644
index 0000000..47bd8c7
--- /dev/null
+++ b/uc_store/config/uc_store.country.BJ.yml
@@ -0,0 +1,19 @@
+iso2: BJ
+iso3: BEN
+name: Benin
+numeric: 204
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    AK: Atacora
+    AL: Alibori
+    AQ: Atlantique
+    BO: Borgou
+    CO: Collines
+    DO: Donga
+    KO: Couffo
+    LI: Littoral
+    MO: Mono
+    OU: Ouémé
+    PL: Plateau
+    ZO: Zou
diff --git a/uc_store/config/uc_store.country.BL.yml b/uc_store/config/uc_store.country.BL.yml
new file mode 100644
index 0000000..75c7392
--- /dev/null
+++ b/uc_store/config/uc_store.country.BL.yml
@@ -0,0 +1,6 @@
+iso2: BL
+iso3: BLM
+name: 'Saint Barthélemy'
+numeric: 652
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.BM.yml b/uc_store/config/uc_store.country.BM.yml
new file mode 100644
index 0000000..62a2d50
--- /dev/null
+++ b/uc_store/config/uc_store.country.BM.yml
@@ -0,0 +1,18 @@
+iso2: BM
+iso3: BMU
+name: Bermuda
+numeric: 60
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city - !postal_code\r\n!zone_code\r\n!country_name_if"
+zones:
+    DEV: Devonshire
+    HA: 'Hamilton Municipality'
+    HAM: Hamilton
+    PAG: Paget
+    PEM: Pembroke
+    SAN: Sandys
+    SG: 'Saint George Municipality'
+    SGE: 'Saint Georges'
+    SMI: Smiths
+    SOU: Southampton
+    WAR: Warwick
diff --git a/uc_store/config/uc_store.country.BN.yml b/uc_store/config/uc_store.country.BN.yml
new file mode 100644
index 0000000..ce8865e
--- /dev/null
+++ b/uc_store/config/uc_store.country.BN.yml
@@ -0,0 +1,11 @@
+iso2: BN
+iso3: BRN
+name: 'Brunei Darussalam'
+numeric: 96
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !postal_code\r\n!zone_name\r\n!country_name_if"
+zones:
+    BN-BE: Belait
+    BN-BM: Brunei-Muara
+    BN-TE: Temburong
+    BN-TU: Tutong
diff --git a/uc_store/config/uc_store.country.BO.yml b/uc_store/config/uc_store.country.BO.yml
new file mode 100644
index 0000000..ec276e7
--- /dev/null
+++ b/uc_store/config/uc_store.country.BO.yml
@@ -0,0 +1,16 @@
+iso2: BO
+iso3: BOL
+name: 'Bolivia, Plurinational State of'
+numeric: 68
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    BO-B: 'El Beni'
+    BO-C: Cochabamba
+    BO-H: Chuquisaca
+    BO-L: 'La Paz'
+    BO-N: Pando
+    BO-O: Oruro
+    BO-P: Potosí
+    BO-S: 'Santa Cruz'
+    BO-T: Tarija
diff --git a/uc_store/config/uc_store.country.BQ.yml b/uc_store/config/uc_store.country.BQ.yml
new file mode 100644
index 0000000..29a65d8
--- /dev/null
+++ b/uc_store/config/uc_store.country.BQ.yml
@@ -0,0 +1,6 @@
+iso2: BQ
+iso3: BES
+name: 'Bonaire, Saint Eustatius and Saba'
+numeric: 535
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.BR.yml b/uc_store/config/uc_store.country.BR.yml
new file mode 100644
index 0000000..8c14f6d
--- /dev/null
+++ b/uc_store/config/uc_store.country.BR.yml
@@ -0,0 +1,34 @@
+iso2: BR
+iso3: BRA
+name: Brazil
+numeric: 76
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !postal_code\r\n!zone_name, !country_name"
+zones:
+    AC: Acre
+    AL: Alagoas
+    AM: Amazonas
+    AP: Amapá
+    BA: Bahia
+    CE: Ceará
+    DF: 'Distrito Federal'
+    ES: 'Espírito Santo'
+    GO: Goiás
+    MA: Maranhão
+    MG: 'Minas Gerais'
+    MS: 'Mato Grosso do Sul'
+    MT: 'Mato Grosso'
+    PA: Pará
+    PB: Paraíba
+    PE: Pernambuco
+    PI: Piauí
+    PR: Paraná
+    RJ: 'Rio de Janeiro'
+    RN: 'Rio Grande do Norte'
+    RO: Rondônia
+    RR: Roraima
+    RS: 'Rio Grande do Sul'
+    SC: 'Santa Catarina'
+    SE: Sergipe
+    SP: 'São Paulo'
+    TO: Tocantins
diff --git a/uc_store/config/uc_store.country.BS.yml b/uc_store/config/uc_store.country.BS.yml
new file mode 100644
index 0000000..3a3f235
--- /dev/null
+++ b/uc_store/config/uc_store.country.BS.yml
@@ -0,0 +1,28 @@
+iso2: BS
+iso3: BHS
+name: Bahamas
+numeric: 44
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AC: 'Acklins and Crooked Islands'
+    BI: Bimini
+    CI: 'Cat Island'
+    EX: Exuma
+    FC: 'Fresh Creek'
+    FP: Freeport
+    GH: 'Governor''s Harbour'
+    GT: 'Green Turtle Cay'
+    HI: 'Harbour Island'
+    HR: 'High Rock'
+    IN: Inaqua
+    KB: 'Kemps Bay'
+    LI: 'Long Island'
+    MG: Mayaquana
+    MH: 'Marsh Harbour'
+    NB: 'Nicholls Town and Berry Islands'
+    NP: 'New Providence'
+    RI: 'Ragged Island'
+    RS: 'Rock Sound'
+    SP: 'Sandy Point'
+    SR: 'San Salvador and Rum Cay'
diff --git a/uc_store/config/uc_store.country.BT.yml b/uc_store/config/uc_store.country.BT.yml
new file mode 100644
index 0000000..cc8f26f
--- /dev/null
+++ b/uc_store/config/uc_store.country.BT.yml
@@ -0,0 +1,27 @@
+iso2: BT
+iso3: BTN
+name: Bhutan
+numeric: 64
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code  !postal_code\r\n!country_name_if"
+zones:
+    11: Paro
+    12: Chhukha
+    13: Ha
+    14: Samchi
+    15: Thimphu
+    21: Chirang
+    22: Daga
+    23: Punakha
+    24: 'Wangdi Phodrang'
+    31: Geylegphug
+    32: Tongsa
+    33: Bumthang
+    34: Shemgang
+    41: Tashigang
+    42: Mongar
+    43: Pemagatsel
+    44: Lhuntshi
+    45: 'Samdrup Jongkhar'
+    GA: Gasa
+    TY: 'Tashi Yangtse'
diff --git a/uc_store/config/uc_store.country.BV.yml b/uc_store/config/uc_store.country.BV.yml
new file mode 100644
index 0000000..58fdabb
--- /dev/null
+++ b/uc_store/config/uc_store.country.BV.yml
@@ -0,0 +1,6 @@
+iso2: BV
+iso3: BVT
+name: 'Bouvet Island'
+numeric: 74
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.BW.yml b/uc_store/config/uc_store.country.BW.yml
new file mode 100644
index 0000000..cc15f26
--- /dev/null
+++ b/uc_store/config/uc_store.country.BW.yml
@@ -0,0 +1,16 @@
+iso2: BW
+iso3: BWA
+name: Botswana
+numeric: 72
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    CE: Central
+    GH: Ghanzi
+    KG: Kgalagadi
+    KL: Kgatleng
+    KW: Kweneng
+    NE: North-East
+    NW: North-West
+    SE: South-East
+    SO: Southern
diff --git a/uc_store/config/uc_store.country.BY.yml b/uc_store/config/uc_store.country.BY.yml
new file mode 100644
index 0000000..c8ec3c7
--- /dev/null
+++ b/uc_store/config/uc_store.country.BY.yml
@@ -0,0 +1,14 @@
+iso2: BY
+iso3: BLR
+name: Belarus
+numeric: 112
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    BR: Brest
+    HM: 'Horad Minsk'
+    HO: Homyel
+    HR: Hrodna
+    MA: Mahilyow
+    MI: Minsk
+    VI: Vitsyebsk
diff --git a/uc_store/config/uc_store.country.BZ.yml b/uc_store/config/uc_store.country.BZ.yml
new file mode 100644
index 0000000..b9dd4d5
--- /dev/null
+++ b/uc_store/config/uc_store.country.BZ.yml
@@ -0,0 +1,13 @@
+iso2: BZ
+iso3: BLZ
+name: Belize
+numeric: 84
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    BZ: Belize
+    CY: Cayo
+    CZL: Corozal
+    OW: 'Orange Walk'
+    SC: 'Stann Creek'
+    TOL: Toledo
diff --git a/uc_store/config/uc_store.country.CA.yml b/uc_store/config/uc_store.country.CA.yml
new file mode 100644
index 0000000..a3a543d
--- /dev/null
+++ b/uc_store/config/uc_store.country.CA.yml
@@ -0,0 +1,20 @@
+iso2: CA
+iso3: CAN
+name: Canada
+numeric: 124
+status: 1
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !postal_code\r\n!zone_name, !country_name"
+zones:
+    AB: Alberta
+    BC: 'British Columbia'
+    MB: Manitoba
+    NB: 'New Brunswick'
+    NL: 'Newfoundland and Labrador'
+    NS: 'Nova Scotia'
+    NT: 'Northwest Territories'
+    NU: Nunavut
+    ON: Ontario
+    PE: 'Prince Edward Island'
+    QC: Quebec
+    SK: Saskatchewan
+    YT: 'Yukon Territory'
diff --git a/uc_store/config/uc_store.country.CC.yml b/uc_store/config/uc_store.country.CC.yml
new file mode 100644
index 0000000..4fc758c
--- /dev/null
+++ b/uc_store/config/uc_store.country.CC.yml
@@ -0,0 +1,6 @@
+iso2: CC
+iso3: CCK
+name: 'Cocos (Keeling) Islands'
+numeric: 166
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.CD.yml b/uc_store/config/uc_store.country.CD.yml
new file mode 100644
index 0000000..bd8ba65
--- /dev/null
+++ b/uc_store/config/uc_store.country.CD.yml
@@ -0,0 +1,18 @@
+iso2: CD
+iso3: COD
+name: 'Congo, the Democratic Republic of the'
+numeric: 180
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    CD-BC: Bas-Congo
+    CD-BN: Bandundu
+    CD-EQ: Equateur
+    CD-KA: Katanga
+    CD-KE: Kasai-Oriental
+    CD-KN: Kinshasa
+    CD-KW: Kasai-Occidental
+    CD-MA: Maniema
+    CD-NK: Nord-Kivu
+    CD-OR: Orientale
+    CD-SK: Sud-Kivu
diff --git a/uc_store/config/uc_store.country.CF.yml b/uc_store/config/uc_store.country.CF.yml
new file mode 100644
index 0000000..57ad059
--- /dev/null
+++ b/uc_store/config/uc_store.country.CF.yml
@@ -0,0 +1,24 @@
+iso2: CF
+iso3: CAF
+name: 'Central African Republic'
+numeric: 140
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    AC: Ouham
+    BB: Bamingui-Bangoran
+    BGF: Bangui
+    BK: Basse-Kotto
+    HK: Haute-Kotto
+    HM: Haut-Mbomou
+    HS: Mambere-Kadei
+    KB: Nana-Grebizi
+    KG: Kemo
+    LB: Lobaye
+    MB: Mbomou
+    MP: 'Ombella-M''Poko'
+    NM: Nana-Mambere
+    OP: Ouham-Pende
+    SE: Sangha-Mbaere
+    UK: Ouaka
+    VK: Vakaga
diff --git a/uc_store/config/uc_store.country.CG.yml b/uc_store/config/uc_store.country.CG.yml
new file mode 100644
index 0000000..0170fc4
--- /dev/null
+++ b/uc_store/config/uc_store.country.CG.yml
@@ -0,0 +1,18 @@
+iso2: CG
+iso3: COG
+name: Congo
+numeric: 178
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    11: Bouenza
+    12: Pool
+    13: Sangha
+    14: Plateaux
+    15: Cuvette-Ouest
+    2: Lekoumou
+    5: Kouilou
+    7: Likouala
+    8: Cuvette
+    9: Niari
+    BZV: Brazzaville
diff --git a/uc_store/config/uc_store.country.CH.yml b/uc_store/config/uc_store.country.CH.yml
new file mode 100644
index 0000000..7b7ba9b
--- /dev/null
+++ b/uc_store/config/uc_store.country.CH.yml
@@ -0,0 +1,33 @@
+iso2: CH
+iso3: CHE
+name: Switzerland
+numeric: 756
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    AG: Aargau
+    AI: 'Appenzell Innerrhoden'
+    AR: 'Appenzell Ausserrhoden'
+    BE: Bern
+    BL: Basel-Landschaft
+    BS: Basel-Stadt
+    FR: Fribourg
+    GE: Geneva
+    GL: Glarus
+    GR: Graubünden
+    JU: Jura
+    LU: Luzern
+    NE: Neuchâtel
+    NW: Nidwalden
+    OW: Obwalden
+    SG: 'St. Gallen'
+    SH: Schaffhausen
+    SO: Solothurn
+    SZ: Schwyz
+    TG: Thurgau
+    TI: Ticino
+    UR: Uri
+    VD: Vaud
+    VS: Valais
+    ZG: Zug
+    ZH: Zürich
diff --git a/uc_store/config/uc_store.country.CI.yml b/uc_store/config/uc_store.country.CI.yml
new file mode 100644
index 0000000..e06a6a7
--- /dev/null
+++ b/uc_store/config/uc_store.country.CI.yml
@@ -0,0 +1,6 @@
+iso2: CI
+iso3: CIV
+name: 'Côte d''Ivoire'
+numeric: 384
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.CK.yml b/uc_store/config/uc_store.country.CK.yml
new file mode 100644
index 0000000..d6bc102
--- /dev/null
+++ b/uc_store/config/uc_store.country.CK.yml
@@ -0,0 +1,6 @@
+iso2: CK
+iso3: COK
+name: 'Cook Islands'
+numeric: 184
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.CL.yml b/uc_store/config/uc_store.country.CL.yml
new file mode 100644
index 0000000..3a454f7
--- /dev/null
+++ b/uc_store/config/uc_store.country.CL.yml
@@ -0,0 +1,20 @@
+iso2: CL
+iso3: CHL
+name: Chile
+numeric: 152
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !postal_code\r\n!zone_name, !country_name"
+zones:
+    AI: Aisen
+    AN: Antofagasta
+    AR: Araucania
+    AT: Atacama
+    BI: Biobio
+    CO: Coquimbo
+    LA: Lagos
+    MA: Magallanes
+    OH: Ohiggins
+    Ri: Rios
+    RM: Metropolitana
+    TA: Tarapaca
+    VA: Valparaiso
diff --git a/uc_store/config/uc_store.country.CM.yml b/uc_store/config/uc_store.country.CM.yml
new file mode 100644
index 0000000..e7f8249
--- /dev/null
+++ b/uc_store/config/uc_store.country.CM.yml
@@ -0,0 +1,17 @@
+iso2: CM
+iso3: CMR
+name: Cameroon
+numeric: 120
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    CM-AD: Adamaoua
+    CM-CE: Centre
+    CM-EN: Extreme-Nord
+    CM-ES: Est
+    CM-LT: Littoral
+    CM-NO: Nord
+    CM-NW: Nord-Ouest
+    CM-OU: Ouest
+    CM-SU: Sud
+    CM-SW: Sud-Ouest
diff --git a/uc_store/config/uc_store.country.CN.yml b/uc_store/config/uc_store.country.CN.yml
new file mode 100644
index 0000000..7a61417
--- /dev/null
+++ b/uc_store/config/uc_store.country.CN.yml
@@ -0,0 +1,41 @@
+iso2: CN
+iso3: CHN
+name: China
+numeric: 156
+status: 0
+format: "!company\r\n!last_name !first_name\r\n!street1\r\n!street2\r\n!city, !zone_name !postal_code\r\n!country_name_if"
+zones:
+    云: 云南
+    京: 北京
+    冀: 河北
+    台: 台湾
+    吉: 吉林
+    宁: 宁夏
+    川: 四川
+    新: 新疆
+    晋: 山西
+    桂: 广西
+    沪: 上海
+    津: 天津
+    浙: 浙江
+    渝: 重庆
+    港: 香港
+    湘: 湖南
+    澳: 澳门
+    琼: 海南
+    甘: 甘肃
+    皖: 安徽
+    粤: 广东
+    苏: 江苏
+    蒙: 内蒙古
+    藏: 西藏
+    豫: 河南
+    贵: 贵州
+    赣: 江西
+    辽: 辽宁
+    鄂: 湖北
+    闽: 福建
+    陕: 陕西
+    青: 青海
+    鲁: 山东
+    黑: 黑龙江
diff --git a/uc_store/config/uc_store.country.CO.yml b/uc_store/config/uc_store.country.CO.yml
new file mode 100644
index 0000000..ee7ba5a
--- /dev/null
+++ b/uc_store/config/uc_store.country.CO.yml
@@ -0,0 +1,39 @@
+iso2: CO
+iso3: COL
+name: Colombia
+numeric: 170
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AMA: Amazonas
+    ANT: Antioquia
+    ARA: Arauca
+    ATL: Atlantico
+    BOL: Bolivar
+    CAL: Caldas
+    CAQ: Caqueta
+    CAS: Casanare
+    CAU: Cauca
+    CES: Cesar
+    CHO: Choco
+    COR: Cordoba
+    CUN: Cundinamarca
+    DC: 'Distrito Capital de Bogota'
+    GUA: Guainia
+    GUV: Guaviare
+    HUI: Huila
+    LAG: 'La Guajira'
+    MAG: Magdalena
+    MET: Meta
+    NAR: Narino
+    NSA: 'Norte de Santander'
+    PUT: Putumayo
+    QUI: Quindio
+    RIS: Risaralda
+    SAN: Santander
+    SAP: 'San Andres, Providencia y Santa Catalina'
+    SUC: Sucre
+    TOL: Tolima
+    VAC: 'Valle del Cauca'
+    VAU: Vaupes
+    VID: Vichada
diff --git a/uc_store/config/uc_store.country.CR.yml b/uc_store/config/uc_store.country.CR.yml
new file mode 100644
index 0000000..7b64a98
--- /dev/null
+++ b/uc_store/config/uc_store.country.CR.yml
@@ -0,0 +1,14 @@
+iso2: CR
+iso3: CRI
+name: 'Costa Rica'
+numeric: 188
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AL: Alajuela
+    CA: Cartago
+    GU: Guanacaste
+    HE: Heredia
+    LI: Limón
+    PU: Puntarenas
+    SJ: 'San José'
diff --git a/uc_store/config/uc_store.country.CU.yml b/uc_store/config/uc_store.country.CU.yml
new file mode 100644
index 0000000..00af751
--- /dev/null
+++ b/uc_store/config/uc_store.country.CU.yml
@@ -0,0 +1,22 @@
+iso2: CU
+iso3: CUB
+name: Cuba
+numeric: 192
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    '01': 'Pinar del Rio'
+    '02': 'La Habana'
+    '03': 'Ciudad de la Habana'
+    '04': Matanzas
+    '05': 'Villa Clara'
+    '06': Cienfuegos
+    '07': 'Sancti Spiritus'
+    '08': 'Ciego de Avila'
+    '09': Camaguey
+    10: 'Las Tunas'
+    11: Holguin
+    12: Granma
+    13: 'Santiago de Cuba'
+    14: 'Sancti Spiritus'
+    99: 'Isla de la Juventud'
diff --git a/uc_store/config/uc_store.country.CV.yml b/uc_store/config/uc_store.country.CV.yml
new file mode 100644
index 0000000..1493b93
--- /dev/null
+++ b/uc_store/config/uc_store.country.CV.yml
@@ -0,0 +1,25 @@
+iso2: CV
+iso3: CPV
+name: 'Cape Verde'
+numeric: 132
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    BR: Brava
+    BV: 'Boa Vista'
+    CA: 'Santa Catarina'
+    CR: 'Sao Lourenço dos Orgaos'
+    CS: 'Sao Miguel'
+    MA: Maio
+    MO: Mosteiros
+    PA: Paul
+    PN: 'Porto Novo'
+    PR: Praia
+    RG: 'Ribeira Grande'
+    SD: 'Sao Domingos'
+    SF: 'Sao Filipe'
+    SL: Sal
+    SN: 'Ribeira Brava'
+    SV: 'Sao Vicente'
+    TA: Tarrafal
+    TS: 'Tarrafal de Sao Nicolau'
diff --git a/uc_store/config/uc_store.country.CW.yml b/uc_store/config/uc_store.country.CW.yml
new file mode 100644
index 0000000..0b57ee1
--- /dev/null
+++ b/uc_store/config/uc_store.country.CW.yml
@@ -0,0 +1,6 @@
+iso2: CW
+iso3: CUW
+name: Curaçao
+numeric: 531
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.CX.yml b/uc_store/config/uc_store.country.CX.yml
new file mode 100644
index 0000000..dff984e
--- /dev/null
+++ b/uc_store/config/uc_store.country.CX.yml
@@ -0,0 +1,6 @@
+iso2: CX
+iso3: CXR
+name: 'Christmas Island'
+numeric: 162
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.CY.yml b/uc_store/config/uc_store.country.CY.yml
new file mode 100644
index 0000000..227c6b6
--- /dev/null
+++ b/uc_store/config/uc_store.country.CY.yml
@@ -0,0 +1,13 @@
+iso2: CY
+iso3: CYP
+name: Cyprus
+numeric: 196
+status: 0
+format: "!company\n!first_name !last_name\n!street1\n!street2\n!city, !zone_code !postal_code\n!country_name_if"
+zones:
+    '01': Nicosia
+    '02': Limassol
+    '03': Larnaca
+    '04': Famagusta
+    '05': Paphos
+    '06': Kyrenia
diff --git a/uc_store/config/uc_store.country.CZ.yml b/uc_store/config/uc_store.country.CZ.yml
new file mode 100644
index 0000000..a68cae3
--- /dev/null
+++ b/uc_store/config/uc_store.country.CZ.yml
@@ -0,0 +1,21 @@
+iso2: CZ
+iso3: CZE
+name: 'Czech Republic'
+numeric: 203
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    HKK: 'Královéhradecký kraj'
+    JHC: 'Jihočeský kraj'
+    JHM: 'Jihomoravský kraj'
+    KVK: 'Karlovarský kraj'
+    LBK: 'Liberecký kraj'
+    MSK: 'Moravskoslezský kraj'
+    OLK: 'Olomoucký kraj'
+    PAK: 'Pardubický kraj'
+    PHA: Praha
+    PLK: 'Plzeňský kraj'
+    STC: 'Středočeský kraj'
+    ULK: 'Ústecký kraj'
+    VYS: Vysočina
+    ZLK: 'Zlínský kraj'
diff --git a/uc_store/config/uc_store.country.DE.yml b/uc_store/config/uc_store.country.DE.yml
new file mode 100644
index 0000000..d710cea
--- /dev/null
+++ b/uc_store/config/uc_store.country.DE.yml
@@ -0,0 +1,23 @@
+iso2: DE
+iso3: DEU
+name: Germany
+numeric: 276
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    BAW: Baden-Württemberg
+    BAY: Bayern
+    BER: Berlin
+    BRE: Bremen
+    BRG: Brandenburg
+    HAM: Hamburg
+    HES: Hessen
+    MEC: Mecklenburg-Vorpommern
+    NDS: Niedersachsen
+    NRW: Nordrhein-Westfalen
+    RHE: Rheinland-Pfalz
+    SAC: Sachsen-Anhalt
+    SAR: Saarland
+    SAS: Sachsen
+    SCN: Schleswig-Holstein
+    THE: Thüringen
diff --git a/uc_store/config/uc_store.country.DJ.yml b/uc_store/config/uc_store.country.DJ.yml
new file mode 100644
index 0000000..f57972a
--- /dev/null
+++ b/uc_store/config/uc_store.country.DJ.yml
@@ -0,0 +1,13 @@
+iso2: DJ
+iso3: DJI
+name: Djibouti
+numeric: 262
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    AR: Arta
+    AS: 'Ali Sabieh'
+    DI: Dikhil
+    DJ: Djibouti
+    OB: Obock
+    TA: Tadjourah
diff --git a/uc_store/config/uc_store.country.DK.yml b/uc_store/config/uc_store.country.DK.yml
new file mode 100644
index 0000000..b6c725a
--- /dev/null
+++ b/uc_store/config/uc_store.country.DK.yml
@@ -0,0 +1,6 @@
+iso2: DK
+iso3: DNK
+name: Denmark
+numeric: 208
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.DM.yml b/uc_store/config/uc_store.country.DM.yml
new file mode 100644
index 0000000..76b9064
--- /dev/null
+++ b/uc_store/config/uc_store.country.DM.yml
@@ -0,0 +1,17 @@
+iso2: DM
+iso3: DMA
+name: Dominica
+numeric: 212
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    '02': 'Saint Andrew'
+    '03': 'Saint David'
+    '04': 'Saint George'
+    '05': 'Saint John'
+    '06': 'Saint Joseph'
+    '07': 'Saint Luke'
+    '08': 'Saint Mark'
+    '09': 'Saint Patrick'
+    10: 'Saint Paul'
+    11: 'Saint Peter'
diff --git a/uc_store/config/uc_store.country.DO.yml b/uc_store/config/uc_store.country.DO.yml
new file mode 100644
index 0000000..b7d14a7
--- /dev/null
+++ b/uc_store/config/uc_store.country.DO.yml
@@ -0,0 +1,39 @@
+iso2: DO
+iso3: DOM
+name: 'Dominican Republic'
+numeric: 214
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AL: 'La Altagracia'
+    AZ: Azua
+    BC: Baoruco
+    BH: Barahona
+    DJ: Dajabon
+    DN: 'Distrito Nacional'
+    DU: Duarte
+    EL: 'Elias Pina'
+    ET: Espaillat
+    HM: 'Hato Mayor'
+    IN: Independencia
+    JO: 'San Jose de Ocoa'
+    MC: 'Monte Cristi'
+    MN: 'Monsenor Nouel'
+    MP: 'Monte Plata'
+    MT: 'Maria Trinidad Sanchez'
+    PD: Pedernales
+    PM: 'San Pedro de Macoris'
+    PP: 'Puerto Plata'
+    PR: 'Peravia (Bani)'
+    RO: 'La Romana'
+    SA: Santiago
+    SC: 'San Cristobal'
+    SD: 'Santo Domingo'
+    SH: 'Sanchez Ramirez'
+    SJ: 'San Juan'
+    SL: Salcedo
+    SM: Samana
+    ST: 'Santiago Rodriguez'
+    SY: 'El Seybo'
+    VA: Valverde
+    VE: 'La Vega'
diff --git a/uc_store/config/uc_store.country.DZ.yml b/uc_store/config/uc_store.country.DZ.yml
new file mode 100644
index 0000000..fa10e89
--- /dev/null
+++ b/uc_store/config/uc_store.country.DZ.yml
@@ -0,0 +1,52 @@
+iso2: DZ
+iso3: DZA
+name: Algeria
+numeric: 12
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city\r\n!postal_code !zone_code\r\n!country_name_if"
+zones:
+    ADRAR: Adrar
+    'AIN DEFLA': 'Ain Defla'
+    'AIN TEMOUCHENT': 'Ain Temouchent'
+    ALGIERS: Algiers
+    ANNABA: Annaba
+    BATNA: Batna
+    BECHAR: Bechar
+    BEJAIA: Bejaia
+    BISKRA: Biskra
+    BLIDA: Blida
+    'BORDJ BOU ARRERIDJ': 'Bordj Bou Arreridj'
+    BOUIRA: Bouira
+    BOUMERDES: Boumerdes
+    CHLEF: Chlef
+    CONSTANTINE: Constantine
+    DJELFA: Djelfa
+    'EL BAYADH': 'El Bayadh'
+    'EL OUED': 'El Oued'
+    'EL TARF': 'El Tarf'
+    GHARDAIA: Ghardaia
+    GUELMA: Guelma
+    ILLIZI: Illizi
+    JIJEL: Jijel
+    KHENCHELA: Khenchela
+    LAGHOUAT: Laghouat
+    MEDEA: Medea
+    MILA: Mila
+    MOSTAGANEM: Mostaganem
+    MSILA: MSila
+    NAAMA: Naama
+    ORAN: Oran
+    OUARGLA: Ouargla
+    'OUM EL-BOUAGHI': 'Oum el-Bouaghi'
+    RELIZANE: Relizane
+    SAIDA: Saida
+    SETIF: Setif
+    'SIDI BEL ABBES': 'Sidi Bel Abbes'
+    SKIKDA: Skikda
+    'SOUK AHRAS': 'Souk Ahras'
+    TAMANGHASSET: Tamanghasset
+    TEBESSA: Tebessa
+    TINDDOUF: Tindouf
+    TISSEMSILT: Tissemsilt
+    'TIZI OUZOU': 'Tizi Ouzou'
+    TLEMCEN: Tlemcen
diff --git a/uc_store/config/uc_store.country.EC.yml b/uc_store/config/uc_store.country.EC.yml
new file mode 100644
index 0000000..35f1965
--- /dev/null
+++ b/uc_store/config/uc_store.country.EC.yml
@@ -0,0 +1,29 @@
+iso2: EC
+iso3: ECU
+name: Ecuador
+numeric: 218
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    A: Azuay
+    B: Bolivar
+    C: Carchi
+    D: Orellana
+    E: Esmeraldas
+    F: Canar
+    G: Guayas
+    H: Chimborazo
+    I: Imbabura
+    L: Loja
+    M: Manabi
+    N: Napo
+    O: 'El Oro'
+    P: Pichincha
+    R: 'Los Rios'
+    S: Morona-Santiago
+    T: Tungurahua
+    U: Sucumbios
+    W: Galapagos
+    X: Cotopaxi
+    Y: Pastaza
+    Z: Zamora-Chichipe
diff --git a/uc_store/config/uc_store.country.EE.yml b/uc_store/config/uc_store.country.EE.yml
new file mode 100644
index 0000000..94560d5
--- /dev/null
+++ b/uc_store/config/uc_store.country.EE.yml
@@ -0,0 +1,22 @@
+iso2: EE
+iso3: EST
+name: Estonia
+numeric: 233
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!zone_name\r\n!country_name_if"
+zones:
+    37: Harjumaa
+    39: Hiiumaa
+    44: Ida-Virumaa
+    49: Jõgevamaa
+    51: Järvamaa
+    57: Läänemaa
+    59: Lääne-Virumaa
+    65: Põlvamaa
+    67: Pärnumaa
+    70: Raplamaa
+    74: Saaremaa
+    78: Tartumaa
+    82: Valgamaa
+    84: Viljandimaa
+    86: Võrumaa
diff --git a/uc_store/config/uc_store.country.EG.yml b/uc_store/config/uc_store.country.EG.yml
new file mode 100644
index 0000000..3b55eab
--- /dev/null
+++ b/uc_store/config/uc_store.country.EG.yml
@@ -0,0 +1,34 @@
+iso2: EG
+iso3: EGY
+name: Egypt
+numeric: 818
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    ALX: الاسكندرية
+    ASN: اسوان
+    AST: اسيوط
+    BA: 'البحر الاحمر'
+    BH: البحيرة
+    BNS: 'بني سويف'
+    CAI: القاهرة
+    DK: الدقهلية
+    DT: دمياط
+    FYM: الفيوم
+    GH: الغربية
+    GZ: الجيزة
+    IS: الاسماعيلية
+    JS: 'جنوب سيناء'
+    KB: القليوبية
+    KFS: 'كفر الشيخ'
+    KN: قنا
+    MN: المنيا
+    MNF: المنوفية
+    MUH: 'مرسى مطروح'
+    PTS: 'بور سعيد'
+    SHG: سوهاج
+    SHR: الشرقية
+    SIN: 'شمال سيناء'
+    SUZ: السويس
+    UQ: الاقصر
+    WAD: 'الوادي الجديد'
diff --git a/uc_store/config/uc_store.country.EH.yml b/uc_store/config/uc_store.country.EH.yml
new file mode 100644
index 0000000..bfad430
--- /dev/null
+++ b/uc_store/config/uc_store.country.EH.yml
@@ -0,0 +1,6 @@
+iso2: EH
+iso3: ESH
+name: 'Western Sahara'
+numeric: 732
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.ER.yml b/uc_store/config/uc_store.country.ER.yml
new file mode 100644
index 0000000..a07416a
--- /dev/null
+++ b/uc_store/config/uc_store.country.ER.yml
@@ -0,0 +1,13 @@
+iso2: ER
+iso3: ERI
+name: Eritrea
+numeric: 232
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    AN: Anseba
+    DK: 'Debubawi Keyih Bahri'
+    DU: Debub
+    GB: 'Gash Barka'
+    MA: Maekel
+    Sk: 'Semenawi Keyih Bahri'
diff --git a/uc_store/config/uc_store.country.ES.yml b/uc_store/config/uc_store.country.ES.yml
new file mode 100644
index 0000000..17e9266
--- /dev/null
+++ b/uc_store/config/uc_store.country.ES.yml
@@ -0,0 +1,59 @@
+iso2: ES
+iso3: ESP
+name: Spain
+numeric: 724
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    AB: Albacete
+    AC: Alicante
+    AL: Álava
+    AM: Almería
+    AS: Asturias
+    AV: Ávila
+    BA: Barcelona
+    BJ: Badajoz
+    BU: Burgos
+    CA: 'A Coruña'
+    CC: Cáceres
+    CD: Córdoba
+    CE: Ceuta
+    CL: Castellón
+    CR: 'Ciudad Real'
+    CT: Cantabria
+    CU: Cuenca
+    CZ: Cádiz
+    GD: Granada
+    GI: Girona
+    GJ: Guadalajara
+    GP: Guipúzcoa
+    HL: Huelva
+    HS: Huesca
+    IB: Baleares
+    JN: Jaén
+    LE: León
+    LG: Lugo
+    LL: Lleida
+    MA: Málaga
+    MD: Madrid
+    ML: Melilla
+    MU: Murcia
+    NV: Navarra
+    OU: Ourense
+    PL: Palencia
+    PM: 'Las Palmas'
+    PO: Pontevedra
+    RJ: 'La Rioja'
+    SC: 'Santa Cruz de Tenerife'
+    SG: Segovia
+    SL: Salamanca
+    SO: Soria
+    SV: Sevilla
+    TA: Tarragona
+    TE: Teruel
+    TO: Toledo
+    VC: Valencia
+    VD: Valladolid
+    VZ: Vizcaya
+    ZM: Zamora
+    ZR: Zaragoza
diff --git a/uc_store/config/uc_store.country.ET.yml b/uc_store/config/uc_store.country.ET.yml
new file mode 100644
index 0000000..353c8d4
--- /dev/null
+++ b/uc_store/config/uc_store.country.ET.yml
@@ -0,0 +1,18 @@
+iso2: ET
+iso3: ETH
+name: Ethiopia
+numeric: 231
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    ET-AA: 'Addis Ababa'
+    ET-AF: Afar
+    ET-AM: Amara
+    ET-BE: Benshangul-Gumaz
+    ET-DD: 'Dire Dawa'
+    ET-GA: 'Gambela Peoples'
+    ET-HA: 'Harari People'
+    ET-OR: Oromia
+    ET-SN: 'Southern Nations, Nationalities and Peoples'
+    ET-SO: Somali
+    ET-TI: Tigrai
diff --git a/uc_store/config/uc_store.country.FI.yml b/uc_store/config/uc_store.country.FI.yml
new file mode 100644
index 0000000..14db06a
--- /dev/null
+++ b/uc_store/config/uc_store.country.FI.yml
@@ -0,0 +1,26 @@
+iso2: FI
+iso3: FIN
+name: Finland
+numeric: 246
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    FI-01: 'Ahvenanmaan maakunta'
+    FI-02: Etelä-Karjal
+    FI-03: Etelä-Pohjanmaa
+    FI-04: Etelä-Savo
+    FI-05: Kainuu
+    FI-06: Kanta-Häme
+    FI-07: Keski-Pohjanmaa
+    FI-08: Keski-Suomi
+    FI-09: Kymenlaakso
+    FI-10: Lappi
+    FI-11: Pirkanmaa
+    FI-12: Pohjanmaa
+    FI-13: Pohjois-Karjala
+    FI-14: Pohjois-Pohjanmaa
+    FI-15: Pohjois-Savo
+    FI-16: Päijät-Häme
+    FI-17: Satakunta
+    FI-18: Uusimaa
+    FI-19: Varsinais-Suomi
diff --git a/uc_store/config/uc_store.country.FJ.yml b/uc_store/config/uc_store.country.FJ.yml
new file mode 100644
index 0000000..d1cf1d1
--- /dev/null
+++ b/uc_store/config/uc_store.country.FJ.yml
@@ -0,0 +1,22 @@
+iso2: FJ
+iso3: FJI
+name: Fiji
+numeric: 242
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    BA: Ba
+    BU: Bua
+    Ck: Cakaudrove
+    KD: Kadavu
+    LM: Lomaiviti
+    LU: Lau
+    MC: Macuata
+    NM: Namosi
+    NN: Nadroga-Navosa
+    NT: Naitasiri
+    RA: Ra
+    RT: Rotuma
+    RW: Rewa
+    SR: Serua
+    TL: Tailevu
diff --git a/uc_store/config/uc_store.country.FK.yml b/uc_store/config/uc_store.country.FK.yml
new file mode 100644
index 0000000..5bc7832
--- /dev/null
+++ b/uc_store/config/uc_store.country.FK.yml
@@ -0,0 +1,6 @@
+iso2: FK
+iso3: FLK
+name: 'Falkland Islands'
+numeric: 238
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.FM.yml b/uc_store/config/uc_store.country.FM.yml
new file mode 100644
index 0000000..32ba124
--- /dev/null
+++ b/uc_store/config/uc_store.country.FM.yml
@@ -0,0 +1,11 @@
+iso2: FM
+iso3: FSM
+name: 'Micronesia, Federated States of'
+numeric: 583
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    FM-KSA: Kosrae
+    FM-PNI: Pohnpei
+    FM-TRK: Chuuk
+    FM-YAP: Yap
diff --git a/uc_store/config/uc_store.country.FO.yml b/uc_store/config/uc_store.country.FO.yml
new file mode 100644
index 0000000..2e674df
--- /dev/null
+++ b/uc_store/config/uc_store.country.FO.yml
@@ -0,0 +1,14 @@
+iso2: FO
+iso3: FRO
+name: 'Faroe Islands'
+numeric: 234
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    NO: Norderoerne
+    OS: Ostero
+    SA: Sando
+    SN: 'Sudero Nordre'
+    SS: 'Sudero Sondre'
+    ST: Stromo
+    VG: Vago
diff --git a/uc_store/config/uc_store.country.FR.yml b/uc_store/config/uc_store.country.FR.yml
new file mode 100644
index 0000000..9f2b5b0
--- /dev/null
+++ b/uc_store/config/uc_store.country.FR.yml
@@ -0,0 +1,109 @@
+iso2: FR
+iso3: FRA
+name: France
+numeric: 250
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    FR-01: Ain
+    FR-02: Aisne
+    FR-03: Allier
+    FR-04: Alpes-de-Haute-Provence
+    FR-05: Hautes-Alpes
+    FR-06: Alpes-Maritimes
+    FR-07: Ardèche
+    FR-08: Ardennes
+    FR-09: Ariège
+    FR-10: Aube
+    FR-11: Aude
+    FR-12: Aveyron
+    FR-13: Bouches-du-Rhône
+    FR-14: Calvados
+    FR-15: Cantal
+    FR-16: Charente
+    FR-17: Charente-Maritime
+    FR-18: Cher
+    FR-19: Corrèze
+    FR-21: 'Côte-d''Or'
+    FR-22: 'Côtes-d''Armor'
+    FR-23: Creuse
+    FR-24: Dordogne
+    FR-25: Doubs
+    FR-26: Drôme
+    FR-27: Eure
+    FR-28: Eure-et-Loir
+    FR-29: Finistère
+    FR-2A: Corse-du-Sud
+    FR-2B: Haute-Corse
+    FR-30: Gard
+    FR-31: Haute-Garonne
+    FR-32: Gers
+    FR-33: Gironde
+    FR-34: Hérault
+    FR-35: Ille-et-Vilaine
+    FR-36: Indre
+    FR-37: Indre-et-Loire
+    FR-38: Isère
+    FR-39: Jura
+    FR-40: Landes
+    FR-41: Loir-et-Cher
+    FR-42: Loire
+    FR-43: Haute-Loire
+    FR-44: Loire-Atlantique
+    FR-45: Loiret
+    FR-46: Lot
+    FR-47: Lot-et-Garonne
+    FR-48: Lozère
+    FR-49: Maine-et-Loire
+    FR-50: Manche
+    FR-51: Marne
+    FR-52: Haute-Marne
+    FR-53: Mayenne
+    FR-54: Meurthe-et-Moselle
+    FR-55: Meuse
+    FR-56: Morbihan
+    FR-57: Moselle
+    FR-58: Nièvre
+    FR-59: Nord
+    FR-60: Oise
+    FR-61: Orne
+    FR-62: Pas-de-Calais
+    FR-63: Puy-de-Dôme
+    FR-64: Pyrénées-Atlantiques
+    FR-65: Hautes-Pyrénées
+    FR-66: Pyrénées-Orientales
+    FR-67: Bas-Rhin
+    FR-68: Haut-Rhin
+    FR-69: Rhône
+    FR-70: Haute-Saône
+    FR-71: Saône-et-Loire
+    FR-72: Sarthe
+    FR-73: Savoie
+    FR-74: Haute-Savoie
+    FR-75: Paris
+    FR-76: Seine-Maritime
+    FR-77: Seine-et-Marne
+    FR-78: Yvelines
+    FR-79: Deux-Sèvres
+    FR-80: Somme
+    FR-81: Tarn
+    FR-82: Tarn-et-Garonne
+    FR-83: Var
+    FR-84: Vaucluse
+    FR-85: Vendée
+    FR-86: Vienne
+    FR-87: Haute-Vienne
+    FR-88: Vosges
+    FR-89: Yonne
+    FR-90: 'Territoire de Belfort'
+    FR-91: Essonne
+    FR-92: Hauts-de-Seine
+    FR-93: Seine-Saint-Denis
+    FR-94: Val-de-Marne
+    FR-95: 'Val-d''Oise'
+    FR-NC: 'New Caledonia'
+    FR-PF: 'French Polynesia'
+    FR-PM: 'Saint-Pierre and Miquelon'
+    FR-TF: 'French Southern Territories'
+    FR-WF: 'Wallis and Futuna'
+    FR-YT: Mayotte
diff --git a/uc_store/config/uc_store.country.GA.yml b/uc_store/config/uc_store.country.GA.yml
new file mode 100644
index 0000000..02eab5a
--- /dev/null
+++ b/uc_store/config/uc_store.country.GA.yml
@@ -0,0 +1,16 @@
+iso2: GA
+iso3: GAB
+name: Gabon
+numeric: 266
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    1: Estuaire
+    2: Haut-Ogooue
+    3: Moyen-Ogooue
+    4: Ngounie
+    5: Nyanga
+    6: Ogooue-Ivindo
+    7: OgoouE-Lolo
+    8: Ogooue-Maritime
+    9: Woleu-Ntem
diff --git a/uc_store/config/uc_store.country.GB.yml b/uc_store/config/uc_store.country.GB.yml
new file mode 100644
index 0000000..c9e4880
--- /dev/null
+++ b/uc_store/config/uc_store.country.GB.yml
@@ -0,0 +1,118 @@
+iso2: GB
+iso3: GBR
+name: 'United Kingdom'
+numeric: 826
+status: 0
+format: "!first_name !last_name\r\n!company\r\n!street1\r\n!street2\r\n!city\r\n!postal_code\r\n!country_name_if"
+zones:
+    ABN: Aberdeen
+    ABNS: Aberdeenshire
+    AGS: Angus
+    ANG: Anglesey
+    ARY: 'Argyll and Bute'
+    ARYE: 'East Ayrshire'
+    ARYN: 'North Ayrshire'
+    ARYS: 'South Ayrshire'
+    AVON: Avon
+    BEDS: Bedfordshire
+    BERKS: Berkshire
+    BLA: 'Blaenau Gwent'
+    BOR: 'Scottish Borders'
+    BRI: Bridgend
+    BSTL: Bristol
+    BUCKS: Buckinghamshire
+    CAE: Caerphilly
+    CAMBS: Cambridgeshire
+    CARM: Carmarthenshire
+    CDF: Cardiff
+    CDGN: Ceredigion
+    CHES: Cheshire
+    CLACK: Clackmannanshire
+    CLVD: Cleveland
+    CMA: Cumbria
+    COAN: 'County Antrim'
+    COAR: 'County Armagh'
+    CODN: 'County Down'
+    COFE: 'County Fermanagh'
+    COLO: 'County Londonderry'
+    CON: Conwy
+    CORN: Cornwall
+    COTY: 'County Tyrone'
+    DERBY: Derbyshire
+    DGL: 'Dumfries and Galloway'
+    DHM: Durham
+    DNBG: Denbighshire
+    DOR: Dorset
+    DUNBE: 'East Dunbartonshire'
+    DUND: Dundee
+    DVN: Devon
+    EDIN: Edinburgh
+    ERYS: 'East Riding of Yorkshire'
+    ESX: Essex
+    FALK: Falkirk
+    FFE: Fife
+    FLINT: Flintshire
+    GDD: Gwynedd
+    GLAS: Glasgow
+    GLOS: Gloucestershire
+    HANTS: Hampshire
+    HERTS: Hertfordshire
+    HLD: Highlands
+    HWR: Herefordshire
+    IOS: 'Isles of Scilly'
+    IOW: 'Isle of Wight'
+    IVER: Inverclyde
+    KNT: Kent
+    LANCS: Lancashire
+    LANN: 'North Lanarkshire'
+    LANS: 'South Lanarkshire'
+    LDN: London
+    LEICS: Leicestershire
+    LINCS: Lincolnshire
+    LOTE: 'East Lothian'
+    MAN: 'Greater Manchester'
+    MERT: 'Merthyr Tydfil'
+    MIDDX: Middlesex
+    MLOT: Midlothian
+    MMOUTH: Monmouthshire
+    MORAY: Moray
+    MSY: Merseyside
+    NEWPT: Newport
+    NHM: Northamptonshire
+    NLD: Northumberland
+    NOR: Norfolk
+    NOT: Nottinghamshire
+    NPRTAL: 'Neath Port Talbot'
+    OFE: Oxfordshire
+    ORK: 'Orkney Islands'
+    PEM: Pembrokeshire
+    PERTH: 'Perth and Kinross'
+    PWS: Powys
+    REN: Renfrewshire
+    RENE: 'East Renfrewshire'
+    RHON: 'Rhondda Cynon Taff'
+    RUT: Rutland
+    SFD: Staffordshire
+    SFK: Suffolk
+    SHET: 'Shetland Islands'
+    SOM: Somerset
+    SPE: Shropshire
+    SRY: Surrey
+    STIR: Stirling
+    SWAN: Swansea
+    SXE: 'East Sussex'
+    SXW: 'West Sussex'
+    TORF: Torfaen
+    TWR: 'Tyne and Wear'
+    VGLAM: 'Vale of Glamorgan'
+    WARKS: Warwickshire
+    WDUN: 'West Dunbartonshire'
+    WIL: 'Western Isles'
+    WLOT: 'West Lothian'
+    WLT: Wiltshire
+    WMD: 'West Midlands'
+    WORCS: Worcestershire
+    WRX: Wrexham
+    YSN: 'North Yorkshire'
+    YSS: 'South Yorkshire'
+    YSW: 'West Yorkshire'
diff --git a/uc_store/config/uc_store.country.GD.yml b/uc_store/config/uc_store.country.GD.yml
new file mode 100644
index 0000000..30e88fc
--- /dev/null
+++ b/uc_store/config/uc_store.country.GD.yml
@@ -0,0 +1,6 @@
+iso2: GD
+iso3: GRD
+name: Grenada
+numeric: 308
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.GE.yml b/uc_store/config/uc_store.country.GE.yml
new file mode 100644
index 0000000..fcdfac9
--- /dev/null
+++ b/uc_store/config/uc_store.country.GE.yml
@@ -0,0 +1,19 @@
+iso2: GE
+iso3: GEO
+name: Georgia
+numeric: 268
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AB: Abkhazia
+    AJ: Ajaria
+    GU: Guria
+    IM: 'Imeret''i'
+    KA: 'Kakhet''i'
+    KK: 'K''vemo K''art''li'
+    MM: 'Mts''khet''a-Mt''ianet''i'
+    RL: 'Racha-Lech''khumi-K''vemo'
+    SJ: 'Samts''khe-Javakhet''i'
+    SK: 'Shida K''art''li'
+    SZ: 'Samegrelo-Zemo Svanet''i'
+    TB: 'T''bilisi'
diff --git a/uc_store/config/uc_store.country.GF.yml b/uc_store/config/uc_store.country.GF.yml
new file mode 100644
index 0000000..0d6885d
--- /dev/null
+++ b/uc_store/config/uc_store.country.GF.yml
@@ -0,0 +1,6 @@
+iso2: GF
+iso3: GUF
+name: 'French Guiana'
+numeric: 254
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.GG.yml b/uc_store/config/uc_store.country.GG.yml
new file mode 100644
index 0000000..7c0f363
--- /dev/null
+++ b/uc_store/config/uc_store.country.GG.yml
@@ -0,0 +1,6 @@
+iso2: GG
+iso3: GGY
+name: Guernsey
+numeric: 831
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.GH.yml b/uc_store/config/uc_store.country.GH.yml
new file mode 100644
index 0000000..4908ccd
--- /dev/null
+++ b/uc_store/config/uc_store.country.GH.yml
@@ -0,0 +1,17 @@
+iso2: GH
+iso3: GHA
+name: Ghana
+numeric: 288
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    GH-AA: 'Greater Accra'
+    GH-AH: Ashanti
+    GH-BA: Brong-Ahafo
+    GH-CP: Central
+    GH-EP: Eastern
+    GH-NP: Northern
+    GH-TV: Volta
+    GH-UE: 'Upper East'
+    GH-UW: 'Upper West'
+    GH-WP: Western
diff --git a/uc_store/config/uc_store.country.GI.yml b/uc_store/config/uc_store.country.GI.yml
new file mode 100644
index 0000000..38fb32c
--- /dev/null
+++ b/uc_store/config/uc_store.country.GI.yml
@@ -0,0 +1,6 @@
+iso2: GI
+iso3: GIB
+name: Gibraltar
+numeric: 292
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.GL.yml b/uc_store/config/uc_store.country.GL.yml
new file mode 100644
index 0000000..c6561b4
--- /dev/null
+++ b/uc_store/config/uc_store.country.GL.yml
@@ -0,0 +1,37 @@
+iso2: GL
+iso3: GRL
+name: Greenland
+numeric: 304
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    AK: Arsuk
+    AP: 'Alluitsup Paa'
+    AT: Aasiaat
+    CP: 'Constable Pynt'
+    DH: Danmarkshavn
+    IL: Ilulissat
+    IQ: Ikerasassuaq
+    IT: Ittoqqortoormiit
+    KA: Kangaatsiaq
+    KK: Kulusuk
+    KQ: Kangerlussuaq
+    KT: Kangilinnguit
+    MQ: Maniitsoq
+    MV: Mestersvig
+    NA: Narsaq
+    NK: Nanortalik
+    NQ: Nuussuaq
+    NR: Narsarsuaq
+    PT: Pituffik
+    QA: Qaarsut
+    QE: Qeqertarsuaq
+    QN: Qaanaaq
+    QQ: Qaqortoq
+    QT: Qasigiannguit
+    SN: 'Station Nord'
+    SS: 'Slædepatruljen Sirius'
+    ST: Sisimiut
+    TQ: Tasiilaq
+    UM: Uummannaq
+    UP: Upernavik
diff --git a/uc_store/config/uc_store.country.GM.yml b/uc_store/config/uc_store.country.GM.yml
new file mode 100644
index 0000000..a5e50ba
--- /dev/null
+++ b/uc_store/config/uc_store.country.GM.yml
@@ -0,0 +1,6 @@
+iso2: GM
+iso3: GMB
+name: Gambia
+numeric: 270
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.GN.yml b/uc_store/config/uc_store.country.GN.yml
new file mode 100644
index 0000000..6f8e4cd
--- /dev/null
+++ b/uc_store/config/uc_store.country.GN.yml
@@ -0,0 +1,40 @@
+iso2: GN
+iso3: GIN
+name: Guinea
+numeric: 324
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    GN-BE: Beyla
+    GN-BF: Boffa
+    GN-BK: Boké
+    GN-CO: Coyah
+    GN-DB: Dabola
+    GN-DI: Dinguiraye
+    GN-DL: Dalaba
+    GN-DU: Dubréka
+    GN-FA: Faranah
+    GN-FO: Forécariah
+    GN-FR: Fria
+    GN-GA: Gaoual
+    GN-GU: Guékédou
+    GN-KA: Kankan
+    GN-KB: Koubia
+    GN-KD: Kindia
+    GN-KE: Kérouané
+    GN-KN: Koundara
+    GN-KO: Kouroussa
+    GN-KS: Kissidougou
+    GN-LA: Labé
+    GN-LE: Lélouma
+    GN-LO: Lola
+    GN-MC: Macenta
+    GN-MD: Mandiana
+    GN-ML: Mali
+    GN-MM: Mamou
+    GN-NZ: Nzérékor
+    GN-PI: Pita
+    GN-SI: Siguiri
+    GN-TE: Télimélé
+    GN-TO: Tougué
+    GN-YO: Yomou
diff --git a/uc_store/config/uc_store.country.GP.yml b/uc_store/config/uc_store.country.GP.yml
new file mode 100644
index 0000000..42fb163
--- /dev/null
+++ b/uc_store/config/uc_store.country.GP.yml
@@ -0,0 +1,6 @@
+iso2: GP
+iso3: GLP
+name: Guadeloupe
+numeric: 312
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.GQ.yml b/uc_store/config/uc_store.country.GQ.yml
new file mode 100644
index 0000000..8ffc471
--- /dev/null
+++ b/uc_store/config/uc_store.country.GQ.yml
@@ -0,0 +1,14 @@
+iso2: GQ
+iso3: GNQ
+name: 'Equatorial Guinea'
+numeric: 226
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    GQ-AN: Annobon
+    GQ-BN: 'Bioko Norte'
+    GQ-BS: 'Bioko Sur'
+    GQ-CS: 'Centro Sur'
+    GQ-KN: Kie-Ntem
+    GQ-LI: Litoral
+    GQ-WN: Wele-Nzas
diff --git a/uc_store/config/uc_store.country.GR.yml b/uc_store/config/uc_store.country.GR.yml
new file mode 100644
index 0000000..38b6cbc
--- /dev/null
+++ b/uc_store/config/uc_store.country.GR.yml
@@ -0,0 +1,58 @@
+iso2: GR
+iso3: GRC
+name: Greece
+numeric: 300
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code, !city\r\n!country_name_if"
+zones:
+    AHA: Αχαϊα
+    AIT: Αιτωλοακαρνανία
+    ARG: Αργολίδα
+    ARK: Αρκαδία
+    ART: Άρτα
+    ATT: Αττική
+    BOI: Βοιωτία
+    DOD: Δωδεκάνησα
+    DRA: Δράμα
+    EVI: Εύβοια
+    EVR: Έβρος
+    EVT: Ευρυτανία
+    FLO: Φλώρινα
+    FOK: Φωκίδα
+    FTH: Φθιώτιδα
+    GRE: Γρεβενά
+    HAL: Χαλκιδική
+    HAN: Χανιά
+    HIO: Χίος
+    HMA: Ημαθία
+    HRA: Ηράκλειο
+    ILI: Ηλεία
+    IOA: Ιωάννινα
+    KAR: Καρδίτσα
+    KAS: Καστοριά
+    KAV: Καβάλα
+    KEF: Κεφαλληνία
+    KER: Κέρκυρα
+    KIL: Κιλκίς
+    KOR: Κορινθία
+    KOZ: Κοζάνη
+    KYK: Κυκλάδες
+    LAK: Λακωνία
+    LAR: Λάρισα
+    LAS: Λασίθι
+    LEF: Λευκάδα
+    LES: Λέσβος
+    MAG: Μαγνησία
+    PEL: Πέλλα
+    PIE: Πιερία
+    PRE: Πρέβεζα
+    RET: Ρέθυμνο
+    ROD: Ροδόπη
+    SAM: Σάμος
+    SER: Σέρρες
+    THE: Θεσσαλονίκη
+    THP: Θεσπρωτία
+    TRI: Τρίκαλα
+    XAN: Ξάνθη
+    ZAK: Ζάκυνθος
+    ΜES: Μεσσηνία
diff --git a/uc_store/config/uc_store.country.GS.yml b/uc_store/config/uc_store.country.GS.yml
new file mode 100644
index 0000000..af51ba6
--- /dev/null
+++ b/uc_store/config/uc_store.country.GS.yml
@@ -0,0 +1,6 @@
+iso2: GS
+iso3: SGS
+name: 'South Georgia and the South Sandwich Islands'
+numeric: 239
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.GT.yml b/uc_store/config/uc_store.country.GT.yml
new file mode 100644
index 0000000..b7fb158
--- /dev/null
+++ b/uc_store/config/uc_store.country.GT.yml
@@ -0,0 +1,29 @@
+iso2: GT
+iso3: GTM
+name: Guatemala
+numeric: 320
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AV: 'Alta Verapaz'
+    BV: 'Baja Verapaz'
+    CM: Chimaltenango
+    CQ: Chiquimula
+    ES: Escuintla
+    GU: Guatemala
+    HU: Huehuetenango
+    IZ: Izabal
+    JA: Jalapa
+    JU: Jutiapa
+    PE: Peten
+    PR: 'El Progreso'
+    QC: Quiche
+    QZ: Quetzaltenango
+    RE: Retalhuleu
+    SA: Sacatepequez
+    SM: 'San Marcos'
+    SO: Solola
+    SR: 'Santa Rosa'
+    SU: Suchitepequez
+    TO: Totonicapan
+    ZA: Zacapa
diff --git a/uc_store/config/uc_store.country.GU.yml b/uc_store/config/uc_store.country.GU.yml
new file mode 100644
index 0000000..fc127b1
--- /dev/null
+++ b/uc_store/config/uc_store.country.GU.yml
@@ -0,0 +1,6 @@
+iso2: GU
+iso3: GUM
+name: Guam
+numeric: 316
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.GW.yml b/uc_store/config/uc_store.country.GW.yml
new file mode 100644
index 0000000..ab7ebae
--- /dev/null
+++ b/uc_store/config/uc_store.country.GW.yml
@@ -0,0 +1,16 @@
+iso2: GW
+iso3: GNB
+name: Guinea-Bissau
+numeric: 624
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    GW-BA: Bafatá
+    GW-BL: Bolama
+    GW-BM: Biombo
+    GW-BS: Bissau
+    GW-CA: Cacheu
+    GW-GA: Gabú
+    GW-OI: Oio
+    GW-QU: Quinara
+    GW-TO: Tombali
diff --git a/uc_store/config/uc_store.country.GY.yml b/uc_store/config/uc_store.country.GY.yml
new file mode 100644
index 0000000..1afa681
--- /dev/null
+++ b/uc_store/config/uc_store.country.GY.yml
@@ -0,0 +1,17 @@
+iso2: GY
+iso3: GUY
+name: Guyana
+numeric: 328
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    GY-BA: Barima-Waini
+    GY-CU: Cuyuni-Mazaruni
+    GY-DE: Demerara-Mahaica
+    GY-EB: 'East Berbice-Corentyne'
+    GY-ES: 'Essequibo Islands-West Demerara'
+    GY-MA: Mahaica-Berbice
+    GY-PM: Pomeroon-Supenaam
+    GY-PT: Potaro-Siparuni
+    GY-UD: 'Upper Demerara-Berbice'
+    GY-UT: 'Upper Takutu-Upper Essequibo'
diff --git a/uc_store/config/uc_store.country.HK.yml b/uc_store/config/uc_store.country.HK.yml
new file mode 100644
index 0000000..960a4db
--- /dev/null
+++ b/uc_store/config/uc_store.country.HK.yml
@@ -0,0 +1,9 @@
+iso2: HK
+iso3: HKG
+name: 'Hong Kong'
+numeric: 344
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!zone_name, !country_name"
+zones:
+    HK: 'Hong Kong'
+    NT: 'New Territories'
diff --git a/uc_store/config/uc_store.country.HM.yml b/uc_store/config/uc_store.country.HM.yml
new file mode 100644
index 0000000..d688651
--- /dev/null
+++ b/uc_store/config/uc_store.country.HM.yml
@@ -0,0 +1,6 @@
+iso2: HM
+iso3: HMD
+name: 'Heard Island and McDonald Islands'
+numeric: 334
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.HN.yml b/uc_store/config/uc_store.country.HN.yml
new file mode 100644
index 0000000..4fa867d
--- /dev/null
+++ b/uc_store/config/uc_store.country.HN.yml
@@ -0,0 +1,25 @@
+iso2: HN
+iso3: HND
+name: Honduras
+numeric: 340
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    HN-AT: Atlántida
+    HN-CH: Choluteca
+    HN-CL: Colón
+    HN-CM: Comayagua
+    HN-CP: Copán
+    HN-CR: Cortés
+    HN-EP: 'El Paraíso'
+    HN-FM: 'Francisco Morazán'
+    HN-GD: 'Gracias a Dios'
+    HN-IB: 'Islas de la Bahía'
+    HN-IN: Intibucá
+    HN-LE: Lempira
+    HN-LP: 'La Paz'
+    HN-OC: Ocotepeque
+    HN-OL: Olancho
+    HN-SB: 'Santa Bárbara'
+    HN-VA: Valle
+    HN-YO: Yoro
diff --git a/uc_store/config/uc_store.country.HR.yml b/uc_store/config/uc_store.country.HR.yml
new file mode 100644
index 0000000..1f14b28
--- /dev/null
+++ b/uc_store/config/uc_store.country.HR.yml
@@ -0,0 +1,28 @@
+iso2: HR
+iso3: HRV
+name: Croatia
+numeric: 191
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1 !street2\r\n!postal_code !zone_name\r\n!country_name"
+zones:
+    '01': 'Zagreb county'
+    '02': 'Krapina-Zagorje county'
+    '03': 'Sisak-Moslavina county'
+    '04': 'Karlovac county'
+    '05': 'Varaždin county'
+    '06': 'Koprivnica-Križevci county'
+    '07': 'Bjelovar-Bilogora county'
+    '08': 'Primorje-Gorski Kotar county'
+    '09': 'Lika-Senj county'
+    10: 'Virovitica-Podravina county'
+    11: 'Požega-Slavonia county'
+    12: 'Brod-Posavina county'
+    13: 'Zadar county'
+    14: 'Osijek-Baranja county'
+    15: 'Šibenik-Knin county'
+    16: 'Vukovar-Srijem county'
+    17: 'Split-Dalmatia county'
+    18: 'Istria county'
+    19: 'Dubrovnik-Neretva county'
+    20: 'Međimurje county'
+    21: Zagreb
diff --git a/uc_store/config/uc_store.country.HT.yml b/uc_store/config/uc_store.country.HT.yml
new file mode 100644
index 0000000..4167f8f
--- /dev/null
+++ b/uc_store/config/uc_store.country.HT.yml
@@ -0,0 +1,17 @@
+iso2: HT
+iso3: HTI
+name: Haiti
+numeric: 332
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    HT-AR: Artibonite
+    HT-CE: Centre
+    HT-GA: Grande-Anse
+    HT-ND: Nord
+    HT-NE: Nord-Est
+    HT-NI: Nippes
+    HT-NO: Nord-Ouest
+    HT-OU: Ouest
+    HT-SD: Sud
+    HT-SE: Sud-Est
diff --git a/uc_store/config/uc_store.country.HU.yml b/uc_store/config/uc_store.country.HU.yml
new file mode 100644
index 0000000..5b6527d
--- /dev/null
+++ b/uc_store/config/uc_store.country.HU.yml
@@ -0,0 +1,27 @@
+iso2: HU
+iso3: HUN
+name: Hungary
+numeric: 348
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    BAR: Baranya
+    BAZ: Borsod-Abaúj-Zemplén
+    BÉK: Békés
+    BKK: Bács-Kiskun
+    BUD: Budapest
+    CSO: Csongrád
+    FEJ: Fejér
+    GYS: Gyõr-Sopron
+    HAB: Hajdú-Bihar
+    HEV: Heves
+    JNS: Jász-Nagykun-Szolnok
+    KOE: Komárom-Esztergom
+    NOG: Nógrád
+    PES: Pest
+    SOM: Somogy
+    SSB: Szabolcs-Szatmár-Bereg
+    TOL: Tolna
+    VAS: Vas
+    VES: Veszprém
+    ZAL: Zala
diff --git a/uc_store/config/uc_store.country.ID.yml b/uc_store/config/uc_store.country.ID.yml
new file mode 100644
index 0000000..dafe1bb
--- /dev/null
+++ b/uc_store/config/uc_store.country.ID.yml
@@ -0,0 +1,40 @@
+iso2: ID
+iso3: IDN
+name: Indonesia
+numeric: 360
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !postal_code\r\n!country_name_if"
+zones:
+    Babel: 'Kepulauan Bangka Belitung'
+    Bali: Bali
+    Banten: Banten
+    Bengkulu: Bengkulu
+    DIY: 'Daista Yogyakarta'
+    DKI: 'DKI Jakarta'
+    Gorontalo: Gorontalo
+    Irjabar: 'Irian Jaya Barat'
+    Jabar: 'Jawa Barat'
+    Jambi: Jambi
+    Jateng: 'Jawa Tengah'
+    Jatim: 'Jawa Timur'
+    Kalbar: 'Kalimantan Barat'
+    Kalsel: 'Kalimantan Selatan'
+    Kalteng: 'Kalimantan Tengah'
+    Kaltim: 'Kalimantan Timur'
+    Kepri: 'Kepulauan Riau'
+    Lampung: Lampung
+    Maluku: Maluku
+    Malut: 'Maluku Utara'
+    NAD: 'Nanggroe Aceh Darussalam'
+    NTB: 'Nusa Tenggara Barat'
+    NTT: 'Nusa Tenggara Timur'
+    Papua: Papua
+    Riau: Riau
+    Sulbar: 'Sulawesi Barat'
+    Sulsel: 'Sulawesi Selatan'
+    Sulteng: 'Sulawesi Tengah'
+    Sultra: 'Sulawesi Tenggara'
+    Sulut: 'Sulawesi Utara'
+    Sumbar: 'Sumatera Barat'
+    Sumsel: 'Sumatera Selatan'
+    Sumut: 'Sumatera Utara'
diff --git a/uc_store/config/uc_store.country.IE.yml b/uc_store/config/uc_store.country.IE.yml
new file mode 100644
index 0000000..14030f3
--- /dev/null
+++ b/uc_store/config/uc_store.country.IE.yml
@@ -0,0 +1,33 @@
+iso2: IE
+iso3: IRL
+name: Ireland
+numeric: 372
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name !postal_code\r\n!country_name_if"
+zones:
+    CARLOW: 'Co. Carlow'
+    CAVAN: 'Co. Cavan'
+    CLARE: 'Co. Clare'
+    CORK: 'Co. Cork'
+    DONEGAL: 'Co. Donegal'
+    DUBLIN: 'Co. Dublin'
+    GALWAY: 'Co. Galway'
+    KERRY: 'Co. Kerry'
+    KILDARE: 'Co. Kildare'
+    KILKENNY: 'Co. Kilkenny'
+    LAOIS: 'Co. Laois'
+    LEITRIM: 'Co. Leitrim'
+    LIMERICK: 'Co. Limerick'
+    LONGFORD: 'Co. Longford'
+    LOUTH: 'Co. Louth'
+    MAYO: 'Co. Mayo'
+    MEATH: 'Co. Meath'
+    MONAGHAN: 'Co. Monaghan'
+    OFFALY: 'Co. Offaly'
+    ROSCOMMON: 'Co. Roscommon'
+    SLIGO: 'Co. Sligo'
+    TIPPERARY: 'Co. Tipperary'
+    WATERFORD: 'Co. Waterford'
+    WESTMEATH: 'Co. Westmeath'
+    WEXFORD: 'Co. Wexford'
+    WICKLOW: 'Co. Wicklow'
diff --git a/uc_store/config/uc_store.country.IL.yml b/uc_store/config/uc_store.country.IL.yml
new file mode 100644
index 0000000..e012eda
--- /dev/null
+++ b/uc_store/config/uc_store.country.IL.yml
@@ -0,0 +1,18 @@
+iso2: IL
+iso3: ISR
+name: Israel
+numeric: 376
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    BH: 'Bika''at Hayarden'
+    BS: 'Be''er Sheva'
+    EA: 'Eilat and Arava'
+    GA: Galil
+    HA: Haifa
+    JE: Jerusalem
+    JM: 'Jehuda Mountains'
+    NE: Negev
+    SE: Semaria
+    SH: Sharon
+    TA: 'Tel Aviv (Gosh Dan)'
diff --git a/uc_store/config/uc_store.country.IM.yml b/uc_store/config/uc_store.country.IM.yml
new file mode 100644
index 0000000..b576289
--- /dev/null
+++ b/uc_store/config/uc_store.country.IM.yml
@@ -0,0 +1,6 @@
+iso2: IM
+iso3: IMN
+name: 'Isle of Man'
+numeric: 833
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.IN.yml b/uc_store/config/uc_store.country.IN.yml
new file mode 100644
index 0000000..d25f78a
--- /dev/null
+++ b/uc_store/config/uc_store.country.IN.yml
@@ -0,0 +1,42 @@
+iso2: IN
+iso3: IND
+name: India
+numeric: 356
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city - !postal_code\r\n!zone_code\r\n!country_name_if"
+zones:
+    AN: 'Andaman and Nicobar'
+    AP: 'Andhra Pradesh'
+    AR: 'Arunachal Pradesh'
+    AS: Assam
+    BR: Bihar
+    CH: Chandigarh
+    CT: Chhattisgarh
+    DD: 'Daman and Diu'
+    DL: Delhi
+    DN: 'Dadra and Nagar Haveli'
+    GA: Goa
+    GJ: Gujarat
+    HP: 'Himachal Pradesh'
+    HR: Haryana
+    JH: Jharkhand
+    JK: 'Jammu and Kashmir'
+    KA: Karnataka
+    KL: Kerala
+    LD: Lakshadweep
+    MH: Maharashtra
+    ML: Meghalaya
+    MN: Manipur
+    MP: 'Madhya Pradesh'
+    MZ: Mizoram
+    NL: Nagaland
+    OR: Orissa
+    PB: Punjab
+    PY: Puducherry
+    RJ: Rajasthan
+    SK: Sikkim
+    TN: 'Tamil Nadu'
+    TR: Tripura
+    UL: Uttarakhand
+    UP: 'Uttar Pradesh'
+    WB: 'West Bengal'
diff --git a/uc_store/config/uc_store.country.IO.yml b/uc_store/config/uc_store.country.IO.yml
new file mode 100644
index 0000000..ca9bc83
--- /dev/null
+++ b/uc_store/config/uc_store.country.IO.yml
@@ -0,0 +1,6 @@
+iso2: IO
+iso3: IOT
+name: 'British Indian Ocean Territory'
+numeric: 86
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.IQ.yml b/uc_store/config/uc_store.country.IQ.yml
new file mode 100644
index 0000000..cfffd27
--- /dev/null
+++ b/uc_store/config/uc_store.country.IQ.yml
@@ -0,0 +1,25 @@
+iso2: IQ
+iso3: IRQ
+name: Iraq
+numeric: 368
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    IQ-AN: 'Al Anbār'
+    IQ-AR: Arbīl
+    IQ-BA: 'Al Başrah'
+    IQ-BB: 'Babil !Bābil'
+    IQ-BG: Baghdād
+    IQ-DA: Dahūk
+    IQ-DI: Diyālá
+    IQ-DQ: 'Dhī Qār'
+    IQ-KA: 'Karbalā'''
+    IQ-MA: Maysān
+    IQ-MU: 'Al Muthanná'
+    IQ-NA: 'An Najaf'
+    IQ-NI: Nīnawá
+    IQ-QA: 'Al Qādisīyah'
+    IQ-SD: 'Şalāḩ ad Dīn'
+    IQ-SU: 'As Sulaymānīyah'
+    IQ-TS: 'At Ta''mīm'
+    IQ-WA: Wāsiţ
diff --git a/uc_store/config/uc_store.country.IR.yml b/uc_store/config/uc_store.country.IR.yml
new file mode 100644
index 0000000..563d2c7
--- /dev/null
+++ b/uc_store/config/uc_store.country.IR.yml
@@ -0,0 +1,35 @@
+iso2: IR
+iso3: IRN
+name: 'Iran, Islamic Republic of'
+numeric: 364
+status: 0
+format: "!first_name !last_name\r\n!country_name - !zone_name - !city,\r\n!street1\r\n!street2\r\n!postal_code"
+zones:
+    AG: 'آذربایجان غربی'
+    AR: اردبیل
+    AS: 'آذربایجان شرقی'
+    BU: بوشهر
+    CB: 'چهار محال بختیاری'
+    ES: اصفهان
+    FR: فارس
+    GL: گیلان
+    GS: گلستان
+    HM: همدان
+    HR: هرمزگان
+    IL: ایلام
+    KB: 'کهگیلویه و بویر احمد'
+    KD: کردستان
+    KH: 'خراسان جنوبی'
+    KR: کرمان
+    KS: کرمانشاه
+    KZ: خوزستان
+    LR: لرستان
+    MR: مرکزی
+    MZ: مازندران
+    QM: قم
+    QZ: قزوین
+    SB: 'سیستان و بلوچستان'
+    SM: سمنان
+    TH: تهران
+    YZ: یزد
+    ZN: زنجان
diff --git a/uc_store/config/uc_store.country.IS.yml b/uc_store/config/uc_store.country.IS.yml
new file mode 100644
index 0000000..81608dd
--- /dev/null
+++ b/uc_store/config/uc_store.country.IS.yml
@@ -0,0 +1,16 @@
+iso2: IS
+iso3: ISL
+name: Iceland
+numeric: 352
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    IS-0: Reykjavík
+    IS-1: 'Höfuðborgarsvæði utan Reykjavíkur'
+    IS-2: Suðurnes
+    IS-3: Vesturland
+    IS-4: Vestfirðir
+    IS-5: 'Norðurland vestra'
+    IS-6: 'Norðurland eystra'
+    IS-7: Austurland
+    IS-8: Suðurland
diff --git a/uc_store/config/uc_store.country.IT.yml b/uc_store/config/uc_store.country.IT.yml
new file mode 100644
index 0000000..f46654f
--- /dev/null
+++ b/uc_store/config/uc_store.country.IT.yml
@@ -0,0 +1,119 @@
+iso2: IT
+iso3: ITA
+name: Italy
+numeric: 380
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code, !city\r\n!zone_code\r\n!country_name_if"
+zones:
+    AG: Agrigento
+    AL: Alessandria
+    AN: Ancona
+    AO: Aosta
+    AP: 'Ascoli Piceno'
+    AQ: 'L''Aquila'
+    AR: Arezzo
+    AT: Asti
+    AV: Avellino
+    BA: Bari
+    BG: Bergamo
+    BI: Biella
+    BL: Belluno
+    BN: Benevento
+    BO: Bologna
+    BR: Brindisi
+    BS: Brescia
+    BT: Barletta-Andria-Trani
+    BZ: Bolzano
+    CA: Cagliari
+    CB: Campobasso
+    CE: Caserta
+    CH: Chieti
+    CI: Carbonia-Iglesias
+    CL: Caltanissetta
+    CN: Cuneo
+    CO: Como
+    CR: Cremona
+    CS: Cosenza
+    CT: Catania
+    CTV: 'Città del Vaticano'
+    CZ: Catanzaro
+    EN: Enna
+    FC: Forlì-Cesena
+    FE: Ferrara
+    FG: Foggia
+    FI: Firenze
+    FM: Fermo
+    FR: Frosinone
+    GE: Genova
+    GO: Gorizia
+    GR: Grosseto
+    IM: Imperia
+    IS: Isernia
+    KR: Crotone
+    LC: Lecco
+    LE: Lecce
+    LI: Livorno
+    LO: Lodi
+    LT: Latina
+    LU: Lucca
+    MB: 'Monza e Brianza'
+    MC: Macerata
+    ME: Messina
+    MI: Milano
+    MN: Mantova
+    MO: Modena
+    MS: 'Massa e Carrara'
+    MT: Matera
+    NA: Napoli
+    NO: Novara
+    NU: Nuoro
+    OG: Ogliastra
+    OR: Oristano
+    OT: Olbia-Tempio
+    PA: Palermo
+    PC: Piacenza
+    PD: Padova
+    PE: Pescara
+    PG: Perugia
+    PI: Pisa
+    PN: Pordenone
+    PO: Prato
+    PR: Parma
+    PT: Pistoia
+    PU: 'Pesaro e Urbino'
+    PV: Pavia
+    PZ: Potenza
+    RA: Ravenna
+    RC: 'Reggio Calabria'
+    RE: 'Reggio Emilia'
+    RG: Ragusa
+    RI: Rieti
+    RM: Roma
+    RN: Rimini
+    RO: Rovigo
+    RSM: 'Rep San Marino'
+    SA: Salerno
+    SI: Siena
+    SO: Sondrio
+    SP: 'La Spezia'
+    SR: Siracusa
+    SS: Sassari
+    SV: Savona
+    TA: Taranto
+    TE: Teramo
+    TN: Trento
+    TO: Torino
+    TP: Trapani
+    TR: Terni
+    TS: Trieste
+    TV: Treviso
+    UD: Udine
+    VA: Varese
+    VB: Verbano-Cusio-Ossola
+    VC: Vercelli
+    VE: Venezia
+    VI: Vicenza
+    VR: Verona
+    VS: 'Medio Campidano'
+    VT: Viterbo
+    VV: 'Vibo Valentia'
diff --git a/uc_store/config/uc_store.country.JE.yml b/uc_store/config/uc_store.country.JE.yml
new file mode 100644
index 0000000..c6fdadc
--- /dev/null
+++ b/uc_store/config/uc_store.country.JE.yml
@@ -0,0 +1,6 @@
+iso2: JE
+iso3: JEY
+name: Jersey
+numeric: 832
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.JM.yml b/uc_store/config/uc_store.country.JM.yml
new file mode 100644
index 0000000..3fb1fb9
--- /dev/null
+++ b/uc_store/config/uc_store.country.JM.yml
@@ -0,0 +1,6 @@
+iso2: JM
+iso3: JAM
+name: Jamaica
+numeric: 388
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city - !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.JO.yml b/uc_store/config/uc_store.country.JO.yml
new file mode 100644
index 0000000..93bcaf7
--- /dev/null
+++ b/uc_store/config/uc_store.country.JO.yml
@@ -0,0 +1,19 @@
+iso2: JO
+iso3: JOR
+name: Jordan
+numeric: 400
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    JO-AJ: '''Ajlūn'
+    JO-AM: '''Ammān'
+    JO-AQ: 'Al ''Aqaba'
+    JO-AT: 'Aţ Ţafīlah'
+    JO-AZ: 'Az Zarqā'''
+    JO-BA: 'Al Balqā'''
+    JO-IR: Irbid
+    JO-JA: Jarash
+    JO-KA: 'Al Karak'
+    JO-MA: 'Al Mafraq'
+    JO-MD: Mādaba
+    JO-MN: 'Ma''ٰān'
diff --git a/uc_store/config/uc_store.country.JP.yml b/uc_store/config/uc_store.country.JP.yml
new file mode 100644
index 0000000..ea85424
--- /dev/null
+++ b/uc_store/config/uc_store.country.JP.yml
@@ -0,0 +1,54 @@
+iso2: JP
+iso3: JPN
+name: Japan
+numeric: 392
+status: 0
+format: "!postal_code\r\n!zone_name !city\r\n!street1\r\n!street2\r\n!company\r\n!last_name !first_name\r\n!country_name_if"
+zones:
+    '01': 北海道
+    '02': 青森県
+    '03': 岩手県
+    '04': 宮城県
+    '05': 秋田県
+    '06': 山形県
+    '07': 福島県
+    '08': 茨城県
+    '09': 栃木県
+    10: 群馬県
+    11: 埼玉県
+    12: 千葉県
+    13: 東京都
+    14: 神奈川県
+    15: 新潟県
+    16: 富山県
+    17: 石川県
+    18: 福井県
+    19: 山梨県
+    20: 長野県
+    21: 岐阜県
+    22: 静岡県
+    23: 愛知県
+    24: 三重県
+    25: 滋賀県
+    26: 京都府
+    27: 大阪府
+    28: 兵庫県
+    29: 奈良県
+    30: 和歌山県
+    31: 鳥取県
+    32: 島根県
+    33: 岡山県
+    34: 広島県
+    35: 山口県
+    36: 徳島県
+    37: 香川県
+    38: 愛媛県
+    39: 高知県
+    40: 福岡県
+    41: 佐賀県
+    42: 長崎県
+    43: 熊本県
+    44: 大分県
+    45: 宮崎県
+    46: 鹿児島県
+    47: 沖縄県
diff --git a/uc_store/config/uc_store.country.KE.yml b/uc_store/config/uc_store.country.KE.yml
new file mode 100644
index 0000000..43b06f9
--- /dev/null
+++ b/uc_store/config/uc_store.country.KE.yml
@@ -0,0 +1,15 @@
+iso2: KE
+iso3: KEN
+name: Kenya
+numeric: 404
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    110: Nairobi
+    200: Central
+    300: Pwani
+    400: Eastern
+    500: North-Eastern
+    600: Nyanza
+    700: 'Bonde la Ufa'
+    800: Western
diff --git a/uc_store/config/uc_store.country.KG.yml b/uc_store/config/uc_store.country.KG.yml
new file mode 100644
index 0000000..bbfe9bc
--- /dev/null
+++ b/uc_store/config/uc_store.country.KG.yml
@@ -0,0 +1,15 @@
+iso2: KG
+iso3: KGZ
+name: Kyrgyzstan
+numeric: 417
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    KG-B: Batken
+    KG-C: Chü
+    KG-GB: Bishkek
+    KG-J: Jalal-Abad
+    KG-N: Naryn
+    KG-O: Osh
+    KG-T: Talas
+    KG-Y: Ysyk-Köl
diff --git a/uc_store/config/uc_store.country.KH.yml b/uc_store/config/uc_store.country.KH.yml
new file mode 100644
index 0000000..c9effd6
--- /dev/null
+++ b/uc_store/config/uc_store.country.KH.yml
@@ -0,0 +1,31 @@
+iso2: KH
+iso3: KHM
+name: Cambodia
+numeric: 116
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    1: 'Banteay Meanchey'
+    10: Kracheh
+    11: 'Mondol Kiri'
+    12: 'Phnum Penh'
+    13: 'Preah Vihear'
+    14: 'Prey Veng'
+    15: Pousaat
+    16: Rotanokiri
+    17: 'Siem Reab'
+    18: 'Krong Preah Sihanouk'
+    19: 'Stueng Traeng'
+    2: Batdambang
+    20: 'Svay Rieng'
+    21: Taakaev
+    22: 'Otdar Mean Chey'
+    23: 'Krong Keb'
+    24: 'Krong Pailin'
+    3: 'Kampong Chaam'
+    4: 'Kampong Chhnang'
+    5: 'Kampong Spoe'
+    6: 'Kampong Thum'
+    7: Kampot
+    8: Kandal
+    9: 'Kaoh Kong'
diff --git a/uc_store/config/uc_store.country.KI.yml b/uc_store/config/uc_store.country.KI.yml
new file mode 100644
index 0000000..62d9e7f
--- /dev/null
+++ b/uc_store/config/uc_store.country.KI.yml
@@ -0,0 +1,10 @@
+iso2: KI
+iso3: KIR
+name: Kiribati
+numeric: 296
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    KI-G: 'Gilbert Islands'
+    KI-L: 'Line Islands'
+    KI-P: 'Phoenix Islands'
diff --git a/uc_store/config/uc_store.country.KM.yml b/uc_store/config/uc_store.country.KM.yml
new file mode 100644
index 0000000..648f9dd
--- /dev/null
+++ b/uc_store/config/uc_store.country.KM.yml
@@ -0,0 +1,10 @@
+iso2: KM
+iso3: COM
+name: Comoros
+numeric: 174
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    A: Anjouan
+    G: 'Grande Comore'
+    M: Moheli
diff --git a/uc_store/config/uc_store.country.KN.yml b/uc_store/config/uc_store.country.KN.yml
new file mode 100644
index 0000000..715b675
--- /dev/null
+++ b/uc_store/config/uc_store.country.KN.yml
@@ -0,0 +1,21 @@
+iso2: KN
+iso3: KNA
+name: 'Saint Kitts and Nevis'
+numeric: 659
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    ASP: 'Saint Anne Sandy Point'
+    CCN: 'Christ Church Nichola Town'
+    GBA: 'Saint George Basseterre'
+    GGI: 'Saint George Gingerland'
+    JCA: 'Saint John Capisterre'
+    JFI: 'Saint John Figtree'
+    JWI: 'Saint James Windward'
+    MCA: 'Saint Mary Cayon'
+    PBS: 'Saint Peter Basseterre'
+    PCA: 'Saint Paul Capisterre'
+    PCH: 'Saint Paul Charlestown'
+    TLO: 'Saint Thomas Lowland'
+    TMI: 'Saint Thomas Middle Island'
+    TPP: 'Trinity Palmetto Point'
diff --git a/uc_store/config/uc_store.country.KP.yml b/uc_store/config/uc_store.country.KP.yml
new file mode 100644
index 0000000..db3cb29
--- /dev/null
+++ b/uc_store/config/uc_store.country.KP.yml
@@ -0,0 +1,18 @@
+iso2: KP
+iso3: PRK
+name: 'Korea, Democratic People''s Republic_of'
+numeric: 408
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    KP-01: P’yŏngyang
+    KP-02: P’yŏngan-namdo
+    KP-03: P’yŏngan-bukto
+    KP-04: Chagang-do
+    KP-05: Hwanghae-namdo
+    KP-06: Hwanghae-bukto
+    KP-07: Kangwŏn-do
+    KP-08: Hamgyŏng-namdo
+    KP-09: Hamgyŏng-bukto
+    KP-10: Yanggang-do
+    KP-13: 'Nasŏn (Najin-Sŏnbong'
diff --git a/uc_store/config/uc_store.country.KR.yml b/uc_store/config/uc_store.country.KR.yml
new file mode 100644
index 0000000..681e564
--- /dev/null
+++ b/uc_store/config/uc_store.country.KR.yml
@@ -0,0 +1,22 @@
+iso2: KR
+iso3: KOR
+name: 'Korea, Republic of'
+numeric: 410
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    CB: Cholla-bukto
+    CD: Cheju-do
+    CH: 'Ch''ungch''ong-namdo'
+    CN: Cholla-namdo
+    CO: 'Ch''ungch''ong-bukto'
+    IG: 'Inch''on-gwangyoksi'
+    KA: Kangwon-do
+    KB: Kyongsang-bukto
+    KD: Kyonggi-do
+    KG: Kwangju-gwangyoksi
+    KN: Kyongsang-namdo
+    PG: Pusan-gwangyoksi
+    SO: 'Soul-t''ukpyolsi'
+    TA: Taegu-gwangyoksi
+    TG: Taejon-gwangyoksi
diff --git a/uc_store/config/uc_store.country.KW.yml b/uc_store/config/uc_store.country.KW.yml
new file mode 100644
index 0000000..3b4f747
--- /dev/null
+++ b/uc_store/config/uc_store.country.KW.yml
@@ -0,0 +1,13 @@
+iso2: KW
+iso3: KWT
+name: Kuwait
+numeric: 414
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    KW-AH: 'Al Aḩmadi'
+    KW-FA: 'Al Farwānīyah'
+    KW-HA: 'Hawallī !Ḩawallī'
+    KW-JA: 'Al Jahrah'
+    KW-KU: 'Al Kuwayt'
+    KW-MU: 'Mubārak al Kabīr'
diff --git a/uc_store/config/uc_store.country.KY.yml b/uc_store/config/uc_store.country.KY.yml
new file mode 100644
index 0000000..5ed6b68
--- /dev/null
+++ b/uc_store/config/uc_store.country.KY.yml
@@ -0,0 +1,14 @@
+iso2: KY
+iso3: CYM
+name: 'Cayman Islands'
+numeric: 136
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    BT: 'Bodden Town'
+    CB: 'Cayman Brac'
+    EE: 'East End'
+    GT: 'George Town'
+    NS: 'North Side'
+    SO: 'Little Cayman'
+    WB: 'West Bay'
diff --git a/uc_store/config/uc_store.country.KZ.yml b/uc_store/config/uc_store.country.KZ.yml
new file mode 100644
index 0000000..a7d2fcc
--- /dev/null
+++ b/uc_store/config/uc_store.country.KZ.yml
@@ -0,0 +1,23 @@
+iso2: KZ
+iso3: KAZ
+name: Kazakhstan
+numeric: 398
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    AKM: 'Акмолинская область'
+    AKT: 'Актюбинская область'
+    ALA: Алматы
+    ALM: 'Алматинская область'
+    ATR: 'Атырауская область'
+    DZH: 'Жамбылская область'
+    EKZ: 'Восточно-Казахстанская область'
+    KAR: 'Карагандинская область'
+    KOR: 'Кызылординская область'
+    KUS: 'Костанайская область'
+    MAN: 'Мангистауская область'
+    NKZ: 'Северо-Казахстанская область'
+    PVL: 'Павлодарская область'
+    SKZ: 'Южно-Казахстанская область'
+    TSE: Астана
+    WKZ: 'Западно-Казахстанская область'
diff --git a/uc_store/config/uc_store.country.LA.yml b/uc_store/config/uc_store.country.LA.yml
new file mode 100644
index 0000000..e0c0558
--- /dev/null
+++ b/uc_store/config/uc_store.country.LA.yml
@@ -0,0 +1,25 @@
+iso2: LA
+iso3: LAO
+name: 'Lao People''s Democratic Republic'
+numeric: 418
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    LA-AT: 'Attapu [Attopeu]'
+    LA-BK: Bokè
+    LA-BL: 'Bolikhamxai [Borikhane]'
+    LA-CH: 'Champasak [Champassak]'
+    LA-HO: Houaphan
+    LA-KH: Khammouan
+    LA-LM: 'Louang Namtha'
+    LA-LP: 'Louangphabang [Louang Prabang]'
+    LA-OU: 'Oudômxai [Oudomsai]'
+    LA-PH: 'Phôngsali [Phong Saly]'
+    LA-SL: 'Salavan [Saravane]'
+    LA-SV: Savannakhé
+    LA-VI: Vientiane
+    LA-VT: Vientiane
+    LA-XA: Xaignabouli
+    LA-XE: Xekong
+    LA-XI: 'Xiangkhoang [Xieng Khouang]'
+    LA-XN: Xaisômbou
diff --git a/uc_store/config/uc_store.country.LB.yml b/uc_store/config/uc_store.country.LB.yml
new file mode 100644
index 0000000..6b00712
--- /dev/null
+++ b/uc_store/config/uc_store.country.LB.yml
@@ -0,0 +1,15 @@
+iso2: LB
+iso3: LBN
+name: Lebanon
+numeric: 422
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    LB-AK: Aakkâr
+    LB-AS: Liban-Nord
+    LB-BA: Beyrouth
+    LB-BH: Baalbek-Hermel
+    LB-BI: Beqaa
+    LB-JA: Liban-Sud
+    LB-JL: Mont-Liban
+    LB-NA: Nabatîyé
diff --git a/uc_store/config/uc_store.country.LC.yml b/uc_store/config/uc_store.country.LC.yml
new file mode 100644
index 0000000..2aa8def
--- /dev/null
+++ b/uc_store/config/uc_store.country.LC.yml
@@ -0,0 +1,18 @@
+iso2: LC
+iso3: LCA
+name: 'Saint Lucia'
+numeric: 662
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AR: Anse-la-Raye
+    CA: Castries
+    CH: Choiseul
+    DA: Dauphin
+    DE: Dennery
+    GI: Gros-Islet
+    LA: Laborie
+    MI: Micoud
+    PR: Praslin
+    SO: Soufriere
+    VF: Vieux-Fort
diff --git a/uc_store/config/uc_store.country.LI.yml b/uc_store/config/uc_store.country.LI.yml
new file mode 100644
index 0000000..caae88e
--- /dev/null
+++ b/uc_store/config/uc_store.country.LI.yml
@@ -0,0 +1,18 @@
+iso2: LI
+iso3: LIE
+name: Liechtenstein
+numeric: 438
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    LI-01: Balzers
+    LI-02: Eschen
+    LI-03: Gamprin
+    LI-04: Mauren
+    LI-05: Planken
+    LI-06: Ruggell
+    LI-07: Schaan
+    LI-08: Schellenberg
+    LI-09: Triesen
+    LI-10: Triesenberg
+    LI-11: Vaduz
diff --git a/uc_store/config/uc_store.country.LK.yml b/uc_store/config/uc_store.country.LK.yml
new file mode 100644
index 0000000..bae690d
--- /dev/null
+++ b/uc_store/config/uc_store.country.LK.yml
@@ -0,0 +1,41 @@
+iso2: LK
+iso3: LKA
+name: 'Sri Lanka'
+numeric: 144
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    1: 'Western Province'
+    11: Colombo
+    12: Gampaha
+    13: Kalutara
+    2: 'Central Province'
+    21: Kandy
+    22: Matale
+    23: 'Nuwara Eliya'
+    3: 'Dakunu Palata'
+    31: Galle
+    32: Matara
+    33: Hambantota
+    4: 'Northern Province'
+    41: Jaffna
+    42: Kilinochchi
+    43: Mannar
+    44: Vavuniya
+    45: Mullaittivu
+    5: 'Negenahira Palata'
+    51: Batticaloa
+    52: Ampara
+    53: Trincomalee
+    6: 'North Western Province'
+    61: Kurunegala
+    62: Puttalam
+    7: 'Uturumeda Palata'
+    71: Anuradhapura
+    72: Polonnaruwa
+    8: 'Uva Palata'
+    81: Badulla
+    82: Monaragala
+    9: 'Sabaragamuwa Palata'
+    91: Ratnapura
+    92: Kegalla
diff --git a/uc_store/config/uc_store.country.LR.yml b/uc_store/config/uc_store.country.LR.yml
new file mode 100644
index 0000000..e320602
--- /dev/null
+++ b/uc_store/config/uc_store.country.LR.yml
@@ -0,0 +1,22 @@
+iso2: LR
+iso3: LBR
+name: Liberia
+numeric: 430
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    LR-BG: Bong
+    LR-BM: Bomi
+    LR-CM: 'Grand Cape Mount'
+    LR-GB: 'Grand Bassa'
+    LR-GG: 'Grand Gedeh'
+    LR-GK: 'Grand Kru'
+    LR-GP: Gbarpolu
+    LR-LO: Lofa
+    LR-MG: Margibi
+    LR-MO: Montserrado
+    LR-MY: Maryland
+    LR-NI: Nimba
+    LR-RG: RiverGee
+    LR-RI: Rivercess
+    LR-SI: Sinoe
diff --git a/uc_store/config/uc_store.country.LS.yml b/uc_store/config/uc_store.country.LS.yml
new file mode 100644
index 0000000..39d4cff
--- /dev/null
+++ b/uc_store/config/uc_store.country.LS.yml
@@ -0,0 +1,17 @@
+iso2: LS
+iso3: LSO
+name: Lesotho
+numeric: 426
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    LS-A: Maseru
+    LS-B: Butha-Buthe
+    LS-C: Leribe
+    LS-D: Berea
+    LS-E: Mafeteng
+    LS-F: 'Mohale''s Hoek'
+    LS-G: Quthing
+    LS-H: 'Qacha''s Nek'
+    LS-J: Mokhotlong
+    LS-K: Thaba-Tseka
diff --git a/uc_store/config/uc_store.country.LT.yml b/uc_store/config/uc_store.country.LT.yml
new file mode 100644
index 0000000..a57defe
--- /dev/null
+++ b/uc_store/config/uc_store.country.LT.yml
@@ -0,0 +1,50 @@
+iso2: LT
+iso3: LTU
+name: Lithuania
+numeric: 440
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    AK: 'Akmenės rajonas'
+    AL: 'Alytaus rajonas'
+    AN: 'Anykščių rajonas'
+    BIR: 'Biržų rajonas'
+    IG: 'Ignalinos rajonas'
+    JO: 'Joniškio rajonas'
+    JON: 'Jonavos rajonas'
+    JUR: 'Jurbarko rajonas'
+    KA: 'Kauno rajonas'
+    KAI: 'Kaišiadorių rajonas'
+    KE: 'Kėdainių rajonas'
+    KEL: 'Kelmės rajonas'
+    KLA: 'Klaipėdos rajonas'
+    KR: 'Kretingos rajonas'
+    KU: 'Kupiškio rajonas'
+    LA: 'Lazdijų rajonas'
+    MA: 'Mažeikių rajonas'
+    MO: 'Molėtų rajonas'
+    PA: 'Pakruojo rajonas'
+    PAN: 'Panevėžio rajonas'
+    PAS: 'Pasvalio rajonas'
+    PLU: 'Plungės rajonas'
+    PR: 'Prienų rajonas'
+    RA: 'Radviliškio rajonas'
+    RAS: 'Raseinių rajonas'
+    RO: 'Rokiškio rajonas'
+    SA: 'Šakių rajonas'
+    SAL: 'Šalčininkų rajonas'
+    SI: 'Šilalės rajonas'
+    SIA: 'Šiaulių rajonas'
+    SIL: 'Šilutės rajonas'
+    SIR: 'Širvintų rajonas'
+    SK: 'Skuodo rajonas'
+    SV: 'Švenčionių rajonas'
+    TA: 'Tauragės rajonas'
+    TE: 'Telšių rajonas'
+    TR: 'Trakų rajonas'
+    UK: 'Ukmergės rajonas'
+    UT: 'Utenos rajonas'
+    VA: 'Varėnos rajonas'
+    VI: 'Vilkaviškio rajonas'
+    VIL: 'Vilniaus rajonas'
+    ZAR: 'Zarasų rajonas'
diff --git a/uc_store/config/uc_store.country.LU.yml b/uc_store/config/uc_store.country.LU.yml
new file mode 100644
index 0000000..ca6c2d2
--- /dev/null
+++ b/uc_store/config/uc_store.country.LU.yml
@@ -0,0 +1,8 @@
+iso2: LU
+iso3: LUX
+name: Luxembourg
+numeric: 442
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    L: Luxemburg
diff --git a/uc_store/config/uc_store.country.LV.yml b/uc_store/config/uc_store.country.LV.yml
new file mode 100644
index 0000000..3e98c86
--- /dev/null
+++ b/uc_store/config/uc_store.country.LV.yml
@@ -0,0 +1,40 @@
+iso2: LV
+iso3: LVA
+name: Latvia
+numeric: 428
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !postal_code\r\n!country_name_if"
+zones:
+    AI: 'Aizkraukles rajons'
+    AL: 'Alūksnes rajons'
+    BL: 'Balvu rajons'
+    BU: 'Bauskas rajons'
+    CE: 'Cēsu rajons'
+    DA: 'Daugavpils rajons'
+    DGV: 'Daugavpils pilsēta'
+    DO: 'Dobeles rajons'
+    GU: 'Gulbenes rajons'
+    JEL: 'Jelgavas pilsēta'
+    JK: 'Jēkabpils rajons'
+    JL: 'Jelgavas rajons'
+    JUR: 'Jūrmalas pilsēta'
+    KR: 'Krāslavas rajons'
+    KU: 'Kuldīgas rajons'
+    LE: 'Liepājas rajons'
+    LM: 'Limbažu rajons'
+    LPX: 'Liepājas pilsēta'
+    LU: 'Ludzas rajons'
+    MA: 'Madonas rajons'
+    OG: 'Ogres rajons'
+    PR: 'Preiļu rajons'
+    RE: 'Rēzeknes rajons'
+    REZ: 'Rēzeknes pilsēta'
+    RI: 'Rīgas rajons'
+    RIX: 'Rīgas pilsēta'
+    SA: 'Saldus rajons'
+    TA: 'Talsu rajons'
+    TU: 'Tukuma rajons'
+    VE: 'Ventspils rajons'
+    VEN: 'Ventspils pilsēta'
+    VK: 'Valkas rajons'
+    VM: 'Valmieras rajons'
diff --git a/uc_store/config/uc_store.country.LY.yml b/uc_store/config/uc_store.country.LY.yml
new file mode 100644
index 0000000..4178a6c
--- /dev/null
+++ b/uc_store/config/uc_store.country.LY.yml
@@ -0,0 +1,29 @@
+iso2: LY
+iso3: LBY
+name: 'Libyan Arab Jamahiriya'
+numeric: 434
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    LY-BA: Banghāzī
+    LY-BU: 'Al Buţnān'
+    LY-DR: Darnah
+    LY-GT: Ghāt
+    LY-JA: 'Al Jabal al Akhḑar'
+    LY-JG: 'Al Jabal al Gharbī'
+    LY-JI: 'Al Jifārah'
+    LY-JU: 'Al Jufrah'
+    LY-KF: 'Al Kufrah'
+    LY-MB: 'Al Marqab'
+    LY-MI: Mişrātah
+    LY-MJ: 'Al Marj'
+    LY-MQ: Murzuq
+    LY-NL: Nālūt
+    LY-NQ: 'An Nuqaţ al Khams'
+    LY-SB: Sabhā
+    LY-SR: Surt
+    LY-TB: Tarābulus
+    LY-WA: 'Al Wāḩāt'
+    LY-WD: 'Wādī al Ḩayāt'
+    LY-WS: 'Wādī ash Shāţiʾ'
+    LY-ZA: 'Az Zāwiyah'
diff --git a/uc_store/config/uc_store.country.MA.yml b/uc_store/config/uc_store.country.MA.yml
new file mode 100644
index 0000000..5a47bee
--- /dev/null
+++ b/uc_store/config/uc_store.country.MA.yml
@@ -0,0 +1,74 @@
+iso2: MA
+iso3: MAR
+name: Morocco
+numeric: 504
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '01': Tanger-Tetouan
+    '02': 'Gharb-Chrarda-Beni Hssen'
+    '03': 'Taza-Al Hoceima-Taounate'
+    '04': L-Oriental
+    '05': Fes-Boulemane
+    '06': Meknes-Tafilalet
+    '07': Rabat-Sale-Zemmour-Zaer
+    '08': 'Grand Casablanca'
+    '09': Chaouia-Ouardigha
+    10: Doukkala-Abda
+    11: 'Marrakech-Tensift-Al Haouz'
+    12: Tadla-Azilal
+    13: Sous-Massa-Draa
+    14: 'Guelmim-Es Smara'
+    15: 'Laayoune-Boujdour-Sakia el Hamra'
+    16: 'Oued ed Dahab-Lagouira'
+    AGD: Agadir
+    ASZ: Assa-Zaq
+    AZI: Azilal
+    BAH: 'Ait Baha'
+    BEM: 'Beni Mellal'
+    BER: Berkane
+    BES: 'Ben Slimane'
+    BOD: Boujdour
+    BOM: Boulemane
+    CAS: Casablanca
+    CHE: Chefchaouene
+    CHI: Chichaoua
+    ERR: Errachidia
+    ESI: Essaouira
+    ESM: 'Es Smara'
+    FES: Fes
+    FIG: Figuig
+    GUE: Guelmim
+    HAJ: 'El Hajeb'
+    HAO: 'Al Haouz'
+    HOC: 'AL Hoceima'
+    IFR: Ifrane
+    JDI: 'El Jadida'
+    JRA: Jerada
+    KEN: Kenitra
+    KES: 'Kelaat Sraghna'
+    KHE: Khemisset
+    KHN: Khenifra
+    KHO: Khouribga
+    LAA: Laayoune
+    LAR: Larache
+    MAR: Marrakech
+    MEK: Meknes
+    MEL: 'Ait Melloul'
+    NAD: Nador
+    OUA: Ouarzazate
+    OUD: 'Oued ed Dahab'
+    OUJ: Oujda
+    RBA: Rabat-Sale
+    SAF: Safi
+    SEF: Sefrou
+    SET: Settat
+    SIK: 'Sidi Kacem'
+    TAO: Taounate
+    TAR: Taroudannt
+    TAT: Tata
+    TAZ: Taza
+    TET: Tetouan
+    TIZ: Tiznit
+    TNG: Tanger
+    TNT: Tan-Tan
diff --git a/uc_store/config/uc_store.country.MC.yml b/uc_store/config/uc_store.country.MC.yml
new file mode 100644
index 0000000..9b3754c
--- /dev/null
+++ b/uc_store/config/uc_store.country.MC.yml
@@ -0,0 +1,6 @@
+iso2: MC
+iso3: MCO
+name: Monaco
+numeric: 492
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.MD.yml b/uc_store/config/uc_store.country.MD.yml
new file mode 100644
index 0000000..3eb549e
--- /dev/null
+++ b/uc_store/config/uc_store.country.MD.yml
@@ -0,0 +1,44 @@
+iso2: MD
+iso3: MDA
+name: 'Moldovoa, Republic of'
+numeric: 498
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!zone_name, !country_name_if\r\n!city, !postal_code\r\n!street1\r\n!street2"
+zones:
+    AN: 'Anenii Noi'
+    BA: Bălţi
+    BD: Tighina
+    BR: Briceni
+    BS: Basarabeasca
+    CA: Cahul
+    CL: Călăraşi
+    CM: Cimişlia
+    CR: Criuleni
+    CS: Căuşeni
+    CT: Cantemir
+    CU: Chişinău
+    DO: Donduşeni
+    DR: Drochia
+    DU: Dubăsari
+    ED: Edineţ
+    FA: Făleşti
+    FL: Floreşti
+    GA: 'Găgăuzia, Unitatea teritorială autonomă (UTAG)'
+    GL: Glodeni
+    HI: Hînceşti
+    IA: Ialoveni
+    LE: Leova
+    NI: Nisporeni
+    OC: Ocniţa
+    OR: Orhei
+    RE: Rezina
+    RI: Rîşcani
+    SD: Şoldăneşti
+    SI: Sîngerei
+    SN: 'Stînga Nistrului, unitatea teritorială din'
+    SO: Soroca
+    ST: Străşeni
+    SV: 'Ştefan Vodă'
+    TA: Taraclia
+    TE: Teleneşti
+    UN: Ungheni
diff --git a/uc_store/config/uc_store.country.ME.yml b/uc_store/config/uc_store.country.ME.yml
new file mode 100644
index 0000000..8661e80
--- /dev/null
+++ b/uc_store/config/uc_store.country.ME.yml
@@ -0,0 +1,28 @@
+iso2: ME
+iso3: MNE
+name: Montenegro
+numeric: 499
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '01': Andrijevica
+    '02': Bar
+    '03': Berane
+    '04': 'Bijelo Polje'
+    '05': Budva
+    '06': Cetinje
+    '07': Danilovgrad
+    '08': Herceq-Novi
+    '09': Kolasin
+    10: Kotor
+    11: Mojkovac
+    12: Niksic
+    13: Plav
+    14: Pljevlja
+    15: Pluzine
+    16: Podgorica
+    17: Rozaje
+    18: Savnik
+    19: Tivat
+    20: Ulcinj
+    21: Zabljak
diff --git a/uc_store/config/uc_store.country.MF.yml b/uc_store/config/uc_store.country.MF.yml
new file mode 100644
index 0000000..e090b41
--- /dev/null
+++ b/uc_store/config/uc_store.country.MF.yml
@@ -0,0 +1,6 @@
+iso2: MF
+iso3: MAF
+name: 'Saint Martin (French part)'
+numeric: 663
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.MG.yml b/uc_store/config/uc_store.country.MG.yml
new file mode 100644
index 0000000..8d8f980
--- /dev/null
+++ b/uc_store/config/uc_store.country.MG.yml
@@ -0,0 +1,13 @@
+iso2: MG
+iso3: MDG
+name: Madagascar
+numeric: 450
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    MG-A: Toamasina
+    MG-D: Antsiranana
+    MG-F: Fianarantsoa
+    MG-M: Mahajanga
+    MG-T: Antananarivo
+    MG-U: Toliara
diff --git a/uc_store/config/uc_store.country.MH.yml b/uc_store/config/uc_store.country.MH.yml
new file mode 100644
index 0000000..dcad68c
--- /dev/null
+++ b/uc_store/config/uc_store.country.MH.yml
@@ -0,0 +1,31 @@
+iso2: MH
+iso3: MHL
+name: 'Marshall Islands'
+numeric: 584
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    MH-ALK: Ailuk
+    MH-ALL: Ailinglaplap
+    MH-ARN: Arno
+    MH-AUR: Aur
+    MH-EBO: Ebon
+    MH-ENI: Enewetak
+    MH-JAB: Jabat
+    MH-JAL: Jaluit
+    MH-KIL: Kili
+    MH-KWA: Kwajalein
+    MH-LAE: Lae
+    MH-LIB: Lib
+    MH-LIK: Likiep
+    MH-MAJ: Majuro
+    MH-MAL: Maloelap
+    MH-MEJ: Mejit
+    MH-MIL: Mili
+    MH-NMK: Namdrik
+    MH-NMU: Namu
+    MH-RON: Rongelap
+    MH-UJA: Ujae
+    MH-UTI: Utirik
+    MH-WTH: Wotho
+    MH-WTJ: Wotje
diff --git a/uc_store/config/uc_store.country.MK.yml b/uc_store/config/uc_store.country.MK.yml
new file mode 100644
index 0000000..6a1070d
--- /dev/null
+++ b/uc_store/config/uc_store.country.MK.yml
@@ -0,0 +1,90 @@
+iso2: MK
+iso3: MKD
+name: Macedonia
+numeric: 807
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '01': Aerodrom
+    '02': Aracinovo
+    '03': Berovo
+    '04': Bitola
+    '05': Bogdanci
+    '06': Bogovinje
+    '07': Bosilovo
+    '08': Brvenica
+    '09': Butel
+    10: Valandovo
+    11: Vasilevo
+    12: Vevcani
+    13: Veles
+    14: Vinica
+    15: Vranestica
+    16: Vrapciste
+    17: 'Gazi Baba'
+    18: Gevgelija
+    19: Gostivar
+    20: Gradsko
+    21: Debar
+    22: Debarca
+    23: Delcevo
+    24: 'Demir Kapija'
+    26: Dojran
+    27: Dolneni
+    28: Drugovo
+    29: 'Gjorce Petrov'
+    30: Zelino
+    31: Zajas
+    32: Zelenikovo
+    33: Zrnovci
+    34: Ilinden
+    35: Jequnovce
+    36: Kavadarci
+    37: Karbinci
+    38: Karpos
+    39: 'Kisela Voda'
+    40: Kicevo
+    41: Konce
+    42: Kocani
+    43: Kratovo
+    44: 'Kriva Palanka'
+    45: Krivoqastani
+    46: Krusevo
+    47: Kumanovo
+    48: Lipkovo
+    49: Lozovo
+    50: Mavrovo-i-Rostusa
+    51: 'Makedonska Kamenica'
+    52: 'Makedonski Brod'
+    53: Moqila
+    54: Negotino
+    55: Novaci
+    56: 'Novo Selo'
+    57: Oslomej
+    58: Ohrid
+    59: Petrovec
+    60: Pehcevo
+    61: Plasnica
+    62: Prilep
+    63: Probistip
+    64: Radovis
+    65: Rankovce
+    66: Resen
+    67: Rosoman
+    68: Saraj
+    69: 'Sveti Nikole'
+    70: Sopiste
+    71: 'Staro Nagoricane'
+    72: Struga
+    73: Strumica
+    74: Studenicani
+    75: Tearce
+    76: Tetovo
+    77: Centar
+    78: 'Centar Zupa'
+    79: Cair
+    80: Caska
+    81: Cesinovo-Oblesevo
+    82: 'Cucer Sandevo'
+    83: Stip
+    84: 'Suto Orizari'
diff --git a/uc_store/config/uc_store.country.ML.yml b/uc_store/config/uc_store.country.ML.yml
new file mode 100644
index 0000000..21a98eb
--- /dev/null
+++ b/uc_store/config/uc_store.country.ML.yml
@@ -0,0 +1,16 @@
+iso2: ML
+iso3: MLI
+name: Mali
+numeric: 466
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    ML-1: Kayes
+    ML-2: Koulikoro
+    ML-3: Sikasso
+    ML-4: Ségou
+    ML-5: Mopti
+    ML-6: Tombouctou
+    ML-7: Gao
+    ML-8: Kidal
+    ML-BKO: Bamako
diff --git a/uc_store/config/uc_store.country.MM.yml b/uc_store/config/uc_store.country.MM.yml
new file mode 100644
index 0000000..f920c59
--- /dev/null
+++ b/uc_store/config/uc_store.country.MM.yml
@@ -0,0 +1,21 @@
+iso2: MM
+iso3: MMR
+name: Myanmar
+numeric: 104
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '01': Sagaing
+    '02': Bago
+    '03': Magway
+    '04': Mandalay
+    '05': Tanintharyi
+    '06': Yangon
+    '07': Ayeyarwady
+    11: Kachin
+    12: Kayah
+    13: Kayin
+    14: Chin
+    15: Mon
+    16: Rakhine
+    17: Shan
diff --git a/uc_store/config/uc_store.country.MN.yml b/uc_store/config/uc_store.country.MN.yml
new file mode 100644
index 0000000..0fd0c8f
--- /dev/null
+++ b/uc_store/config/uc_store.country.MN.yml
@@ -0,0 +1,29 @@
+iso2: MN
+iso3: MNG
+name: Mongolia
+numeric: 496
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    MN-035: Orhon
+    MN-037: 'Darhan uul'
+    MN-039: Hentiy
+    MN-041: Hövsgöl
+    MN-043: Hovd
+    MN-046: Uvs
+    MN-047: Töv
+    MN-049: Selenge
+    MN-051: Sühbaatar
+    MN-053: Ömnögovĭ
+    MN-055: Övörhangay
+    MN-057: Dzavhan
+    MN-059: Dundgovĭ
+    MN-061: Dornod
+    MN-063: Dornogovĭ
+    MN-064: Govĭ-Sümber
+    MN-065: Govĭ-Altay
+    MN-067: Bulgan
+    MN-069: Bayanhongor
+    MN-071: Bayan-Ölgiy
+    MN-073: Arhangay
+    MN-1: Ulaanbaatar
diff --git a/uc_store/config/uc_store.country.MO.yml b/uc_store/config/uc_store.country.MO.yml
new file mode 100644
index 0000000..8ec4172
--- /dev/null
+++ b/uc_store/config/uc_store.country.MO.yml
@@ -0,0 +1,6 @@
+iso2: MO
+iso3: MAC
+name: Macau
+numeric: 446
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.MP.yml b/uc_store/config/uc_store.country.MP.yml
new file mode 100644
index 0000000..1e9b905
--- /dev/null
+++ b/uc_store/config/uc_store.country.MP.yml
@@ -0,0 +1,6 @@
+iso2: MP
+iso3: MNP
+name: 'Northern Mariana Islands'
+numeric: 580
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.MQ.yml b/uc_store/config/uc_store.country.MQ.yml
new file mode 100644
index 0000000..a36a352
--- /dev/null
+++ b/uc_store/config/uc_store.country.MQ.yml
@@ -0,0 +1,6 @@
+iso2: MQ
+iso3: MTQ
+name: Martinique
+numeric: 474
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.MR.yml b/uc_store/config/uc_store.country.MR.yml
new file mode 100644
index 0000000..41f8056
--- /dev/null
+++ b/uc_store/config/uc_store.country.MR.yml
@@ -0,0 +1,20 @@
+iso2: MR
+iso3: MRT
+name: Mauritania
+numeric: 478
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    MR-01: 'Hodh ech Chargui'
+    MR-02: 'Hodh el Gharbi'
+    MR-03: Assaba
+    MR-04: Gorgol
+    MR-05: Brakna
+    MR-06: Trarza
+    MR-07: Adrar
+    MR-08: 'Dakhlet Nouâdhibou'
+    MR-09: Tagant
+    MR-10: Guidimaka
+    MR-11: 'Tiris Zemmour'
+    MR-12: Inchiri
+    MR-NKC: Nouakchott
diff --git a/uc_store/config/uc_store.country.MS.yml b/uc_store/config/uc_store.country.MS.yml
new file mode 100644
index 0000000..b155760
--- /dev/null
+++ b/uc_store/config/uc_store.country.MS.yml
@@ -0,0 +1,6 @@
+iso2: MS
+iso3: MSR
+name: Montserrat
+numeric: 500
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.MT.yml b/uc_store/config/uc_store.country.MT.yml
new file mode 100644
index 0000000..b99da18
--- /dev/null
+++ b/uc_store/config/uc_store.country.MT.yml
@@ -0,0 +1,75 @@
+iso2: MT
+iso3: MLT
+name: Malta
+numeric: 470
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '01': Attard
+    '02': Balzan
+    '03': Birqu
+    '04': Birkirkara
+    '05': Birzebbuqa
+    '06': Bormla
+    '07': Dinqli
+    '08': Fgura
+    '09': Floriana
+    10: Fontana
+    11: Gudja
+    12: Gzira
+    13: Ghajnsielem
+    14: Gharb
+    15: Gharqhur
+    16: Ghasri
+    17: Ghaxaq
+    18: Hamrun
+    19: Iklin
+    20: Isla
+    21: Kalkara
+    22: Kercem
+    23: Kirkop
+    24: Lija
+    25: Luga
+    26: Marsa
+    27: Marsaskala
+    28: Marsaxlokk
+    29: Mdina
+    30: Mellieha
+    31: Mgarr
+    32: Mosta
+    33: Mgabba
+    34: Msida
+    35: Mtarfa
+    36: Munxar
+    37: Nadur
+    38: Naxxar
+    39: Paola
+    40: Pembroke
+    41: Pieta
+    42: Qala
+    43: Qormi
+    44: Qrendi
+    45: 'Rabat Gozo'
+    46: 'Rabat Malta'
+    47: Safi
+    48: 'San Giljan'
+    49: 'San Gwann'
+    50: 'San Lawrenz'
+    51: 'Saint Paul''s Bay'
+    52: Sannat
+    53: 'Santa Lucija'
+    54: 'Santa Venera'
+    55: Siggiewi
+    56: Sliema
+    57: Swiegi
+    58: 'Ta''Xbiex'
+    59: Tarxien
+    60: Valletta
+    61: Xaghra
+    62: Xewkija
+    63: Xghajra
+    64: Zabbar
+    65: 'Zebbug Gozo'
+    66: 'Zebbug Malta'
+    67: Zejtun
+    68: Zurrieg
diff --git a/uc_store/config/uc_store.country.MU.yml b/uc_store/config/uc_store.country.MU.yml
new file mode 100644
index 0000000..2f87bb9
--- /dev/null
+++ b/uc_store/config/uc_store.country.MU.yml
@@ -0,0 +1,24 @@
+iso2: MU
+iso3: MUS
+name: Mauritius
+numeric: 480
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AG: 'Agalega Islands'
+    BL: 'Black River'
+    BR: 'Beau Bassin-Rose'
+    CC: 'Saint Brandon Islands'
+    CU: Curepipe
+    FL: Flacq
+    GP: 'Grand Port'
+    MO: Moka
+    PA: Pamplemousses
+    PL: 'Port Louis'
+    PU: 'Port Louis'
+    PW: 'Plaines Wilhems'
+    QB: 'Quatre Bornes'
+    RO: 'Rodrigues Island'
+    RR: 'Riviere du Rempart'
+    SA: Savanne
+    VP: Vacoas-Phoenix
diff --git a/uc_store/config/uc_store.country.MV.yml b/uc_store/config/uc_store.country.MV.yml
new file mode 100644
index 0000000..a20efd3
--- /dev/null
+++ b/uc_store/config/uc_store.country.MV.yml
@@ -0,0 +1,27 @@
+iso2: MV
+iso3: MDV
+name: Maldives
+numeric: 462
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    MV-01: Seenu
+    MV-02: Alif
+    MV-03: Lhaviyani
+    MV-04: Vaavu
+    MV-05: Laamu
+    MV-07: 'Haa Alif'
+    MV-08: Thaa
+    MV-12: Meemu
+    MV-13: Raa
+    MV-14: Faafu
+    MV-17: Dhaalu
+    MV-20: Baa
+    MV-23: 'Haa Dhaalu'
+    MV-24: Shaviyani
+    MV-25: Noonu
+    MV-26: Kaafu
+    MV-27: 'Gaaf Alif'
+    MV-28: 'Gaafu Dhaalu'
+    MV-29: Gnaviyani
+    MV-MLE: Male
diff --git a/uc_store/config/uc_store.country.MW.yml b/uc_store/config/uc_store.country.MW.yml
new file mode 100644
index 0000000..3151332
--- /dev/null
+++ b/uc_store/config/uc_store.country.MW.yml
@@ -0,0 +1,35 @@
+iso2: MW
+iso3: MWI
+name: Malawi
+numeric: 454
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    MW-BA: Balaka
+    MW-BL: Blantyre
+    MW-CK: Chikwawa
+    MW-CR: Chiradzulu
+    MW-CT: Chitipa
+    MW-DE: Dedza
+    MW-DO: Dowa
+    MW-KR: Karonga
+    MW-KS: Kasungu
+    MW-LI: Lilongwe
+    MW-LK: Likoma
+    MW-MC: Mchinji
+    MW-MG: Mangochi
+    MW-MH: Machinga
+    MW-MU: Mulanje
+    MW-MW: Mwanza
+    MW-MZ: Mzimba
+    MW-NB: 'Nkhata Bay'
+    MW-NE: Neno
+    MW-NI: Ntchisi
+    MW-NK: Nkhotakota
+    MW-NS: Nsanje
+    MW-NU: Ntcheu
+    MW-PH: Phalombe
+    MW-RU: Rumphi
+    MW-SA: Salima
+    MW-TH: Thyolo
+    MW-ZO: Zomba
diff --git a/uc_store/config/uc_store.country.MX.yml b/uc_store/config/uc_store.country.MX.yml
new file mode 100644
index 0000000..1e347ce
--- /dev/null
+++ b/uc_store/config/uc_store.country.MX.yml
@@ -0,0 +1,39 @@
+iso2: MX
+iso3: MEX
+name: Mexico
+numeric: 484
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    AGS: Aguascalientes
+    BC: 'Baja California'
+    BCS: 'Baja California Sur'
+    CAM: Campeche
+    CHI: Chihuahua
+    CHIS: Chiapas
+    COAH: Coahuila
+    COL: Colima
+    DF: 'Distrito Federal'
+    DGO: Durango
+    GRO: Guerrero
+    GTO: Guanajuato
+    HGO: Hidalgo
+    JAL: Jalisco
+    ME: México
+    MICH: Michoacán
+    MOR: Morelos
+    NAY: Nayarit
+    NL: 'Nuevo León'
+    OAX: Oaxaca
+    PUE: Puebla
+    QR: 'Quintana Roo'
+    QUE: Querétaro
+    SIN: Sinaloa
+    SLP: 'San Luis Potosi'
+    SON: Sonora
+    TAB: Tabasco
+    TAM: Tamaulipas
+    TLA: Tlaxcala
+    VER: Veracruz
+    YUC: Yucatán
+    ZAC: Zacatecas
diff --git a/uc_store/config/uc_store.country.MY.yml b/uc_store/config/uc_store.country.MY.yml
new file mode 100644
index 0000000..b75c017
--- /dev/null
+++ b/uc_store/config/uc_store.country.MY.yml
@@ -0,0 +1,23 @@
+iso2: MY
+iso3: MYS
+name: Malaysia
+numeric: 458
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if"
+zones:
+    JHR: Johor
+    KDH: Kedah
+    KTN: Kelantan
+    KUL: 'Kuala Lumpur'
+    LBN: Labuan
+    MLK: Melaka
+    NSN: 'Negeri Sembilan'
+    PHG: Pahang
+    PJY: Putrajaya
+    PLS: Perlis
+    PNG: 'Pulau Pinang'
+    PRK: Perak
+    SBH: Sabah
+    SGR: Selangor
+    SRW: Sarawak
+    TRG: Terengganu
diff --git a/uc_store/config/uc_store.country.MZ.yml b/uc_store/config/uc_store.country.MZ.yml
new file mode 100644
index 0000000..0f8c6fd
--- /dev/null
+++ b/uc_store/config/uc_store.country.MZ.yml
@@ -0,0 +1,17 @@
+iso2: MZ
+iso3: MOZ
+name: Mozambique
+numeric: 508
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name\r\n!country_name"
+zones:
+    APL: Nampula
+    BEW: Sofala
+    CHI: Manica
+    INH: Inhambane
+    MPM: Maputo
+    POL: 'Cabo Delgado'
+    TCV: Tete
+    UEL: Zambezia
+    VJB: Gaza
+    VXC: Niassa
diff --git a/uc_store/config/uc_store.country.NA.yml b/uc_store/config/uc_store.country.NA.yml
new file mode 100644
index 0000000..f13acc4
--- /dev/null
+++ b/uc_store/config/uc_store.country.NA.yml
@@ -0,0 +1,20 @@
+iso2: NA
+iso3: NAM
+name: Namibia
+numeric: 516
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    NA-CA: Caprivi
+    NA-ER: Erongo
+    NA-HA: Hardap
+    NA-KA: Karas
+    NA-KH: Khomas
+    NA-KU: Kunene
+    NA-OD: Otjozondjupa
+    NA-OH: Omaheke
+    NA-OK: Okavango
+    NA-ON: Oshana
+    NA-OS: Omusati
+    NA-OT: Oshikoto
+    NA-OW: Ohangwena
diff --git a/uc_store/config/uc_store.country.NC.yml b/uc_store/config/uc_store.country.NC.yml
new file mode 100644
index 0000000..3c3af16
--- /dev/null
+++ b/uc_store/config/uc_store.country.NC.yml
@@ -0,0 +1,6 @@
+iso2: NC
+iso3: NCL
+name: 'New Caledonia'
+numeric: 540
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.NE.yml b/uc_store/config/uc_store.country.NE.yml
new file mode 100644
index 0000000..254ab32
--- /dev/null
+++ b/uc_store/config/uc_store.country.NE.yml
@@ -0,0 +1,15 @@
+iso2: NE
+iso3: NER
+name: Niger
+numeric: 562
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    NE-1: Agadez
+    NE-2: Diffa
+    NE-3: Dosso
+    NE-4: Maradi
+    NE-5: 'Tahoua '
+    NE-6: Tillabéri
+    NE-7: Zinder
+    NE-8: Niamey
diff --git a/uc_store/config/uc_store.country.NF.yml b/uc_store/config/uc_store.country.NF.yml
new file mode 100644
index 0000000..d515f6b
--- /dev/null
+++ b/uc_store/config/uc_store.country.NF.yml
@@ -0,0 +1,6 @@
+iso2: NF
+iso3: NFK
+name: 'Norfolk Island'
+numeric: 574
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.NG.yml b/uc_store/config/uc_store.country.NG.yml
new file mode 100644
index 0000000..b2ca701
--- /dev/null
+++ b/uc_store/config/uc_store.country.NG.yml
@@ -0,0 +1,44 @@
+iso2: NG
+iso3: NGA
+name: Nigeria
+numeric: 566
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city - !postal_code\r\n!zone_code\r\n!country_name_if"
+zones:
+    AB: Abia
+    AD: Adamawa
+    AK: 'Akwa Ibom'
+    AN: Anambra
+    BA: Bauchi
+    BN: Benue
+    BO: Borno
+    BY: Bayelsa
+    CR: 'Cross River'
+    DT: Delta
+    EB: Ebonyi
+    ED: Edo
+    EK: Ekiti
+    EN: Enugu
+    FC: 'FCT - Abuja'
+    GB: Gombe
+    IM: Imo
+    JG: Jigawa
+    KB: Kebbi
+    KD: Kaduna
+    KG: Kogi
+    KN: Kano
+    KT: Katsina
+    KW: Kwara
+    LA: Lagos
+    NG: Niger
+    NS: Nassarawa
+    OG: Ogun
+    ON: Ondo
+    OS: Osun
+    OY: Oyo
+    PL: Plateau
+    RV: Rivers
+    SO: Sokoto
+    TB: Taraba
+    YB: Yobe
+    ZM: Zamfara
diff --git a/uc_store/config/uc_store.country.NI.yml b/uc_store/config/uc_store.country.NI.yml
new file mode 100644
index 0000000..748b54e
--- /dev/null
+++ b/uc_store/config/uc_store.country.NI.yml
@@ -0,0 +1,24 @@
+iso2: NI
+iso3: NIC
+name: Nicaragua
+numeric: 558
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AN: 'Atlantico Norte'
+    AS: 'Atlantico Sur'
+    BO: Boaco
+    CA: Carazo
+    CI: Chinandega
+    CO: Chontales
+    ES: Esteli
+    GR: Granada
+    JI: Jinotega
+    LE: Leon
+    MD: Madriz
+    MN: Managua
+    MS: Masaya
+    MT: Matagalpa
+    NS: 'Nueva Segovia'
+    RI: Rivas
+    SJ: 'Rio San Juan'
diff --git a/uc_store/config/uc_store.country.NL.yml b/uc_store/config/uc_store.country.NL.yml
new file mode 100644
index 0000000..a66b67c
--- /dev/null
+++ b/uc_store/config/uc_store.country.NL.yml
@@ -0,0 +1,19 @@
+iso2: NL
+iso3: NLD
+name: Netherlands
+numeric: 528
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    DRE: Drenthe
+    FLD: Flevoland
+    FRL: Friesland
+    GLD: Gelderland
+    GRO: Groningen
+    LIM: Limburg
+    NBR: Noord-Brabant
+    NHL: Noord-Holland
+    OVE: Overijssel
+    UTR: Utrecht
+    ZHL: Zuid-Holland
+    ZLD: Zeeland
diff --git a/uc_store/config/uc_store.country.NO.yml b/uc_store/config/uc_store.country.NO.yml
new file mode 100644
index 0000000..527ff32
--- /dev/null
+++ b/uc_store/config/uc_store.country.NO.yml
@@ -0,0 +1,27 @@
+iso2: NO
+iso3: NOR
+name: Norway
+numeric: 578
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    AA: Aust-Agder
+    AK: Akershus
+    BU: Buskerud
+    FM: Finnmark
+    HL: Hordaland
+    HM: Hedmark
+    MR: 'More og Romdal'
+    NL: Nordland
+    NT: Nord-Trondelag
+    OF: Ostfold
+    OL: Oslo
+    OP: Oppland
+    RL: Rogaland
+    SJ: 'Sogn og Fjordane'
+    ST: Sor-Trondelag
+    SV: Svalbard
+    TM: Telemark
+    TR: Troms
+    VA: Vest-Agder
+    VF: Vestfold
diff --git a/uc_store/config/uc_store.country.NP.yml b/uc_store/config/uc_store.country.NP.yml
new file mode 100644
index 0000000..db8af53
--- /dev/null
+++ b/uc_store/config/uc_store.country.NP.yml
@@ -0,0 +1,26 @@
+iso2: NP
+iso3: NPL
+name: Nepal
+numeric: 524
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    1: Madhyamanchal
+    2: 'Madhya Pashchimanchal'
+    3: Pashchimanchal
+    4: Purwanchal
+    5: 'Sudur Pashchimanchal'
+    BA: Bagmati
+    BH: Bheri
+    DH: Dhawalagiri
+    GA: Gandaki
+    JA: Janakpur
+    KA: Karnali
+    KO: Koshi
+    LU: Lumbini
+    MA: Mahakali
+    ME: Mechi
+    NA: Narayani
+    RA: Rapti
+    SA: Sagarmatha
+    SE: Seti
diff --git a/uc_store/config/uc_store.country.NR.yml b/uc_store/config/uc_store.country.NR.yml
new file mode 100644
index 0000000..585f0ee
--- /dev/null
+++ b/uc_store/config/uc_store.country.NR.yml
@@ -0,0 +1,21 @@
+iso2: NR
+iso3: NRU
+name: Nauru
+numeric: 520
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    NR-01: Aiwo
+    NR-02: Anabar
+    NR-03: Anetan
+    NR-04: Anibare
+    NR-05: Baiti
+    NR-06: Boe
+    NR-07: Buada
+    NR-08: Denigomodu
+    NR-09: Ewa
+    NR-10: Ijuw
+    NR-11: Meneng
+    NR-12: Nibok
+    NR-13: Uaboe
+    NR-14: Yaren
diff --git a/uc_store/config/uc_store.country.NU.yml b/uc_store/config/uc_store.country.NU.yml
new file mode 100644
index 0000000..752b76c
--- /dev/null
+++ b/uc_store/config/uc_store.country.NU.yml
@@ -0,0 +1,6 @@
+iso2: NU
+iso3: NIU
+name: Niue
+numeric: 570
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.NZ.yml b/uc_store/config/uc_store.country.NZ.yml
new file mode 100644
index 0000000..4dc2ec3
--- /dev/null
+++ b/uc_store/config/uc_store.country.NZ.yml
@@ -0,0 +1,26 @@
+iso2: NZ
+iso3: NZL
+name: 'New Zealand'
+numeric: 554
+status: 0
+format: "!first_name !last_name\r\n!company\r\n!street1\r\n!street2\r\n!city !postal_code\r\n!country_name_if"
+zones:
+    AUK: Auckland
+    BOP: 'Bay of Plenty'
+    CAN: Canterbury
+    COR: Coromandel
+    FIO: Fiordland
+    GIS: Gisborne
+    HKB: 'Hawke''s Bay'
+    MBH: Marlborough
+    MCM: 'Mt Cook-Mackenzie'
+    MWT: Manawatu-Wanganui
+    NSN: Nelson
+    NTL: Northland
+    OTA: Otago
+    STL: Southland
+    TKI: Taranaki
+    WAI: Wairarapa
+    WGN: Wellington
+    WKO: Waikato
+    WTC: 'West Coast'
diff --git a/uc_store/config/uc_store.country.OM.yml b/uc_store/config/uc_store.country.OM.yml
new file mode 100644
index 0000000..0fd6007
--- /dev/null
+++ b/uc_store/config/uc_store.country.OM.yml
@@ -0,0 +1,15 @@
+iso2: OM
+iso3: OMN
+name: Oman
+numeric: 512
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city\r\n!zone_name, !country_name_if"
+zones:
+    BA: 'Al Batinah'
+    DA: 'Ad Dakhiliyah'
+    JA: 'Al Janubiyah'
+    MA: Masqat
+    MU: Musandam
+    SH: 'Ash Sharqiyah'
+    WU: 'Al Wusta'
+    ZA: 'Az Zahirah'
diff --git a/uc_store/config/uc_store.country.PA.yml b/uc_store/config/uc_store.country.PA.yml
new file mode 100644
index 0000000..5f3a452
--- /dev/null
+++ b/uc_store/config/uc_store.country.PA.yml
@@ -0,0 +1,17 @@
+iso2: PA
+iso3: PAN
+name: Panama
+numeric: 591
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    - 'Comarca de San Blas'
+    - 'Bocas del Toro'
+    - Cocle
+    - Colon
+    - Chiriqui
+    - Darien
+    - Herrera
+    - 'Los Santos'
+    - Panama
+    - Veraguas
diff --git a/uc_store/config/uc_store.country.PE.yml b/uc_store/config/uc_store.country.PE.yml
new file mode 100644
index 0000000..2bbcd48
--- /dev/null
+++ b/uc_store/config/uc_store.country.PE.yml
@@ -0,0 +1,32 @@
+iso2: PE
+iso3: PER
+name: Peru
+numeric: 604
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AMA: Amazonas
+    ANC: Ancash
+    APU: Apurímac
+    ARE: Arequipa
+    AYA: Ayacucho
+    CAJ: Cajamarca
+    CAL: Callao
+    CUS: Cusco
+    HUC: Huánuco
+    HUV: Huancavelica
+    ICA: Ica
+    JUN: Junín
+    LAL: 'La Libertad'
+    LAM: Lambayeque
+    LIM: Lima
+    LOR: Loreto
+    MDD: 'Madre de Dios'
+    MOQ: Moquegua
+    PAS: Pasco
+    PIU: Piura
+    PUN: Puno
+    SAM: 'San Martín'
+    TAC: Tacna
+    TUM: Tumbes
+    UCA: Ucayali
diff --git a/uc_store/config/uc_store.country.PF.yml b/uc_store/config/uc_store.country.PF.yml
new file mode 100644
index 0000000..d2e85c6
--- /dev/null
+++ b/uc_store/config/uc_store.country.PF.yml
@@ -0,0 +1,6 @@
+iso2: PF
+iso3: PYF
+name: 'French Polynesia'
+numeric: 258
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.PG.yml b/uc_store/config/uc_store.country.PG.yml
new file mode 100644
index 0000000..2896aae
--- /dev/null
+++ b/uc_store/config/uc_store.country.PG.yml
@@ -0,0 +1,27 @@
+iso2: PG
+iso3: PNG
+name: 'Papua New Guinea'
+numeric: 598
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    CPK: Chimbu
+    CPM: Central
+    EBR: 'East New Britain'
+    EHG: 'Eastern Highlands'
+    EPW: Enga
+    ESW: 'East Sepik'
+    GPK: Gulf
+    MBA: 'Milne Bay'
+    MPL: Morobe
+    MPM: Madang
+    MRL: Manus
+    NCD: 'National Capital District (Port Moresby)'
+    NIK: 'New Ireland'
+    NPP: Northern
+    NSA: 'North Solomons'
+    SAN: 'Sandaun [West Sepik]'
+    SHM: 'Southern Highlands'
+    WBK: 'West New Britain'
+    WHM: 'Western Highlands'
+    WPD: Western
diff --git a/uc_store/config/uc_store.country.PH.yml b/uc_store/config/uc_store.country.PH.yml
new file mode 100644
index 0000000..eaeb34a
--- /dev/null
+++ b/uc_store/config/uc_store.country.PH.yml
@@ -0,0 +1,89 @@
+iso2: PH
+iso3: PHL
+name: Philippines
+numeric: 608
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if"
+zones:
+    ABR: Abra
+    AKL: Aklan
+    ALB: Albay
+    ANO: 'Agusan del Norte'
+    ANT: Antique
+    APY: Apayao
+    ASU: 'Agusan del Sur'
+    AUR: Aurora
+    BAS: Basilan
+    BEN: Benguet
+    BLR: Biliran
+    BOL: Bohol
+    BTA: Bataan
+    BTE: Batanes
+    BTG: Batangas
+    BUK: Bukidnon
+    BUL: Bulacan
+    CAG: Cagayan
+    CAM: Camiguin
+    CAP: Capiz
+    CAT: Catanduanes
+    CAV: Cavite
+    CEB: Cebu
+    CMP: 'Compostela Valley'
+    CNO: 'Camarines Norte'
+    CSU: 'Camarines Sur'
+    DGI: 'Dinagat Islands'
+    DNO: 'Davao del Norte'
+    DOR: 'Davao Oriental'
+    DSU: 'Davao del Sur'
+    ESA: 'Eastern Samar'
+    GUI: Guimaras
+    IFU: Ifugao
+    ILO: Iloilo
+    INO: 'Ilocos Norte'
+    ISA: Isabela
+    ISU: 'Ilocos Sur'
+    KAL: Kalinga
+    LAG: Laguna
+    LEY: Leyte
+    LNO: 'Lanao del Norte'
+    LSU: 'Lanao del Sur'
+    MAG: Maguindanao
+    MIC: 'Mindoro Occidental'
+    MIR: 'Mindoro Oriental'
+    MLA: 'Metro Manila'
+    MOP: 'Mountain Province'
+    MOR: 'Misamis Oriental'
+    MRN: Marinduque
+    MSB: Masbate
+    MSC: 'Misamis Occidental'
+    NCT: 'North Cotabato'
+    NEC: 'Nueva Ecija'
+    NOC: 'Negros Occidental'
+    NOR: 'Negros Oriental'
+    NSM: 'Northern Samar'
+    NVZ: 'Nueva Vizcaya'
+    PLW: Palawan
+    PMP: Pampanga
+    PNG: Pangasinan
+    QRN: Quirino
+    QZN: Quezon
+    RIZ: Rizal
+    ROM: Romblon
+    SCO: 'South Cotabato'
+    SHK: 'Shariff Kabunsuan'
+    SKU: 'Sultan Kudarat'
+    SLE: 'Southern Leyte'
+    SLU: Sulu
+    SMR: Samar
+    SNO: 'Surigao del Norte'
+    SQJ: Siquijor
+    SRG: Sarangani
+    SRS: Sorsogon
+    SSU: 'Surigao del Sur'
+    TAR: Tarlac
+    TAW: Tawi-Tawi
+    UNI: 'La Union'
+    ZBL: Zambales
+    ZNO: 'Zamboanga del Norte'
+    ZSI: 'Zamboanga Sibugay'
+    ZSU: 'Zamboanga del Sur'
diff --git a/uc_store/config/uc_store.country.PK.yml b/uc_store/config/uc_store.country.PK.yml
new file mode 100644
index 0000000..10e805a
--- /dev/null
+++ b/uc_store/config/uc_store.country.PK.yml
@@ -0,0 +1,11 @@
+iso2: PK
+iso3: PAK
+name: Pakistan
+numeric: 586
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code\r\n!country_name_if"
+zones:
+    BL: Balochistan
+    NW: N.W.F.P
+    PB: Punjab
+    SN: Sindh
diff --git a/uc_store/config/uc_store.country.PL.yml b/uc_store/config/uc_store.country.PL.yml
new file mode 100644
index 0000000..4bf9636
--- /dev/null
+++ b/uc_store/config/uc_store.country.PL.yml
@@ -0,0 +1,23 @@
+iso2: PL
+iso3: POL
+name: Poland
+numeric: 616
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if"
+zones:
+    DO: Dolnośląskie
+    KP: Kujawsko-Pomorskie
+    LL: Lubelskie
+    LO: Łódzkie
+    LU: Lubuskie
+    ML: Małopolskie
+    MZ: Mazowieckie
+    OP: Opolskie
+    PL: Podlaskie
+    PM: Pomorskie
+    PP: Podkarpackie
+    SL: Śląskie
+    SW: Świętokrzyskie
+    WM: Warmińsko-Mazurskie
+    WP: Wielkopolskie
+    ZA: Zachodniopomorskie
diff --git a/uc_store/config/uc_store.country.PM.yml b/uc_store/config/uc_store.country.PM.yml
new file mode 100644
index 0000000..9b98622
--- /dev/null
+++ b/uc_store/config/uc_store.country.PM.yml
@@ -0,0 +1,6 @@
+iso2: PM
+iso3: SPM
+name: 'Saint Pierre and Miquelon'
+numeric: 666
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.PN.yml b/uc_store/config/uc_store.country.PN.yml
new file mode 100644
index 0000000..4989fba
--- /dev/null
+++ b/uc_store/config/uc_store.country.PN.yml
@@ -0,0 +1,6 @@
+iso2: PN
+iso3: PCN
+name: Pitcairn
+numeric: 612
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.PR.yml b/uc_store/config/uc_store.country.PR.yml
new file mode 100644
index 0000000..1f202e8
--- /dev/null
+++ b/uc_store/config/uc_store.country.PR.yml
@@ -0,0 +1,6 @@
+iso2: PR
+iso3: PRI
+name: 'Puerto Rico'
+numeric: 630
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.PS.yml b/uc_store/config/uc_store.country.PS.yml
new file mode 100644
index 0000000..3f8fd9a
--- /dev/null
+++ b/uc_store/config/uc_store.country.PS.yml
@@ -0,0 +1,6 @@
+iso2: PS
+iso3: PSE
+name: 'Palestinian Territory, Occupied'
+numeric: 275
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.PT.yml b/uc_store/config/uc_store.country.PT.yml
new file mode 100644
index 0000000..e0c4bbe
--- /dev/null
+++ b/uc_store/config/uc_store.country.PT.yml
@@ -0,0 +1,27 @@
+iso2: PT
+iso3: PRT
+name: Portugal
+numeric: 620
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name\r\n!country_name"
+zones:
+    ACO: 'Reg. Autónoma Açores'
+    AVE: Aveiro
+    BEJ: Beja
+    BGA: Bragança
+    BRA: Braga
+    CAB: 'Castelo Branco'
+    COI: Coimbra
+    EVO: Évora
+    FAR: Faro
+    GUA: Guarda
+    LEI: Leiria
+    LIS: Lisboa
+    MAD: 'Reg. Autónoma Madeira'
+    POR: Porto
+    PTL: Portalegre
+    SET: Setúbal
+    STR: Santarém
+    VIC: 'Viana do Castelo'
+    VIR: 'Vila Real'
+    VIS: Viseu
diff --git a/uc_store/config/uc_store.country.PW.yml b/uc_store/config/uc_store.country.PW.yml
new file mode 100644
index 0000000..b730227
--- /dev/null
+++ b/uc_store/config/uc_store.country.PW.yml
@@ -0,0 +1,23 @@
+iso2: PW
+iso3: PLW
+name: Palau
+numeric: 585
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    PW-002: Aimeliik
+    PW-004: Airai
+    PW-010: Angaur
+    PW-050: Hatobohei
+    PW-100: Kayangel
+    PW-150: Koror
+    PW-212: Melekeok
+    PW-214: Ngaraard
+    PW-218: Ngarchelong
+    PW-222: Ngardmau
+    PW-224: Ngatpang
+    PW-226: Ngchesar
+    PW-227: Ngeremlengui
+    PW-228: Ngiwal
+    PW-350: Peleliu
+    PW-370: Sonsorol
diff --git a/uc_store/config/uc_store.country.PY.yml b/uc_store/config/uc_store.country.PY.yml
new file mode 100644
index 0000000..df0c423
--- /dev/null
+++ b/uc_store/config/uc_store.country.PY.yml
@@ -0,0 +1,25 @@
+iso2: PY
+iso3: PRY
+name: Paraguay
+numeric: 600
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    PY-01: Concepción
+    PY-02: 'San Pedro'
+    PY-03: Cordillera
+    PY-04: Guairá
+    PY-05: Caaguazú
+    PY-06: Caazapá
+    PY-07: Itapúa
+    PY-08: Misiones
+    PY-09: Paraguarí
+    PY-10: 'Alto Paraná'
+    PY-11: Central
+    PY-12: Ñeembucú
+    PY-13: Amambay
+    PY-14: Canindeyú
+    PY-15: 'Presidente Hayes'
+    PY-16: 'Alto Paraguay'
+    PY-19: Boquerón
+    PY-ASU: Asunción
diff --git a/uc_store/config/uc_store.country.QA.yml b/uc_store/config/uc_store.country.QA.yml
new file mode 100644
index 0000000..baa2b39
--- /dev/null
+++ b/uc_store/config/uc_store.country.QA.yml
@@ -0,0 +1,16 @@
+iso2: QA
+iso3: QAT
+name: Qatar
+numeric: 634
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    QA-DA: 'Ad Dawḩah'
+    QA-GH: 'Al Ghuwayrīyah'
+    QA-JB: 'Jarīyān al Bāţnah'
+    QA-JU: 'Al Jumaylīyah'
+    QA-KH: 'Al Khawr'
+    QA-MS: 'Madīnat ash Shamāl'
+    QA-RA: 'Ar Rayyān'
+    QA-US: 'Umm Şalāl'
+    QA-WA: 'Al Wakrah'
diff --git a/uc_store/config/uc_store.country.RE.yml b/uc_store/config/uc_store.country.RE.yml
new file mode 100644
index 0000000..b04d4f6
--- /dev/null
+++ b/uc_store/config/uc_store.country.RE.yml
@@ -0,0 +1,6 @@
+iso2: RE
+iso3: REU
+name: Réunion
+numeric: 638
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.RO.yml b/uc_store/config/uc_store.country.RO.yml
new file mode 100644
index 0000000..04491de
--- /dev/null
+++ b/uc_store/config/uc_store.country.RO.yml
@@ -0,0 +1,49 @@
+iso2: RO
+iso3: ROU
+name: Romania
+numeric: 642
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !postal_code\r\n!zone_name, !country_name_if"
+zones:
+    AB: Alba
+    AG: Arges
+    AR: Arad
+    B: Bucuresti
+    BC: Bacau
+    BH: Bihor
+    BN: Bistrita-Nasaud
+    BR: Braila
+    BT: Botosani
+    BV: Brasov
+    BZ: Buzau
+    CJ: Cluj
+    CL: Calarasi
+    CS: Caras-Severin
+    CT: Constanta
+    CV: Covasna
+    DB: Dimbovita
+    DJ: Dolj
+    GJ: Gorj
+    GL: Galati
+    GR: Giurgiu
+    HD: Hunedoara
+    HR: Harghita
+    IF: Ilfov
+    IL: Ialomita
+    IS: Iasi
+    MH: Mehedinti
+    MM: Maramures
+    MS: Mures
+    NT: Neamt
+    OT: Olt
+    PH: Prahova
+    SB: Sibiu
+    SJ: Salaj
+    SM: Satu-Mare
+    SV: Suceava
+    TL: Tulcea
+    TM: Timis
+    TR: Teleorman
+    VL: Valcea
+    VN: Vrancea
+    VS: Vaslui
diff --git a/uc_store/config/uc_store.country.RS.yml b/uc_store/config/uc_store.country.RS.yml
new file mode 100644
index 0000000..8d6c1dc
--- /dev/null
+++ b/uc_store/config/uc_store.country.RS.yml
@@ -0,0 +1,39 @@
+iso2: RS
+iso3: SRB
+name: Serbia
+numeric: 688
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '00': Beograd
+    '01': 'Severna Backa'
+    '02': 'Srednji Banat'
+    '03': 'Severni Banat'
+    '04': 'Juzni Banat'
+    '05': 'Zapadna Backa'
+    '06': 'Juzna Backa'
+    '07': Srem
+    '08': Macva
+    '09': Kolubara
+    10: Podunavlje
+    11: Barnicevo
+    12: Sumadija
+    13: Pomoravlje
+    14: Bor
+    15: Zajecar
+    16: Zlatibor
+    17: Moravica
+    18: Raska
+    19: Rasina
+    20: Nisava
+    21: Toplica
+    22: Pirot
+    23: Jablanica
+    24: Pcinja
+    25: Kosovo
+    26: Pec
+    27: Prizren
+    28: 'Kosovska Mitrovica'
+    29: Kosovo-Pomoravlje
+    KM: Kosovo-Metohija
+    VO: Vojvodina
diff --git a/uc_store/config/uc_store.country.RU.yml b/uc_store/config/uc_store.country.RU.yml
new file mode 100644
index 0000000..21ac8c3
--- /dev/null
+++ b/uc_store/config/uc_store.country.RU.yml
@@ -0,0 +1,90 @@
+iso2: RU
+iso3: RUS
+name: Russia
+numeric: 643
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    AD: 'Республика Адыгея'
+    AL: 'Республика Алтай'
+    ALT: 'Алтайский край'
+    AMU: 'Амурская область'
+    ARK: 'Архангельская область'
+    AST: 'Астраханская область'
+    BA: 'Республика Башкортостан'
+    BEL: 'Белгородская область'
+    BRY: 'Брянская область'
+    BU: 'Республика Бурятия'
+    CE: 'Чеченская республика'
+    CHE: 'Челябинская область'
+    CHU: 'Чукотский автономный округ'
+    CU: 'Чувашская Республика'
+    DA: 'Республика Дагестан'
+    IN: 'Республика Ингушетия'
+    IRK: 'Иркутская область'
+    IVA: 'Ивановская область'
+    KAM: 'Камчатский край'
+    KB: 'Кабардино-Балкарская Республика'
+    KC: 'Карачаево-Черкесская республика'
+    KDA: 'Краснодарский край'
+    KEM: 'Кемеровская область'
+    KGD: 'Калининградская область'
+    KGN: 'Курганская область'
+    KHA: 'Хабаровский край'
+    KHM: 'Ханты-Мансийский автономный округ - Югра'
+    KIA: 'Красноярский край'
+    KIR: 'Кировская область'
+    KK: 'Республика Хакасия'
+    KL: 'Республика Калмыкия'
+    KLU: 'Калужская область'
+    KO: 'Республика Коми'
+    KOS: 'Костромская область'
+    KR: 'Республика Карелия'
+    KRS: 'Курская область'
+    LEN: 'Ленинградская область'
+    LIP: 'Липецкая область'
+    MAG: 'Магаданская область'
+    ME: 'Республика Марий Эл'
+    MO: 'Республика Мордовия'
+    MOS: 'Московская область'
+    MOW: Москва
+    MUR: 'Мурманская область'
+    NEN: 'Ненецкий автономный округ'
+    NGR: 'Новгородская область'
+    NIZ: 'Нижегородская область'
+    NVS: 'Новосибирская область'
+    OMS: 'Омская область'
+    ORE: 'Оренбургская область'
+    ORL: 'Орловская область'
+    PER: 'Пермский край'
+    PNZ: 'Пензенская область'
+    PRI: 'Приморский край'
+    PSK: 'Псковская область'
+    ROS: 'Ростовская область'
+    RYA: 'Рязанская область'
+    SA: 'Республика Саха (Якутия)'
+    SAK: 'Сахалинская область'
+    SAM: 'Самарская область'
+    SAR: 'Саратовская область'
+    SE: 'Республика Северная Осетия-Алания'
+    SMO: 'Смоленская область'
+    SPE: Санкт-Петербург
+    STA: 'Ставропольский край'
+    SVE: 'Свердловская область'
+    TA: 'Республика Татарстан'
+    TAM: 'Тамбовская область'
+    TOM: 'Томская область'
+    TUL: 'Тульская область'
+    TVE: 'Тверская область'
+    TY: 'Республика Тыва'
+    TYU: 'Тюменская область'
+    UD: 'Удмуртская Республика'
+    ULY: 'Ульяновская область'
+    VGG: 'Волгоградская область'
+    VLA: 'Владимирская область'
+    VLG: 'Вологодская область'
+    VOR: 'Воронежская область'
+    YAN: 'Ямало-Ненецкий автономный округ'
+    YAR: 'Ярославская область'
+    YEV: 'Еврейская автономная область'
+    ZAB: 'Забайкальский край'
diff --git a/uc_store/config/uc_store.country.RW.yml b/uc_store/config/uc_store.country.RW.yml
new file mode 100644
index 0000000..4e3f652
--- /dev/null
+++ b/uc_store/config/uc_store.country.RW.yml
@@ -0,0 +1,12 @@
+iso2: RW
+iso3: RWA
+name: Rwanda
+numeric: 646
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    RW-01: 'Ville de Kigali'
+    RW-02: Est
+    RW-03: Nord
+    RW-04: Ouest
+    RW-05: Sud
diff --git a/uc_store/config/uc_store.country.SA.yml b/uc_store/config/uc_store.country.SA.yml
new file mode 100644
index 0000000..717c3e3
--- /dev/null
+++ b/uc_store/config/uc_store.country.SA.yml
@@ -0,0 +1,20 @@
+iso2: SA
+iso3: SAU
+name: 'Saudi Arabia'
+numeric: 682
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !postal_code\r\n!country_name_if"
+zones:
+    'AL BAHAH': 'Al Bahah'
+    'AL JAWF': 'Al Jawf'
+    'AL MADINAH': 'Al Madinah'
+    'AL QASIM': 'Al Qasim'
+    'AL RIYADH': 'Al Riyadh'
+    ASIR: Asir
+    'EASTERN PROVINCE': 'Eastern Province'
+    HAIL: Hail
+    JIZAN: Jizan
+    MAKKAH: Makkah
+    NAJRAN: Najran
+    'NORTHERN BORDER': 'Northern Border'
+    TABUK: Tabuk
diff --git a/uc_store/config/uc_store.country.SB.yml b/uc_store/config/uc_store.country.SB.yml
new file mode 100644
index 0000000..d0ed879
--- /dev/null
+++ b/uc_store/config/uc_store.country.SB.yml
@@ -0,0 +1,17 @@
+iso2: SB
+iso3: SLB
+name: 'Solomon Islands'
+numeric: 90
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    SB-CE: Central
+    SB-CH: Choiseul
+    SB-CT: 'Capital Territory (Honiara)'
+    SB-GU: Guadalcanal
+    SB-IS: Isabel
+    SB-MK: Makira
+    SB-ML: Malaita
+    SB-RB: 'Rennell and Bellona'
+    SB-TE: Temotu
+    SB-WE: Western
diff --git a/uc_store/config/uc_store.country.SC.yml b/uc_store/config/uc_store.country.SC.yml
new file mode 100644
index 0000000..1473895
--- /dev/null
+++ b/uc_store/config/uc_store.country.SC.yml
@@ -0,0 +1,30 @@
+iso2: SC
+iso3: SYC
+name: Seychelles
+numeric: 690
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '01': 'Anse aux Pins'
+    '02': 'Anse Boileau'
+    '03': 'Anse Etoile'
+    '04': 'Anse Louis'
+    '05': 'Anse Royale'
+    '06': 'Baie Lazare'
+    '07': 'Baie Sainte Anne'
+    '08': 'Beau Vallon'
+    '09': 'Bel Air'
+    10: 'Bel Ombre'
+    11: Cascade
+    12: Glacis
+    13: 'Grand'' Anse Mahe'
+    14: 'Grand'' Anse Praslin'
+    15: 'La Digue'
+    16: 'La Riviere Anglaise'
+    17: 'Mont Buxton'
+    18: 'Mont Fleuri'
+    19: Plaisance
+    20: 'Pointe La Rue'
+    21: 'Port Glaud'
+    22: 'Saint Louis'
+    23: Takamaka
diff --git a/uc_store/config/uc_store.country.SD.yml b/uc_store/config/uc_store.country.SD.yml
new file mode 100644
index 0000000..3b8f180
--- /dev/null
+++ b/uc_store/config/uc_store.country.SD.yml
@@ -0,0 +1,32 @@
+iso2: SD
+iso3: SDN
+name: Sudan
+numeric: 736
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    SD-01: 'Ash Shamālīyah'
+    SD-02: 'Shamāl Dārfūr'
+    SD-03: 'Al Kharţūm'
+    SD-04: 'An Nīl'
+    SD-05: Kassalā
+    SD-06: 'Al Qaḑārif'
+    SD-07: 'Al Jazīrah'
+    SD-08: 'An Nīl al Abyaḑ'
+    SD-09: 'Shamāl Kurdufān'
+    SD-11: 'Janūb Dārfūr'
+    SD-12: 'Gharb Dārfūr'
+    SD-13: 'Janūb Kurdufān'
+    SD-14: 'Gharb Baḩr al Ghazāl'
+    SD-15: 'Shamāl Baḩr al Ghazāl'
+    SD-16: 'Gharb al Istiwā''īyah'
+    SD-17: 'Baḩr al Jabal'
+    SD-18: 'Al Buḩayrāt'
+    SD-19: 'Sharq al Istiwā''īyah'
+    SD-20: Jūnqalī
+    SD-21: Wārāb
+    SD-22: 'Al Waḩdah'
+    SD-23: 'Ā''ٰālī an Nīl'
+    SD-24: 'An Nīl al Azraq'
+    SD-25: Sinnār
+    SD-26: 'Al Baḩr al Aḩmar'
diff --git a/uc_store/config/uc_store.country.SE.yml b/uc_store/config/uc_store.country.SE.yml
new file mode 100644
index 0000000..417855c
--- /dev/null
+++ b/uc_store/config/uc_store.country.SE.yml
@@ -0,0 +1,28 @@
+iso2: SE
+iso3: SWE
+name: Sweden
+numeric: 752
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code !city\r\n!country_name_if"
+zones:
+    BL: Blekinge
+    DA: Dalarna
+    GA: Gavleborg
+    GO: Gotland
+    HA: Halland
+    JA: Jamtland
+    JO: Jonkoping
+    KA: Kalmar
+    KR: Kronoberg
+    NO: Norrbotten
+    OR: Orebro
+    OS: Ostergotland
+    SK: Skane
+    SO: Sodermanland
+    ST: Stockholm
+    UP: Uppsala
+    VB: Vasterbotten
+    VG: 'Vastra Gotaland'
+    VL: Varmland
+    VM: Vastmanland
+    VN: Vasternorrland
diff --git a/uc_store/config/uc_store.country.SG.yml b/uc_store/config/uc_store.country.SG.yml
new file mode 100644
index 0000000..68ae835
--- /dev/null
+++ b/uc_store/config/uc_store.country.SG.yml
@@ -0,0 +1,6 @@
+iso2: SG
+iso3: SGP
+name: Singapore
+numeric: 702
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!country_name, !postal_code"
diff --git a/uc_store/config/uc_store.country.SH.yml b/uc_store/config/uc_store.country.SH.yml
new file mode 100644
index 0000000..5f6ba60
--- /dev/null
+++ b/uc_store/config/uc_store.country.SH.yml
@@ -0,0 +1,6 @@
+iso2: SH
+iso3: SHN
+name: 'Saint Helena, Ascension and Tristan da Cunha'
+numeric: 654
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.SI.yml b/uc_store/config/uc_store.country.SI.yml
new file mode 100644
index 0000000..585086c
--- /dev/null
+++ b/uc_store/config/uc_store.country.SI.yml
@@ -0,0 +1,199 @@
+iso2: SI
+iso3: SVN
+name: Slovenia
+numeric: 705
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '002': Beltinci
+    '003': Bled
+    '004': Bohinj
+    '005': Borovnica
+    '006': Bovec
+    '007': Brda
+    '008': Brezovica
+    '009': Brezice
+    '010': Tisina
+    '011': Celje
+    '012': 'Cerklje na Gorenjskem'
+    '013': Cerknica
+    '014': Cerkno
+    '015': Crensovci
+    '016': 'Crna na Koroskem'
+    '017': Crnomelj
+    '018': Destrnik
+    '019': Divaca
+    '020': Dobrepolje
+    '021': 'Dobrova-Horjul-Polhov Gradec'
+    '022': 'Dol pri Ljublijani'
+    '023': Domzale
+    '024': Dornava
+    '025': Dravograd
+    '026': Duplek
+    '027': 'Gorenja vas-Poljane'
+    '028': Gorisnica
+    '029': 'Gornja Radgona'
+    '030': 'Gornji Grad'
+    '031': 'Gornji Petrovci'
+    '032': Grosuplje
+    '033': Salovci
+    '034': Hrastnik
+    '035': Hrpelje-Kozina
+    '036': Idrija
+    '037': Ig
+    '038': 'Illirska Bistrica'
+    '039': 'Ivancna Gorica'
+    '040': Izola/Isola
+    '041': Jesenice
+    '042': Jursinci
+    '043': Kamnik
+    '044': Kanal
+    '045': Kidricevo
+    '046': Kobarid
+    '047': Kobilje
+    '048': Kocevje
+    '049': Komen
+    '050': Koper/Capodistria
+    '051': Kozje
+    '052': Kranj
+    '053': 'Kranjska Gora'
+    '054': Krsko
+    '055': Kungota
+    '056': Kuzma
+    '057': Lasko
+    '058': Lenart
+    '059': Lendava
+    '060': Litija
+    '061': Ljubljana
+    '062': Ljubno
+    '063': Ljutomer
+    '064': Logatec
+    '065': 'Loska Dolina'
+    '066': 'Loski Potok'
+    '067': Luce
+    '068': Lukovica
+    '069': Majsperk
+    '070': Maribor
+    '071': Medvode
+    '072': Menges
+    '073': Metlika
+    '074': Mezica
+    '075': Miren-Kostanjevica
+    '076': Mislinja
+    '077': Moravce
+    '078': 'Moravske Toplice'
+    '079': Mozirje
+    '080': 'Murska Sobota'
+    '081': Muta
+    '082': Naklo
+    '083': Nazarje
+    '084': 'Nova Gorica'
+    '085': 'Novo Mesto'
+    '086': Odranci
+    '087': Ormoz
+    '088': Osilnica
+    '089': Pesnica
+    '090': Pirano
+    '091': Pivka
+    '092': Podcetrtek
+    '093': Podvelka
+    '094': Postojna
+    '095': Preddvor
+    '096': Ptuj
+    '097': Puconci
+    '098': Race-Fram
+    '099': Radece
+    100: Radenci
+    101: 'Radlje ob Dravi'
+    102: Radovljica
+    103: 'Ravne na Koroskem'
+    104: Ribnica
+    105: Rogasovci
+    106: 'Rogaska Slatina'
+    107: Rogatec
+    108: Ruse
+    109: Semic
+    110: Sevnica
+    111: Sezana
+    112: 'Slovenj Gradec'
+    113: 'Slovenska Bistrica'
+    114: 'Slovenske Konjice'
+    115: Starse
+    116: 'Sveti Jurij'
+    117: Sencur
+    118: Sentilj
+    119: Sentjernej
+    120: 'Sentjur pri Celju'
+    121: Skocjan
+    122: 'Skofja Loka'
+    123: Skofljica
+    124: 'Smarje pri Jelsah'
+    125: 'Smartno ob Paki'
+    126: Sostanj
+    127: Store
+    128: Tolmin
+    129: Trbovlje
+    130: Trebnje
+    131: Trzic
+    132: Turnisce
+    133: Velenje
+    134: 'Velike Lasce'
+    135: Videm
+    136: Vipava
+    137: Vitanje
+    138: Vodice
+    139: Vojnik
+    140: Vrhnika
+    141: Vuzenica
+    142: 'Zagorje ob Savi'
+    143: Zavrc
+    144: Zrece
+    146: Zelezniki
+    147: Ziri
+    148: Benedikt
+    149: 'Bistrica ob Sotli'
+    150: Bloke
+    151: Braslovce
+    152: Cankova
+    153: Cerkvenjak
+    154: Dobje
+    155: Dobrna
+    156: Dobrovnik
+    157: 'Dolenjske Toplice'
+    158: Grad
+    159: Hajdina
+    160: Hoce-Slivnica
+    161: Hodos
+    162: Horjul
+    163: Jezersko
+    164: Komenda
+    165: Kostel
+    166: Krizevci
+    167: 'Lovrenc na Pohorju'
+    168: Markovci
+    169: 'Miklavz na Dravskem Polju'
+    170: 'Mirna Pec'
+    171: Oplotnica
+    172: Podlehnik
+    173: Polzela
+    174: Prebold
+    175: Prevalje
+    176: Razkrizje
+    177: 'Ribnica na Pohorju'
+    178: 'Selnica ob Dravi'
+    179: Sodrazica
+    180: Solcava
+    181: 'Sveta Ana'
+    182: 'Sveti Andraz v Slovenskih Goricah'
+    183: Sempeter-Vrtojba
+    184: Tabor
+    185: 'Trnovska Vas'
+    186: Trzin
+    187: 'Velika Polana'
+    188: Verzej
+    189: Vransko
+    190: Zalec
+    191: Zetale
+    192: Zirovnica
+    193: Zuzemberk
+    194: 'Smartno pri Litiji'
diff --git a/uc_store/config/uc_store.country.SJ.yml b/uc_store/config/uc_store.country.SJ.yml
new file mode 100644
index 0000000..8c0c93f
--- /dev/null
+++ b/uc_store/config/uc_store.country.SJ.yml
@@ -0,0 +1,6 @@
+iso2: SJ
+iso3: SJM
+name: 'Svalbard and Jan Mayen'
+numeric: 744
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.SK.yml b/uc_store/config/uc_store.country.SK.yml
new file mode 100644
index 0000000..9ca6bf3
--- /dev/null
+++ b/uc_store/config/uc_store.country.SK.yml
@@ -0,0 +1,15 @@
+iso2: SK
+iso3: SVK
+name: Slovakia
+numeric: 703
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    BC: 'Banskobystricky kraj'
+    BL: 'Bratislavsky kraj'
+    KI: 'Kosicky kraj'
+    NI: 'Nitriansky kraj'
+    PV: 'Presovsky kraj'
+    TA: 'Trnavsky kraj'
+    TC: 'Trenciansky kraj'
+    ZI: 'Zilinsky kraj'
diff --git a/uc_store/config/uc_store.country.SL.yml b/uc_store/config/uc_store.country.SL.yml
new file mode 100644
index 0000000..128c9f0
--- /dev/null
+++ b/uc_store/config/uc_store.country.SL.yml
@@ -0,0 +1,11 @@
+iso2: SL
+iso3: SLE
+name: 'Sierra Leone'
+numeric: 694
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    SL-E: Eastern
+    SL-N: Northern
+    SL-S: Southern
+    SL-W: 'Western Area (Freetown)'
diff --git a/uc_store/config/uc_store.country.SM.yml b/uc_store/config/uc_store.country.SM.yml
new file mode 100644
index 0000000..c028fea
--- /dev/null
+++ b/uc_store/config/uc_store.country.SM.yml
@@ -0,0 +1,16 @@
+iso2: SM
+iso3: SMR
+name: 'San Marino'
+numeric: 674
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    SM-01: Acquaviva
+    SM-02: Chiesanuova
+    SM-03: Domagnano
+    SM-04: Faetano
+    SM-05: Fiorentino
+    SM-06: 'Borgo Maggiore'
+    SM-07: 'San Marino'
+    SM-08: Montegiardino
+    SM-09: Serravalle
diff --git a/uc_store/config/uc_store.country.SN.yml b/uc_store/config/uc_store.country.SN.yml
new file mode 100644
index 0000000..b3bb9d3
--- /dev/null
+++ b/uc_store/config/uc_store.country.SN.yml
@@ -0,0 +1,18 @@
+iso2: SN
+iso3: SEN
+name: Senegal
+numeric: 686
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    DB: Diourbel
+    DK: Dakar
+    FK: Fatick
+    KD: Kolda
+    KL: Kaolack
+    LG: Louga
+    MT: Matam
+    SL: Saint-Louis
+    TC: Tambacounda
+    TH: Thies
+    ZH: Ziguinchor
diff --git a/uc_store/config/uc_store.country.SO.yml b/uc_store/config/uc_store.country.SO.yml
new file mode 100644
index 0000000..7fbfa8a
--- /dev/null
+++ b/uc_store/config/uc_store.country.SO.yml
@@ -0,0 +1,25 @@
+iso2: SO
+iso3: SOM
+name: Somalia
+numeric: 706
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    SO-AW: Awdal
+    SO-BK: Bakool
+    SO-BN: Banaadir
+    SO-BR: Bari
+    SO-BY: Bay
+    SO-GA: Galguduud
+    SO-GE: Gedo
+    SO-HI: Hiiraan
+    SO-JD: 'Jubbada Dhexe'
+    SO-JH: 'Jubbada Hoose'
+    SO-MU: Mudug
+    SO-NU: Nugaal
+    SO-SA: Sanaag
+    SO-SD: 'Shabeellaha Dhexe'
+    SO-SH: 'Shabeellaha Hoose'
+    SO-SO: Sool
+    SO-TO: Togdheer
+    SO-WO: 'Woqooyi Galbeed'
diff --git a/uc_store/config/uc_store.country.SR.yml b/uc_store/config/uc_store.country.SR.yml
new file mode 100644
index 0000000..37818f6
--- /dev/null
+++ b/uc_store/config/uc_store.country.SR.yml
@@ -0,0 +1,17 @@
+iso2: SR
+iso3: SUR
+name: Suriname
+numeric: 740
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    BR: Brokopondo
+    CM: Commonwijne
+    CR: Coronie
+    MA: Marowijne
+    NI: Nickerie
+    PM: Paramaribo
+    PR: Para
+    SA: Saramacca
+    SI: Sipaliwini
+    WA: Wanica
diff --git a/uc_store/config/uc_store.country.ST.yml b/uc_store/config/uc_store.country.ST.yml
new file mode 100644
index 0000000..5b2c1b5
--- /dev/null
+++ b/uc_store/config/uc_store.country.ST.yml
@@ -0,0 +1,9 @@
+iso2: ST
+iso3: STP
+name: 'Sao Tome and Principe'
+numeric: 678
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    ST-P: Príncipe
+    ST-S: 'São Tomé'
diff --git a/uc_store/config/uc_store.country.SV.yml b/uc_store/config/uc_store.country.SV.yml
new file mode 100644
index 0000000..26d3ec5
--- /dev/null
+++ b/uc_store/config/uc_store.country.SV.yml
@@ -0,0 +1,21 @@
+iso2: SV
+iso3: SLV
+name: 'El Salvador'
+numeric: 222
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AH: Ahuachapan
+    CA: Cabanas
+    CH: Chalatenango
+    CU: Cuscatian
+    LI: 'La Libertad'
+    MO: Morazan
+    PA: 'La Paz'
+    SA: 'Santa Ana'
+    SM: 'San Miguel'
+    SO: Sonsonate
+    SS: 'San Salvador'
+    SV: 'San Vicente'
+    UN: 'La Union'
+    US: Usulutan
diff --git a/uc_store/config/uc_store.country.SX.yml b/uc_store/config/uc_store.country.SX.yml
new file mode 100644
index 0000000..c834e8c
--- /dev/null
+++ b/uc_store/config/uc_store.country.SX.yml
@@ -0,0 +1,41 @@
+iso2: SX
+iso3: SXM
+name: 'Sint Maarten'
+numeric: 534
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code\r\n!country_name_if"
+zones:
+    AD: 'Almond Grove'
+    BH: 'Beacon Hill'
+    BV: Belvedere
+    CB: 'Cole Bay'
+    CC: Cupecoy
+    CH: 'Cay Hill'
+    DB: 'Dawn Beach'
+    DC: 'Dutch Cul De Sac'
+    DF: Defiance
+    DQ: 'Dutch Quarter'
+    EZ: Ebenezer
+    FP: 'Fresh Pond'
+    GB: 'Guana Bay'
+    GR: 'Great Bay'
+    HE: 'Hope Estate'
+    KB: 'Cay Bay'
+    LB: 'Little Bay'
+    LL: 'Low Lands'
+    LP: 'Lower Prince Quarter'
+    MA: 'Marian Estate'
+    MB: 'Mullet Bay'
+    MD: 'Madam Estate'
+    MH: Maho
+    ML: 'Middle Land'
+    OP: 'Oyster Pond'
+    PB: 'Point Blanche'
+    PH: Philispburg
+    SB: 'Simpson Bay'
+    SD: Saunders
+    SG: 'Sucker Garden'
+    SP: 'St Peters'
+    SR: 'South Reward'
+    UP: 'Upper Prince Quarter'
+    VY: Vineyard
diff --git a/uc_store/config/uc_store.country.SY.yml b/uc_store/config/uc_store.country.SY.yml
new file mode 100644
index 0000000..bcea82d
--- /dev/null
+++ b/uc_store/config/uc_store.country.SY.yml
@@ -0,0 +1,21 @@
+iso2: SY
+iso3: SYR
+name: 'Syrian Arab Republic'
+numeric: 760
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    SY-DI: Dimashq
+    SY-DR: Darٰā
+    SY-DY: 'Dayr az Zawr'
+    SY-HA: 'Al Hasakah'
+    SY-HI: Himş
+    SY-HL: Halab
+    SY-HM: Hamāh
+    SY-ID: Idlib
+    SY-LA: 'Al Lādhiqīyah'
+    SY-QU: 'Al Qunayţirah'
+    SY-RA: 'Ar Raqqah'
+    SY-RD: 'Rīf Dimashq'
+    SY-SU: 'As Suwaydā'''
+    SY-TA: Ţarţūs
diff --git a/uc_store/config/uc_store.country.SZ.yml b/uc_store/config/uc_store.country.SZ.yml
new file mode 100644
index 0000000..cd6d245
--- /dev/null
+++ b/uc_store/config/uc_store.country.SZ.yml
@@ -0,0 +1,11 @@
+iso2: SZ
+iso3: SWZ
+name: Swaziland
+numeric: 748
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    SZ-HH: Hhohho
+    SZ-LU: Lubombo
+    SZ-MA: Manzini
+    SZ-SH: Shiselweni
diff --git a/uc_store/config/uc_store.country.TC.yml b/uc_store/config/uc_store.country.TC.yml
new file mode 100644
index 0000000..e290e8e
--- /dev/null
+++ b/uc_store/config/uc_store.country.TC.yml
@@ -0,0 +1,6 @@
+iso2: TC
+iso3: TCA
+name: 'Turks and Caicos Islands'
+numeric: 796
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.TD.yml b/uc_store/config/uc_store.country.TD.yml
new file mode 100644
index 0000000..72b8268
--- /dev/null
+++ b/uc_store/config/uc_store.country.TD.yml
@@ -0,0 +1,25 @@
+iso2: TD
+iso3: TCD
+name: Chad
+numeric: 148
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    BA: Batha
+    BET: Ennedi
+    CB: Chari-Baguirmi
+    GR: Guera
+    HL: Hadjer-Lamis
+    KA: 'Barh el Ghazel'
+    LC: Lac
+    LO: 'Logone Occidental'
+    LR: 'Logone Oriental'
+    MA: Mandoul
+    MC: Moyen-Chari
+    ME: 'Mayo-Kebbi Est'
+    MO: 'Mayo-Kebbi Ouest'
+    ND: 'Ville de N''Djamena'
+    OD: Ouaddai
+    SA: Salamat
+    TA: Tandjile
+    WF: 'Wadi Fira'
diff --git a/uc_store/config/uc_store.country.TF.yml b/uc_store/config/uc_store.country.TF.yml
new file mode 100644
index 0000000..27de95c
--- /dev/null
+++ b/uc_store/config/uc_store.country.TF.yml
@@ -0,0 +1,6 @@
+iso2: TF
+iso3: ATF
+name: 'French Southern Territories'
+numeric: 260
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.TG.yml b/uc_store/config/uc_store.country.TG.yml
new file mode 100644
index 0000000..a413944
--- /dev/null
+++ b/uc_store/config/uc_store.country.TG.yml
@@ -0,0 +1,12 @@
+iso2: TG
+iso3: TGO
+name: Togo
+numeric: 768
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    TG-C: Centre
+    TG-K: Kara
+    TG-M: 'Maritime (Région)'
+    TG-P: Plateaux
+    TG-S: Savannes
diff --git a/uc_store/config/uc_store.country.TH.yml b/uc_store/config/uc_store.country.TH.yml
new file mode 100644
index 0000000..ffca651
--- /dev/null
+++ b/uc_store/config/uc_store.country.TH.yml
@@ -0,0 +1,85 @@
+iso2: TH
+iso3: THA
+name: Thailand
+numeric: 764
+status: 0
+format: "!first_name !last_name\r\n!company\r\n!street1\r\n!street2\r\n!city, !zone_name !postal_code\r\n!country_name"
+zones:
+    TH-10: 'Bangkok <Krung Thep Maha Nakhon>'
+    TH-11: 'Samut Prakan'
+    TH-12: Nonthaburi
+    TH-13: 'Pathum Thani'
+    TH-14: 'Phra Nakhon Si Ayutthaya'
+    TH-15: 'Ang Thong'
+    TH-16: 'Lop Buri'
+    TH-17: 'Sing Buri'
+    TH-18: 'Chai Nat'
+    TH-19: Saraburi
+    TH-20: 'Chon Buri'
+    TH-21: Rayong
+    TH-22: Chanthaburi
+    TH-23: Trat
+    TH-24: Chachoengsao
+    TH-25: 'Prachin Buri'
+    TH-26: 'Nakhon Nayok'
+    TH-27: 'Sa Kaeo'
+    TH-30: 'Nakhon Ratchasima'
+    TH-31: 'Buri Ram'
+    TH-32: Surin
+    TH-33: 'Si Sa Ket'
+    TH-34: 'Ubon Ratchathani'
+    TH-35: Yasothon
+    TH-36: Chaiyaphum
+    TH-37: 'Amnat Charoen'
+    TH-38: 'Bueng Kan'
+    TH-39: 'Nong Bua Lam Phu'
+    TH-40: 'Khon Kaen'
+    TH-41: 'Udon Thani'
+    TH-42: Loei
+    TH-43: 'Nong Khai'
+    TH-44: 'Maha Sarakham'
+    TH-45: 'Roi Et'
+    TH-46: Kalasin
+    TH-47: 'Sakon Nakhon'
+    TH-48: 'Nakhon Phanom'
+    TH-49: Mukdahan
+    TH-50: 'Chiang Mai'
+    TH-51: Lamphun
+    TH-52: Lampang
+    TH-53: Uttaradit
+    TH-54: Phrae
+    TH-55: Nan
+    TH-56: Phayao
+    TH-57: 'Chiang Rai'
+    TH-58: 'Mae Hong Son'
+    TH-60: 'Nakhon Sawan'
+    TH-61: 'Uthai Thani'
+    TH-62: 'Kamphaeng Phet'
+    TH-63: Tak
+    TH-64: Sukhothai
+    TH-65: Phitsanulok
+    TH-66: Phichit
+    TH-67: Phetchabun
+    TH-70: Ratchaburi
+    TH-71: Kanchanaburi
+    TH-72: 'Suphan Buri'
+    TH-73: 'Nakhon Pathom'
+    TH-74: 'Samut Sakhon'
+    TH-75: 'Samut Songkhram'
+    TH-76: Phetchaburi
+    TH-77: 'Prachuap Khiri Khan'
+    TH-80: 'Nakhon Si Thammarat'
+    TH-81: Krabi
+    TH-82: Phangnga
+    TH-83: Phuket
+    TH-84: 'Surat Thani'
+    TH-85: Ranong
+    TH-86: Chumphon
+    TH-90: Songkhla
+    TH-91: Satun
+    TH-92: Trang
+    TH-93: Phatthalung
+    TH-94: Pattani
+    TH-95: Yala
+    TH-96: Narathiwat
+    TH-S: Pattaya
diff --git a/uc_store/config/uc_store.country.TJ.yml b/uc_store/config/uc_store.country.TJ.yml
new file mode 100644
index 0000000..48cfec7
--- /dev/null
+++ b/uc_store/config/uc_store.country.TJ.yml
@@ -0,0 +1,10 @@
+iso2: TJ
+iso3: TJK
+name: Tajikistan
+numeric: 762
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    TJ-GB: Gorno-Badakhshan
+    TJ-KT: Khatlon
+    TJ-SU: Sughd
diff --git a/uc_store/config/uc_store.country.TK.yml b/uc_store/config/uc_store.country.TK.yml
new file mode 100644
index 0000000..cd7f0a9
--- /dev/null
+++ b/uc_store/config/uc_store.country.TK.yml
@@ -0,0 +1,6 @@
+iso2: TK
+iso3: TKL
+name: Tokelau
+numeric: 772
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.TL.yml b/uc_store/config/uc_store.country.TL.yml
new file mode 100644
index 0000000..4c99bcd
--- /dev/null
+++ b/uc_store/config/uc_store.country.TL.yml
@@ -0,0 +1,20 @@
+iso2: TL
+iso3: TLS
+name: Timor-Leste
+numeric: 626
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    TL-AL: Aileu
+    TL-AN: Ainaro
+    TL-BA: Baucau
+    TL-BO: Bobonaro
+    TL-CO: 'Cova Lima'
+    TL-DI: Dili
+    TL-ER: Ermera
+    TL-LA: Lautem
+    TL-LI: Liquiça
+    TL-MF: Manufahi
+    TL-MT: Manatuto
+    TL-OE: Oecussi
+    TL-VI: Viqueque
diff --git a/uc_store/config/uc_store.country.TM.yml b/uc_store/config/uc_store.country.TM.yml
new file mode 100644
index 0000000..2fb0e60
--- /dev/null
+++ b/uc_store/config/uc_store.country.TM.yml
@@ -0,0 +1,13 @@
+iso2: TM
+iso3: TKM
+name: Turkmenistan
+numeric: 795
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    TM-A: Ahal
+    TM-B: Balkan
+    TM-D: Daşoguz
+    TM-L: Lebap
+    TM-M: Mary
+    TM-S: Aşgabat
diff --git a/uc_store/config/uc_store.country.TN.yml b/uc_store/config/uc_store.country.TN.yml
new file mode 100644
index 0000000..b9adf21
--- /dev/null
+++ b/uc_store/config/uc_store.country.TN.yml
@@ -0,0 +1,31 @@
+iso2: TN
+iso3: TUN
+name: Tunisia
+numeric: 788
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    11: Tunis
+    12: 'L''Ariana'
+    13: 'Ben Arous'
+    14: 'La Manouba'
+    21: Nabeul
+    22: Zaghouan
+    23: Bizerte
+    31: Beja
+    32: Jendouba
+    33: 'Le Kef'
+    34: Siliana
+    41: Kairouan
+    42: Kasserine
+    43: 'Sidi Bouzid'
+    51: Sousse
+    52: Monastir
+    53: Mahdia
+    61: Sfax
+    71: Gafsa
+    72: Tozeur
+    73: Kebili
+    81: Gabes
+    82: Medenine
+    83: Tataouine
diff --git a/uc_store/config/uc_store.country.TO.yml b/uc_store/config/uc_store.country.TO.yml
new file mode 100644
index 0000000..53da6de
--- /dev/null
+++ b/uc_store/config/uc_store.country.TO.yml
@@ -0,0 +1,12 @@
+iso2: TO
+iso3: TON
+name: Tonga
+numeric: 776
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    TO-01: '''Eua'
+    TO-02: 'Ha''apai'
+    TO-03: Niuas
+    TO-04: Tongatapu
+    TO-05: 'Vava''u'
diff --git a/uc_store/config/uc_store.country.TR.yml b/uc_store/config/uc_store.country.TR.yml
new file mode 100644
index 0000000..117671c
--- /dev/null
+++ b/uc_store/config/uc_store.country.TR.yml
@@ -0,0 +1,6 @@
+iso2: TR
+iso3: TUR
+name: Turkey
+numeric: 792
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!postal_code, !city\r\n\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.TT.yml b/uc_store/config/uc_store.country.TT.yml
new file mode 100644
index 0000000..2ab0ef3
--- /dev/null
+++ b/uc_store/config/uc_store.country.TT.yml
@@ -0,0 +1,23 @@
+iso2: TT
+iso3: TTO
+name: 'Trinidad and Tobago'
+numeric: 780
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    TT-ARI: Arima
+    TT-CHA: Chaguanas
+    TT-CTT: Couva-Tabaquite-Talparo
+    TT-DMN: 'Diego Martin'
+    TT-ETO: 'Eastern Tobago'
+    TT-PED: Penal-Debe
+    TT-POS: 'Port of Spain'
+    TT-PRT: 'Princes Town'
+    TT-PTF: 'Point Fortin'
+    TT-RCM: 'Rio Claro-Mayaro'
+    TT-SFO: 'San Fernando'
+    TT-SGE: 'Sangre Grande'
+    TT-SIP: Siparia
+    TT-SJL: 'San Juan-Laventille'
+    TT-TUP: Tunapuna-Piarco
+    TT-WTO: 'Western Tobago'
diff --git a/uc_store/config/uc_store.country.TV.yml b/uc_store/config/uc_store.country.TV.yml
new file mode 100644
index 0000000..9b272ff
--- /dev/null
+++ b/uc_store/config/uc_store.country.TV.yml
@@ -0,0 +1,15 @@
+iso2: TV
+iso3: TUV
+name: Tuvalu
+numeric: 798
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    TV-FUN: Funafuti
+    TV-NIT: Niutao
+    TV-NKF: Nukufetau
+    TV-NKL: Nukulaelae
+    TV-NMA: Nanumea
+    TV-NMG: Nanumanga
+    TV-NUI: Nui
+    TV-VAI: Vaitupu
diff --git a/uc_store/config/uc_store.country.TW.yml b/uc_store/config/uc_store.country.TW.yml
new file mode 100644
index 0000000..7e11826
--- /dev/null
+++ b/uc_store/config/uc_store.country.TW.yml
@@ -0,0 +1,59 @@
+iso2: TW
+iso3: TWN
+name: Taiwan
+numeric: 158
+status: 0
+format: "!company\r\n!last_name !first_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '01': 'ChangHua County'
+    '02': 'ChiaYi City'
+    '03': 'ChiaYi County'
+    '04': 'HsinChu City'
+    '05': 'HsinChu County'
+    '06': 'HuaLien County'
+    '07': 'KaoHsiung City'
+    '08': 'KaoHsiung County'
+    '09': 'KeeLung City '
+    10: 'KinMen County'
+    11: 'LienChiang County'
+    12: 'MiaoLi County'
+    13: NanHai
+    14: 'NanTou County'
+    15: 'PengHu County'
+    16: 'PingTung County'
+    17: 'TaiChung City'
+    18: 'TaiChung County'
+    19: 'TaiNan City'
+    20: 'TaiNan County'
+    21: 'Taipei City'
+    22: 'Taipei County'
+    23: 'TaiTung County'
+    24: 'TaoYuan County'
+    25: 'Yilan County'
+    26: 'YunLin County'
+    27: 南投縣
+    28: 南海諸島
+    29: 嘉義市
+    30: 嘉義縣
+    31: 基隆市
+    32: 宜蘭縣
+    33: 屏東縣
+    34: 彰化縣
+    35: 新竹市
+    36: 新竹縣
+    37: 桃園縣
+    38: 澎湖縣
+    39: 臺中市
+    40: 臺中縣
+    41: 臺北市
+    42: 臺北縣
+    43: 臺南市
+    44: 臺南縣
+    45: 臺東縣
+    46: 花蓮縣
+    47: 苗栗縣
+    48: 連江縣
+    49: 金門縣
+    50: 雲林縣
+    51: 高雄市
+    52: 高雄縣
diff --git a/uc_store/config/uc_store.country.TZ.yml b/uc_store/config/uc_store.country.TZ.yml
new file mode 100644
index 0000000..974e831
--- /dev/null
+++ b/uc_store/config/uc_store.country.TZ.yml
@@ -0,0 +1,33 @@
+iso2: TZ
+iso3: TZA
+name: Tanzania
+numeric: 834
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    '01': Arusha
+    '02': 'Dar es Salaam'
+    '03': Dodoma
+    '04': Iringa
+    '05': Kagera
+    '06': 'Kaskazini Pemba'
+    '07': 'Zanzibar North'
+    '08': Kigoma
+    '09': Kilimanjaro
+    10: 'Pemba South'
+    11: 'Zanzibar South'
+    12: Lindi
+    13: Mara
+    14: Mbeya
+    15: 'Mjini Mgharibi'
+    16: Morogoro
+    17: Mtwara
+    18: Mwanza
+    19: Coast
+    20: Rukwa
+    21: Ruvuma
+    22: Shinyanga
+    23: Singida
+    24: Tabora
+    25: Tanga
+    26: Manyara
diff --git a/uc_store/config/uc_store.country.UA.yml b/uc_store/config/uc_store.country.UA.yml
new file mode 100644
index 0000000..bc42af1
--- /dev/null
+++ b/uc_store/config/uc_store.country.UA.yml
@@ -0,0 +1,31 @@
+iso2: UA
+iso3: UKR
+name: Ukraine
+numeric: 804
+status: 0
+format: "!country_name\r\n!zone_name\r\n!city\r\n!postal_code\r\n!street1\r\n!street2\r\n!company\r\n!first_name !last_name"
+zones:
+    CK: 'Черкаська область'
+    CN: 'Чернігівська область'
+    CV: 'Чернівецька область'
+    DN: 'Донецька область'
+    DP: 'Дніпропетровська область'
+    IF: 'Івано-Франківська область'
+    KH: 'Харківська область'
+    KM: 'Хмельницька область'
+    KR: 'Кіровоградська область'
+    KS: 'Херсонська область'
+    KV: 'Київська область'
+    LG: 'Луганська область'
+    LT: 'Волинська область'
+    LV: 'Львівська область'
+    MK: 'Миколаївська область'
+    OD: 'Одеська область'
+    PL: 'Полтавська область'
+    RV: 'Рівненська область'
+    SM: 'Сумська область'
+    TE: 'Тернопільська область'
+    UZ: 'Закарпатська область'
+    VN: 'Вінницька область'
+    ZP: 'Запорізька область'
+    ZT: 'Житомирська область'
diff --git a/uc_store/config/uc_store.country.UG.yml b/uc_store/config/uc_store.country.UG.yml
new file mode 100644
index 0000000..417a5d6
--- /dev/null
+++ b/uc_store/config/uc_store.country.UG.yml
@@ -0,0 +1,87 @@
+iso2: UG
+iso3: UGA
+name: Uganda
+numeric: 800
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    UG-101: Kalangala
+    UG-102: Kampala
+    UG-103: Kiboga
+    UG-104: Luwero
+    UG-105: Masaka
+    UG-106: Mpigi
+    UG-107: Mubende
+    UG-108: Mukono
+    UG-109: Nakasongola
+    UG-110: Rakai
+    UG-111: Sembabule
+    UG-112: Kayunga
+    UG-113: Wakiso
+    UG-114: Mityana
+    UG-115: Nakaseke
+    UG-116: Lyantonde
+    UG-201: Bugiri
+    UG-202: Busia
+    UG-203: Iganga
+    UG-204: Jinja
+    UG-205: Kamuli
+    UG-206: Kapchorwa
+    UG-207: Katakwi
+    UG-208: Kumi
+    UG-209: Mbale
+    UG-210: Pallisa
+    UG-211: Soroti
+    UG-212: Tororo
+    UG-213: Kaberamaido
+    UG-214: Mayuge
+    UG-215: Sironko
+    UG-216: Amuria
+    UG-217: Budaka
+    UG-218: Bukwa
+    UG-219: Butaleja
+    UG-220: Kaliro
+    UG-221: Manafwa
+    UG-222: Namutumba
+    UG-223: Bududa
+    UG-224: Bukedea
+    UG-301: Adjumani
+    UG-302: Apac
+    UG-303: Arua
+    UG-304: Gulu
+    UG-305: Kitgum
+    UG-306: Kotido
+    UG-307: Lira
+    UG-308: Moroto
+    UG-309: Moyo
+    UG-310: Nebbi
+    UG-311: Nakapiripirit
+    UG-312: Pader
+    UG-313: Yumbe
+    UG-314: Amolatar
+    UG-315: Kaabong
+    UG-316: Koboko
+    UG-317: Abim
+    UG-318: Dokolo
+    UG-319: Amuru
+    UG-320: Maracha
+    UG-321: Oyam
+    UG-401: Bundibugyo
+    UG-402: Bushenyi
+    UG-403: Hoima
+    UG-404: Kabale
+    UG-405: Kabarole
+    UG-406: Kasese
+    UG-407: Kibaale
+    UG-408: Kisoro
+    UG-409: Masindi
+    UG-410: Mbarara
+    UG-411: Ntungamo
+    UG-412: Rukungiri
+    UG-413: Kamwenge
+    UG-414: Kanungu
+    UG-415: Kyenjojo
+    UG-416: Ibanda
+    UG-417: Isingiro
+    UG-418: Kiruhura
+    UG-419: Buliisa
diff --git a/uc_store/config/uc_store.country.UM.yml b/uc_store/config/uc_store.country.UM.yml
new file mode 100644
index 0000000..ee97b08
--- /dev/null
+++ b/uc_store/config/uc_store.country.UM.yml
@@ -0,0 +1,16 @@
+iso2: UM
+iso3: UMI
+name: 'United States Minor Outlying Islands'
+numeric: 581
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    UM-67: 'Johnston Atoll'
+    UM-71: 'Midway Islands'
+    UM-76: 'Navassa Island'
+    UM-79: 'Wake Island'
+    UM-81: 'Baker Island'
+    UM-84: 'Howland Island'
+    UM-86: 'Jarvis Island'
+    UM-89: 'Kingman Reef'
+    UM-95: 'Palmyra Atoll'
diff --git a/uc_store/config/uc_store.country.US.yml b/uc_store/config/uc_store.country.US.yml
new file mode 100644
index 0000000..f961acd
--- /dev/null
+++ b/uc_store/config/uc_store.country.US.yml
@@ -0,0 +1,72 @@
+iso2: US
+iso3: USA
+name: 'United States'
+numeric: 840
+status: 1
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AA: 'Armed Forces Americas'
+    AC: 'Armed Forces Canada'
+    AE: 'Armed Forces Europe'
+    AF: 'Armed Forces Africa'
+    AK: Alaska
+    AL: Alabama
+    AM: 'Armed Forces Middle East'
+    AP: 'Armed Forces Pacific'
+    AR: Arkansas
+    AS: 'American Samoa'
+    AZ: Arizona
+    CA: California
+    CO: Colorado
+    CT: Connecticut
+    DC: 'District of Columbia'
+    DE: Delaware
+    FL: Florida
+    FM: 'Federated States Of Micronesia'
+    GA: Georgia
+    GU: Guam
+    HI: Hawaii
+    IA: Iowa
+    ID: Idaho
+    IL: Illinois
+    IN: Indiana
+    KS: Kansas
+    KY: Kentucky
+    LA: Louisiana
+    MA: Massachusetts
+    MD: Maryland
+    ME: Maine
+    MH: 'Marshall Islands'
+    MI: Michigan
+    MN: Minnesota
+    MO: Missouri
+    MP: 'Northern Mariana Islands'
+    MS: Mississippi
+    MT: Montana
+    NC: 'North Carolina'
+    ND: 'North Dakota'
+    NE: Nebraska
+    NH: 'New Hampshire'
+    NJ: 'New Jersey'
+    NM: 'New Mexico'
+    NV: Nevada
+    NY: 'New York'
+    OH: Ohio
+    OK: Oklahoma
+    OR: Oregon
+    PA: Pennsylvania
+    PR: 'Puerto Rico'
+    PW: Palau
+    RI: 'Rhode Island'
+    SC: 'South Carolina'
+    SD: 'South Dakota'
+    TN: Tennessee
+    TX: Texas
+    UT: Utah
+    VA: Virginia
+    VI: 'Virgin Islands'
+    VT: Vermont
+    WA: Washington
+    WI: Wisconsin
+    WV: 'West Virginia'
+    WY: Wyoming
diff --git a/uc_store/config/uc_store.country.UY.yml b/uc_store/config/uc_store.country.UY.yml
new file mode 100644
index 0000000..28aa9b9
--- /dev/null
+++ b/uc_store/config/uc_store.country.UY.yml
@@ -0,0 +1,26 @@
+iso2: UY
+iso3: URY
+name: Uruguay
+numeric: 858
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AR: Artigas
+    CA: Canelones
+    CL: 'Cerro Largo'
+    CO: Colonia
+    DU: Durazno
+    FD: Florida
+    FS: Flores
+    LA: Lavalleja
+    MA: Maldonado
+    MO: Montevideo
+    PA: Paysandu
+    RN: 'Rio Negro'
+    RO: Rocha
+    RV: Rivera
+    SA: Salto
+    SJ: 'San Jose'
+    SO: Soriano
+    TA: Tacuarembo
+    TT: 'Treinta y Tres'
diff --git a/uc_store/config/uc_store.country.UZ.yml b/uc_store/config/uc_store.country.UZ.yml
new file mode 100644
index 0000000..2db462d
--- /dev/null
+++ b/uc_store/config/uc_store.country.UZ.yml
@@ -0,0 +1,21 @@
+iso2: UZ
+iso3: UZB
+name: Uzbekistan
+numeric: 860
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    UZ-AN: Andijon
+    UZ-BU: Buxoro
+    UZ-FA: Farg‘ona
+    UZ-JI: Jizzax
+    UZ-NG: Namangan
+    UZ-NW: Navoiy
+    UZ-QA: Qashqadaryo
+    UZ-QR: 'Qoraqalpog‘iston Respublikasi'
+    UZ-SA: Samarqand
+    UZ-SI: Sirdaryo
+    UZ-SU: Surxondaryo
+    UZ-TK: Toshkent
+    UZ-TO: Toshkent
+    UZ-XO: Xorazm
diff --git a/uc_store/config/uc_store.country.VA.yml b/uc_store/config/uc_store.country.VA.yml
new file mode 100644
index 0000000..bcd104e
--- /dev/null
+++ b/uc_store/config/uc_store.country.VA.yml
@@ -0,0 +1,6 @@
+iso2: VA
+iso3: VAT
+name: 'Holy See (Vatican City State)'
+numeric: 336
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.VC.yml b/uc_store/config/uc_store.country.VC.yml
new file mode 100644
index 0000000..07529c3
--- /dev/null
+++ b/uc_store/config/uc_store.country.VC.yml
@@ -0,0 +1,13 @@
+iso2: VC
+iso3: VCT
+name: 'Saint Vincent and the Grenadines'
+numeric: 670
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    VC-01: Charlotte
+    VC-02: 'Saint Andrew'
+    VC-03: 'Saint David'
+    VC-04: 'Saint George'
+    VC-05: 'Saint Patrick'
+    VC-06: Grenadines
diff --git a/uc_store/config/uc_store.country.VE.yml b/uc_store/config/uc_store.country.VE.yml
new file mode 100644
index 0000000..ff6ad8a
--- /dev/null
+++ b/uc_store/config/uc_store.country.VE.yml
@@ -0,0 +1,32 @@
+iso2: VE
+iso3: VEN
+name: 'Venezuela, Bolivarian Republic of'
+numeric: 862
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AM: Amazonas
+    AN: Anzoátegui
+    AP: Apure
+    AR: Aragua
+    BA: Barinas
+    BO: Bolívar
+    CA: Carabobo
+    CO: Cojedes
+    DA: 'Delta Amacuro'
+    DC: 'Distrito Capital'
+    DF: 'Dependencias Federales'
+    FA: Falcón
+    GU: Guárico
+    LA: Lara
+    ME: Mérida
+    MI: Miranda
+    MO: Monagas
+    NE: 'Nueva Esparta'
+    PO: Portuguesa
+    SU: Sucre
+    TA: Táchira
+    TR: Trujillo
+    VA: Vargas
+    YA: Yaracuy
+    ZU: Zulia
diff --git a/uc_store/config/uc_store.country.VG.yml b/uc_store/config/uc_store.country.VG.yml
new file mode 100644
index 0000000..56d65be
--- /dev/null
+++ b/uc_store/config/uc_store.country.VG.yml
@@ -0,0 +1,6 @@
+iso2: VG
+iso3: VGB
+name: 'Virgin Islands, British'
+numeric: 92
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.VI.yml b/uc_store/config/uc_store.country.VI.yml
new file mode 100644
index 0000000..5b324e3
--- /dev/null
+++ b/uc_store/config/uc_store.country.VI.yml
@@ -0,0 +1,6 @@
+iso2: VI
+iso3: VIR
+name: 'Virgin Islands, U.S.'
+numeric: 850
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city !zone_code !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.VN.yml b/uc_store/config/uc_store.country.VN.yml
new file mode 100644
index 0000000..0fa3141
--- /dev/null
+++ b/uc_store/config/uc_store.country.VN.yml
@@ -0,0 +1,71 @@
+iso2: VN
+iso3: VNM
+name: Vietnam
+numeric: 704
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if"
+zones:
+    AG: 'An Giang'
+    BD: 'Binh Dinh'
+    BG: 'Bac Giang'
+    BI: 'Binh Duong'
+    BK: 'Bac Can'
+    BL: 'Bac Lieu'
+    BN: 'Bac Ninh'
+    BP: 'Binh Phuoc'
+    BR: 'Ben Tre'
+    BU: 'Binh Thuan'
+    BV: 'Ba Ria-Vung Tau'
+    CB: 'Cao Bang'
+    CM: 'Ca Mau'
+    CN: 'Can Tho'
+    DA: 'Da Nang'
+    DB: 'Dien Bien'
+    DC: 'Dac Lac'
+    DN: 'Dong Nai'
+    DO: 'Dac Nong'
+    DT: 'Dong Thap'
+    GL: 'Gia Lai'
+    HA: 'Ha Tay'
+    HC: 'Ho Chi Minh'
+    HD: 'Hai Duong'
+    HG: 'Ha Giang'
+    HM: 'Ha Nam'
+    HN: Hanoi
+    HO: 'Hoa Binh'
+    HP: Haiphong
+    HT: 'Ha Tinh'
+    HU: 'Hau Giang'
+    HY: 'Hung Yen'
+    KG: 'Kien Giang'
+    KH: 'Khanh Hoa'
+    KT: 'Kon Tum'
+    LA: 'Long An'
+    LD: 'Lam Dong'
+    LI: 'Lai Chau'
+    LO: 'Lao Cai'
+    LS: 'Lang Son'
+    NA: 'Nghe An'
+    NB: 'Ninh Binh'
+    ND: 'Nam Dinh'
+    NT: 'Ninh Thuan'
+    PT: 'Phu Tho'
+    PY: 'Phu Yen'
+    QB: 'Quang Binh'
+    QG: 'Quang Ngai'
+    QM: 'Quang Nam'
+    QN: 'Quang Ninh'
+    QT: 'Quang Tri'
+    SL: 'Son La'
+    ST: 'Soc Trang'
+    TB: 'Thai Binh'
+    TG: 'Tien Giang'
+    TH: 'Thanh Hoa'
+    TN: 'Tay Ninh'
+    TQ: 'Tuyen Quang'
+    TT: 'Thua Thien-Hue'
+    TV: 'Tra Vinh'
+    TY: 'Thai Nguyen'
+    VC: 'Vinh Phuc'
+    VL: 'Vinh Long'
+    YB: 'Yen Bai'
diff --git a/uc_store/config/uc_store.country.VU.yml b/uc_store/config/uc_store.country.VU.yml
new file mode 100644
index 0000000..85f4335
--- /dev/null
+++ b/uc_store/config/uc_store.country.VU.yml
@@ -0,0 +1,13 @@
+iso2: VU
+iso3: VUT
+name: Vanuatu
+numeric: 548
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    VU-MAP: Malampa
+    VU-PAM: Pénama
+    VU-SAM: Sanma
+    VU-SEE: Shéfa
+    VU-TAE: Taféa
+    VU-TOB: Torba
diff --git a/uc_store/config/uc_store.country.WF.yml b/uc_store/config/uc_store.country.WF.yml
new file mode 100644
index 0000000..43a78b7
--- /dev/null
+++ b/uc_store/config/uc_store.country.WF.yml
@@ -0,0 +1,6 @@
+iso2: WF
+iso3: WLF
+name: 'Wallis and Futuna'
+numeric: 876
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.WS.yml b/uc_store/config/uc_store.country.WS.yml
new file mode 100644
index 0000000..a75721e
--- /dev/null
+++ b/uc_store/config/uc_store.country.WS.yml
@@ -0,0 +1,18 @@
+iso2: WS
+iso3: WSM
+name: Samoa
+numeric: 882
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    WS-AA: 'A''ana'
+    WS-AL: Aiga-i-le-Tai
+    WS-AT: Atua
+    WS-FA: 'Fa''asaleleaga'
+    WS-GE: 'Gaga''emauga'
+    WS-GI: Gagaifomauga
+    WS-PA: Palauli
+    WS-SA: 'Satupa''itea'
+    WS-TU: Tuamasaga
+    WS-VF: 'Va''a-o-Fonoti'
+    WS-VS: Vaisigano
diff --git a/uc_store/config/uc_store.country.YE.yml b/uc_store/config/uc_store.country.YE.yml
new file mode 100644
index 0000000..08cdba5
--- /dev/null
+++ b/uc_store/config/uc_store.country.YE.yml
@@ -0,0 +1,28 @@
+iso2: YE
+iso3: YEM
+name: Yemen
+numeric: 887
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    YE-AB: Abyān
+    YE-AD: '''Adan'
+    YE-AM: '''Amrān'
+    YE-BA: 'Al Bayḑā'''
+    YE-DA: 'Aḑ Ḑāli'''
+    YE-DH: Dhamār
+    YE-HD: Ḩaḑramawt
+    YE-HJ: Ḩajjah
+    YE-HU: 'Al Ḩudaydah'
+    YE-IB: Ibb
+    YE-JA: 'Al Jawf'
+    YE-LA: Laḩij
+    YE-MA: 'Ma''rib'
+    YE-MR: 'Al Mahrah'
+    YE-MW: 'Al Maḩwīt'
+    YE-RA: Raymah
+    YE-SA: 'Şan‘ā'' [city]'
+    YE-SD: Şā‘dah
+    YE-SH: Shabwah
+    YE-SN: 'Şan‘ā'''
+    YE-TA: Tā‘izz
diff --git a/uc_store/config/uc_store.country.YT.yml b/uc_store/config/uc_store.country.YT.yml
new file mode 100644
index 0000000..4d87122
--- /dev/null
+++ b/uc_store/config/uc_store.country.YT.yml
@@ -0,0 +1,6 @@
+iso2: YT
+iso3: MYT
+name: Mayotte
+numeric: 175
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city  !postal_code\r\n!country_name_if"
diff --git a/uc_store/config/uc_store.country.ZA.yml b/uc_store/config/uc_store.country.ZA.yml
new file mode 100644
index 0000000..974253b
--- /dev/null
+++ b/uc_store/config/uc_store.country.ZA.yml
@@ -0,0 +1,16 @@
+iso2: ZA
+iso3: ZAF
+name: 'South Africa'
+numeric: 710
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city\r\n!postal_code\r\n!country_name_if"
+zones:
+    EC: 'Eastern Cape'
+    FS: 'Free State'
+    GT: Gauteng
+    KZN: KwaZulu-Natal
+    LP: Limpopo
+    MP: Mpumalanga
+    NC: 'Northern Cape'
+    NW: 'North West'
+    WC: 'Western Cape'
diff --git a/uc_store/config/uc_store.country.ZM.yml b/uc_store/config/uc_store.country.ZM.yml
new file mode 100644
index 0000000..86f9083
--- /dev/null
+++ b/uc_store/config/uc_store.country.ZM.yml
@@ -0,0 +1,16 @@
+iso2: ZM
+iso3: ZMB
+name: Zambia
+numeric: 894
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name  !postal_code\r\n!country_name_if"
+zones:
+    ZM-01: Western
+    ZM-02: Central
+    ZM-03: Eastern
+    ZM-04: Luapula
+    ZM-05: Northern
+    ZM-06: NorthWestern
+    ZM-07: Southern
+    ZM-08: Copperbelt
+    ZM-09: Lusaka
diff --git a/uc_store/config/uc_store.country.ZW.yml b/uc_store/config/uc_store.country.ZW.yml
new file mode 100644
index 0000000..6ab99ab
--- /dev/null
+++ b/uc_store/config/uc_store.country.ZW.yml
@@ -0,0 +1,17 @@
+iso2: ZW
+iso3: ZWE
+name: Zimbabwe
+numeric: 716
+status: 0
+format: "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city\r\n!country_name_if"
+zones:
+    BW: Bulawayo
+    HR: Harare
+    MBN: 'Matabeleland North'
+    MBS: 'Matabeleland South'
+    MC: Manicaland
+    ML: Midlands
+    MSC: 'Mashonaland Central'
+    MSE: 'Mashonaland East'
+    MSW: 'Mashonaland West'
+    MV: Masvingo
diff --git a/uc_store/config/uc_store.settings.yml b/uc_store/config/uc_store.settings.yml
index c4b67eb..ebb1062 100644
--- a/uc_store/config/uc_store.settings.yml
+++ b/uc_store/config/uc_store.settings.yml
@@ -8,8 +8,8 @@ address:
   street1: ''
   street2: ''
   city: ''
-  zone: 0
-  country: 840
+  zone: ''
+  country: US
   postal_code: ''
 address_fields:
   first_name:
diff --git a/uc_store/countries/afghanistan_4_1.cif b/uc_store/countries/afghanistan_4_1.cif
deleted file mode 100644
index f3a51dc..0000000
--- a/uc_store/countries/afghanistan_4_1.cif
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function afghanistan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 4,
-      'country_name' => 'Afghanistan',
-      'country_iso_code_2' => 'AF',
-      'country_iso_code_3' => 'AFG',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  // VALUES = Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(4, 'BDS', 'Badakhshan'),
-    array(4, 'BDG', 'Badghis'),
-    array(4, 'BGL', 'Baghlan'),
-    array(4, 'BAL', 'Balkh'),
-    array(4, 'BAM', 'Bamian'),
-    array(4, 'FRA', 'Farah'),
-    array(4, 'FYB', 'Faryab'),
-    array(4, 'GHA', 'Ghazni'),
-    array(4, 'GHO', 'Ghowr'),
-    array(4, 'HEL', 'Helmand'),
-    array(4, 'HER', 'Herat'),
-    array(4, 'JOW', 'Jowzjan'),
-    array(4, 'KAB', 'Kabul'),
-    array(4, 'KAN', 'Kandahar'),
-    array(4, 'KAP', 'Kapisa'),
-    array(4, 'KHO', 'Khost'),
-    array(4, 'KNR', 'Konar'),
-    array(4, 'KDZ', 'Kondoz'),
-    array(4, 'LAG', 'Laghman'),
-    array(4, 'LOW', 'Lowgar'),
-    array(4, 'NAN', 'Nangrahar'),
-    array(4, 'NIM', 'Nimruz'),
-    array(4, 'NUR', 'Nurestan'),
-    array(4, 'ORU', 'Oruzgan'),
-    array(4, 'PIA', 'Paktia'),
-    array(4, 'PKA', 'Paktika'),
-    array(4, 'PAR', 'Parwan'),
-    array(4, 'SAM', 'Samangan'),
-    array(4, 'SAR', 'Sar-e Pol'),
-    array(4, 'TAK', 'Takhar'),
-    array(4, 'WAR', 'Wardak'),
-    array(4, 'ZAB', 'Zabol'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    4,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/aland_islands_248_1.cif b/uc_store/countries/aland_islands_248_1.cif
deleted file mode 100644
index 936c0d8..0000000
--- a/uc_store/countries/aland_islands_248_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function aland_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 248,
-      'country_name' => 'Åland Islands',
-      'country_iso_code_2' => 'AX',
-      'country_iso_code_3' => 'ALA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    248,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/albania_8_1.cif b/uc_store/countries/albania_8_1.cif
deleted file mode 100644
index 36852d9..0000000
--- a/uc_store/countries/albania_8_1.cif
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-function albania_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 8,
-      'country_name' => 'Albania',
-      'country_iso_code_2' => 'AL',
-      'country_iso_code_3' => 'ALB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(8, '1', 'Berat county'),
-    array(8, '2', 'Durres county'),
-    array(8, '3', 'Elbasan county'),
-    array(8, '4', 'Fier county'),
-    array(8, '5', 'Gjirokaster county'),
-    array(8, '6', 'Korce county'),
-    array(8, '7', 'Kukes county'),
-    array(8, '8', 'Lezhe county'),
-    array(8, '9', 'Diber county'),
-    array(8, '10', 'Shkoder county'),
-    array(8, '11', 'Tirane county'),
-    array(8, '12', 'Vlore county'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    8,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/algeria_12_1.cif b/uc_store/countries/algeria_12_1.cif
deleted file mode 100644
index 1c5d8ff..0000000
--- a/uc_store/countries/algeria_12_1.cif
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function algeria_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 12,
-      'country_name' => 'Algeria',
-      'country_iso_code_2' => 'DZ',
-      'country_iso_code_3' => 'DZA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  // VALUES = Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(12, 'ADRAR', 'Adrar'),
-    array(12, 'AIN TEMOUCHENT', 'Ain Temouchent'),
-    array(12, 'ALGIERS', 'Algiers'),
-    array(12, 'ANNABA', 'Annaba'),
-    array(12, 'LAGHOUAT', 'Laghouat'),
-    array(12, 'BATNA', 'Batna'),
-    array(12, 'BEJAIA', 'Bejaia'),
-    array(12, 'BISKRA', 'Biskra'),
-    array(12, 'BECHAR', 'Bechar'),
-    array(12, 'BLIDA', 'Blida'),
-    array(12, 'BOUIRA', 'Bouira'),
-    array(12, 'CHLEF', 'Chlef'),
-    array(12, 'CONSTANTINE', 'Constantine'),
-    array(12, 'DJELFA', 'Djelfa'),
-    array(12, 'TAMANGHASSET', 'Tamanghasset'),
-    array(12, 'TEBESSA', 'Tebessa'),
-    array(12, 'TLEMCEN', 'Tlemcen'),
-    array(12, 'TIZI OUZOU', 'Tizi Ouzou'),
-    array(12, 'JIJEL', 'Jijel'),
-    array(12, 'SETIF', 'Setif'),
-    array(12, 'SAIDA', 'Saida'),
-    array(12, 'SKIKDA', 'Skikda'),
-    array(12, 'SIDI BEL ABBES', 'Sidi Bel Abbes'),
-    array(12, 'GUELMA', 'Guelma'),
-    array(12, 'MEDEA', 'Medea'),
-    array(12, 'MOSTAGANEM', 'Mostaganem'),
-    array(12, 'MSILA', 'MSila'),
-    array(12, 'ORAN', 'Oran'),
-    array(12, 'OUARGLA', 'Ouargla'),
-    array(12, 'OUM EL-BOUAGHI', 'Oum el-Bouaghi'),
-    array(12, 'EL BAYADH', 'El Bayadh'),
-    array(12, 'ILLIZI', 'Illizi'),
-    array(12, 'BORDJ BOU ARRERIDJ', 'Bordj Bou Arreridj'),
-    array(12, 'BOUMERDES', 'Boumerdes'),
-    array(12, 'EL TARF', 'El Tarf'),
-    array(12, 'TINDDOUF', 'Tindouf'),
-    array(12, 'TISSEMSILT', 'Tissemsilt'),
-    array(12, 'EL OUED', 'El Oued'),
-    array(12, 'KHENCHELA', 'Khenchela'),
-    array(12, 'SOUK AHRAS', 'Souk Ahras'),
-    array(12, 'MILA', 'Mila'),
-    array(12, 'AIN DEFLA', 'Ain Defla'),
-    array(12, 'NAAMA', 'Naama'),
-    array(12, 'GHARDAIA', 'Ghardaia'),
-    array(12, 'RELIZANE', 'Relizane'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    12,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city\r\n".
-    "!postal_code !zone_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/american_samoa_16_1.cif b/uc_store/countries/american_samoa_16_1.cif
deleted file mode 100644
index 281976c..0000000
--- a/uc_store/countries/american_samoa_16_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function american_samoa_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 16,
-      'country_name' => 'American Samoa',
-      'country_iso_code_2' => 'AS',
-      'country_iso_code_3' => 'ASM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    16,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/andorra_20_1.cif b/uc_store/countries/andorra_20_1.cif
deleted file mode 100644
index bb69404..0000000
--- a/uc_store/countries/andorra_20_1.cif
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function andorra_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 20,
-      'country_name' => 'Andorra',
-      'country_iso_code_2' => 'AD',
-      'country_iso_code_3' => 'AND',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(20, 'CA', 'Canillo'),
-    array(20, 'EN', 'Encamp'),
-    array(20, 'MA', 'La Massana'),
-    array(20, 'OR', 'Ordino'),
-    array(20, 'JL', 'Sant Julià de Lòria'),
-    array(20, 'AN', 'Andorra La Vella'),
-    array(20, 'EE', 'Escaldes Engordany'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    20,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/angola_24_1.cif b/uc_store/countries/angola_24_1.cif
deleted file mode 100644
index 86f8659..0000000
--- a/uc_store/countries/angola_24_1.cif
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-function angola_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 24,
-      'country_name' => 'Angola',
-      'country_iso_code_2' => 'AO',
-      'country_iso_code_3' => 'AGO',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(24, 'BGO', 'Bengo'),
-    array(24, 'BGU', 'Benguela'),
-    array(24, 'BIE', 'Bie'),
-    array(24, 'CAB', 'Cabinda'),
-    array(24, 'CCU', 'Cuando Cubango'),
-    array(24, 'CNO', 'Cuanza Norte'),
-    array(24, 'CUS', 'Cuanza Sul'),
-    array(24, 'CNN', 'Cunene'),
-    array(24, 'HUA', 'Huambo'),
-    array(24, 'HUI', 'Huila'),
-    array(24, 'LUA', 'Luanda'),
-    array(24, 'LNO', 'Lunda Norte'),
-    array(24, 'LSU', 'Lunda Sul'),
-    array(24, 'MAL', 'Malanje'),
-    array(24, 'MOX', 'Moxico'),
-    array(24, 'NAM', 'Namibe'),
-    array(24, 'UIG', 'Uige'),
-    array(24, 'ZAI', 'Zaire'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    24,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/anguilla_660_1.cif b/uc_store/countries/anguilla_660_1.cif
deleted file mode 100644
index 95de5c4..0000000
--- a/uc_store/countries/anguilla_660_1.cif
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-function anguilla_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 660,
-      'country_name' => 'Anguilla',
-      'country_iso_code_2' => 'AI',
-      'country_iso_code_3' => 'AIA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(660, 'BP', 'Blowing Point'),
-    array(660, 'EE', 'East End'),
-    array(660, 'GH', 'George Hill'),
-    array(660, 'IH', 'Island Harbour'),
-    array(660, 'NH', 'North Hill'),
-    array(660, 'NS', 'North Side'),
-    array(660, 'SG', 'Sandy Ground'),
-    array(660, 'SH', 'Sandy Hill'),
-    array(660, 'SO', 'South Hill'),
-    array(660, 'ST', 'Stoney Ground'),
-    array(660, 'TF', 'The Farrington'),
-    array(660, 'TQ', 'The Quarter (including Rey Hill)'),
-    array(660, 'TV', 'The Valley (including Upper & South Valley)'),
-    array(660, 'WE', 'West End (including Long Bay)'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    660,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/antarctica_10_1.cif b/uc_store/countries/antarctica_10_1.cif
deleted file mode 100644
index a8110ab..0000000
--- a/uc_store/countries/antarctica_10_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function antarctica_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 10,
-      'country_name' => 'Antarctica',
-      'country_iso_code_2' => 'AQ',
-      'country_iso_code_3' => 'ATA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    10,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/antigua_barbuda_28_1.cif b/uc_store/countries/antigua_barbuda_28_1.cif
deleted file mode 100644
index 85d04cd..0000000
--- a/uc_store/countries/antigua_barbuda_28_1.cif
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-function antigua_barbuda_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 28,
-      'country_name' => 'Antigua and Barbuda',
-      'country_iso_code_2' => 'AG',
-      'country_iso_code_3' => 'ATG',
-      'version' => 1,
-    ))
-    ->execute();
-
-  $zones = array(
-    array(28, 'GE', 'St. George'),
-    array(28, 'JO', 'St. John'),
-    array(28, 'MA', 'St. Mary'),
-    array(28, 'PA', 'St. Paul'),
-    array(28, 'PE', 'St. Peter'),
-    array(28, 'BB', 'Barbuda'),
-    array(28, 'RD', 'Redonda'),
-    array(28, 'PH', 'St. Philip'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    28,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/argentina_32_1.cif b/uc_store/countries/argentina_32_1.cif
deleted file mode 100644
index 8e5caa6..0000000
--- a/uc_store/countries/argentina_32_1.cif
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-function argentina_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 32,
-      'country_name' => 'Argentina',
-      'country_iso_code_2' => 'AR',
-      'country_iso_code_3' => 'ARG',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(32, 'A', 'Salta'),
-    array(32, 'B', 'Buenos Aires Province'),
-    array(32, 'C', 'Capital Federal'),
-    array(32, 'D', 'San Luis'),
-    array(32, 'E', 'Entre Ríos'),
-    array(32, 'F', 'La Rioja'),
-    array(32, 'G', 'Santiago del Estero'),
-    array(32, 'H', 'Chaco'),
-    array(32, 'J', 'San Juan'),
-    array(32, 'K', 'Catamarca'),
-    array(32, 'L', 'La Pampa'),
-    array(32, 'M', 'Mendoza'),
-    array(32, 'N', 'Misiones'),
-    array(32, 'P', 'Formosa'),
-    array(32, 'Q', 'Neuquén'),
-    array(32, 'R', 'Río Negro'),
-    array(32, 'S', 'Santa Fe'),
-    array(32, 'T', 'Tucumán'),
-    array(32, 'U', 'Chubut'),
-    array(32, 'V', 'Tierra del Fuego'),
-    array(32, 'W', 'Corrientes'),
-    array(32, 'X', 'Córdoba'),
-    array(32, 'Y', 'Jujuy'),
-    array(32, 'Z', 'Santa Cruz'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    32,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !zone_name\r\n".
-    "!country_name"
-  );
-}
diff --git a/uc_store/countries/armenia_51_1.cif b/uc_store/countries/armenia_51_1.cif
deleted file mode 100644
index 555b7f5..0000000
--- a/uc_store/countries/armenia_51_1.cif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function armenia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 51,
-      'country_name' => 'Armenia',
-      'country_iso_code_2' => 'AM',
-      'country_iso_code_3' => 'ARM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(51, 'AG', 'Araqacotn'),
-    array(51, 'AR', 'Ararat'),
-    array(51, 'AV', 'Armavir'),
-    array(51, 'ER', 'Erevan'),
-    array(51, 'GR', 'Geqarkunik'),
-    array(51, 'KT', 'Kotayk'),
-    array(51, 'LO', 'Lory'),
-    array(51, 'SH', 'Sirak'),
-    array(51, 'SU', 'Syunik'),
-    array(51, 'TV', 'Tavus'),
-    array(51, 'VD', 'Vayoc Jor'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    51,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/aruba_533_1.cif b/uc_store/countries/aruba_533_1.cif
deleted file mode 100644
index 7ff1864..0000000
--- a/uc_store/countries/aruba_533_1.cif
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function aruba_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 533,
-      'country_name' => 'Aruba',
-      'country_iso_code_2' => 'AW',
-      'country_iso_code_3' => 'ABW',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    533,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/australia_36_2.cif b/uc_store/countries/australia_36_2.cif
deleted file mode 100644
index c50ecd8..0000000
--- a/uc_store/countries/australia_36_2.cif
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function australia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 36,
-      'country_name' => 'Australia',
-      'country_iso_code_2' => 'AU',
-      'country_iso_code_3' => 'AUS',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(36, 'NSW', 'New South Wales'),
-    array(36, 'QLD', 'Queensland'),
-    array(36, 'SA', 'South Australia'),
-    array(36, 'TAS', 'Tasmania'),
-    array(36, 'VIC', 'Victoria'),
-    array(36, 'WA', 'Western Australia'),
-    array(36, 'NT', 'Northern Territory'),
-    array(36, 'ACT', 'Australian Capital Territory'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    36,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-/**
- * Implements hook_update() with $version being the only argument.
- * Add a new case for each version update, and be sure to always include the
- * latest changes in the install function.
- */
-function australia_update($version) {
-  switch ($version){
-    case 2:
-      db_update('uc_countries')
-        ->fields(array('country_iso_code_3' => 'AUS'))
-        ->condition('country_id', 36)
-        ->execute();
-    break;
-  }
-}
diff --git a/uc_store/countries/austria_40_1.cif b/uc_store/countries/austria_40_1.cif
deleted file mode 100644
index 7c259c3..0000000
--- a/uc_store/countries/austria_40_1.cif
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function austria_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 40,
-      'country_name' => 'Austria',
-      'country_iso_code_2' => 'AT',
-      'country_iso_code_3' => 'AUT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(40, 'BUR', 'Burgenland'),
-    array(40, 'KAR', 'Kärnten'),
-    array(40, 'NOS', 'Niederöesterreich'),
-    array(40, 'OOS', 'Oberöesterreich'),
-    array(40, 'SAL', 'Salzburg'),
-    array(40, 'STE', 'Steiermark'),
-    array(40, 'TIR', 'Tirol'),
-    array(40, 'VOR', 'Vorarlberg'),
-    array(40, 'WIE', 'Wien'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    40,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/azerbaijan_31_1.cif b/uc_store/countries/azerbaijan_31_1.cif
deleted file mode 100644
index 805bd79..0000000
--- a/uc_store/countries/azerbaijan_31_1.cif
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-function azerbaijan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 31,
-      'country_name' => 'Azerbaijan',
-      'country_iso_code_2' => 'AZ',
-      'country_iso_code_3' => 'AZE',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(31, 'ABS', 'Absheron'),
-    array(31, 'AGM', 'Aghdam'),
-    array(31, 'AGS', 'Aghdash'),
-    array(31, 'AGC', 'Aghjabedi'),
-    array(31, 'AGA', 'Aghstafa'),
-    array(31, 'AGU', 'Aghsu'),
-    array(31, 'AB', 'Ali-Bairamly'),
-    array(31, 'AST', 'Astara'),
-    array(31, 'BAB', 'Babek'),
-    array(31, 'BA', 'Baku'),
-    array(31, 'BAL', 'Balaken'),
-    array(31, 'BAR', 'Barda'),
-    array(31, 'BEY', 'Beilagan'),
-    array(31, 'BIL', 'Bilasuvar'),
-    array(31, 'DAS', 'Dashkesan'),
-    array(31, 'DAV', 'Devechi'),
-    array(31, 'FUZ', 'Fizuli'),
-    array(31, 'QAB', 'Gabala'),
-    array(31, 'GAD', 'Gadabey'),
-    array(31, 'QAX', 'Gakh'),
-    array(31, 'GA', 'Ganja'),
-    array(31, 'QAZ', 'Gazakh'),
-    array(31, 'GOR', 'Geranboy'),
-    array(31, 'QOB', 'Gobustan'),
-    array(31, 'GOY', 'Goychay'),
-    array(31, 'QBA', 'Guba'),
-    array(31, 'QBI', 'Gubadly'),
-    array(31, 'QUS', 'Gusar'),
-    array(31, 'HAC', 'Hacuqabul'),
-    array(31, 'IMI', 'Imishli'),
-    array(31, 'ISM', 'Ismailly'),
-    array(31, 'CAL', 'Jalilabad'),
-    array(31, 'CAB', 'Jebrail'),
-    array(31, 'CUL', 'Julfa'),
-    array(31, 'KAL', 'Kelbajar'),
-    array(31, 'XAC', 'Khachmaz'),
-    array(31, 'XA', 'Khankendy'),
-    array(31, 'XAN', 'Khanlar'),
-    array(31, 'XCI', 'Khojaly'),
-    array(31, 'XVD', 'Khojavend'),
-    array(31, 'XIZ', 'Khyzy'),
-    array(31, 'KUR', 'Kyurdamir'),
-    array(31, 'LAC', 'Lachin'),
-    array(31, 'LAN', 'Lankaran district'),
-    array(31, 'LA', 'Lankaran city'),
-    array(31, 'LER', 'Lerik'),
-    array(31, 'MAS', 'Masally'),
-    array(31, 'MI', 'Mingechevir'),
-    array(31, 'NA', 'Naftalan'),
-    array(31, 'NX', 'Nakhchivan'),
-    array(31, 'NEF', 'Neftchala'),
-    array(31, 'OGU', 'Oghuz'),
-    array(31, 'ORD', 'Ordubad'),
-    array(31, 'SAT', 'Saatly'),
-    array(31, 'SAB', 'Sabirabad'),
-    array(31, 'SAL', 'Salyan'),
-    array(31, 'SMX', 'Samuh'),
-    array(31, 'SAD', 'Sedarak'),
-    array(31, 'SAH', 'Shahbuz'),
-    array(31, 'SMI', 'Shamakhy'),
-    array(31, 'SKR', 'Shamkir'),
-    array(31, 'SAK', 'Sheki district'),
-    array(31, 'SA', 'Sheki city'),
-    array(31, 'SAR', 'Sherur'),
-    array(31, 'SUS', 'Shusha district'),
-    array(31, 'SS', 'Shusha city'),
-    array(31, 'SIY', 'Siazan'),
-    array(31, 'SM', 'Sumgayit'),
-    array(31, 'TAR', 'Terter'),
-    array(31, 'TOV', 'Tovuz'),
-    array(31, 'UCA', 'Ujar'),
-    array(31, 'YAR', 'Yardymly'),
-    array(31, 'YEV', 'Yevlakh district'),
-    array(31, 'YE', 'Yevlakh city'),
-    array(31, 'ZAQ', 'Zagatala'),
-    array(31, 'ZAN', 'Zangilan'),
-    array(31, 'ZAR', 'Zerdab'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    31,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/bahamas_44_1.cif b/uc_store/countries/bahamas_44_1.cif
deleted file mode 100644
index b002852..0000000
--- a/uc_store/countries/bahamas_44_1.cif
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function bahamas_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 44,
-      'country_name' => 'Bahamas',
-      'country_iso_code_2' => 'BS',
-      'country_iso_code_3' => 'BHS',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(44, 'AC', 'Acklins and Crooked Islands'),
-    array(44, 'BI', 'Bimini'),
-    array(44, 'CI', 'Cat Island'),
-    array(44, 'EX', 'Exuma'),
-    array(44, 'FP', 'Freeport'),
-    array(44, 'FC', 'Fresh Creek'),
-    array(44, 'GH', "Governor's Harbour"),
-    array(44, 'GT', 'Green Turtle Cay'),
-    array(44, 'HI', 'Harbour Island'),
-    array(44, 'HR', 'High Rock'),
-    array(44, 'IN', 'Inaqua'),
-    array(44, 'KB', 'Kemps Bay'),
-    array(44, 'LI', 'Long Island'),
-    array(44, 'MH', 'Marsh Harbour'),
-    array(44, 'MG', 'Mayaquana'),
-    array(44, 'NP', 'New Providence'),
-    array(44, 'NB', 'Nicholls Town and Berry Islands'),
-    array(44, 'RI', 'Ragged Island'),
-    array(44, 'RS', 'Rock Sound'),
-    array(44, 'SR', 'San Salvador and Rum Cay'),
-    array(44, 'SP', 'Sandy Point'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    44,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/bahrain_48_3.cif b/uc_store/countries/bahrain_48_3.cif
deleted file mode 100644
index 5233fe4..0000000
--- a/uc_store/countries/bahrain_48_3.cif
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function bahrain_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 48,
-      'country_name' => 'Bahrain',
-      'country_iso_code_2' => 'BH',
-      'country_iso_code_3' => 'BHR',
-      'version' => 3,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(48, 'BH-13', 'Al Manamah'),
-    array(48, 'BH-14', 'Al Janubiyah'),
-    array(48, 'BH-15', 'Al Muharraq'),
-    array(48, 'BH-16', 'Al Wusta'),
-    array(48, 'BH-17', 'Ash Shamaliyah'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    48,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1 !street2\r\n".
-    "!zone_name !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function bahrain_update($version) {
-  switch ($version) {
-    case 3:
-      // Correct ISO-3166-2 and ISO-3166-3 codes
-      db_update('uc_countries')
-        ->fields(array('country_iso_code_2' => 'BH', 'country_iso_code_3' => 'BHR'))
-        ->condition('country_id', 48)
-        ->execute();
-
-      // Remove old obsolete zones
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 48)
-          ->condition('zone_code', 'AHD'))
-        ->execute();
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 48)
-          ->condition('zone_code', 'AMG'))
-        ->execute();
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 48)
-          ->condition('zone_code', 'JHA'))
-        ->execute();
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 48)
-          ->condition('zone_code', 'STH'))
-        ->execute();
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 48)
-          ->condition('zone_code', 'MAT'))
-        ->execute();
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 48)
-          ->condition('zone_code', 'ARR'))
-        ->execute();
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 48)
-          ->condition('zone_code', 'AMJ'))
-        ->execute();
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 48)
-          ->condition('zone_code', 'MAH'))
-        ->execute();
-
-      // Add some new zones
-      $zones = array(
-        array(48, 'BH-14', 'Al Janubiyah'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-
-      // Rename remaining zones
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Al Manamah', 'zone_code' => 'BH-13'))
-        ->condition('zone_country_id', 48)
-        ->condition('zone_code', 'AMH')
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Al Muharraq', 'zone_code' => 'BH-15'))
-        ->condition('zone_country_id', 48)
-        ->condition('zone_code', 'AMQ')
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Al Wusta', 'zone_code' => 'BH-16'))
-        ->condition('zone_country_id', 48)
-        ->condition('zone_code', 'AMW')
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Ash Shamaliyah', 'zone_code' => 'BH-17'))
-        ->condition('zone_country_id', 48)
-        ->condition('zone_code', 'AMS')
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/bangladesh_50_1.cif b/uc_store/countries/bangladesh_50_1.cif
deleted file mode 100644
index bd1e6e8..0000000
--- a/uc_store/countries/bangladesh_50_1.cif
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-function bangladesh_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 50,
-      'country_name' => 'Bangladesh',
-      'country_iso_code_2' => 'BD',
-      'country_iso_code_3' => 'BGD',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(50, '1', 'Barisal'),
-    array(50, '2', 'Chittagong'),
-    array(50, '3', 'Dhaka'),
-    array(50, '4', 'Khulna'),
-    array(50, '5', 'Rajshahi'),
-    array(50, '6', 'Sylhet'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    50,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/barbados_52_1.cif b/uc_store/countries/barbados_52_1.cif
deleted file mode 100644
index 9db8a27..0000000
--- a/uc_store/countries/barbados_52_1.cif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function barbados_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 52,
-      'country_name' => 'Barbados',
-      'country_iso_code_2' => 'BB',
-      'country_iso_code_3' => 'BRB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(52, '01', 'Christ Church'),
-    array(52, '02', 'Saint Andrew'),
-    array(52, '03', 'Saint George'),
-    array(52, '04', 'Saint James'),
-    array(52, '05', 'Saint John'),
-    array(52, '06', 'Saint Joseph'),
-    array(52, '07', 'Saint Lucy'),
-    array(52, '08', 'Saint Michael'),
-    array(52, '09', 'Saint Peter'),
-    array(52, '10', 'Saint Philip'),
-    array(52, '11', 'Saint Thomas'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    52,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/belarus_112_1.cif b/uc_store/countries/belarus_112_1.cif
deleted file mode 100644
index d834ea0..0000000
--- a/uc_store/countries/belarus_112_1.cif
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-function belarus_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 112,
-      'country_name' => 'Belarus',
-      'country_iso_code_2' => 'BY',
-      'country_iso_code_3' => 'BLR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(112, 'BR', 'Brest'),
-    array(112, 'HO', 'Homyel'),
-    array(112, 'HM', 'Horad Minsk'),
-    array(112, 'HR', 'Hrodna'),
-    array(112, 'MA', 'Mahilyow'),
-    array(112, 'MI', 'Minsk'),
-    array(112, 'VI', 'Vitsyebsk'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    112,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/belgium_56_3.cif b/uc_store/countries/belgium_56_3.cif
deleted file mode 100644
index 469aacd..0000000
--- a/uc_store/countries/belgium_56_3.cif
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-function belgium_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 56,
-      'country_name' => 'Belgium',
-      'country_iso_code_2' => 'BE',
-      'country_iso_code_3' => 'BEL',
-      'version' => 3,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(56, 'VWV', 'West-Vlaanderen'),
-    array(56, 'VOV', 'Oost-Vlaanderen'),
-    array(56, 'VAN', 'Antwerpen'),
-    array(56, 'VLI', 'Limburg'),
-    array(56, 'VBR', 'Vlaams-Brabant'),
-    array(56, 'BRU', 'Brussel/Bruxelles'),
-    array(56, 'WBW', 'Brabant-Wallon'),
-    array(56, 'WLG', 'Liège'),
-    array(56, 'WHT', 'Hainaut'),
-    array(56, 'WNA', 'Namur'),
-    array(56, 'WLX', 'Luxembourg'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    56,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
-
-function belgium_update($version) {
-  switch ($version) {
-    case '2':
-      // Update existing zone codes and names.
-      db_update('uc_zones')
-        ->fields(array('zone_code' => 'VWV'))
-        ->condition('zone_code', 'WV')
-        ->condition('zone_country_id', 56)
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_code' => 'VOV'))
-        ->condition('zone_code', 'OV')
-        ->condition('zone_country_id', 56)
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_code' => 'VAN'))
-        ->condition('zone_code', 'AN')
-        ->condition('zone_country_id', 56)
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_code' => 'VLI'))
-        ->condition('zone_code', 'LG')
-        ->condition('zone_country_id', 56)
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_code' => 'VBR'))
-        ->condition('zone_code', 'VB')
-        ->condition('zone_country_id', 56)
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Brabant-Wallon', 'zone_code' => 'WBR'))
-        ->condition('zone_code', 'BW')
-        ->condition('zone_country_id', 56)
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Liège', 'zone_code' => 'WLG'))
-        ->condition('zone_code', 'LB')
-        ->condition('zone_country_id', 56)
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Hainaut', 'zone_code' => 'WHT'))
-        ->condition('zone_code', 'HT')
-        ->condition('zone_country_id', 56)
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Namur', 'zone_code' => 'WNA'))
-        ->condition('zone_code', 'NM')
-        ->condition('zone_country_id', 56)
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Luxembourg', 'zone_code' => 'WLX'))
-        ->condition('zone_code', 'LU')
-        ->condition('zone_country_id', 56)
-        ->execute();
-
-      // Insert Brussels.
-      db_insert('uc_zones')
-        ->fields(array(
-            'zone_country_id' => 56,
-            'zone_code' => 'BRU',
-            'zone_name' => 'Brussel/Bruxelles',
-          ))
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/belize_84_1.cif b/uc_store/countries/belize_84_1.cif
deleted file mode 100644
index dee708d..0000000
--- a/uc_store/countries/belize_84_1.cif
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function belize_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 84,
-      'country_name' => 'Belize',
-      'country_iso_code_2' => 'BZ',
-      'country_iso_code_3' => 'BLZ',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(84, 'BZ', 'Belize'),
-    array(84, 'CY', 'Cayo'),
-    array(84, 'CZL', 'Corozal'),
-    array(84, 'OW', 'Orange Walk'),
-    array(84, 'SC', 'Stann Creek'),
-    array(84, 'TOL', 'Toledo'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    84,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/benin_204_1.cif b/uc_store/countries/benin_204_1.cif
deleted file mode 100644
index daddd4b..0000000
--- a/uc_store/countries/benin_204_1.cif
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-function benin_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 204,
-      'country_name' => 'Benin',
-      'country_iso_code_2' => 'BJ',
-      'country_iso_code_3' => 'BEN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(204, 'AL', 'Alibori'),
-    array(204, 'AK', 'Atacora'),
-    array(204, 'AQ', 'Atlantique'),
-    array(204, 'BO', 'Borgou'),
-    array(204, 'CO', 'Collines'),
-    array(204, 'KO', 'Couffo'),
-    array(204, 'DO', 'Donga'),
-    array(204, 'LI', 'Littoral'),
-    array(204, 'MO', 'Mono'),
-    array(204, 'OU', 'Ouémé'),
-    array(204, 'PL', 'Plateau'),
-    array(204, 'ZO', 'Zou'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    204,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/bermuda_60_1.cif b/uc_store/countries/bermuda_60_1.cif
deleted file mode 100644
index fe9b678..0000000
--- a/uc_store/countries/bermuda_60_1.cif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function bermuda_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 60,
-      'country_name' => 'Bermuda',
-      'country_iso_code_2' => 'BM',
-      'country_iso_code_3' => 'BMU',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(60, 'DEV', 'Devonshire'),
-    array(60, 'HAM', 'Hamilton'),
-    array(60, 'HA', 'Hamilton Municipality'),
-    array(60, 'PAG', 'Paget'),
-    array(60, 'PEM', 'Pembroke'),
-    array(60, 'SG', 'Saint George Municipality'),
-    array(60, 'SGE', 'Saint Georges'),
-    array(60, 'SAN', 'Sandys'),
-    array(60, 'SMI', 'Smiths'),
-    array(60, 'SOU', 'Southampton'),
-    array(60, 'WAR', 'Warwick'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    60,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city - !postal_code\r\n".
-    "!zone_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/bhutan_64_1.cif b/uc_store/countries/bhutan_64_1.cif
deleted file mode 100644
index 31471de..0000000
--- a/uc_store/countries/bhutan_64_1.cif
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-function bhutan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 64,
-      'country_name' => 'Bhutan',
-      'country_iso_code_2' => 'BT',
-      'country_iso_code_3' => 'BTN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-     array(64, 'GA', 'Gasa'),
-     array(64, 'TY', 'Tashi Yangtse'),
-     array(64, '11', 'Paro'),
-     array(64, '12', 'Chhukha'),
-     array(64, '13', 'Ha'),
-     array(64, '14', 'Samchi'),
-     array(64, '15', 'Thimphu'),
-     array(64, '21', 'Chirang'),
-     array(64, '22', 'Daga'),
-     array(64, '23', 'Punakha'),
-     array(64, '24', 'Wangdi Phodrang'),
-     array(64, '31', 'Geylegphug'),
-     array(64, '32', 'Tongsa'),
-     array(64, '33', 'Bumthang'),
-     array(64, '34', 'Shemgang'),
-     array(64, '41', 'Tashigang'),
-     array(64, '42', 'Mongar'),
-     array(64, '43', 'Pemagatsel'),
-     array(64, '44', 'Lhuntshi'),
-     array(64, '45', 'Samdrup Jongkhar'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    64,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/bolivia_68_1.cif b/uc_store/countries/bolivia_68_1.cif
deleted file mode 100644
index 277a886..0000000
--- a/uc_store/countries/bolivia_68_1.cif
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-function bolivia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 68,
-      'country_name' => 'Bolivia, Plurinational State of',
-      'country_iso_code_2' => 'BO',
-      'country_iso_code_3' => 'BOL',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(68, 'BO-C', 'Cochabamba'),
-    array(68, 'BO-H', 'Chuquisaca'),
-    array(68, 'BO-B', 'El Beni'),
-    array(68, 'BO-L', 'La Paz'),
-    array(68, 'BO-O', 'Oruro'),
-    array(68, 'BO-N', 'Pando'),
-    array(68, 'BO-P', 'Potosí'),
-    array(68, 'BO-S', 'Santa Cruz'),
-    array(68, 'BO-T', 'Tarija'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    68,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/bonaire_535_1.cif b/uc_store/countries/bonaire_535_1.cif
deleted file mode 100644
index a00abe0..0000000
--- a/uc_store/countries/bonaire_535_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function bonaire_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 535,
-      'country_name' => 'Bonaire, Saint Eustatius and Saba',
-      'country_iso_code_2' => 'BQ',
-      'country_iso_code_3' => 'BES',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    535,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/bosnia_herzegovina_70_2.cif b/uc_store/countries/bosnia_herzegovina_70_2.cif
deleted file mode 100644
index 680d623..0000000
--- a/uc_store/countries/bosnia_herzegovina_70_2.cif
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function bosnia_herzegovina_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 70,
-      'country_name' => 'Bosnia and Herzegovina',
-      'country_iso_code_2' => 'BA',
-      'country_iso_code_3' => 'BIH',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(70, 'BIH', 'Federacija Bosna i Hercegovina'),
-    array(70, 'SRP', 'Republika Srpska'),
-    array(70, '05', 'Bosansko-Podrinjski Kanton'),
-    array(70, '10', 'Hercegovacko-Bosanski Kanton'),
-    array(70, '07', 'Hercegovacko-Neretvanski Kanton'),
-    array(70, '09', 'Kanton Sarajevo'),
-    array(70, '02', 'Posavski Kanton'),
-    array(70, '06', 'Srednjobosanski Kanton'),
-    array(70, '03', 'Tuzlanski Kanton'),
-    array(70, '01', 'Unsko-Sanski Kanton'),
-    array(70, '08', 'Zapadno-Hercegovacki Kanton'),
-    array(70, '04', 'Zenicko-Dobojski Kanton'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    70,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function bosnia_herzegovina_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => 'Bosnia and Herzegovina'))
-        ->condition('country_id', 70)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/botswana_72_1.cif b/uc_store/countries/botswana_72_1.cif
deleted file mode 100644
index 770508c..0000000
--- a/uc_store/countries/botswana_72_1.cif
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function botswana_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 72,
-      'country_name' => 'Botswana',
-      'country_iso_code_2' => 'BW',
-      'country_iso_code_3' => 'BWA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(72, 'CE', 'Central'),
-    array(72, 'GH', 'Ghanzi'),
-    array(72, 'KG', 'Kgalagadi'),
-    array(72, 'KL', 'Kgatleng'),
-    array(72, 'KW', 'Kweneng'),
-    array(72, 'NE', 'North-East'),
-    array(72, 'NW', 'North-West'),
-    array(72, 'SE', 'South-East'),
-    array(72, 'SO', 'Southern'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    72,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/bouvet_island_74_1.cif b/uc_store/countries/bouvet_island_74_1.cif
deleted file mode 100644
index bf8e702..0000000
--- a/uc_store/countries/bouvet_island_74_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function bouvet_island_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 74,
-      'country_name' => 'Bouvet Island',
-      'country_iso_code_2' => 'BV',
-      'country_iso_code_3' => 'BVT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    74,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/brazil_76_1.cif b/uc_store/countries/brazil_76_1.cif
deleted file mode 100644
index 51144ed..0000000
--- a/uc_store/countries/brazil_76_1.cif
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-function brazil_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 76,
-      'country_name' => 'Brazil',
-      'country_iso_code_2' => 'BR',
-      'country_iso_code_3' => 'BRA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(76, 'AC', 'Acre'),
-    array(76, 'AL', 'Alagoas'),
-    array(76, 'AP', 'Amapá'),
-    array(76, 'AM', 'Amazonas'),
-    array(76, 'BA', 'Bahia'),
-    array(76, 'CE', 'Ceará'),
-    array(76, 'DF', 'Distrito Federal'),
-    array(76, 'ES', 'Espírito Santo'),
-    array(76, 'GO', 'Goiás'),
-    array(76, 'MA', 'Maranhão'),
-    array(76, 'MT', 'Mato Grosso'),
-    array(76, 'MS', 'Mato Grosso do Sul'),
-    array(76, 'MG', 'Minas Gerais'),
-    array(76, 'PA', 'Pará'),
-    array(76, 'PB', 'Paraíba'),
-    array(76, 'PR', 'Paraná'),
-    array(76, 'PE', 'Pernambuco'),
-    array(76, 'PI', 'Piauí'),
-    array(76, 'RJ', 'Rio de Janeiro'),
-    array(76, 'RN', 'Rio Grande do Norte'),
-    array(76, 'RS', 'Rio Grande do Sul'),
-    array(76, 'RO', 'Rondônia'),
-    array(76, 'RR', 'Roraima'),
-    array(76, 'SC', 'Santa Catarina'),
-    array(76, 'SP', 'São Paulo'),
-    array(76, 'SE', 'Sergipe'),
-    array(76, 'TO', 'Tocantins'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    76,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !postal_code\r\n".
-    "!zone_name, !country_name"
-  );
-}
diff --git a/uc_store/countries/british_indian_ocean_territory_86_1.cif b/uc_store/countries/british_indian_ocean_territory_86_1.cif
deleted file mode 100644
index d959635..0000000
--- a/uc_store/countries/british_indian_ocean_territory_86_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function british_indian_ocean_territory_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 86,
-      'country_name' => 'British Indian Ocean Territory',
-      'country_iso_code_2' => 'IO',
-      'country_iso_code_3' => 'IOT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    86,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/brunei_darussalam_96_3.cif b/uc_store/countries/brunei_darussalam_96_3.cif
deleted file mode 100644
index 64be444..0000000
--- a/uc_store/countries/brunei_darussalam_96_3.cif
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-function brunei_darussalam_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 96,
-      'country_name' => 'Brunei Darussalam',
-      'country_iso_code_2' => 'BN',
-      'country_iso_code_3' => 'BRN',
-      'version' => 3,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(96, 'BN-BE', 'Belait'),
-    array(96, 'BN-BM', 'Brunei-Muara'),
-    array(96, 'BN-TE', 'Temburong'),
-    array(96, 'BN-TU', 'Tutong'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    96,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !postal_code\r\n".
-    "!zone_name\r\n".
-    "!country_name_if"
-  );
-}
-
-function brunei_darussalam_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct the address format
-      uc_set_address_format(
-        96,
-        "!company\r\n".
-        "!first_name !last_name\r\n".
-        "!street1\r\n".
-        "!street2\r\n".
-        "!city !postal_code\r\n".
-        "!zone_name\r\n".
-        "!country_name_if"
-      );
-      break;
-
-    case 3:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => 'Brunei Darussalam'))
-        ->condition('country_id', 96)
-        ->execute();
-      break;
-  }
-}
diff --git a/uc_store/countries/bulgaria_100_1.cif b/uc_store/countries/bulgaria_100_1.cif
deleted file mode 100644
index e808d36..0000000
--- a/uc_store/countries/bulgaria_100_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function bulgaria_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 100,
-      'country_name' => 'Bulgaria',
-      'country_iso_code_2' => 'BG',
-      'country_iso_code_3' => 'BGR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // BG has no postal zones in the Ubercart sense
-
-  // Set address format
-  uc_set_address_format(
-    100,
-    "!first_name !last_name\r\n".
-    "!company\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!zone_name\r\n".
-    "!postal_code !city !country_name_if"
-  );
-}
diff --git a/uc_store/countries/burkina_faso_854_1.cif b/uc_store/countries/burkina_faso_854_1.cif
deleted file mode 100644
index e9cc306..0000000
--- a/uc_store/countries/burkina_faso_854_1.cif
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-function burkina_faso_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 854,
-      'country_name' => 'Burkina Faso',
-      'country_iso_code_2' => 'BF',
-      'country_iso_code_3' => 'BFA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(854, 'BAL', 'Bale'),
-    array(854, 'BAM', 'Bam'),
-    array(854, 'BAN', 'Banwa'),
-    array(854, 'BAZ', 'Bazega'),
-    array(854, 'BGR', 'Bougouriba'),
-    array(854, 'BLG', 'Boulgou'),
-    array(854, 'BLK', 'Boulkiemde'),
-    array(854, 'COM', 'Comoe'),
-    array(854, 'GAN', 'Ganzourgou'),
-    array(854, 'GNA', 'Gnagna'),
-    array(854, 'GOU', 'Gourma'),
-    array(854, 'HOU', 'Houet'),
-    array(854, 'IOB', 'Ioba'),
-    array(854, 'KAD', 'Kadiogo'),
-    array(854, 'KEN', 'Kenedougou'),
-    array(854, 'KMD', 'Komandjoari'),
-    array(854, 'KMP', 'Kompienga'),
-    array(854, 'KOS', 'Kossi'),
-    array(854, 'KOP', 'Koulpelogo'),
-    array(854, 'KOT', 'Kouritenga'),
-    array(854, 'KOW', 'Kourweogo'),
-    array(854, 'LER', 'Leraba'),
-    array(854, 'LOR', 'Loroum'),
-    array(854, 'MOU', 'Mouhoun'),
-    array(854, 'NAO', 'Nahouri'),
-    array(854, 'NAM', 'Namentenga'),
-    array(854, 'NAY', 'Nayala'),
-    array(854, 'NOU', 'Noumbiel'),
-    array(854, 'OUB', 'Oubritenga'),
-    array(854, 'OUD', 'Oudalan'),
-    array(854, 'PAS', 'Passore'),
-    array(854, 'PON', 'Poni'),
-    array(854, 'SNG', 'Sanguie'),
-    array(854, 'SMT', 'Sanmatenga'),
-    array(854, 'SEN', 'Seno'),
-    array(854, 'SIS', 'Sissili'),
-    array(854, 'SOM', 'Soum'),
-    array(854, 'SOR', 'Sourou'),
-    array(854, 'TAP', 'Tapoa'),
-    array(854, 'TUI', 'Tuy'),
-    array(854, 'YAG', 'Yagha'),
-    array(854, 'YAT', 'Yatenga'),
-    array(854, 'ZIR', 'Ziro'),
-    array(854, 'ZON', 'Zondoma'),
-    array(854, 'ZOU', 'Zoundweogo'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    854,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/burundi_108_1.cif b/uc_store/countries/burundi_108_1.cif
deleted file mode 100644
index a725b15..0000000
--- a/uc_store/countries/burundi_108_1.cif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-function burundi_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 108,
-      'country_name' => 'Burundi',
-      'country_iso_code_2' => 'BI',
-      'country_iso_code_3' => 'BDI',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(108, 'BB', 'Bubanza'),
-    array(108, 'BM', 'Bujumbura Mairie'),
-    array(108, 'BJ', 'Bujumbura Rural'),
-    array(108, 'BR', 'Bururi'),
-    array(108, 'CA', 'Cankuzo'),
-    array(108, 'CI', 'Cibitoke'),
-    array(108, 'GI', 'Gitega'),
-    array(108, 'KR', 'Karuzi'),
-    array(108, 'KY', 'Kayanza'),
-    array(108, 'KI', 'Kirundo'),
-    array(108, 'MA', 'Makamba'),
-    array(108, 'MU', 'Muramvya'),
-    array(108, 'MY', 'Muyinga'),
-    array(108, 'MW', 'Mwaro'),
-    array(108, 'NG', 'Ngozi'),
-    array(108, 'RT', 'Rutana'),
-    array(108, 'RY', 'Ruyigi'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    108,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/cambodia_116_1.cif b/uc_store/countries/cambodia_116_1.cif
deleted file mode 100644
index d179ab2..0000000
--- a/uc_store/countries/cambodia_116_1.cif
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function cambodia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 116,
-      'country_name' => 'Cambodia',
-      'country_iso_code_2' => 'KH',
-      'country_iso_code_3' => 'KHM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(116, '2', 'Baat Dambang'),
-    array(116, '1', 'Banteay Mean Chey'),
-    array(116, '1', 'Banteay Meanchey'),
-    array(116, '2', 'Batdambang'),
-    array(116, '3', 'Kampong Chaam'),
-    array(116, '3', 'Kampong Cham'),
-    array(116, '4', 'Kampong Chhnang'),
-    array(116, '5', 'Kampong Spoe'),
-    array(116, '5', 'Kampong Spueu'),
-    array(116, '6', 'Kampong Thum'),
-    array(116, '7', 'Kampot'),
-    array(116, '8', 'Kandaal'),
-    array(116, '8', 'Kandal'),
-    array(116, '9', 'Kaoh Kong'),
-    array(116, '10', 'Kracheh'),
-    array(116, '23', 'Krong Kaeb'),
-    array(116, '23', 'Krong Keb'),
-    array(116, '24', 'Krong Pailin'),
-    array(116, '18', 'Krong Preah Sihanouk'),
-    array(116, '11', 'Mondol Kiri'),
-    array(116, '22', 'Otdar Mean Chey'),
-    array(116, '22', 'Otdar Meanchey'),
-    array(116, '12', 'Phnom Penh'),
-    array(116, '12', 'Phnum Penh'),
-    array(116, '15', 'Pousaat'),
-    array(116, '15', 'Pouthisat'),
-    array(116, '13', 'Preah Vihear'),
-    array(116, '14', 'Prey Veaeng'),
-    array(116, '14', 'Prey Veng'),
-    array(116, '16', 'Rotanak Kiri'),
-    array(116, '16', 'Rotanokiri'),
-    array(116, '17', 'Siem Reab'),
-    array(116, '17', 'Siemreab'),
-    array(116, '19', 'Stoeng Treng'),
-    array(116, '19', 'Stueng Traeng'),
-    array(116, '20', 'Svaay Rieng'),
-    array(116, '20', 'Svay Rieng'),
-    array(116, '21', 'Taakaev'),
-    array(116, '21', 'Takev'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    116,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/cameroon_120_1.cif b/uc_store/countries/cameroon_120_1.cif
deleted file mode 100644
index 653fae3..0000000
--- a/uc_store/countries/cameroon_120_1.cif
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-function cameroon_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 120,
-      'country_name' => 'Cameroon',
-      'country_iso_code_2' => 'CM',
-      'country_iso_code_3' => 'CMR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(120, 'CM-AD', 'Adamaoua'),
-    array(120, 'CM-CE', 'Centre'),
-    array(120, 'CM-ES', 'Est'),
-    array(120, 'CM-EN', 'Extreme-Nord'),
-    array(120, 'CM-LT', 'Littoral'),
-    array(120, 'CM-NO', 'Nord'),
-    array(120, 'CM-NW', 'Nord-Ouest'),
-    array(120, 'CM-OU', 'Ouest'),
-    array(120, 'CM-SU', 'Sud'),
-    array(120, 'CM-SW', 'Sud-Ouest'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    120,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/canada_124_2.cif b/uc_store/countries/canada_124_2.cif
deleted file mode 100644
index 4112570..0000000
--- a/uc_store/countries/canada_124_2.cif
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-function canada_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 124,
-      'country_name' => 'Canada',
-      'country_iso_code_2' => 'CA',
-      'country_iso_code_3' => 'CAN',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(124, 'AB', 'Alberta'),
-    array(124, 'BC', 'British Columbia'),
-    array(124, 'MB', 'Manitoba'),
-    array(124, 'NL', 'Newfoundland and Labrador'),
-    array(124, 'NB', 'New Brunswick'),
-    array(124, 'NS', 'Nova Scotia'),
-    array(124, 'NT', 'Northwest Territories'),
-    array(124, 'NU', 'Nunavut'),
-    array(124, 'ON', 'Ontario'),
-    array(124, 'PE', 'Prince Edward Island'),
-    array(124, 'QC', 'Quebec'),
-    array(124, 'SK', 'Saskatchewan'),
-    array(124, 'YT', 'Yukon Territory'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  // Have to call variable_set() instead of uc_set_address_format()
-  // because the Canada .cif file is loaded during the installation
-  // of the uc_store module, before uc_set_address_format() is available
-  // to use.
-  /*
-  variable_set(
-    'uc_address_format_124',
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !postal_code\r\n".
-    "!zone_name, !country_name"
-  );
-  */
-}
-
-function canada_update($version) {
-  switch ($version) {
-    case 2:
-
-      // Rename zone
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Newfoundland and Labrador', 'zone_code' => 'NL'))
-        ->condition('zone_country_id', 124)
-        ->condition('zone_code', 'NF')
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/cape_verde_132_1.cif b/uc_store/countries/cape_verde_132_1.cif
deleted file mode 100644
index a6081ef..0000000
--- a/uc_store/countries/cape_verde_132_1.cif
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-function cape_verde_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 132,
-      'country_name' => 'Cape Verde',
-      'country_iso_code_2' => 'CV',
-      'country_iso_code_3' => 'CPV',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(132, 'BV', 'Boa Vista'),
-    array(132, 'BR', 'Brava'),
-    array(132, 'MA', 'Maio'),
-    array(132, 'MO', 'Mosteiros'),
-    array(132, 'PA', 'Paul'),
-    array(132, 'PN', 'Porto Novo'),
-    array(132, 'PR', 'Praia'),
-    array(132, 'SN', 'Ribeira Brava'),
-    array(132, 'RG', 'Ribeira Grande'),
-    array(132, 'PR', 'Ribeira Grande de Santiago'),
-    array(132, 'SL', 'Sal'),
-    array(132, 'CA', 'Santa Catarina'),
-    array(132, 'SF', 'Santa Catarina do Fogo'),
-    array(132, 'CR', 'Santa Cruz'),
-    array(132, 'SD', 'Sao Domingos'),
-    array(132, 'SF', 'Sao Filipe'),
-    array(132, 'CR', 'Sao Lourenço dos Orgaos'),
-    array(132, 'CS', 'Sao Miguel'),
-    array(132, 'CA', 'Sao Salvador do Mundo'),
-    array(132, 'SV', 'Sao Vicente'),
-    array(132, 'TA', 'Tarrafal'),
-    array(132, 'TS', 'Tarrafal de Sao Nicolau'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    132,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/cayman_islands_136_1.cif b/uc_store/countries/cayman_islands_136_1.cif
deleted file mode 100644
index 04f7a16..0000000
--- a/uc_store/countries/cayman_islands_136_1.cif
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-function cayman_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 136,
-      'country_name' => 'Cayman Islands',
-      'country_iso_code_2' => 'KY',
-      'country_iso_code_3' => 'CYM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(136, 'BT', 'Bodden Town'),
-    array(136, 'CB', 'Cayman Brac'),
-    array(136, 'EE', 'East End'),
-    array(136, 'GT', 'George Town'),
-    array(136, 'SO', 'Little Cayman'),
-    array(136, 'NS', 'North Side'),
-    array(136, 'WB', 'West Bay'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    136,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/central_african_republic_140_1.cif b/uc_store/countries/central_african_republic_140_1.cif
deleted file mode 100644
index 12772b1..0000000
--- a/uc_store/countries/central_african_republic_140_1.cif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-function central_african_republic_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 140,
-      'country_name' => 'Central African Republic',
-      'country_iso_code_2' => 'CF',
-      'country_iso_code_3' => 'CAF',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(140, 'BB', 'Bamingui-Bangoran'),
-    array(140, 'BGF', 'Bangui'),
-    array(140, 'BK', 'Basse-Kotto'),
-    array(140, 'HK', 'Haute-Kotto'),
-    array(140, 'HM', 'Haut-Mbomou'),
-    array(140, 'KG', 'Kemo'),
-    array(140, 'LB', 'Lobaye'),
-    array(140, 'HS', 'Mambere-Kadei'),
-    array(140, 'MB', 'Mbomou'),
-    array(140, 'KB', 'Nana-Grebizi'),
-    array(140, 'NM', 'Nana-Mambere'),
-    array(140, 'MP', "Ombella-M'Poko"),
-    array(140, 'UK', 'Ouaka'),
-    array(140, 'AC', 'Ouham'),
-    array(140, 'OP', 'Ouham-Pende'),
-    array(140, 'SE', 'Sangha-Mbaere'),
-    array(140, 'VK', 'Vakaga'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    140,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/chad_148_1.cif b/uc_store/countries/chad_148_1.cif
deleted file mode 100644
index ad37f0b..0000000
--- a/uc_store/countries/chad_148_1.cif
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-function chad_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 148,
-      'country_name' => 'Chad',
-      'country_iso_code_2' => 'TD',
-      'country_iso_code_3' => 'TCD',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(148, 'KA', 'Barh el Ghazel'),
-    array(148, 'BA', 'Batha'),
-    array(148, 'BET', 'Borkou'),
-    array(148, 'CB', 'Chari-Baguirmi'),
-    array(148, 'BET', 'Ennedi'),
-    array(148, 'GR', 'Guera'),
-    array(148, 'HL', 'Hadjer-Lamis'),
-    array(148, 'KA', 'Kanem'),
-    array(148, 'LC', 'Lac'),
-    array(148, 'LO', 'Logone Occidental'),
-    array(148, 'LR', 'Logone Oriental'),
-    array(148, 'MA', 'Mandoul'),
-    array(148, 'ME', 'Mayo-Kebbi Est'),
-    array(148, 'MO', 'Mayo-Kebbi Ouest'),
-    array(148, 'MC', 'Moyen-Chari'),
-    array(148, 'OD', 'Ouaddai'),
-    array(148, 'SA', 'Salamat'),
-    array(148, 'OD', 'Sila'),
-    array(148, 'TA', 'Tandjile'),
-    array(148, 'BET', 'Tibesti'),
-    array(148, 'ND', "Ville de N'Djamena"),
-    array(148, 'WF', 'Wadi Fira'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    148,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/chile_152_1.cif b/uc_store/countries/chile_152_1.cif
deleted file mode 100644
index c576912..0000000
--- a/uc_store/countries/chile_152_1.cif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-function chile_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 152,
-      'country_name' => 'Chile',
-      'country_iso_code_2' => 'CL',
-      'country_iso_code_3' => 'CHL',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(152, 'TA', 'Tarapaca'),
-    array(152, 'AN', 'Antofagasta'),
-    array(152, 'AT', 'Atacama'),
-    array(152, 'CO', 'Coquimbo'),
-    array(152, 'VA', 'Valparaiso'),
-    array(152, 'OH', 'Ohiggins'),
-    array(152, 'MA', 'Maule'),
-    array(152, 'BI', 'Biobio'),
-    array(152, 'AR', 'Araucania'),
-    array(152, 'LA', 'Lagos'),
-    array(152, 'AI', 'Aisen'),
-    array(152, 'MA', 'Magallanes'),
-    array(152, 'RM', 'Metropolitana'),
-    array(152, 'Ri', 'Rios'),
-    array(152, 'AR', 'Arica'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    152,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !postal_code\r\n".
-    "!zone_name, !country_name"
-  );
-}
diff --git a/uc_store/countries/china_156_1.cif b/uc_store/countries/china_156_1.cif
deleted file mode 100644
index 68930ba..0000000
--- a/uc_store/countries/china_156_1.cif
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function china_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 156,
-      'country_name' => 'China',
-      'country_iso_code_2' => 'CN',
-      'country_iso_code_3' => 'CHN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.  Use %d for the zone_id and the
-  // function uc_get_zone_ids($num) as the second argument for db_query() where
-  // $num is the number of zones in the INSERT query.
-  // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(156, '京', '北京'),
-    array(156, '沪', '上海'),
-    array(156, '津', '天津'),
-    array(156, '渝', '重庆'),
-    array(156, '冀', '河北'),
-    array(156, '豫', '河南'),
-    array(156, '鄂', '湖北'),
-    array(156, '湘', '湖南'),
-    array(156, '苏', '江苏'),
-    array(156, '赣', '江西'),
-    array(156, '辽', '辽宁'),
-    array(156, '吉', '吉林'),
-    array(156, '黑', '黑龙江'),
-    array(156, '陕', '陕西'),
-    array(156, '鲁', '山东'),
-    array(156, '晋', '山西'),
-    array(156, '川', '四川'),
-    array(156, '青', '青海'),
-    array(156, '皖', '安徽'),
-    array(156, '琼', '海南'),
-    array(156, '粤', '广东'),
-    array(156, '桂', '广西'),
-    array(156, '贵', '贵州'),
-    array(156, '浙', '浙江'),
-    array(156, '闽', '福建'),
-    array(156, '甘', '甘肃'),
-    array(156, '云', '云南'),
-    array(156, '蒙', '内蒙古'),
-    array(156, '宁', '宁夏'),
-    array(156, '新', '新疆'),
-    array(156, '藏', '西藏'),
-    array(156, '港', '香港'),
-    array(156, '澳', '澳门'),
-    array(156, '台', '台湾'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    156,
-    "!company\r\n".
-    "!last_name !first_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/christmas_island_162_1.cif b/uc_store/countries/christmas_island_162_1.cif
deleted file mode 100644
index d83791d..0000000
--- a/uc_store/countries/christmas_island_162_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function christmas_island_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 162,
-      'country_name' => 'Christmas Island',
-      'country_iso_code_2' => 'CX',
-      'country_iso_code_3' => 'CXR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    162,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/cocos_islands_166_1.cif b/uc_store/countries/cocos_islands_166_1.cif
deleted file mode 100644
index 2474e7c..0000000
--- a/uc_store/countries/cocos_islands_166_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function cocos_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 166,
-      'country_name' => 'Cocos (Keeling) Islands',
-      'country_iso_code_2' => 'CC',
-      'country_iso_code_3' => 'CCK',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    166,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/colombia_170_1.cif b/uc_store/countries/colombia_170_1.cif
deleted file mode 100644
index 592d021..0000000
--- a/uc_store/countries/colombia_170_1.cif
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function colombia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 170,
-      'country_name' => 'Colombia',
-      'country_iso_code_2' => 'CO',
-      'country_iso_code_3' => 'COL',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(170, 'AMA', 'Amazonas'),
-    array(170, 'ANT', 'Antioquia'),
-    array(170, 'ARA', 'Arauca'),
-    array(170, 'ATL', 'Atlantico'),
-    array(170, 'BOL', 'Bolivar'),
-    array(170, 'CAL', 'Caldas'),
-    array(170, 'CAQ', 'Caqueta'),
-    array(170, 'CAS', 'Casanare'),
-    array(170, 'CAU', 'Cauca'),
-    array(170, 'CES', 'Cesar'),
-    array(170, 'CHO', 'Choco'),
-    array(170, 'COR', 'Cordoba'),
-    array(170, 'CUN', 'Cundinamarca'),
-    array(170, 'DC', 'Distrito Capital de Bogota'),
-    array(170, 'GUA', 'Guainia'),
-    array(170, 'GUV', 'Guaviare'),
-    array(170, 'HUI', 'Huila'),
-    array(170, 'LAG', 'La Guajira'),
-    array(170, 'MAG', 'Magdalena'),
-    array(170, 'MET', 'Meta'),
-    array(170, 'NAR', 'Narino'),
-    array(170, 'NSA', 'Norte de Santander'),
-    array(170, 'PUT', 'Putumayo'),
-    array(170, 'QUI', 'Quindio'),
-    array(170, 'RIS', 'Risaralda'),
-    array(170, 'SAP', 'San Andres, Providencia y Santa Catalina'),
-    array(170, 'SAN', 'Santander'),
-    array(170, 'SUC', 'Sucre'),
-    array(170, 'TOL', 'Tolima'),
-    array(170, 'VAC', 'Valle del Cauca'),
-    array(170, 'VAU', 'Vaupes'),
-    array(170, 'VID', 'Vichada'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    170,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/comoros_174_1.cif b/uc_store/countries/comoros_174_1.cif
deleted file mode 100644
index e8a22d0..0000000
--- a/uc_store/countries/comoros_174_1.cif
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-function comoros_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 174,
-      'country_name' => 'Comoros',
-      'country_iso_code_2' => 'KM',
-      'country_iso_code_3' => 'COM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(174, 'A', 'Anjouan'),
-    array(174, 'G', 'Grande Comore'),
-    array(174, 'M', 'Moheli'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    174,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/congo_178_1.cif b/uc_store/countries/congo_178_1.cif
deleted file mode 100644
index 4580880..0000000
--- a/uc_store/countries/congo_178_1.cif
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-function congo_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 178,
-      'country_name' => 'Congo',
-      'country_iso_code_2' => 'CG',
-      'country_iso_code_3' => 'COG',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(178, '11', 'Bouenza'),
-    array(178, 'BZV', 'Brazzaville'),
-    array(178, '8', 'Cuvette'),
-    array(178, '15', 'Cuvette-Ouest'),
-    array(178, '5', 'Kouilou'),
-    array(178, '2', 'Lekoumou'),
-    array(178, '7', 'Likouala'),
-    array(178, '9', 'Niari'),
-    array(178, '14', 'Plateaux'),
-    array(178, '12', 'Pool'),
-    array(178, '13', 'Sangha'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    178,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/congo_democratic_republic_of_180_1.cif b/uc_store/countries/congo_democratic_republic_of_180_1.cif
deleted file mode 100644
index ebc1e6b..0000000
--- a/uc_store/countries/congo_democratic_republic_of_180_1.cif
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-function congo_democratic_republic_of_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 180,
-      'country_name' => 'Congo, the Democratic Republic of the',
-      'country_iso_code_2' => 'CD',
-      'country_iso_code_3' => 'COD',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(180, 'CD-KN', 'Kinshasa'),
-    array(180, 'CD-BN', 'Bandundu'),
-    array(180, 'CD-BC', 'Bas-Congo'),
-    array(180, 'CD-EQ', 'Equateur'),
-    array(180, 'CD-KW', 'Kasai-Occidental'),
-    array(180, 'CD-KE', 'Kasai-Oriental'),
-    array(180, 'CD-KA', 'Katanga'),
-    array(180, 'CD-MA', 'Maniema'),
-    array(180, 'CD-NK', 'Nord-Kivu'),
-    array(180, 'CD-OR', 'Orientale'),
-    array(180, 'CD-SK', 'Sud-Kivu'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    180,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/cook_islands_184_1.cif b/uc_store/countries/cook_islands_184_1.cif
deleted file mode 100644
index 2a06c6e..0000000
--- a/uc_store/countries/cook_islands_184_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function cook_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 184,
-      'country_name' => 'Cook Islands',
-      'country_iso_code_2' => 'CK',
-      'country_iso_code_3' => 'COK',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    184,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/costa_rica_188_2.cif b/uc_store/countries/costa_rica_188_2.cif
deleted file mode 100644
index e051378..0000000
--- a/uc_store/countries/costa_rica_188_2.cif
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function costa_rica_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 188,
-      'country_name' => 'Costa Rica',
-      'country_iso_code_2' => 'CR',
-      'country_iso_code_3' => 'CRI',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(188, 'AL', 'Alajuela'),
-    array(188, 'CA', 'Cartago'),
-    array(188, 'GU', 'Guanacaste'),
-    array(188, 'HE', 'Heredia'),
-    array(188, 'LI', 'Limón'),
-    array(188, 'PU', 'Puntarenas'),
-    array(188, 'SJ', 'San José'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    188,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function costa_rica_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_iso_code_3' => 'CRI'))
-        ->condition('country_id', 188)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/cote_d_ivoire_384_1.cif b/uc_store/countries/cote_d_ivoire_384_1.cif
deleted file mode 100644
index 3536324..0000000
--- a/uc_store/countries/cote_d_ivoire_384_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function cote_d_ivoire_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 384,
-      'country_name' => "Côte d'Ivoire",
-      'country_iso_code_2' => 'CI',
-      'country_iso_code_3' => 'CIV',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    384,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/croatia_191_1.cif b/uc_store/countries/croatia_191_1.cif
deleted file mode 100644
index ecff4c3..0000000
--- a/uc_store/countries/croatia_191_1.cif
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-function croatia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 191,
-      'country_name' => 'Croatia',
-      'country_iso_code_2' => 'HR',
-      'country_iso_code_3' => 'HRV',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(191, '01', 'Zagreb county'),
-    array(191, '02', 'Krapina-Zagorje county'),
-    array(191, '03', 'Sisak-Moslavina county'),
-    array(191, '04', 'Karlovac county'),
-    array(191, '05', 'Varaždin county'),
-    array(191, '06', 'Koprivnica-Križevci county'),
-    array(191, '07', 'Bjelovar-Bilogora county'),
-    array(191, '08', 'Primorje-Gorski Kotar county'),
-    array(191, '09', 'Lika-Senj county'),
-    array(191, '10', 'Virovitica-Podravina county'),
-    array(191, '11', 'Požega-Slavonia county'),
-    array(191, '12', 'Brod-Posavina county'),
-    array(191, '13', 'Zadar county'),
-    array(191, '14', 'Osijek-Baranja county'),
-    array(191, '15', 'Šibenik-Knin county'),
-    array(191, '16', 'Vukovar-Srijem county'),
-    array(191, '17', 'Split-Dalmatia county'),
-    array(191, '18', 'Istria county'),
-    array(191, '19', 'Dubrovnik-Neretva county'),
-    array(191, '20', 'Međimurje county'),
-    array(191, '21', 'Zagreb'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    191,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1 !street2\r\n".
-    "!postal_code !zone_name\r\n".
-    "!country_name"
-  );
-}
diff --git a/uc_store/countries/cuba_192_1.cif b/uc_store/countries/cuba_192_1.cif
deleted file mode 100644
index 6e71275..0000000
--- a/uc_store/countries/cuba_192_1.cif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-function cuba_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 192,
-      'country_name' => 'Cuba',
-      'country_iso_code_2' => 'CU',
-      'country_iso_code_3' => 'CUB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(192, '01', 'Pinar del Rio'),
-    array(192, '02', 'La Habana'),
-    array(192, '03', 'Ciudad de la Habana'),
-    array(192, '04', 'Matanzas'),
-    array(192, '05', 'Villa Clara'),
-    array(192, '06', 'Cienfuegos'),
-    array(192, '07', 'Sancti Spiritus'),
-    array(192, '08', 'Ciego de Avila'),
-    array(192, '09', 'Camaguey'),
-    array(192, '10', 'Las Tunas'),
-    array(192, '11', 'Holguin'),
-    array(192, '12', 'Granma'),
-    array(192, '13', 'Santiago de Cuba'),
-    array(192, '14', 'Sancti Spiritus'),
-    array(192, '99', 'Isla de la Juventud'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    192,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/curacao_531_1.cif b/uc_store/countries/curacao_531_1.cif
deleted file mode 100644
index ec65672..0000000
--- a/uc_store/countries/curacao_531_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function curacao_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 531,
-      'country_name' => 'Curaçao',
-      'country_iso_code_2' => 'CW',
-      'country_iso_code_3' => 'CUW',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    531,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/cyprus_196_1.cif b/uc_store/countries/cyprus_196_1.cif
deleted file mode 100644
index e8adacf..0000000
--- a/uc_store/countries/cyprus_196_1.cif
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-function cyprus_install() {
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => '196',
-      'country_name' => 'Cyprus',
-      'country_iso_code_2' => 'CY',
-      'country_iso_code_3' => 'CYP',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(196, '04', 'Famagusta'),
-    array(196, '06', 'Kyrenia'),
-    array(196, '03', 'Larnaca'),
-    array(196, '02', 'Limassol'),
-    array(196, '01', 'Nicosia'),
-    array(196, '05', 'Paphos')
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  uc_set_address_format(196, "!company\n!first_name !last_name\n!street1\n!street2\n!city, !zone_code !postal_code\n!country_name_if");
-}
diff --git a/uc_store/countries/czech_203_1.cif b/uc_store/countries/czech_203_1.cif
deleted file mode 100644
index 786de78..0000000
--- a/uc_store/countries/czech_203_1.cif
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-function czech_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 203,
-      'country_name' => 'Czech Republic',
-      'country_iso_code_2' => 'CZ',
-      'country_iso_code_3' => 'CZE',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(203, 'PHA', 'Praha'),
-    array(203, 'STC', 'Středočeský kraj'),
-    array(203, 'JHC', 'Jihočeský kraj'),
-    array(203, 'PLK', 'Plzeňský kraj'),
-    array(203, 'KVK', 'Karlovarský kraj'),
-    array(203, 'ULK', 'Ústecký kraj'),
-    array(203, 'LBK', 'Liberecký kraj'),
-    array(203, 'HKK', 'Královéhradecký kraj'),
-    array(203, 'PAK', 'Pardubický kraj'),
-    array(203, 'VYS', 'Vysočina'),
-    array(203, 'JHM', 'Jihomoravský kraj'),
-    array(203, 'OLK', 'Olomoucký kraj'),
-    array(203, 'ZLK', 'Zlínský kraj'),
-    array(203, 'MSK', 'Moravskoslezský kraj'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    203,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/denmark_208_2.cif b/uc_store/countries/denmark_208_2.cif
deleted file mode 100644
index f430860..0000000
--- a/uc_store/countries/denmark_208_2.cif
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function denmark_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 208,
-      'country_name' => 'Denmark',
-      'country_iso_code_2' => 'DK',
-      'country_iso_code_3' => 'DNK',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(208, 'DK-84', 'Hovedstaden'),
-    array(208, 'DK-82', 'Midtjylland'),
-    array(208, 'DK-81', 'Nordjylland'),
-    array(208, 'DK-85', 'Sjælland'),
-    array(208, 'DK-83', 'Syddanmark'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    208,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
-
-/**
- * Implements hook_update() with $version being the only argument.
- * Add a new case for each version update, and be sure to always include the
- * latest changes in the install function.
- */
-function denmark_update($version) {
-  switch ($version) {
-    case 2:
-      $zones = array(
-        array(208, 'DK-84', 'Hovedstaden'),
-        array(208, 'DK-82', 'Midtjylland'),
-        array(208, 'DK-81', 'Nordjylland'),
-        array(208, 'DK-85', 'Sjælland'),
-        array(208, 'DK-83', 'Syddanmark'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-      break;
-  }
-}
diff --git a/uc_store/countries/djibouti_262_1.cif b/uc_store/countries/djibouti_262_1.cif
deleted file mode 100644
index 14aa5ab..0000000
--- a/uc_store/countries/djibouti_262_1.cif
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-function djibouti_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 262,
-      'country_name' => 'Djibouti',
-      'country_iso_code_2' => 'DJ',
-      'country_iso_code_3' => 'DJI',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(262, 'AS', 'Ali Sabieh'),
-    array(262, 'AR', 'Arta'),
-    array(262, 'DI', 'Dikhil'),
-    array(262, 'DJ', 'Djibouti'),
-    array(262, 'OB', 'Obock'),
-    array(262, 'TA', 'Tadjourah'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    262,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/dominica_212_1.cif b/uc_store/countries/dominica_212_1.cif
deleted file mode 100644
index ed51c26..0000000
--- a/uc_store/countries/dominica_212_1.cif
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-function dominica_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 212,
-      'country_name' => 'Dominica',
-      'country_iso_code_2' => 'DM',
-      'country_iso_code_3' => 'DMA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(212, '02', 'Saint Andrew'),
-    array(212, '03', 'Saint David'),
-    array(212, '04', 'Saint George'),
-    array(212, '05', 'Saint John'),
-    array(212, '06', 'Saint Joseph'),
-    array(212, '07', 'Saint Luke'),
-    array(212, '08', 'Saint Mark'),
-    array(212, '09', 'Saint Patrick'),
-    array(212, '10', 'Saint Paul'),
-    array(212, '11', 'Saint Peter'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    212,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/dominican_republic_214_1.cif b/uc_store/countries/dominican_republic_214_1.cif
deleted file mode 100644
index 6d6f1ee..0000000
--- a/uc_store/countries/dominican_republic_214_1.cif
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function dominican_republic_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 214,
-      'country_name' => 'Dominican Republic',
-      'country_iso_code_2' => 'DO',
-      'country_iso_code_3' => 'DOM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(214, 'DN', 'Distrito Nacional'),
-    array(214, 'AZ', 'Azua'),
-    array(214, 'BC', 'Baoruco'),
-    array(214, 'BH', 'Barahona'),
-    array(214, 'DJ', 'Dajabon'),
-    array(214, 'DU', 'Duarte'),
-    array(214, 'EL', 'Elias Pina'),
-    array(214, 'SY', 'El Seybo'),
-    array(214, 'ET', 'Espaillat'),
-    array(214, 'HM', 'Hato Mayor'),
-    array(214, 'IN', 'Independencia'),
-    array(214, 'AL', 'La Altagracia'),
-    array(214, 'RO', 'La Romana'),
-    array(214, 'VE', 'La Vega'),
-    array(214, 'MT', 'Maria Trinidad Sanchez'),
-    array(214, 'MN', 'Monsenor Nouel'),
-    array(214, 'MC', 'Monte Cristi'),
-    array(214, 'MP', 'Monte Plata'),
-    array(214, 'PD', 'Pedernales'),
-    array(214, 'PR', 'Peravia (Bani)'),
-    array(214, 'PP', 'Puerto Plata'),
-    array(214, 'SL', 'Salcedo'),
-    array(214, 'SM', 'Samana'),
-    array(214, 'SH', 'Sanchez Ramirez'),
-    array(214, 'SC', 'San Cristobal'),
-    array(214, 'JO', 'San Jose de Ocoa'),
-    array(214, 'SJ', 'San Juan'),
-    array(214, 'PM', 'San Pedro de Macoris'),
-    array(214, 'SA', 'Santiago'),
-    array(214, 'ST', 'Santiago Rodriguez'),
-    array(214, 'SD', 'Santo Domingo'),
-    array(214, 'VA', 'Valverde'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    214,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/ecuador_218_1.cif b/uc_store/countries/ecuador_218_1.cif
deleted file mode 100644
index 9acc385..0000000
--- a/uc_store/countries/ecuador_218_1.cif
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function ecuador_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 218,
-      'country_name' => 'Ecuador',
-      'country_iso_code_2' => 'EC',
-      'country_iso_code_3' => 'ECU',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(218, 'A', 'Azuay'),
-    array(218, 'B', 'Bolivar'),
-    array(218, 'F', 'Canar'),
-    array(218, 'C', 'Carchi'),
-    array(218, 'H', 'Chimborazo'),
-    array(218, 'X', 'Cotopaxi'),
-    array(218, 'O', 'El Oro'),
-    array(218, 'E', 'Esmeraldas'),
-    array(218, 'W', 'Galapagos'),
-    array(218, 'G', 'Guayas'),
-    array(218, 'I', 'Imbabura'),
-    array(218, 'L', 'Loja'),
-    array(218, 'R', 'Los Rios'),
-    array(218, 'M', 'Manabi'),
-    array(218, 'S', 'Morona-Santiago'),
-    array(218, 'N', 'Napo'),
-    array(218, 'D', 'Orellana'),
-    array(218, 'Y', 'Pastaza'),
-    array(218, 'P', 'Pichincha'),
-    array(218, 'U', 'Sucumbios'),
-    array(218, 'T', 'Tungurahua'),
-    array(218, 'Z', 'Zamora-Chichipe'),
-    );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    218,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/egypt_818_1.cif b/uc_store/countries/egypt_818_1.cif
deleted file mode 100644
index d0220ee..0000000
--- a/uc_store/countries/egypt_818_1.cif
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function egypt_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 818,
-      'country_name' => 'Egypt',
-      'country_iso_code_2' => 'EG',
-      'country_iso_code_3' => 'EGY',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(818, 'MUH', 'مرسى مطروح'),
-    array(818, 'ALX', 'الاسكندرية'),
-    array(818, 'WAD', 'الوادي الجديد'),
-    array(818, 'GZ', 'الجيزة'),
-    array(818, 'FYM', 'الفيوم'),
-    array(818, 'BNS', 'بني سويف'),
-    array(818, 'MN', 'المنيا'),
-    array(818, 'AST', 'اسيوط'),
-    array(818, 'SHG', 'سوهاج'),
-    array(818, 'ASN', 'اسوان'),
-    array(818, 'SIN', 'شمال سيناء'),
-    array(818, 'JS', 'جنوب سيناء'),
-    array(818, 'MNF', 'المنوفية'),
-    array(818, 'BA', 'البحر الاحمر'),
-    array(818, 'SHR', 'الشرقية'),
-    array(818, 'KB', 'القليوبية'),
-    array(818, 'IS', 'الاسماعيلية'),
-    array(818, 'SUZ', 'السويس'),
-    array(818, 'BH', 'البحيرة'),
-    array(818, 'GH', 'الغربية'),
-    array(818, 'KFS', 'كفر الشيخ'),
-    array(818, 'DK', 'الدقهلية'),
-    array(818, 'UQ', 'الاقصر'),
-    array(818, 'PTS', 'بور سعيد'),
-    array(818, 'DT', 'دمياط'),
-    array(818, 'KN', 'قنا'),
-    array(818, 'CAI', 'القاهرة'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    818,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/el_salvador_222_1.cif b/uc_store/countries/el_salvador_222_1.cif
deleted file mode 100644
index 88c943a..0000000
--- a/uc_store/countries/el_salvador_222_1.cif
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function el_salvador_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 222,
-      'country_name' => 'El Salvador',
-      'country_iso_code_2' => 'SV',
-      'country_iso_code_3' => 'SLV',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(222, 'AH', 'Ahuachapan'),
-    array(222, 'CA', 'Cabanas'),
-    array(222, 'CH', 'Chalatenango'),
-    array(222, 'CU', 'Cuscatian'),
-    array(222, 'LI', 'La Libertad'),
-    array(222, 'PA', 'La Paz'),
-    array(222, 'UN', 'La Union'),
-    array(222, 'MO', 'Morazan'),
-    array(222, 'SM', 'San Miguel'),
-    array(222, 'SS', 'San Salvador'),
-    array(222, 'SV', 'San Vicente'),
-    array(222, 'SA', 'Santa Ana'),
-    array(222, 'SO', 'Sonsonate'),
-    array(222, 'US', 'Usulutan'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    222,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/equatorial_guinea_226_1.cif b/uc_store/countries/equatorial_guinea_226_1.cif
deleted file mode 100644
index 6a642c7..0000000
--- a/uc_store/countries/equatorial_guinea_226_1.cif
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-function equatorial_guinea_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 226,
-      'country_name' => 'Equatorial Guinea',
-      'country_iso_code_2' => 'GQ',
-      'country_iso_code_3' => 'GNQ',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(226, 'GQ-AN', 'Annobon'),
-    array(226, 'GQ-BN', 'Bioko Norte'),
-    array(226, 'GQ-BS', 'Bioko Sur'),
-    array(226, 'GQ-CS', 'Centro Sur'),
-    array(226, 'GQ-KN', 'Kie-Ntem'),
-    array(226, 'GQ-LI', 'Litoral'),
-    array(226, 'GQ-WN', 'Wele-Nzas'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    226,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/eritrea_232_1.cif b/uc_store/countries/eritrea_232_1.cif
deleted file mode 100644
index ff84b10..0000000
--- a/uc_store/countries/eritrea_232_1.cif
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-function eritrea_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 232,
-      'country_name' => 'Eritrea',
-      'country_iso_code_2' => 'ER',
-      'country_iso_code_3' => 'ERI',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(232, 'AN', 'Anseba'),
-    array(232, 'DU', 'Debub'),
-    array(232, 'DK', 'Debubawi Keyih Bahri'),
-    array(232, 'GB', 'Gash Barka'),
-    array(232, 'MA', 'Maekel'),
-    array(232, 'Sk', 'Semenawi Keyih Bahri'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    232,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/estonia_233_1.cif b/uc_store/countries/estonia_233_1.cif
deleted file mode 100644
index 933db89..0000000
--- a/uc_store/countries/estonia_233_1.cif
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function estonia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 233,
-      'country_name' => 'Estonia',
-      'country_iso_code_2' => 'EE',
-      'country_iso_code_3' => 'EST',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(233, '37', 'Harjumaa'),
-    array(233, '39', 'Hiiumaa'),
-    array(233, '44', 'Ida-Virumaa'),
-    array(233, '49', 'Jõgevamaa'),
-    array(233, '51', 'Järvamaa'),
-    array(233, '57', 'Läänemaa'),
-    array(233, '59', 'Lääne-Virumaa'),
-    array(233, '65', 'Põlvamaa'),
-    array(233, '67', 'Pärnumaa'),
-    array(233, '70', 'Raplamaa'),
-    array(233, '74', 'Saaremaa'),
-    array(233, '78', 'Tartumaa'),
-    array(233, '82', 'Valgamaa'),
-    array(233, '84', 'Viljandimaa'),
-    array(233, '86', 'Võrumaa'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    233,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!zone_name\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/ethiopia_231_1.cif b/uc_store/countries/ethiopia_231_1.cif
deleted file mode 100644
index b6e8d00..0000000
--- a/uc_store/countries/ethiopia_231_1.cif
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-function ethiopia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 231,
-      'country_name' => 'Ethiopia',
-      'country_iso_code_2' => 'ET',
-      'country_iso_code_3' => 'ETH',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(231, 'ET-AA', 'Addis Ababa'),
-    array(231, 'ET-DD', 'Dire Dawa'),
-    array(231, 'ET-AF', 'Afar'),
-    array(231, 'ET-AM', 'Amara'),
-    array(231, 'ET-BE', 'Benshangul-Gumaz'),
-    array(231, 'ET-GA', 'Gambela Peoples'),
-    array(231, 'ET-HA', 'Harari People'),
-    array(231, 'ET-OR', 'Oromia'),
-    array(231, 'ET-SO', 'Somali'),
-    array(231, 'ET-TI', 'Tigrai'),
-    array(231, 'ET-SN', 'Southern Nations, Nationalities and Peoples'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    231,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/falkland_islands_238_2.cif b/uc_store/countries/falkland_islands_238_2.cif
deleted file mode 100644
index 74fdd2e..0000000
--- a/uc_store/countries/falkland_islands_238_2.cif
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-function falkland_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 238,
-      'country_name' => 'Falkland Islands (Malvinas)',
-      'country_iso_code_2' => 'FK',
-      'country_iso_code_3' => 'FLK',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    238,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function falkland_islands_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => 'Falkland Islands (Malvinas)'))
-        ->condition('country_id', 238)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/faroe_islands_234_1.cif b/uc_store/countries/faroe_islands_234_1.cif
deleted file mode 100644
index ab1ecb2..0000000
--- a/uc_store/countries/faroe_islands_234_1.cif
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-function faroe_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 234,
-      'country_name' => 'Faroe Islands',
-      'country_iso_code_2' => 'FO',
-      'country_iso_code_3' => 'FRO',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(234, 'NO', 'Norderoerne'),
-    array(234, 'OS', 'Ostero'),
-    array(234, 'SA', 'Sando'),
-    array(234, 'ST', 'Stromo'),
-    array(234, 'SN', 'Sudero Nordre'),
-    array(234, 'SS', 'Sudero Sondre'),
-    array(234, 'VG', 'Vago'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    234,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/fiji_242_1.cif b/uc_store/countries/fiji_242_1.cif
deleted file mode 100644
index 2b8c967..0000000
--- a/uc_store/countries/fiji_242_1.cif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-function fiji_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 242,
-      'country_name' => 'Fiji',
-      'country_iso_code_2' => 'FJ',
-      'country_iso_code_3' => 'FJI',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(242, 'BA', 'Ba'),
-    array(242, 'BU', 'Bua'),
-    array(242, 'Ck', 'Cakaudrove'),
-    array(242, 'KD', 'Kadavu'),
-    array(242, 'LU', 'Lau'),
-    array(242, 'LM', 'Lomaiviti'),
-    array(242, 'MC', 'Macuata'),
-    array(242, 'NN', 'Nadroga-Navosa'),
-    array(242, 'NT', 'Naitasiri'),
-    array(242, 'NM', 'Namosi'),
-    array(242, 'RA', 'Ra'),
-    array(242, 'RW', 'Rewa'),
-    array(242, 'RT', 'Rotuma'),
-    array(242, 'SR', 'Serua'),
-    array(242, 'TL', 'Tailevu'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    242,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/finland_246_2.cif b/uc_store/countries/finland_246_2.cif
deleted file mode 100644
index 655fab7..0000000
--- a/uc_store/countries/finland_246_2.cif
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-function finland_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 246,
-      'country_name' => 'Finland',
-      'country_iso_code_2' => 'FI',
-      'country_iso_code_3' => 'FIN',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(246, 'FI-01', 'Ahvenanmaan maakunta'),
-    array(246, 'FI-02', 'Etelä-Karjal'),
-    array(246, 'FI-03', 'Etelä-Pohjanmaa'),
-    array(246, 'FI-04', 'Etelä-Savo'),
-    array(246, 'FI-05', 'Kainuu'),
-    array(246, 'FI-06', 'Kanta-Häme'),
-    array(246, 'FI-07', 'Keski-Pohjanmaa'),
-    array(246, 'FI-08', 'Keski-Suomi'),
-    array(246, 'FI-09', 'Kymenlaakso'),
-    array(246, 'FI-10', 'Lappi'),
-    array(246, 'FI-11', 'Pirkanmaa'),
-    array(246, 'FI-12', 'Pohjanmaa'),
-    array(246, 'FI-13', 'Pohjois-Karjala'),
-    array(246, 'FI-14', 'Pohjois-Pohjanmaa'),
-    array(246, 'FI-15', 'Pohjois-Savo'),
-    array(246, 'FI-16', 'Päijät-Häme'),
-    array(246, 'FI-17', 'Satakunta'),
-    array(246, 'FI-18', 'Uusimaa'),
-    array(246, 'FI-19', 'Varsinais-Suomi'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    246,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
-
-function finland_update($version) {
-  switch ($version) {
-    case 2:
-      // Add some missing zones
-      $zones = array(
-        array(246, 'FI-01', 'Ahvenanmaan maakunta'),
-        array(246, 'FI-02', 'Etelä-Karjal'),
-        array(246, 'FI-03', 'Etelä-Pohjanmaa'),
-        array(246, 'FI-04', 'Etelä-Savo'),
-        array(246, 'FI-05', 'Kainuu'),
-        array(246, 'FI-06', 'Kanta-Häme'),
-        array(246, 'FI-07', 'Keski-Pohjanmaa'),
-        array(246, 'FI-08', 'Keski-Suomi'),
-        array(246, 'FI-09', 'Kymenlaakso'),
-        array(246, 'FI-10', 'Lappi'),
-        array(246, 'FI-11', 'Pirkanmaa'),
-        array(246, 'FI-12', 'Pohjanmaa'),
-        array(246, 'FI-13', 'Pohjois-Karjala'),
-        array(246, 'FI-14', 'Pohjois-Pohjanmaa'),
-        array(246, 'FI-15', 'Pohjois-Savo'),
-        array(246, 'FI-16', 'Päijät-Häme'),
-        array(246, 'FI-17', 'Satakunta'),
-        array(246, 'FI-18', 'Uusimaa'),
-        array(246, 'FI-19', 'Varsinais-Suomi'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/france_250_1.cif b/uc_store/countries/france_250_1.cif
deleted file mode 100644
index b125e3c..0000000
--- a/uc_store/countries/france_250_1.cif
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-function france_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 250,
-      'country_name' => 'France',
-      'country_iso_code_2' => 'FR',
-      'country_iso_code_3' => 'FRA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(250, 'FR-01', 'Ain'),
-    array(250, 'FR-02', 'Aisne'),
-    array(250, 'FR-03', 'Allier'),
-    array(250, 'FR-04', 'Alpes-de-Haute-Provence'),
-    array(250, 'FR-05', 'Hautes-Alpes'),
-    array(250, 'FR-06', 'Alpes-Maritimes'),
-    array(250, 'FR-07', 'Ardèche'),
-    array(250, 'FR-08', 'Ardennes'),
-    array(250, 'FR-09', 'Ariège'),
-    array(250, 'FR-10', 'Aube'),
-    array(250, 'FR-11', 'Aude'),
-    array(250, 'FR-12', 'Aveyron'),
-    array(250, 'FR-13', 'Bouches-du-Rhône'),
-    array(250, 'FR-14', 'Calvados'),
-    array(250, 'FR-15', 'Cantal'),
-    array(250, 'FR-16', 'Charente'),
-    array(250, 'FR-17', 'Charente-Maritime'),
-    array(250, 'FR-18', 'Cher'),
-    array(250, 'FR-19', 'Corrèze'),
-    array(250, 'FR-21', "Côte-d'Or"),
-    array(250, 'FR-22', "Côtes-d'Armor"),
-    array(250, 'FR-23', 'Creuse'),
-    array(250, 'FR-24', 'Dordogne'),
-    array(250, 'FR-25', 'Doubs'),
-    array(250, 'FR-26', 'Drôme'),
-    array(250, 'FR-27', 'Eure'),
-    array(250, 'FR-28', 'Eure-et-Loir'),
-    array(250, 'FR-29', 'Finistère'),
-    array(250, 'FR-2A', 'Corse-du-Sud'),
-    array(250, 'FR-2B', 'Haute-Corse'),
-    array(250, 'FR-30', 'Gard'),
-    array(250, 'FR-31', 'Haute-Garonne'),
-    array(250, 'FR-32', 'Gers'),
-    array(250, 'FR-33', 'Gironde'),
-    array(250, 'FR-34', 'Hérault'),
-    array(250, 'FR-35', 'Ille-et-Vilaine'),
-    array(250, 'FR-36', 'Indre'),
-    array(250, 'FR-37', 'Indre-et-Loire'),
-    array(250, 'FR-38', 'Isère'),
-    array(250, 'FR-39', 'Jura'),
-    array(250, 'FR-40', 'Landes'),
-    array(250, 'FR-41', 'Loir-et-Cher'),
-    array(250, 'FR-42', 'Loire'),
-    array(250, 'FR-43', 'Haute-Loire'),
-    array(250, 'FR-44', 'Loire-Atlantique'),
-    array(250, 'FR-45', 'Loiret'),
-    array(250, 'FR-46', 'Lot'),
-    array(250, 'FR-47', 'Lot-et-Garonne'),
-    array(250, 'FR-48', 'Lozère'),
-    array(250, 'FR-49', 'Maine-et-Loire'),
-    array(250, 'FR-50', 'Manche'),
-    array(250, 'FR-51', 'Marne'),
-    array(250, 'FR-52', 'Haute-Marne'),
-    array(250, 'FR-53', 'Mayenne'),
-    array(250, 'FR-54', 'Meurthe-et-Moselle'),
-    array(250, 'FR-55', 'Meuse'),
-    array(250, 'FR-56', 'Morbihan'),
-    array(250, 'FR-57', 'Moselle'),
-    array(250, 'FR-58', 'Nièvre'),
-    array(250, 'FR-59', 'Nord'),
-    array(250, 'FR-60', 'Oise'),
-    array(250, 'FR-61', 'Orne'),
-    array(250, 'FR-62', 'Pas-de-Calais'),
-    array(250, 'FR-63', 'Puy-de-Dôme'),
-    array(250, 'FR-64', 'Pyrénées-Atlantiques'),
-    array(250, 'FR-65', 'Hautes-Pyrénées'),
-    array(250, 'FR-66', 'Pyrénées-Orientales'),
-    array(250, 'FR-67', 'Bas-Rhin'),
-    array(250, 'FR-68', 'Haut-Rhin'),
-    array(250, 'FR-69', 'Rhône'),
-    array(250, 'FR-70', 'Haute-Saône'),
-    array(250, 'FR-71', 'Saône-et-Loire'),
-    array(250, 'FR-72', 'Sarthe'),
-    array(250, 'FR-73', 'Savoie'),
-    array(250, 'FR-74', 'Haute-Savoie'),
-    array(250, 'FR-75', 'Paris'),
-    array(250, 'FR-76', 'Seine-Maritime'),
-    array(250, 'FR-77', 'Seine-et-Marne'),
-    array(250, 'FR-78', 'Yvelines'),
-    array(250, 'FR-79', 'Deux-Sèvres'),
-    array(250, 'FR-80', 'Somme'),
-    array(250, 'FR-81', 'Tarn'),
-    array(250, 'FR-82', 'Tarn-et-Garonne'),
-    array(250, 'FR-83', 'Var'),
-    array(250, 'FR-84', 'Vaucluse'),
-    array(250, 'FR-85', 'Vendée'),
-    array(250, 'FR-86', 'Vienne'),
-    array(250, 'FR-87', 'Haute-Vienne'),
-    array(250, 'FR-88', 'Vosges'),
-    array(250, 'FR-89', 'Yonne'),
-    array(250, 'FR-90', 'Territoire de Belfort'),
-    array(250, 'FR-91', 'Essonne'),
-    array(250, 'FR-92', 'Hauts-de-Seine'),
-    array(250, 'FR-93', 'Seine-Saint-Denis'),
-    array(250, 'FR-94', 'Val-de-Marne'),
-    array(250, 'FR-95', "Val-d'Oise"),
-    array(250, 'FR-NC', 'New Caledonia'),
-    array(250, 'FR-PF', 'French Polynesia'),
-    array(250, 'FR-PM', 'Saint-Pierre and Miquelon'),
-    array(250, 'FR-TF', 'French Southern Territories'),
-    array(250, 'FR-YT', 'Mayotte'),
-    array(250, 'FR-WF', 'Wallis and Futuna'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    250,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/french_guiana_254_1.cif b/uc_store/countries/french_guiana_254_1.cif
deleted file mode 100644
index d72b109..0000000
--- a/uc_store/countries/french_guiana_254_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function french_guiana_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 254,
-      'country_name' => 'French Guiana',
-      'country_iso_code_2' => 'GF',
-      'country_iso_code_3' => 'GUF',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    254,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/french_polynesia_258_1.cif b/uc_store/countries/french_polynesia_258_1.cif
deleted file mode 100644
index faf3ba1..0000000
--- a/uc_store/countries/french_polynesia_258_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function french_polynesia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 258,
-      'country_name' => 'French Polynesia',
-      'country_iso_code_2' => 'PF',
-      'country_iso_code_3' => 'PYF',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    258,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/french_southern_territories_260_1.cif b/uc_store/countries/french_southern_territories_260_1.cif
deleted file mode 100644
index 71e4620..0000000
--- a/uc_store/countries/french_southern_territories_260_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function french_southern_territories_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 260,
-      'country_name' => 'French Southern Territories',
-      'country_iso_code_2' => 'TF',
-      'country_iso_code_3' => 'ATF',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    260,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/gabon_266_1.cif b/uc_store/countries/gabon_266_1.cif
deleted file mode 100644
index cf65f7d..0000000
--- a/uc_store/countries/gabon_266_1.cif
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-function gabon_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 266,
-      'country_name' => 'Gabon',
-      'country_iso_code_2' => 'GA',
-      'country_iso_code_3' => 'GAB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(266, '1', 'Estuaire'),
-    array(266, '2', 'Haut-Ogooue'),
-    array(266, '3', 'Moyen-Ogooue'),
-    array(266, '4', 'Ngounie'),
-    array(266, '5', 'Nyanga'),
-    array(266, '6', 'Ogooue-Ivindo'),
-    array(266, '7', 'OgoouE-Lolo'),
-    array(266, '8', 'Ogooue-Maritime'),
-    array(266, '9', 'Woleu-Ntem'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    266,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/gambia_270_1.cif b/uc_store/countries/gambia_270_1.cif
deleted file mode 100644
index 9a802d3..0000000
--- a/uc_store/countries/gambia_270_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function gambia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 270,
-      'country_name' => 'Gambia',
-      'country_iso_code_2' => 'GM',
-      'country_iso_code_3' => 'GMB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    270,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/georgia_268_1.cif b/uc_store/countries/georgia_268_1.cif
deleted file mode 100644
index b01e017..0000000
--- a/uc_store/countries/georgia_268_1.cif
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function georgia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 268,
-      'country_name' => 'Georgia',
-      'country_iso_code_2' => 'GE',
-      'country_iso_code_3' => 'GEO',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(268, 'AB', 'Abkhazia'),
-    array(268, 'AJ', 'Ajaria'),
-    array(268, 'GU', 'Guria'),
-    array(268, 'IM', "Imeret'i"),
-    array(268, 'KA', "Kakhet'i"),
-    array(268, 'KK', "K'vemo K'art'li"),
-    array(268, 'MM', "Mts'khet'a-Mt'ianet'i"),
-    array(268, 'RL', "Racha-Lech'khumi-K'vemo"),
-    array(268, 'SZ', "Samegrelo-Zemo Svanet'i"),
-    array(268, 'SJ', "Samts'khe-Javakhet'i"),
-    array(268, 'SK', "Shida K'art'li"),
-    array(268, 'TB', "T'bilisi"),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    268,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/germany_276_1.cif b/uc_store/countries/germany_276_1.cif
deleted file mode 100644
index cd570df..0000000
--- a/uc_store/countries/germany_276_1.cif
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-function germany_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 276,
-      'country_name' => 'Germany',
-      'country_iso_code_2' => 'DE',
-      'country_iso_code_3' => 'DEU',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(276, 'BAW', 'Baden-Württemberg'),
-    array(276, 'BAY', 'Bayern'),
-    array(276, 'BER', 'Berlin'),
-    array(276, 'BRG', 'Brandenburg'),
-    array(276, 'BRE', 'Bremen'),
-    array(276, 'HAM', 'Hamburg'),
-    array(276, 'HES', 'Hessen'),
-    array(276, 'MEC', 'Mecklenburg-Vorpommern'),
-    array(276, 'NDS', 'Niedersachsen'),
-    array(276, 'NRW', 'Nordrhein-Westfalen'),
-    array(276, 'RHE', 'Rheinland-Pfalz'),
-    array(276, 'SAR', 'Saarland'),
-    array(276, 'SAS', 'Sachsen'),
-    array(276, 'SAC', 'Sachsen-Anhalt'),
-    array(276, 'SCN', 'Schleswig-Holstein'),
-    array(276, 'THE', 'Thüringen'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    276,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/ghana_288_1.cif b/uc_store/countries/ghana_288_1.cif
deleted file mode 100644
index fa67f8f..0000000
--- a/uc_store/countries/ghana_288_1.cif
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-function ghana_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 288,
-      'country_name' => 'Ghana',
-      'country_iso_code_2' => 'GH',
-      'country_iso_code_3' => 'GHA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(288, 'GH-AH', 'Ashanti'),
-    array(288, 'GH-BA', 'Brong-Ahafo'),
-    array(288, 'GH-CP', 'Central'),
-    array(288, 'GH-EP', 'Eastern'),
-    array(288, 'GH-AA', 'Greater Accra'),
-    array(288, 'GH-NP', 'Northern'),
-    array(288, 'GH-UE', 'Upper East'),
-    array(288, 'GH-UW', 'Upper West'),
-    array(288, 'GH-TV', 'Volta'),
-    array(288, 'GH-WP', 'Western'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    288,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/gibraltar_292_1.cif b/uc_store/countries/gibraltar_292_1.cif
deleted file mode 100644
index 8e34689..0000000
--- a/uc_store/countries/gibraltar_292_1.cif
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function gibraltar_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 292,
-      'country_name' => 'Gibraltar',
-      'country_iso_code_2' => 'GI',
-      'country_iso_code_3' => 'GIB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    292,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/greece_300_1.cif b/uc_store/countries/greece_300_1.cif
deleted file mode 100644
index a719ce8..0000000
--- a/uc_store/countries/greece_300_1.cif
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function greece_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 300,
-      'country_name' => 'Greece',
-      'country_iso_code_2' => 'GR',
-      'country_iso_code_3' => 'GRC',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(300, 'ATT', 'Αττική'),
-    array(300, 'AIT', 'Αιτωλοακαρνανία'),
-    array(300, 'ARG', 'Αργολίδα'),
-    array(300, 'ARK', 'Αρκαδία'),
-    array(300, 'ART', 'Άρτα'),
-    array(300, 'AHA', 'Αχαϊα'),
-    array(300, 'BOI', 'Βοιωτία'),
-    array(300, 'GRE', 'Γρεβενά'),
-    array(300, 'DRA', 'Δράμα'),
-    array(300, 'DOD', 'Δωδεκάνησα'),
-    array(300, 'EVR', 'Έβρος'),
-    array(300, 'EVI', 'Εύβοια'),
-    array(300, 'EVT', 'Ευρυτανία'),
-    array(300, 'ZAK', 'Ζάκυνθος'),
-    array(300, 'ILI', 'Ηλεία'),
-    array(300, 'HMA', 'Ημαθία'),
-    array(300, 'HRA', 'Ηράκλειο'),
-    array(300, 'THP', 'Θεσπρωτία'),
-    array(300, 'THE', 'Θεσσαλονίκη'),
-    array(300, 'IOA', 'Ιωάννινα'),
-    array(300, 'KAV', 'Καβάλα'),
-    array(300, 'KAR', 'Καρδίτσα'),
-    array(300, 'KAS', 'Καστοριά'),
-    array(300, 'KER', 'Κέρκυρα'),
-    array(300, 'KEF', 'Κεφαλληνία'),
-    array(300, 'KIL', 'Κιλκίς'),
-    array(300, 'KOZ', 'Κοζάνη'),
-    array(300, 'KOR', 'Κορινθία'),
-    array(300, 'KYK', 'Κυκλάδες'),
-    array(300, 'LAK', 'Λακωνία'),
-    array(300, 'LAR', 'Λάρισα'),
-    array(300, 'LAS', 'Λασίθι'),
-    array(300, 'LES', 'Λέσβος'),
-    array(300, 'LEF', 'Λευκάδα'),
-    array(300, 'MAG', 'Μαγνησία'),
-    array(300, 'ΜES', 'Μεσσηνία'),
-    array(300, 'XAN', 'Ξάνθη'),
-    array(300, 'PEL', 'Πέλλα'),
-    array(300, 'PIE', 'Πιερία'),
-    array(300, 'PRE', 'Πρέβεζα'),
-    array(300, 'RET', 'Ρέθυμνο'),
-    array(300, 'ROD', 'Ροδόπη'),
-    array(300, 'SAM', 'Σάμος'),
-    array(300, 'SER', 'Σέρρες'),
-    array(300, 'TRI', 'Τρίκαλα'),
-    array(300, 'FTH', 'Φθιώτιδα'),
-    array(300, 'FLO', 'Φλώρινα'),
-    array(300, 'FOK', 'Φωκίδα'),
-    array(300, 'HAL', 'Χαλκιδική'),
-    array(300, 'HAN', 'Χανιά'),
-    array(300, 'HIO', 'Χίος'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    300,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code, !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/greenland_304_1.cif b/uc_store/countries/greenland_304_1.cif
deleted file mode 100644
index 93d1974..0000000
--- a/uc_store/countries/greenland_304_1.cif
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function greenland_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 304,
-      'country_name' => 'Greenland',
-      'country_iso_code_2' => 'GL',
-      'country_iso_code_3' => 'GRL',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.  Use %d for the zone_id and the
-  // function uc_get_zone_ids($num) as the second argument for db_query() where
-  // $num is the number of zones in the INSERT query.
-  // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(304, 'NK', 'Nuuk'),
-    array(304, 'NQ', 'Nuussuaq'),
-    array(304, 'KQ', 'Kangerlussuaq'),
-    array(304, 'ST', 'Sisimiut'),
-    array(304, 'MQ', 'Maniitsoq'),
-    array(304, 'TQ', 'Tasiilaq'),
-    array(304, 'KK', 'Kulusuk'),
-    array(304, 'AP', 'Alluitsup Paa'),
-    array(304, 'QQ', 'Qaqortoq'),
-    array(304, 'NA', 'Narsaq'),
-    array(304, 'NK', 'Nanortalik'),
-    array(304, 'NR', 'Narsarsuaq'),
-    array(304, 'IQ', 'Ikerasassuaq'),
-    array(304, 'KT', 'Kangilinnguit'),
-    array(304, 'AK', 'Arsuk'),
-    array(304, 'PT', 'Paamiut'),
-    array(304, 'AT', 'Aasiaat'),
-    array(304, 'QT', 'Qasigiannguit'),
-    array(304, 'IL', 'Ilulissat'),
-    array(304, 'QE', 'Qeqertarsuaq'),
-    array(304, 'KA', 'Kangaatsiaq'),
-    array(304, 'UM', 'Uummannaq'),
-    array(304, 'UP', 'Upernavik'),
-    array(304, 'QA', 'Qaarsut'),
-    array(304, 'PT', 'Pituffik'),
-    array(304, 'QN', 'Qaanaaq'),
-    array(304, 'SN', 'Station Nord'),
-    array(304, 'IT', 'Ittoqqortoormiit'),
-    array(304, 'MV', 'Mestersvig'),
-    array(304, 'DH', 'Danmarkshavn'),
-    array(304, 'CP', 'Constable Pynt'),
-    array(304, 'SS', 'Slædepatruljen Sirius'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    304,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/grenada_308_1.cif b/uc_store/countries/grenada_308_1.cif
deleted file mode 100644
index 19b9aa8..0000000
--- a/uc_store/countries/grenada_308_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function grenada_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 308,
-      'country_name' => 'Grenada',
-      'country_iso_code_2' => 'GD',
-      'country_iso_code_3' => 'GRD',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    308,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/guadeloupe_312_1.cif b/uc_store/countries/guadeloupe_312_1.cif
deleted file mode 100644
index 351ee0c..0000000
--- a/uc_store/countries/guadeloupe_312_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function guadeloupe_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 312,
-      'country_name' => 'Guadeloupe',
-      'country_iso_code_2' => 'GP',
-      'country_iso_code_3' => 'GLP',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    312,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/guam_316_1.cif b/uc_store/countries/guam_316_1.cif
deleted file mode 100644
index f2469dc..0000000
--- a/uc_store/countries/guam_316_1.cif
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function guam_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 316,
-      'country_name' => 'Guam',
-      'country_iso_code_2' => 'GU',
-      'country_iso_code_3' => 'GUM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    316,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/guatemala_320_1.cif b/uc_store/countries/guatemala_320_1.cif
deleted file mode 100644
index 15779b0..0000000
--- a/uc_store/countries/guatemala_320_1.cif
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-function guatemala_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 320,
-      'country_name' => 'Guatemala',
-      'country_iso_code_2' => 'GT',
-      'country_iso_code_3' => 'GTM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(320, 'AV', 'Alta Verapaz'),
-    array(320, 'BV', 'Baja Verapaz'),
-    array(320, 'CM', 'Chimaltenango'),
-    array(320, 'CQ', 'Chiquimula'),
-    array(320, 'PR', 'El Progreso'),
-    array(320, 'ES', 'Escuintla'),
-    array(320, 'GU', 'Guatemala'),
-    array(320, 'HU', 'Huehuetenango'),
-    array(320, 'IZ', 'Izabal'),
-    array(320, 'JA', 'Jalapa'),
-    array(320, 'JU', 'Jutiapa'),
-    array(320, 'PE', 'Peten'),
-    array(320, 'QZ', 'Quetzaltenango'),
-    array(320, 'QC', 'Quiche'),
-    array(320, 'RE', 'Retalhuleu'),
-    array(320, 'SA', 'Sacatepequez'),
-    array(320, 'SM', 'San Marcos'),
-    array(320, 'SR', 'Santa Rosa'),
-    array(320, 'SO', 'Solola'),
-    array(320, 'SU', 'Suchitepequez'),
-    array(320, 'TO', 'Totonicapan'),
-    array(320, 'ZA', 'Zacapa'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    320,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/guernsey_831_1.cif b/uc_store/countries/guernsey_831_1.cif
deleted file mode 100644
index 6e7a730..0000000
--- a/uc_store/countries/guernsey_831_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function guernsey_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 831,
-      'country_name' => 'Guernsey',
-      'country_iso_code_2' => 'GG',
-      'country_iso_code_3' => 'GGY',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    831,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/guinea_324_1.cif b/uc_store/countries/guinea_324_1.cif
deleted file mode 100644
index 9362927..0000000
--- a/uc_store/countries/guinea_324_1.cif
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-function guinea_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 324,
-      'country_name' => 'Guinea',
-      'country_iso_code_2' => 'GN',
-      'country_iso_code_3' => 'GIN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(324, 'GN-BE', 'Beyla'),
-    array(324, 'GN-BF', 'Boffa'),
-    array(324, 'GN-BK', 'Boké'),
-    array(324, 'GN-CO', 'Coyah'),
-    array(324, 'GN-DB', 'Dabola'),
-    array(324, 'GN-DL', 'Dalaba'),
-    array(324, 'GN-DI', 'Dinguiraye'),
-    array(324, 'GN-DU', 'Dubréka'),
-    array(324, 'GN-FA', 'Faranah'),
-    array(324, 'GN-FO', 'Forécariah'),
-    array(324, 'GN-FR', 'Fria'),
-    array(324, 'GN-GA', 'Gaoual'),
-    array(324, 'GN-GU', 'Guékédou'),
-    array(324, 'GN-KA', 'Kankan'),
-    array(324, 'GN-KE', 'Kérouané'),
-    array(324, 'GN-KD', 'Kindia'),
-    array(324, 'GN-KS', 'Kissidougou'),
-    array(324, 'GN-KB', 'Koubia'),
-    array(324, 'GN-KN', 'Koundara'),
-    array(324, 'GN-KO', 'Kouroussa'),
-    array(324, 'GN-LA', 'Labé'),
-    array(324, 'GN-LE', 'Lélouma'),
-    array(324, 'GN-LO', 'Lola'),
-    array(324, 'GN-MC', 'Macenta'),
-    array(324, 'GN-ML', 'Mali'),
-    array(324, 'GN-MM', 'Mamou'),
-    array(324, 'GN-MD', 'Mandiana'),
-    array(324, 'GN-NZ', 'Nzérékor'),
-    array(324, 'GN-PI', 'Pita'),
-    array(324, 'GN-SI', 'Siguiri'),
-    array(324, 'GN-TE', 'Télimélé'),
-    array(324, 'GN-TO', 'Tougué'),
-    array(324, 'GN-YO', 'Yomou'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    324,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/guinea_bissau_624_1.cif b/uc_store/countries/guinea_bissau_624_1.cif
deleted file mode 100644
index afda8f5..0000000
--- a/uc_store/countries/guinea_bissau_624_1.cif
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-function guinea_bissau_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 624,
-      'country_name' => 'Guinea-Bissau',
-      'country_iso_code_2' => 'GW',
-      'country_iso_code_3' => 'GNB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(624, 'GW-BS', 'Bissau'),
-    array(624, 'GW-BA', 'Bafatá'),
-    array(624, 'GW-BM', 'Biombo'),
-    array(624, 'GW-BL', 'Bolama'),
-    array(624, 'GW-CA', 'Cacheu'),
-    array(624, 'GW-GA', 'Gabú'),
-    array(624, 'GW-OI', 'Oio'),
-    array(624, 'GW-QU', 'Quinara'),
-    array(624, 'GW-TO', 'Tombali'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    624,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/guyana_328_1.cif b/uc_store/countries/guyana_328_1.cif
deleted file mode 100644
index cfb572e..0000000
--- a/uc_store/countries/guyana_328_1.cif
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-function guyana_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 328,
-      'country_name' => 'Guyana',
-      'country_iso_code_2' => 'GY',
-      'country_iso_code_3' => 'GUY',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(328, 'GY-BA', 'Barima-Waini'),
-    array(328, 'GY-CU', 'Cuyuni-Mazaruni'),
-    array(328, 'GY-DE', 'Demerara-Mahaica'),
-    array(328, 'GY-EB', 'East Berbice-Corentyne'),
-    array(328, 'GY-ES', 'Essequibo Islands-West Demerara'),
-    array(328, 'GY-MA', 'Mahaica-Berbice'),
-    array(328, 'GY-PM', 'Pomeroon-Supenaam'),
-    array(328, 'GY-PT', 'Potaro-Siparuni'),
-    array(328, 'GY-UD', 'Upper Demerara-Berbice'),
-    array(328, 'GY-UT', 'Upper Takutu-Upper Essequibo'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    328,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/haiti_332_1.cif b/uc_store/countries/haiti_332_1.cif
deleted file mode 100644
index 5408395..0000000
--- a/uc_store/countries/haiti_332_1.cif
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-function haiti_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 332,
-      'country_name' => 'Haiti',
-      'country_iso_code_2' => 'HT',
-      'country_iso_code_3' => 'HTI',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(332, 'HT-AR', 'Artibonite'),
-    array(332, 'HT-CE', 'Centre'),
-    array(332, 'HT-GA', 'Grande-Anse'),
-    array(332, 'HT-NI', 'Nippes'),
-    array(332, 'HT-ND', 'Nord'),
-    array(332, 'HT-NE', 'Nord-Est'),
-    array(332, 'HT-NO', 'Nord-Ouest'),
-    array(332, 'HT-OU', 'Ouest'),
-    array(332, 'HT-SD', 'Sud'),
-    array(332, 'HT-SE', 'Sud-Est'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    332,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/heard_island_334_1.cif b/uc_store/countries/heard_island_334_1.cif
deleted file mode 100644
index 6e69ee8..0000000
--- a/uc_store/countries/heard_island_334_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function heard_island_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 334,
-      'country_name' => 'Heard Island and McDonald Islands',
-      'country_iso_code_2' => 'HM',
-      'country_iso_code_3' => 'HMD',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    334,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/holy_see_336_1.cif b/uc_store/countries/holy_see_336_1.cif
deleted file mode 100644
index 9c75df9..0000000
--- a/uc_store/countries/holy_see_336_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function holy_see_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 336,
-      'country_name' => 'Holy See (Vatican City State)',
-      'country_iso_code_2' => 'VA',
-      'country_iso_code_3' => 'VAT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    336,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/honduras_340_1.cif b/uc_store/countries/honduras_340_1.cif
deleted file mode 100644
index 7304a95..0000000
--- a/uc_store/countries/honduras_340_1.cif
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-function honduras_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 340,
-      'country_name' => 'Honduras',
-      'country_iso_code_2' => 'HN',
-      'country_iso_code_3' => 'HND',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(340, 'HN-AT', 'Atlántida'),
-    array(340, 'HN-CL', 'Colón'),
-    array(340, 'HN-CM', 'Comayagua'),
-    array(340, 'HN-CP', 'Copán'),
-    array(340, 'HN-CR', 'Cortés'),
-    array(340, 'HN-CH', 'Choluteca'),
-    array(340, 'HN-EP', 'El Paraíso'),
-    array(340, 'HN-FM', 'Francisco Morazán'),
-    array(340, 'HN-GD', 'Gracias a Dios'),
-    array(340, 'HN-IN', 'Intibucá'),
-    array(340, 'HN-IB', 'Islas de la Bahía'),
-    array(340, 'HN-LP', 'La Paz'),
-    array(340, 'HN-LE', 'Lempira'),
-    array(340, 'HN-OC', 'Ocotepeque'),
-    array(340, 'HN-OL', 'Olancho'),
-    array(340, 'HN-SB', 'Santa Bárbara'),
-    array(340, 'HN-VA', 'Valle'),
-    array(340, 'HN-YO', 'Yoro'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    340,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/hong_kong_344_1.cif b/uc_store/countries/hong_kong_344_1.cif
deleted file mode 100644
index d45bee1..0000000
--- a/uc_store/countries/hong_kong_344_1.cif
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-function hong_kong_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 344,
-      'country_name' => 'Hong Kong',
-      'country_iso_code_2' => 'HK',
-      'country_iso_code_3' => 'HKG',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(344, 'HK', 'Hong Kong'),
-    array(344, 'NT', 'New Territories'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    344,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!zone_name, !country_name"
-  );
-}
diff --git a/uc_store/countries/hungary_348_1.cif b/uc_store/countries/hungary_348_1.cif
deleted file mode 100644
index dc4a707..0000000
--- a/uc_store/countries/hungary_348_1.cif
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function hungary_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 348,
-      'country_name' => 'Hungary',
-      'country_iso_code_2' => 'HU',
-      'country_iso_code_3' => 'HUN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(348, 'BUD', 'Budapest'),
-    array(348, 'BAR', 'Baranya'),
-    array(348, 'BKK', 'Bács-Kiskun'),
-    array(348, 'BÉK', 'Békés'),
-    array(348, 'BAZ', 'Borsod-Abaúj-Zemplén'),
-    array(348, 'CSO', 'Csongrád'),
-    array(348, 'FEJ', 'Fejér'),
-    array(348, 'GYS', 'Gyõr-Sopron'),
-    array(348, 'HAB', 'Hajdú-Bihar'),
-    array(348, 'HEV', 'Heves'),
-    array(348, 'JNS', 'Jász-Nagykun-Szolnok'),
-    array(348, 'KOE', 'Komárom-Esztergom'),
-    array(348, 'NOG', 'Nógrád'),
-    array(348, 'PES', 'Pest'),
-    array(348, 'SOM', 'Somogy'),
-    array(348, 'SSB', 'Szabolcs-Szatmár-Bereg'),
-    array(348, 'TOL', 'Tolna'),
-    array(348, 'VAS', 'Vas'),
-    array(348, 'VES', 'Veszprém'),
-    array(348, 'ZAL', 'Zala'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    348,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/iceland_352_1.cif b/uc_store/countries/iceland_352_1.cif
deleted file mode 100644
index eaba78b..0000000
--- a/uc_store/countries/iceland_352_1.cif
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-function iceland_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 352,
-      'country_name' => 'Iceland',
-      'country_iso_code_2' => 'IS',
-      'country_iso_code_3' => 'ISL',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(352, 'IS-7', 'Austurland'),
-    array(352, 'IS-1', 'Höfuðborgarsvæði utan Reykjavíkur'),
-    array(352, 'IS-6', 'Norðurland eystra'),
-    array(352, 'IS-5', 'Norðurland vestra'),
-    array(352, 'IS-0', 'Reykjavík'),
-    array(352, 'IS-8', 'Suðurland'),
-    array(352, 'IS-2', 'Suðurnes'),
-    array(352, 'IS-4', 'Vestfirðir'),
-    array(352, 'IS-3', 'Vesturland'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    352,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/india_356_2.cif b/uc_store/countries/india_356_2.cif
deleted file mode 100644
index 94adba3..0000000
--- a/uc_store/countries/india_356_2.cif
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function india_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 356,
-      'country_name' => 'India',
-      'country_iso_code_2' => 'IN',
-      'country_iso_code_3' => 'IND',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(356, 'AN', 'Andaman and Nicobar'),
-    array(356, 'AP', 'Andhra Pradesh'),
-    array(356, 'AR', 'Arunachal Pradesh'),
-    array(356, 'AS', 'Assam'),
-    array(356, 'BR', 'Bihar'),
-    array(356, 'CH', 'Chandigarh'),
-    array(356, 'CT', 'Chhattisgarh'),
-    array(356, 'DN', 'Dadra and Nagar Haveli'),
-    array(356, 'DD', 'Daman and Diu'),
-    array(356, 'DL', 'Delhi'),
-    array(356, 'GA', 'Goa'),
-    array(356, 'GJ', 'Gujarat'),
-    array(356, 'HR', 'Haryana'),
-    array(356, 'HP', 'Himachal Pradesh'),
-    array(356, 'JK', 'Jammu and Kashmir'),
-    array(356, 'JH', 'Jharkhand'),
-    array(356, 'KA', 'Karnataka'),
-    array(356, 'KL', 'Kerala'),
-    array(356, 'LD', 'Lakshadweep'),
-    array(356, 'MP', 'Madhya Pradesh'),
-    array(356, 'MH', 'Maharashtra'),
-    array(356, 'MN', 'Manipur'),
-    array(356, 'ML', 'Meghalaya'),
-    array(356, 'MZ', 'Mizoram'),
-    array(356, 'NL', 'Nagaland'),
-    array(356, 'OR', 'Orissa'),
-    array(356, 'PY', 'Puducherry'),
-    array(356, 'PB', 'Punjab'),
-    array(356, 'RJ', 'Rajasthan'),
-    array(356, 'SK', 'Sikkim'),
-    array(356, 'TN', 'Tamil Nadu'),
-    array(356, 'TR', 'Tripura'),
-    array(356, 'UL', 'Uttarakhand'),
-    array(356, 'UP', 'Uttar Pradesh'),
-    array(356, 'WB', 'West Bengal'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    356,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city - !postal_code\r\n".
-    "!zone_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function india_update($version) {
-  switch ($version) {
-    case 2:
-      // Add some missing zones
-      $zones = array(
-        array(356, 'LD', 'Lakshadweep'),
-        array(356, 'PY', 'Puducherry'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-
-      // Correct zone name misspelling and ISO-3166-2 code
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Chhattisgarh', 'zone_code' => 'CT'))
-        ->condition('zone_country_id', 356)
-        ->condition('zone_code', 'CG')
-        ->execute();
-
-      // Replace ampersand with 'and' for consistency within .cif
-      // and for agreement with ISO-3166-2
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Jammu and Kashmir', 'zone_code' => 'JK'))
-        ->condition('zone_country_id', 356)
-        ->condition('zone_code', 'JK')
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Andaman and Nicobar', 'zone_code' => 'AN'))
-        ->condition('zone_country_id', 356)
-        ->condition('zone_code', 'AN')
-        ->execute();
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Daman and Diu', 'zone_code' => 'DD'))
-        ->condition('zone_country_id', 356)
-        ->condition('zone_code', 'DD')
-        ->execute();
-
-      // Correct ISO-3166-2 code
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Uttarakhand', 'zone_code' => 'UL'))
-        ->condition('zone_country_id', 356)
-        ->condition('zone_code', 'UA')
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/indonesia_360_1.cif b/uc_store/countries/indonesia_360_1.cif
deleted file mode 100644
index 572dfde..0000000
--- a/uc_store/countries/indonesia_360_1.cif
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-function indonesia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 360,
-      'country_name' => 'Indonesia',
-      'country_iso_code_2' => 'ID',
-      'country_iso_code_3' => 'IDN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(360, 'NAD', 'Nanggroe Aceh Darussalam'),
-    array(360, 'Sumut', 'Sumatera Utara'),
-    array(360, 'Sumbar', 'Sumatera Barat'),
-    array(360, 'Riau', 'Riau'),
-    array(360, 'Jambi', 'Jambi'),
-    array(360, 'Sumsel', 'Sumatera Selatan'),
-    array(360, 'Bengkulu', 'Bengkulu'),
-    array(360, 'Lampung', 'Lampung'),
-    array(360, 'Babel', 'Kepulauan Bangka Belitung'),
-    array(360, 'Kepri', 'Kepulauan Riau'),
-    array(360, 'DKI', 'DKI Jakarta'),
-    array(360, 'Jabar', 'Jawa Barat'),
-    array(360, 'Jateng', 'Jawa Tengah'),
-    array(360, 'DIY', 'Daista Yogyakarta'),
-    array(360, 'Jatim', 'Jawa Timur'),
-    array(360, 'Banten', 'Banten'),
-    array(360, 'Bali', 'Bali'),
-    array(360, 'NTB', 'Nusa Tenggara Barat'),
-    array(360, 'NTT', 'Nusa Tenggara Timur'),
-    array(360, 'Kalbar', 'Kalimantan Barat'),
-    array(360, 'Kalteng', 'Kalimantan Tengah'),
-    array(360, 'Kalsel', 'Kalimantan Selatan'),
-    array(360, 'Kaltim', 'Kalimantan Timur'),
-    array(360, 'Sulut', 'Sulawesi Utara'),
-    array(360, 'Sulteng', 'Sulawesi Tengah'),
-    array(360, 'Sulsel', 'Sulawesi Selatan'),
-    array(360, 'Sultra', 'Sulawesi Tenggara'),
-    array(360, 'Gorontalo', 'Gorontalo'),
-    array(360, 'Sulbar', 'Sulawesi Barat'),
-    array(360, 'Maluku', 'Maluku'),
-    array(360, 'Malut', 'Maluku Utara'),
-    array(360, 'Papua', 'Papua'),
-    array(360, 'Irjabar', 'Irian Jaya Barat'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    360,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/iran_364_2.cif b/uc_store/countries/iran_364_2.cif
deleted file mode 100644
index f984bf0..0000000
--- a/uc_store/countries/iran_364_2.cif
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-// $Id$
-
-/**
- * Implements hook_install().
- */
-function iran_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 364,
-      'country_name' => 'Iran, Islamic Republic of',
-      'country_iso_code_2' => 'IR',
-      'country_iso_code_3' => 'IRN',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(364, 'AS', 'آذربایجان شرقی'),
-    array(364, 'AG', 'آذربایجان غربی'),
-    array(364, 'AR', 'اردبیل'),
-    array(364, 'ES', 'اصفهان'),
-    array(364, 'IL', 'ایلام'),
-    array(364, 'BU', 'بوشهر'),
-    array(364, 'TH', 'تهران'),
-    array(364, 'CB', 'چهار محال بختیاری'),
-    array(364, 'KH', 'خراسان جنوبی'),
-    array(364, 'KH', 'خراسان رضوی'),
-    array(364, 'KH', 'خراسان شمالی'),
-    array(364, 'KZ', 'خوزستان'),
-    array(364, 'ZN', 'زنجان'),
-    array(364, 'SB', 'سیستان و بلوچستان'),
-    array(364, 'SM', 'سمنان'),
-    array(364, 'FR', 'فارس'),
-    array(364, 'QZ', 'قزوین'),
-    array(364, 'QM', 'قم'),
-    array(364, 'KD', 'کردستان'),
-    array(364, 'KR', 'کرمان'),
-    array(364, 'KS', 'کرمانشاه'),
-    array(364, 'KB', 'کهگیلویه و بویر احمد'),
-    array(364, 'GL', 'گیلان'),
-    array(364, 'GS', 'گلستان'),
-    array(364, 'LR', 'لرستان'),
-    array(364, 'MZ', 'مازندران'),
-    array(364, 'MR', 'مرکزی'),
-    array(364, 'HR', 'هرمزگان'),
-    array(364, 'HM', 'همدان'),
-    array(364, 'YZ', 'یزد'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    364,
-    "!first_name !last_name\r\n".
-    "!country_name - !zone_name - !city,\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code"
-  );
-}
-
-function iran_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array(
-            'country_name' => 'Iran, Islamic Republic of',
-            'country_iso_code_3' => 'IRN',
-          ))
-        ->condition('country_id', 364)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/iraq_368_1.cif b/uc_store/countries/iraq_368_1.cif
deleted file mode 100644
index 88c8e4e..0000000
--- a/uc_store/countries/iraq_368_1.cif
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-function iraq_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 368,
-      'country_name' => 'Iraq',
-      'country_iso_code_2' => 'IQ',
-      'country_iso_code_3' => 'IRQ',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(368, 'IQ-AN', 'Al Anbār'),
-    array(368, 'IQ-BA', 'Al Başrah'),
-    array(368, 'IQ-MU', 'Al Muthanná'),
-    array(368, 'IQ-QA', 'Al Qādisīyah'),
-    array(368, 'IQ-NA', 'An Najaf'),
-    array(368, 'IQ-AR', 'Arbīl'),
-    array(368, 'IQ-SU', 'As Sulaymānīyah'),
-    array(368, 'IQ-TS', "At Ta'mīm"),
-    array(368, 'IQ-BB', 'Babil !Bābil'),
-    array(368, 'IQ-BG', 'Baghdād'),
-    array(368, 'IQ-DA', 'Dahūk'),
-    array(368, 'IQ-DQ', 'Dhī Qār'),
-    array(368, 'IQ-DI', 'Diyālá'),
-    array(368, 'IQ-KA', "Karbalā'"),
-    array(368, 'IQ-MA', 'Maysān'),
-    array(368, 'IQ-NI', 'Nīnawá'),
-    array(368, 'IQ-SD', 'Şalāḩ ad Dīn'),
-    array(368, 'IQ-WA', 'Wāsiţ'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    368,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/ireland_372_2.cif b/uc_store/countries/ireland_372_2.cif
deleted file mode 100644
index 629f124..0000000
--- a/uc_store/countries/ireland_372_2.cif
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-// Note: Ireland does not currently have postal codes but it has been announced
-// that they will be implemented - so I left the postal code in the address
-// definition.
-// http://www.dcmnr.gov.ie/Press+Releases/Dempsey+announces+programme+to+introduce+postcodes+in+Ireland+by+1st+January+2008.htm
-//
-
-function ireland_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 372,
-      'country_name' => 'Ireland',
-      'country_iso_code_2' => 'IE',
-      'country_iso_code_3' => 'IRL',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(372, 'CARLOW', 'Co. Carlow'),
-    array(372, 'CAVAN', 'Co. Cavan'),
-    array(372, 'CLARE', 'Co. Clare'),
-    array(372, 'CORK', 'Co. Cork'),
-    array(372, 'DONEGAL', 'Co. Donegal'),
-    array(372, 'DUBLIN', 'Co. Dublin'),
-    array(372, 'GALWAY', 'Co. Galway'),
-    array(372, 'KERRY', 'Co. Kerry'),
-    array(372, 'KILDARE', 'Co. Kildare'),
-    array(372, 'KILKENNY', 'Co. Kilkenny'),
-    array(372, 'LAOIS', 'Co. Laois'),
-    array(372, 'LEITRIM', 'Co. Leitrim'),
-    array(372, 'LIMERICK', 'Co. Limerick'),
-    array(372, 'LONGFORD', 'Co. Longford'),
-    array(372, 'LOUTH', 'Co. Louth'),
-    array(372, 'MAYO', 'Co. Mayo'),
-    array(372, 'MEATH', 'Co. Meath'),
-    array(372, 'MONAGHAN', 'Co. Monaghan'),
-    array(372, 'OFFALY', 'Co. Offaly'),
-    array(372, 'ROSCOMMON', 'Co. Roscommon'),
-    array(372, 'SLIGO', 'Co. Sligo'),
-    array(372, 'TIPPERARY', 'Co. Tipperary'),
-    array(372, 'WATERFORD', 'Co. Waterford'),
-    array(372, 'WESTMEATH', 'Co. Westmeath'),
-    array(372, 'WEXFORD', 'Co. Wexford'),
-    array(372, 'WICKLOW', 'Co. Wicklow'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    372,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function ireland_update($version) {
-  switch ($version) {
-    case 2:
-      uc_set_address_format(
-        372,
-        "!company\r\n".
-        "!first_name !last_name\r\n".
-        "!street1\r\n".
-        "!street2\r\n".
-        "!city, !zone_name !postal_code\r\n".
-        "!country_name_if"
-      );
-      break;
-  }
-}
diff --git a/uc_store/countries/isle_of_man_833_1.cif b/uc_store/countries/isle_of_man_833_1.cif
deleted file mode 100644
index 2fc9cdb..0000000
--- a/uc_store/countries/isle_of_man_833_1.cif
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function isle_of_man_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 833,
-      'country_name' => 'Isle of Man',
-      'country_iso_code_2' => 'IM',
-      'country_iso_code_3' => 'IMN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    833,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/israel_376_1.cif b/uc_store/countries/israel_376_1.cif
deleted file mode 100644
index 498ad6e..0000000
--- a/uc_store/countries/israel_376_1.cif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function israel_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 376,
-      'country_name' => 'Israel',
-      'country_iso_code_2' => 'IL',
-      'country_iso_code_3' => 'ISR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(376, 'BS', "Be'er Sheva"),
-    array(376, 'BH', "Bika'at Hayarden"),
-    array(376, 'EA', 'Eilat and Arava'),
-    array(376, 'GA', 'Galil'),
-    array(376, 'HA', 'Haifa'),
-    array(376, 'JM', 'Jehuda Mountains'),
-    array(376, 'JE', 'Jerusalem'),
-    array(376, 'NE', 'Negev'),
-    array(376, 'SE', 'Semaria'),
-    array(376, 'SH', 'Sharon'),
-    array(376, 'TA', 'Tel Aviv (Gosh Dan)'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    376,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/italy_380_3.cif b/uc_store/countries/italy_380_3.cif
deleted file mode 100644
index 0c80387..0000000
--- a/uc_store/countries/italy_380_3.cif
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function italy_install() {
-  // Make the entry in the country table.
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 380,
-      'country_name' => 'Italy',
-      'country_iso_code_2' => 'IT',
-      'country_iso_code_3' => 'ITA',
-      'version' => 3,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(380, 'AG', 'Agrigento'),
-    array(380, 'AL', 'Alessandria'),
-    array(380, 'AN', 'Ancona'),
-    array(380, 'AO', 'Aosta'),
-    array(380, 'AP', 'Ascoli Piceno'),
-    array(380, 'AQ', "L'Aquila"),
-    array(380, 'AR', 'Arezzo'),
-    array(380, 'AT', 'Asti'),
-    array(380, 'AV', 'Avellino'),
-    array(380, 'BA', 'Bari'),
-    array(380, 'BG', 'Bergamo'),
-    array(380, 'BI', 'Biella'),
-    array(380, 'BL', 'Belluno'),
-    array(380, 'BN', 'Benevento'),
-    array(380, 'BO', 'Bologna'),
-    array(380, 'BR', 'Brindisi'),
-    array(380, 'BS', 'Brescia'),
-    array(380, 'BT', 'Barletta-Andria-Trani'),
-    array(380, 'BZ', 'Bolzano'),
-    array(380, 'CA', 'Cagliari'),
-    array(380, 'CB', 'Campobasso'),
-    array(380, 'CE', 'Caserta'),
-    array(380, 'CH', 'Chieti'),
-    array(380, 'CI', 'Carbonia-Iglesias'),
-    array(380, 'CL', 'Caltanissetta'),
-    array(380, 'CN', 'Cuneo'),
-    array(380, 'CO', 'Como'),
-    array(380, 'CR', 'Cremona'),
-    array(380, 'CS', 'Cosenza'),
-    array(380, 'CT', 'Catania'),
-    array(380, 'CZ', 'Catanzaro'),
-    array(380, 'EN', 'Enna'),
-    array(380, 'FC', 'Forlì-Cesena'),
-    array(380, 'FE', 'Ferrara'),
-    array(380, 'FG', 'Foggia'),
-    array(380, 'FI', 'Firenze'),
-    array(380, 'FM', 'Fermo'),
-    array(380, 'FR', 'Frosinone'),
-    array(380, 'GE', 'Genova'),
-    array(380, 'GO', 'Gorizia'),
-    array(380, 'GR', 'Grosseto'),
-    array(380, 'IM', 'Imperia'),
-    array(380, 'IS', 'Isernia'),
-    array(380, 'KR', 'Crotone'),
-    array(380, 'LC', 'Lecco'),
-    array(380, 'LE', 'Lecce'),
-    array(380, 'LI', 'Livorno'),
-    array(380, 'LO', 'Lodi'),
-    array(380, 'LT', 'Latina'),
-    array(380, 'LU', 'Lucca'),
-    array(380, 'MB', 'Monza e Brianza'),
-    array(380, 'MC', 'Macerata'),
-    array(380, 'ME', 'Messina'),
-    array(380, 'MI', 'Milano'),
-    array(380, 'MN', 'Mantova'),
-    array(380, 'MO', 'Modena'),
-    array(380, 'MS', 'Massa e Carrara'),
-    array(380, 'MT', 'Matera'),
-    array(380, 'NA', 'Napoli'),
-    array(380, 'NO', 'Novara'),
-    array(380, 'NU', 'Nuoro'),
-    array(380, 'OG', 'Ogliastra'),
-    array(380, 'OR', 'Oristano'),
-    array(380, 'OT', 'Olbia-Tempio'),
-    array(380, 'PA', 'Palermo'),
-    array(380, 'PC', 'Piacenza'),
-    array(380, 'PD', 'Padova'),
-    array(380, 'PE', 'Pescara'),
-    array(380, 'PG', 'Perugia'),
-    array(380, 'PI', 'Pisa'),
-    array(380, 'PN', 'Pordenone'),
-    array(380, 'PO', 'Prato'),
-    array(380, 'PR', 'Parma'),
-    array(380, 'PU', 'Pesaro e Urbino'),
-    array(380, 'PT', 'Pistoia'),
-    array(380, 'PV', 'Pavia'),
-    array(380, 'PZ', 'Potenza'),
-    array(380, 'RA', 'Ravenna'),
-    array(380, 'RC', 'Reggio Calabria'),
-    array(380, 'RE', 'Reggio Emilia'),
-    array(380, 'RG', 'Ragusa'),
-    array(380, 'RI', 'Rieti'),
-    array(380, 'RM', 'Roma'),
-    array(380, 'RN', 'Rimini'),
-    array(380, 'RO', 'Rovigo'),
-    array(380, 'SA', 'Salerno'),
-    array(380, 'SI', 'Siena'),
-    array(380, 'SO', 'Sondrio'),
-    array(380, 'SP', 'La Spezia'),
-    array(380, 'SR', 'Siracusa'),
-    array(380, 'SS', 'Sassari'),
-    array(380, 'SV', 'Savona'),
-    array(380, 'TA', 'Taranto'),
-    array(380, 'TE', 'Teramo'),
-    array(380, 'TN', 'Trento'),
-    array(380, 'TO', 'Torino'),
-    array(380, 'TP', 'Trapani'),
-    array(380, 'TR', 'Terni'),
-    array(380, 'TS', 'Trieste'),
-    array(380, 'TV', 'Treviso'),
-    array(380, 'UD', 'Udine'),
-    array(380, 'VA', 'Varese'),
-    array(380, 'VB', 'Verbano-Cusio-Ossola'),
-    array(380, 'VC', 'Vercelli'),
-    array(380, 'VE', 'Venezia'),
-    array(380, 'VI', 'Vicenza'),
-    array(380, 'VR', 'Verona'),
-    array(380, 'VS', 'Medio Campidano'),
-    array(380, 'VT', 'Viterbo'),
-    array(380, 'VV', 'Vibo Valentia'),
-    array(380, 'RSM', 'Rep San Marino'),
-    array(380, 'CTV', 'Città del Vaticano'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    380,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code, !city\r\n".
-    "!zone_code\r\n".
-    "!country_name_if"
-  );
-}
-
-
-/**
-* Implements hook_update() with $version being the only argument.
-* Add a new case for each version update, and be sure to always include the
-* latest changes in the install function.
-*/
-function italy_update($version) {
-  switch ($version) {
-    case 2:
-      $zones = array(
-        array(380, 'CI', 'Carbonia-Iglesias'),
-        array(380, 'VS', 'Medio-Campidano'),
-        array(380, 'OG', 'Ogliastra'),
-        array(380, 'OT', 'Olbia-Tempio'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-
-      break;
-
-    case 3:
-      $zones = array(
-        array(380, 'BT', 'Barletta-Andria-Trani'),
-        array(380, 'FM', 'Fermo'),
-        array(380, 'MB', 'Monza e Brianza'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-
-      $zones = array(
-        array(380, 'MS', 'Massa e Carrara'),
-        array(380, 'PU', 'Pesaro e Urbino'),
-        array(380, 'VB', 'Verbano-Cusio-Ossola'),
-        array(380, 'VV', 'Vibo Valentia'),
-      );
-
-      foreach ($zones as $zone) {
-        db_update('uc_zones')
-          ->fields(array('zone_name' => $zone[2]))
-          ->condition('zone_code', $zone[1])
-          ->condition('zone_country_id', 380)
-          ->execute();
-      }
-
-      break;
-  }
-}
diff --git a/uc_store/countries/jamaica_388_2.cif b/uc_store/countries/jamaica_388_2.cif
deleted file mode 100644
index ebed01d..0000000
--- a/uc_store/countries/jamaica_388_2.cif
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-function jamaica_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 388,
-      'country_name' => 'Jamaica',
-      'country_iso_code_2' => 'JM',
-      'country_iso_code_3' => 'JAM',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(388, 'JM-13', 'Clarendon'),
-    array(388, 'JM-09', 'Hanover'),
-    array(388, 'JM-01', 'Kingston'),
-    array(388, 'JM-12', 'Manchester'),
-    array(388, 'JM-04', 'Portland'),
-    array(388, 'JM-02', 'Saint Andrew'),
-    array(388, 'JM-06', 'Saint Ann'),
-    array(388, 'JM-14', 'Saint Catherine'),
-    array(388, 'JM-11', 'Saint Elizabeth'),
-    array(388, 'JM-08', 'Saint James'),
-    array(388, 'JM-05', 'Saint Mary'),
-    array(388, 'JM-03', 'Saint Thomas'),
-    array(388, 'JM-07', 'Trelawny'),
-    array(388, 'JM-10', 'Westmoreland'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    388,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city - !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-/**
- * Implements hook_update() with $version being the only argument.
- * Add a new case for each version update, and be sure to always include the
- * latest changes in the install function.
- */
-function jamaica_update($version) {
-  switch ($version) {
-    case 2:
-      $zones = array(
-        array(388, 'JM-13', 'Clarendon'),
-        array(388, 'JM-09', 'Hanover'),
-        array(388, 'JM-01', 'Kingston'),
-        array(388, 'JM-12', 'Manchester'),
-        array(388, 'JM-04', 'Portland'),
-        array(388, 'JM-02', 'Saint Andrew'),
-        array(388, 'JM-06', 'Saint Ann'),
-        array(388, 'JM-14', 'Saint Catherine'),
-        array(388, 'JM-11', 'Saint Elizabeth'),
-        array(388, 'JM-08', 'Saint James'),
-        array(388, 'JM-05', 'Saint Mary'),
-        array(388, 'JM-03', 'Saint Thomas'),
-        array(388, 'JM-07', 'Trelawny'),
-        array(388, 'JM-10', 'Westmoreland'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-      break;
-  }
-}
diff --git a/uc_store/countries/japan_392_1.cif b/uc_store/countries/japan_392_1.cif
deleted file mode 100644
index a4a17fb..0000000
--- a/uc_store/countries/japan_392_1.cif
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function japan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 392,
-      'country_name' => 'Japan',
-      'country_iso_code_2' => 'JP',
-      'country_iso_code_3' => 'JPN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(392, '01', '北海道'),
-    array(392, '02', '青森県'),
-    array(392, '03', '岩手県'),
-    array(392, '04', '宮城県'),
-    array(392, '05', '秋田県'),
-    array(392, '06', '山形県'),
-    array(392, '07', '福島県'),
-    array(392, '08', '茨城県'),
-    array(392, '09', '栃木県'),
-    array(392, '10', '群馬県'),
-    array(392, '11', '埼玉県'),
-    array(392, '12', '千葉県'),
-    array(392, '13', '東京都'),
-    array(392, '14', '神奈川県'),
-    array(392, '15', '新潟県'),
-    array(392, '16', '富山県'),
-    array(392, '17', '石川県'),
-    array(392, '18', '福井県'),
-    array(392, '19', '山梨県'),
-    array(392, '20', '長野県'),
-    array(392, '21', '岐阜県'),
-    array(392, '22', '静岡県'),
-    array(392, '23', '愛知県'),
-    array(392, '24', '三重県'),
-    array(392, '25', '滋賀県'),
-    array(392, '26', '京都府'),
-    array(392, '27', '大阪府'),
-    array(392, '28', '兵庫県'),
-    array(392, '29', '奈良県'),
-    array(392, '30', '和歌山県'),
-    array(392, '31', '鳥取県'),
-    array(392, '32', '島根県'),
-    array(392, '33', '岡山県'),
-    array(392, '34', '広島県'),
-    array(392, '35', '山口県'),
-    array(392, '36', '徳島県'),
-    array(392, '37', '香川県'),
-    array(392, '38', '愛媛県'),
-    array(392, '39', '高知県'),
-    array(392, '40', '福岡県'),
-    array(392, '41', '佐賀県'),
-    array(392, '42', '長崎県'),
-    array(392, '43', '熊本県'),
-    array(392, '44', '大分県'),
-    array(392, '45', '宮崎県'),
-    array(392, '46', '鹿児島県'),
-    array(392, '47', '沖縄県'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    392,
-    "!postal_code\r\n".
-    "!zone_name !city\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!company\r\n".
-    "!last_name !first_name\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/jersey_832_1.cif b/uc_store/countries/jersey_832_1.cif
deleted file mode 100644
index 1c1592c..0000000
--- a/uc_store/countries/jersey_832_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function jersey_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 832,
-      'country_name' => 'Jersey',
-      'country_iso_code_2' => 'JE',
-      'country_iso_code_3' => 'JEY',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    832,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/jordan_400_1.cif b/uc_store/countries/jordan_400_1.cif
deleted file mode 100644
index 14d9332..0000000
--- a/uc_store/countries/jordan_400_1.cif
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-function jordan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 400,
-      'country_name' => 'Jordan',
-      'country_iso_code_2' => 'JO',
-      'country_iso_code_3' => 'JOR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(400, 'JO-AJ', "'Ajlūn"),
-    array(400, 'JO-AQ', "Al 'Aqaba"),
-    array(400, 'JO-BA', "Al Balqā'"),
-    array(400, 'JO-KA', 'Al Karak'),
-    array(400, 'JO-MA', 'Al Mafraq'),
-    array(400, 'JO-AM', "'Ammān"),
-    array(400, 'JO-AT', 'Aţ Ţafīlah'),
-    array(400, 'JO-AZ', "Az Zarqā'"),
-    array(400, 'JO-IR', 'Irbid'),
-    array(400, 'JO-JA', 'Jarash'),
-    array(400, 'JO-MN', "Ma'ٰān"),
-    array(400, 'JO-MD', 'Mādaba'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    400,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/kazakhstan_398_1.cif b/uc_store/countries/kazakhstan_398_1.cif
deleted file mode 100644
index b6ebfb6..0000000
--- a/uc_store/countries/kazakhstan_398_1.cif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-function kazakhstan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 398,
-      'country_name' => 'Kazakhstan',
-      'country_iso_code_2' => 'KZ',
-      'country_iso_code_3' => 'KAZ',
-      'version' => 1,
-    ))
-    ->execute();
-
-  $zones = array(
-    array(398, 'ALA', 'Алматы'),
-    array(398, 'TSE', 'Астана'),
-    array(398, 'AKM', 'Акмолинская область'),
-    array(398, 'AKT', 'Актюбинская область'),
-    array(398, 'ALM', 'Алматинская область'),
-    array(398, 'ATR', 'Атырауская область'),
-    array(398, 'EKZ', 'Восточно-Казахстанская область'),
-    array(398, 'DZH', 'Жамбылская область'),
-    array(398, 'WKZ', 'Западно-Казахстанская область'),
-    array(398, 'KAR', 'Карагандинская область'),
-    array(398, 'KOR', 'Кызылординская область'),
-    array(398, 'KUS', 'Костанайская область'),
-    array(398, 'MAN', 'Мангистауская область'),
-    array(398, 'PVL', 'Павлодарская область'),
-    array(398, 'NKZ', 'Северо-Казахстанская область'),
-    array(398, 'SKZ', 'Южно-Казахстанская область'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    398,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/kenya_404_1.cif b/uc_store/countries/kenya_404_1.cif
deleted file mode 100644
index 00dff6f..0000000
--- a/uc_store/countries/kenya_404_1.cif
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function kenya_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 404,
-      'country_name' => 'Kenya',
-      'country_iso_code_2' => 'KE',
-      'country_iso_code_3' => 'KEN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(404, '700', 'Bonde la Ufa'),
-    array(404, '200', 'Central'),
-    array(404, '300', 'Coast'),
-    array(404, '400', 'Eastern'),
-    array(404, '500', 'Kaskazini Masariki'),
-    array(404, '200', 'Kati'),
-    array(404, '800', 'Maqharibi'),
-    array(404, '400', 'Mashariki'),
-    array(404, '110', 'Nairobi'),
-    array(404, '500', 'North-Eastern'),
-    array(404, '600', 'Nyanza'),
-    array(404, '300', 'Pwani'),
-    array(404, '700', 'Rift Valley'),
-    array(404, '800', 'Western'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    404,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/kiribati_296_1.cif b/uc_store/countries/kiribati_296_1.cif
deleted file mode 100644
index cbedd9a..0000000
--- a/uc_store/countries/kiribati_296_1.cif
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-function kiribati_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 296,
-      'country_name' => 'Kiribati',
-      'country_iso_code_2' => 'KI',
-      'country_iso_code_3' => 'KIR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(296, 'KI-G', 'Gilbert Islands'),
-    array(296, 'KI-L', 'Line Islands'),
-    array(296, 'KI-P', 'Phoenix Islands'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    296,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/korea_democratic_peoples_republic_of_408_2.cif b/uc_store/countries/korea_democratic_peoples_republic_of_408_2.cif
deleted file mode 100644
index 7512083..0000000
--- a/uc_store/countries/korea_democratic_peoples_republic_of_408_2.cif
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-function korea_democratic_peoples_republic_of_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 408,
-      'country_name' => "Korea, Democratic People's Republic of",
-      'country_iso_code_2' => 'KP',
-      'country_iso_code_3' => 'PRK',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(408, 'KP-01', 'P’yŏngyang'),
-    array(408, 'KP-13', 'Nasŏn (Najin-Sŏnbong'),
-    array(408, 'KP-02', 'P’yŏngan-namdo'),
-    array(408, 'KP-03', 'P’yŏngan-bukto'),
-    array(408, 'KP-04', 'Chagang-do'),
-    array(408, 'KP-05', 'Hwanghae-namdo'),
-    array(408, 'KP-06', 'Hwanghae-bukto'),
-    array(408, 'KP-07', 'Kangwŏn-do'),
-    array(408, 'KP-08', 'Hamgyŏng-namdo'),
-    array(408, 'KP-09', 'Hamgyŏng-bukto'),
-    array(408, 'KP-10', 'Yanggang-do'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    408,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function korea_democratic_peoples_republic_of_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => "Korea, Democratic People's Republic of"))
-        ->condition('country_id', 408)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/korea_republic_of_410_1.cif b/uc_store/countries/korea_republic_of_410_1.cif
deleted file mode 100644
index 6474be5..0000000
--- a/uc_store/countries/korea_republic_of_410_1.cif
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function korea_republic_of_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 410,
-      'country_name' => 'Korea, Republic of',
-      'country_iso_code_2' => 'KR',
-      'country_iso_code_3' => 'KOR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(410, 'CO', "Ch'ungch'ong-bukto"),
-    array(410, 'CH', "Ch'ungch'ong-namdo"),
-    array(410, 'CD', 'Cheju-do'),
-    array(410, 'CB', 'Cholla-bukto'),
-    array(410, 'CN', 'Cholla-namdo'),
-    array(410, 'IG', "Inch'on-gwangyoksi"),
-    array(410, 'KA', 'Kangwon-do'),
-    array(410, 'KG', 'Kwangju-gwangyoksi'),
-    array(410, 'KD', 'Kyonggi-do'),
-    array(410, 'KB', 'Kyongsang-bukto'),
-    array(410, 'KN', 'Kyongsang-namdo'),
-    array(410, 'PG', 'Pusan-gwangyoksi'),
-    array(410, 'SO', "Soul-t'ukpyolsi"),
-    array(410, 'TA', 'Taegu-gwangyoksi'),
-    array(410, 'TG', 'Taejon-gwangyoksi'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    410,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/kuwait_414_1.cif b/uc_store/countries/kuwait_414_1.cif
deleted file mode 100644
index 90a8d40..0000000
--- a/uc_store/countries/kuwait_414_1.cif
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-function kuwait_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 414,
-      'country_name' => 'Kuwait',
-      'country_iso_code_2' => 'KW',
-      'country_iso_code_3' => 'KWT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(414, 'KW-AH', 'Al Aḩmadi'),
-    array(414, 'KW-FA', 'Al Farwānīyah'),
-    array(414, 'KW-JA', 'Al Jahrah'),
-    array(414, 'KW-KU', 'Al Kuwayt'),
-    array(414, 'KW-HA', 'Hawallī !Ḩawallī'),
-    array(414, 'KW-MU', 'Mubārak al Kabīr'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    414,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/kyrgyzstan_417_1.cif b/uc_store/countries/kyrgyzstan_417_1.cif
deleted file mode 100644
index 92db6b3..0000000
--- a/uc_store/countries/kyrgyzstan_417_1.cif
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-function kyrgyzstan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 417,
-      'country_name' => 'Kyrgyzstan',
-      'country_iso_code_2' => 'KG',
-      'country_iso_code_3' => 'KGZ',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(417, 'KG-GB', 'Bishkek'),
-    array(417, 'KG-B', 'Batken'),
-    array(417, 'KG-C', 'Chü'),
-    array(417, 'KG-J', 'Jalal-Abad'),
-    array(417, 'KG-N', 'Naryn'),
-    array(417, 'KG-O', 'Osh'),
-    array(417, 'KG-T', 'Talas'),
-    array(417, 'KG-Y', 'Ysyk-Köl'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    417,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/laos_418_1.cif b/uc_store/countries/laos_418_1.cif
deleted file mode 100644
index 557a34c..0000000
--- a/uc_store/countries/laos_418_1.cif
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-function laos_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 418,
-      'country_name' => "Lao People's Democratic Republic",
-      'country_iso_code_2' => 'LA',
-      'country_iso_code_3' => 'LAO',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(418, 'LA-VT', 'Vientiane'),
-    array(418, 'LA-AT', 'Attapu [Attopeu]'),
-    array(418, 'LA-BK', 'Bokè'),
-    array(418, 'LA-BL', 'Bolikhamxai [Borikhane]'),
-    array(418, 'LA-CH', 'Champasak [Champassak]'),
-    array(418, 'LA-HO', 'Houaphan'),
-    array(418, 'LA-KH', 'Khammouan'),
-    array(418, 'LA-LM', 'Louang Namtha'),
-    array(418, 'LA-LP', 'Louangphabang [Louang Prabang]'),
-    array(418, 'LA-OU', 'Oudômxai [Oudomsai]'),
-    array(418, 'LA-PH', 'Phôngsali [Phong Saly]'),
-    array(418, 'LA-SL', 'Salavan [Saravane]'),
-    array(418, 'LA-SV', 'Savannakhé'),
-    array(418, 'LA-VI', 'Vientiane'),
-    array(418, 'LA-XA', 'Xaignabouli'),
-    array(418, 'LA-XE', 'Xekong'),
-    array(418, 'LA-XI', 'Xiangkhoang [Xieng Khouang]'),
-    array(418, 'LA-XN', 'Xaisômbou'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    418,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/latvia_428_1.cif b/uc_store/countries/latvia_428_1.cif
deleted file mode 100644
index 261132f..0000000
--- a/uc_store/countries/latvia_428_1.cif
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function latvia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 428,
-      'country_name' => 'Latvia',
-      'country_iso_code_2' => 'LV',
-      'country_iso_code_3' => 'LVA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(428, 'AI', 'Aizkraukles rajons'),
-    array(428, 'AL', 'Alūksnes rajons'),
-    array(428, 'BL', 'Balvu rajons'),
-    array(428, 'BU', 'Bauskas rajons'),
-    array(428, 'CE', 'Cēsu rajons'),
-    array(428, 'DGV', 'Daugavpils pilsēta'),
-    array(428, 'DA', 'Daugavpils rajons'),
-    array(428, 'DO', 'Dobeles rajons'),
-    array(428, 'GU', 'Gulbenes rajons'),
-    array(428, 'JK', 'Jēkabpils rajons'),
-    array(428, 'JEL', 'Jelgavas pilsēta'),
-    array(428, 'JL', 'Jelgavas rajons'),
-    array(428, 'JUR', 'Jūrmalas pilsēta'),
-    array(428, 'KR', 'Krāslavas rajons'),
-    array(428, 'KU', 'Kuldīgas rajons'),
-    array(428, 'LPX', 'Liepājas pilsēta'),
-    array(428, 'LE', 'Liepājas rajons'),
-    array(428, 'LM', 'Limbažu rajons'),
-    array(428, 'LU', 'Ludzas rajons'),
-    array(428, 'MA', 'Madonas rajons'),
-    array(428, 'OG', 'Ogres rajons'),
-    array(428, 'PR', 'Preiļu rajons'),
-    array(428, 'REZ', 'Rēzeknes pilsēta'),
-    array(428, 'RE', 'Rēzeknes rajons'),
-    array(428, 'RIX', 'Rīgas pilsēta'),
-    array(428, 'RI', 'Rīgas rajons'),
-    array(428, 'SA', 'Saldus rajons'),
-    array(428, 'TA', 'Talsu rajons'),
-    array(428, 'TU', 'Tukuma rajons'),
-    array(428, 'VK', 'Valkas rajons'),
-    array(428, 'VM', 'Valmieras rajons'),
-    array(428, 'VEN', 'Ventspils pilsēta'),
-    array(428, 'VE', 'Ventspils rajons'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    428,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/lebanon_422_1.cif b/uc_store/countries/lebanon_422_1.cif
deleted file mode 100644
index 8bf818a..0000000
--- a/uc_store/countries/lebanon_422_1.cif
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-function lebanon_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 422,
-      'country_name' => 'Lebanon',
-      'country_iso_code_2' => 'LB',
-      'country_iso_code_3' => 'LBN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(422, 'LB-AK', 'Aakkâr'),
-    array(422, 'LB-BH', 'Baalbek-Hermel'),
-    array(422, 'LB-BI', 'Beqaa'),
-    array(422, 'LB-BA', 'Beyrouth'),
-    array(422, 'LB-AS', 'Liban-Nord'),
-    array(422, 'LB-JA', 'Liban-Sud'),
-    array(422, 'LB-JL', 'Mont-Liban'),
-    array(422, 'LB-NA', 'Nabatîyé'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    422,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/lesotho_426_1.cif b/uc_store/countries/lesotho_426_1.cif
deleted file mode 100644
index 73beea6..0000000
--- a/uc_store/countries/lesotho_426_1.cif
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-function lesotho_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 426,
-      'country_name' => 'Lesotho',
-      'country_iso_code_2' => 'LS',
-      'country_iso_code_3' => 'LSO',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(426, 'LS-D', 'Berea'),
-    array(426, 'LS-B', 'Butha-Buthe'),
-    array(426, 'LS-C', 'Leribe'),
-    array(426, 'LS-E', 'Mafeteng'),
-    array(426, 'LS-A', 'Maseru'),
-    array(426, 'LS-F', "Mohale's Hoek"),
-    array(426, 'LS-J', 'Mokhotlong'),
-    array(426, 'LS-H', "Qacha's Nek"),
-    array(426, 'LS-G', 'Quthing'),
-    array(426, 'LS-K', 'Thaba-Tseka'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    426,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/liberia_430_1.cif b/uc_store/countries/liberia_430_1.cif
deleted file mode 100644
index 2f90a5b..0000000
--- a/uc_store/countries/liberia_430_1.cif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-function liberia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 430,
-      'country_name' => 'Liberia',
-      'country_iso_code_2' => 'LR',
-      'country_iso_code_3' => 'LBR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(430, 'LR-BM', 'Bomi'),
-    array(430, 'LR-BG', 'Bong'),
-    array(430, 'LR-GP', 'Gbarpolu'),
-    array(430, 'LR-GB', 'Grand Bassa'),
-    array(430, 'LR-CM', 'Grand Cape Mount'),
-    array(430, 'LR-GG', 'Grand Gedeh'),
-    array(430, 'LR-GK', 'Grand Kru'),
-    array(430, 'LR-LO', 'Lofa'),
-    array(430, 'LR-MG', 'Margibi'),
-    array(430, 'LR-MY', 'Maryland'),
-    array(430, 'LR-MO', 'Montserrado'),
-    array(430, 'LR-NI', 'Nimba'),
-    array(430, 'LR-RI', 'Rivercess'),
-    array(430, 'LR-RG', 'RiverGee'),
-    array(430, 'LR-SI', 'Sinoe'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    430,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/libya_434_2.cif b/uc_store/countries/libya_434_2.cif
deleted file mode 100644
index f34d4fe..0000000
--- a/uc_store/countries/libya_434_2.cif
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-function libya_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 434,
-      'country_name' => 'Libya',
-      'country_iso_code_2' => 'LY',
-      'country_iso_code_3' => 'LBY',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(434, 'LY-BU', 'Al Buţnān'),
-    array(434, 'LY-JA', 'Al Jabal al Akhḑar'),
-    array(434, 'LY-JG', 'Al Jabal al Gharbī'),
-    array(434, 'LY-JI', 'Al Jifārah'),
-    array(434, 'LY-JU', 'Al Jufrah'),
-    array(434, 'LY-KF', 'Al Kufrah'),
-    array(434, 'LY-MJ', 'Al Marj'),
-    array(434, 'LY-MB', 'Al Marqab'),
-    array(434, 'LY-WA', 'Al Wāḩāt'),
-    array(434, 'LY-NQ', 'An Nuqaţ al Khams'),
-    array(434, 'LY-ZA', 'Az Zāwiyah'),
-    array(434, 'LY-BA', 'Banghāzī'),
-    array(434, 'LY-DR', 'Darnah'),
-    array(434, 'LY-GT', 'Ghāt'),
-    array(434, 'LY-MI', 'Mişrātah'),
-    array(434, 'LY-MQ', 'Murzuq'),
-    array(434, 'LY-NL', 'Nālūt'),
-    array(434, 'LY-SB', 'Sabhā'),
-    array(434, 'LY-SR', 'Surt'),
-    array(434, 'LY-TB', 'Tarābulus'),
-    array(434, 'LY-WD', 'Wādī al Ḩayāt'),
-    array(434, 'LY-WS', 'Wādī ash Shāţiʾ'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    434,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function libya_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => 'Libya'))
-        ->condition('country_id', 434)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/liechtenstein_438_1.cif b/uc_store/countries/liechtenstein_438_1.cif
deleted file mode 100644
index 0305772..0000000
--- a/uc_store/countries/liechtenstein_438_1.cif
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-function liechtenstein_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 438,
-      'country_name' => 'Liechtenstein',
-      'country_iso_code_2' => 'LI',
-      'country_iso_code_3' => 'LIE',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(438, 'LI-01', 'Balzers'),
-    array(438, 'LI-02', 'Eschen'),
-    array(438, 'LI-03', 'Gamprin'),
-    array(438, 'LI-04', 'Mauren'),
-    array(438, 'LI-05', 'Planken'),
-    array(438, 'LI-06', 'Ruggell'),
-    array(438, 'LI-07', 'Schaan'),
-    array(438, 'LI-08', 'Schellenberg'),
-    array(438, 'LI-09', 'Triesen'),
-    array(438, 'LI-10', 'Triesenberg'),
-    array(438, 'LI-11', 'Vaduz'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    438,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/lithuania_440_1.cif b/uc_store/countries/lithuania_440_1.cif
deleted file mode 100644
index 1ede88d..0000000
--- a/uc_store/countries/lithuania_440_1.cif
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function lithuania_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 440,
-      'country_name' => 'Lithuania',
-      'country_iso_code_2' => 'LT',
-      'country_iso_code_3' => 'LTU',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.  Use %d for the zone_id and the
-  // function uc_get_zone_ids($num) as the second argument for db_query() where
-  // $num is the number of zones in the INSERT query.
-  // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(440, 'AK', 'Akmenės rajonas'),
-    array(440, 'AL', 'Alytaus rajonas'),
-    array(440, 'AN', 'Anykščių rajonas'),
-    array(440, 'BIR', 'Biržų rajonas'),
-    array(440, 'IG', 'Ignalinos rajonas'),
-    array(440, 'JON', 'Jonavos rajonas'),
-    array(440, 'JO', 'Joniškio rajonas'),
-    array(440, 'JUR', 'Jurbarko rajonas'),
-    array(440, 'KAI', 'Kaišiadorių rajonas'),
-    array(440, 'KA', 'Kauno rajonas'),
-    array(440, 'KE', 'Kėdainių rajonas'),
-    array(440, 'KEL', 'Kelmės rajonas'),
-    array(440, 'KLA', 'Klaipėdos rajonas'),
-    array(440, 'KR', 'Kretingos rajonas'),
-    array(440, 'KU', 'Kupiškio rajonas'),
-    array(440, 'LA', 'Lazdijų rajonas'),
-    array(440, 'MA', 'Mažeikių rajonas'),
-    array(440, 'MO', 'Molėtų rajonas'),
-    array(440, 'PA', 'Pakruojo rajonas'),
-    array(440, 'PAN', 'Panevėžio rajonas'),
-    array(440, 'PAS', 'Pasvalio rajonas'),
-    array(440, 'PLU', 'Plungės rajonas'),
-    array(440, 'PR', 'Prienų rajonas'),
-    array(440, 'RA', 'Radviliškio rajonas'),
-    array(440, 'RAS', 'Raseinių rajonas'),
-    array(440, 'RO', 'Rokiškio rajonas'),
-    array(440, 'SK', 'Skuodo rajonas'),
-    array(440, 'SA', 'Šakių rajonas'),
-    array(440, 'SAL', 'Šalčininkų rajonas'),
-    array(440, 'SIA', 'Šiaulių rajonas'),
-    array(440, 'SI', 'Šilalės rajonas'),
-    array(440, 'SIL', 'Šilutės rajonas'),
-    array(440, 'SIR', 'Širvintų rajonas'),
-    array(440, 'SV', 'Švenčionių rajonas'),
-    array(440, 'TA', 'Tauragės rajonas'),
-    array(440, 'TE', 'Telšių rajonas'),
-    array(440, 'TR', 'Trakų rajonas'),
-    array(440, 'UK', 'Ukmergės rajonas'),
-    array(440, 'UT', 'Utenos rajonas'),
-    array(440, 'VA', 'Varėnos rajonas'),
-    array(440, 'VI', 'Vilkaviškio rajonas'),
-    array(440, 'VIL', 'Vilniaus rajonas'),
-    array(440, 'ZAR', 'Zarasų rajonas'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    440,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/luxembourg_442_1.cif b/uc_store/countries/luxembourg_442_1.cif
deleted file mode 100644
index bfd553c..0000000
--- a/uc_store/countries/luxembourg_442_1.cif
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function luxembourg_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 442,
-      'country_name' => 'Luxembourg',
-      'country_iso_code_2' => 'LU',
-      'country_iso_code_3' => 'LUX',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(442, 'L', 'Letzebuerg'),
-    array(442, 'L', 'Luxembourg'),
-    array(442, 'L', 'Luxemburg'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    442,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/macao_446_1.cif b/uc_store/countries/macao_446_1.cif
deleted file mode 100644
index 9afa99d..0000000
--- a/uc_store/countries/macao_446_1.cif
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function macao_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 446,
-      'country_name' => 'Macau',
-      'country_iso_code_2' => 'MO',
-      'country_iso_code_3' => 'MAC',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    446,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/macedonia_807_1.cif b/uc_store/countries/macedonia_807_1.cif
deleted file mode 100644
index c22bfac..0000000
--- a/uc_store/countries/macedonia_807_1.cif
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function macedonia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 807,
-      'country_name' => 'Macedonia',
-      'country_iso_code_2' => 'MK',
-      'country_iso_code_3' => 'MKD',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(807, '01', 'Aerodrom'),
-    array(807, '02', 'Aracinovo'),
-    array(807, '03', 'Berovo'),
-    array(807, '04', 'Bitola'),
-    array(807, '05', 'Bogdanci'),
-    array(807, '06', 'Bogovinje'),
-    array(807, '07', 'Bosilovo'),
-    array(807, '08', 'Brvenica'),
-    array(807, '09', 'Butel'),
-    array(807, '79', 'Cair'),
-    array(807, '80', 'Caska'),
-    array(807, '77', 'Centar'),
-    array(807, '78', 'Centar Zupa'),
-    array(807, '81', 'Cesinovo-Oblesevo'),
-    array(807, '82', 'Cucer Sandevo'),
-    array(807, '21', 'Debar'),
-    array(807, '22', 'Debarca'),
-    array(807, '23', 'Delcevo'),
-    array(807, '24', 'Demir Kapija'),
-    array(807, '26', 'Dojran'),
-    array(807, '27', 'Dolneni'),
-    array(807, '28', 'Drugovo'),
-    array(807, '17', 'Gazi Baba'),
-    array(807, '18', 'Gevgelija'),
-    array(807, '29', 'Gjorce Petrov'),
-    array(807, '19', 'Gostivar'),
-    array(807, '20', 'Gradsko'),
-    array(807, '34', 'Ilinden'),
-    array(807, '35', 'Jequnovce'),
-    array(807, '37', 'Karbinci'),
-    array(807, '38', 'Karpos'),
-    array(807, '36', 'Kavadarci'),
-    array(807, '40', 'Kicevo'),
-    array(807, '39', 'Kisela Voda'),
-    array(807, '42', 'Kocani'),
-    array(807, '41', 'Konce'),
-    array(807, '43', 'Kratovo'),
-    array(807, '44', 'Kriva Palanka'),
-    array(807, '45', 'Krivoqastani'),
-    array(807, '46', 'Krusevo'),
-    array(807, '47', 'Kumanovo'),
-    array(807, '48', 'Lipkovo'),
-    array(807, '49', 'Lozovo'),
-    array(807, '51', 'Makedonska Kamenica'),
-    array(807, '52', 'Makedonski Brod'),
-    array(807, '50', 'Mavrovo-i-Rostusa'),
-    array(807, '53', 'Moqila'),
-    array(807, '54', 'Negotino'),
-    array(807, '55', 'Novaci'),
-    array(807, '56', 'Novo Selo'),
-    array(807, '58', 'Ohrid'),
-    array(807, '57', 'Oslomej'),
-    array(807, '60', 'Pehcevo'),
-    array(807, '59', 'Petrovec'),
-    array(807, '61', 'Plasnica'),
-    array(807, '62', 'Prilep'),
-    array(807, '63', 'Probistip'),
-    array(807, '64', 'Radovis'),
-    array(807, '65', 'Rankovce'),
-    array(807, '66', 'Resen'),
-    array(807, '67', 'Rosoman'),
-    array(807, '68', 'Saraj'),
-    array(807, '70', 'Sopiste'),
-    array(807, '71', 'Staro Nagoricane'),
-    array(807, '83', 'Stip'),
-    array(807, '72', 'Struga'),
-    array(807, '73', 'Strumica'),
-    array(807, '74', 'Studenicani'),
-    array(807, '84', 'Suto Orizari'),
-    array(807, '69', 'Sveti Nikole'),
-    array(807, '75', 'Tearce'),
-    array(807, '76', 'Tetovo'),
-    array(807, '10', 'Valandovo'),
-    array(807, '11', 'Vasilevo'),
-    array(807, '13', 'Veles'),
-    array(807, '12', 'Vevcani'),
-    array(807, '14', 'Vinica'),
-    array(807, '15', 'Vranestica'),
-    array(807, '16', 'Vrapciste'),
-    array(807, '31', 'Zajas'),
-    array(807, '32', 'Zelenikovo'),
-    array(807, '30', 'Zelino'),
-    array(807, '33', 'Zrnovci'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    807,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/madagascar_450_1.cif b/uc_store/countries/madagascar_450_1.cif
deleted file mode 100644
index 7686af8..0000000
--- a/uc_store/countries/madagascar_450_1.cif
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-function madagascar_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 450,
-      'country_name' => 'Madagascar',
-      'country_iso_code_2' => 'MG',
-      'country_iso_code_3' => 'MDG',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(450, 'MG-T', 'Antananarivo'),
-    array(450, 'MG-D', 'Antsiranana'),
-    array(450, 'MG-F', 'Fianarantsoa'),
-    array(450, 'MG-M', 'Mahajanga'),
-    array(450, 'MG-A', 'Toamasina'),
-    array(450, 'MG-U', 'Toliara'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    450,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/malawi_454_1.cif b/uc_store/countries/malawi_454_1.cif
deleted file mode 100644
index 5ec7eaa..0000000
--- a/uc_store/countries/malawi_454_1.cif
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-function malawi_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 454,
-      'country_name' => 'Malawi',
-      'country_iso_code_2' => 'MW',
-      'country_iso_code_3' => 'MWI',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(454, 'MW-BA', 'Balaka'),
-    array(454, 'MW-BL', 'Blantyre'),
-    array(454, 'MW-CK', 'Chikwawa'),
-    array(454, 'MW-CR', 'Chiradzulu'),
-    array(454, 'MW-CT', 'Chitipa'),
-    array(454, 'MW-DE', 'Dedza'),
-    array(454, 'MW-DO', 'Dowa'),
-    array(454, 'MW-KR', 'Karonga'),
-    array(454, 'MW-KS', 'Kasungu'),
-    array(454, 'MW-LK', 'Likoma'),
-    array(454, 'MW-LI', 'Lilongwe'),
-    array(454, 'MW-MH', 'Machinga'),
-    array(454, 'MW-MG', 'Mangochi'),
-    array(454, 'MW-MC', 'Mchinji'),
-    array(454, 'MW-MU', 'Mulanje'),
-    array(454, 'MW-MW', 'Mwanza'),
-    array(454, 'MW-MZ', 'Mzimba'),
-    array(454, 'MW-NE', 'Neno'),
-    array(454, 'MW-NB', 'Nkhata Bay'),
-    array(454, 'MW-NK', 'Nkhotakota'),
-    array(454, 'MW-NS', 'Nsanje'),
-    array(454, 'MW-NU', 'Ntcheu'),
-    array(454, 'MW-NI', 'Ntchisi'),
-    array(454, 'MW-PH', 'Phalombe'),
-    array(454, 'MW-RU', 'Rumphi'),
-    array(454, 'MW-SA', 'Salima'),
-    array(454, 'MW-TH', 'Thyolo'),
-    array(454, 'MW-ZO', 'Zomba'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    454,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/malaysia_458_1.cif b/uc_store/countries/malaysia_458_1.cif
deleted file mode 100644
index a61bde2..0000000
--- a/uc_store/countries/malaysia_458_1.cif
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-function malaysia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 458,
-      'country_name' => 'Malaysia',
-      'country_iso_code_2' => 'MY',
-      'country_iso_code_3' => 'MYS',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(458, 'JHR', 'Johor'),
-    array(458, 'KDH', 'Kedah'),
-    array(458, 'KTN', 'Kelantan'),
-    array(458, 'MLK', 'Melaka'),
-    array(458, 'NSN', 'Negeri Sembilan'),
-    array(458, 'PHG', 'Pahang'),
-    array(458, 'PNG', 'Pulau Pinang'),
-    array(458, 'PRK', 'Perak'),
-    array(458, 'PLS', 'Perlis'),
-    array(458, 'SGR', 'Selangor'),
-    array(458, 'TRG', 'Terengganu'),
-    array(458, 'SBH', 'Sabah'),
-    array(458, 'SRW', 'Sarawak'),
-    array(458, 'KUL', 'Kuala Lumpur'),
-    array(458, 'LBN', 'Labuan'),
-    array(458, 'PJY', 'Putrajaya'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    458,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/maldives_462_1.cif b/uc_store/countries/maldives_462_1.cif
deleted file mode 100644
index f7efe05..0000000
--- a/uc_store/countries/maldives_462_1.cif
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-function maldives_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 462,
-      'country_name' => 'Maldives',
-      'country_iso_code_2' => 'MV',
-      'country_iso_code_3' => 'MDV',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(462, 'MV-MLE', 'Male'),
-    array(462, 'MV-02', 'Alif'),
-    array(462, 'MV-20', 'Baa'),
-    array(462, 'MV-17', 'Dhaalu'),
-    array(462, 'MV-14', 'Faafu'),
-    array(462, 'MV-27', 'Gaaf Alif'),
-    array(462, 'MV-28', 'Gaafu Dhaalu'),
-    array(462, 'MV-29', 'Gnaviyani'),
-    array(462, 'MV-07', 'Haa Alif'),
-    array(462, 'MV-23', 'Haa Dhaalu'),
-    array(462, 'MV-26', 'Kaafu'),
-    array(462, 'MV-05', 'Laamu'),
-    array(462, 'MV-03', 'Lhaviyani'),
-    array(462, 'MV-12', 'Meemu'),
-    array(462, 'MV-25', 'Noonu'),
-    array(462, 'MV-13', 'Raa'),
-    array(462, 'MV-01', 'Seenu'),
-    array(462, 'MV-24', 'Shaviyani'),
-    array(462, 'MV-08', 'Thaa'),
-    array(462, 'MV-04', 'Vaavu'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    462,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/mali_466_1.cif b/uc_store/countries/mali_466_1.cif
deleted file mode 100644
index 132eb3a..0000000
--- a/uc_store/countries/mali_466_1.cif
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-function mali_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 466,
-      'country_name' => 'Mali',
-      'country_iso_code_2' => 'ML',
-      'country_iso_code_3' => 'MLI',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(466, 'ML-BKO', 'Bamako'),
-    array(466, 'ML-7', 'Gao'),
-    array(466, 'ML-1', 'Kayes'),
-    array(466, 'ML-8', 'Kidal'),
-    array(466, 'ML-2', 'Koulikoro'),
-    array(466, 'ML-5', 'Mopti'),
-    array(466, 'ML-4', 'Ségou'),
-    array(466, 'ML-3', 'Sikasso'),
-    array(466, 'ML-6', 'Tombouctou'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    466,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/malta_470_1.cif b/uc_store/countries/malta_470_1.cif
deleted file mode 100644
index db3b408..0000000
--- a/uc_store/countries/malta_470_1.cif
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function malta_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 470,
-      'country_name' => 'Malta',
-      'country_iso_code_2' => 'MT',
-      'country_iso_code_3' => 'MLT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(470, '01', 'Attard'),
-    array(470, '02', 'Balzan'),
-    array(470, '03', 'Birqu'),
-    array(470, '04', 'Birkirkara'),
-    array(470, '05', 'Birzebbuqa'),
-    array(470, '06', 'Bormla'),
-    array(470, '07', 'Dinqli'),
-    array(470, '08', 'Fgura'),
-    array(470, '09', 'Floriana'),
-    array(470, '10', 'Fontana'),
-    array(470, '13', 'Ghajnsielem'),
-    array(470, '14', 'Gharb'),
-    array(470, '15', 'Gharqhur'),
-    array(470, '16', 'Ghasri'),
-    array(470, '17', 'Ghaxaq'),
-    array(470, '11', 'Gudja'),
-    array(470, '12', 'Gzira'),
-    array(470, '18', 'Hamrun'),
-    array(470, '19', 'Iklin'),
-    array(470, '20', 'Isla'),
-    array(470, '21', 'Kalkara'),
-    array(470, '22', 'Kercem'),
-    array(470, '23', 'Kirkop'),
-    array(470, '24', 'Lija'),
-    array(470, '25', 'Luga'),
-    array(470, '26', 'Marsa'),
-    array(470, '27', 'Marsaskala'),
-    array(470, '28', 'Marsaxlokk'),
-    array(470, '29', 'Mdina'),
-    array(470, '30', 'Mellieha'),
-    array(470, '31', 'Mgarr'),
-    array(470, '32', 'Mosta'),
-    array(470, '33', 'Mgabba'),
-    array(470, '34', 'Msida'),
-    array(470, '35', 'Mtarfa'),
-    array(470, '36', 'Munxar'),
-    array(470, '37', 'Nadur'),
-    array(470, '38', 'Naxxar'),
-    array(470, '39', 'Paola'),
-    array(470, '40', 'Pembroke'),
-    array(470, '41', 'Pieta'),
-    array(470, '42', 'Qala'),
-    array(470, '43', 'Qormi'),
-    array(470, '44', 'Qrendi'),
-    array(470, '45', 'Rabat Ghawdex'),
-    array(470, '45', 'Rabat Gozo'),
-    array(470, '46', 'Rabat Malta'),
-    array(470, '47', 'Safi'),
-    array(470, '49', 'Saint John'),
-    array(470, '48', "Saint Julian's"),
-    array(470, '50', 'Saint Lawrence'),
-    array(470, '53', "Saint Lucia's"),
-    array(470, '51', "Saint Paul's Bay"),
-    array(470, '48', 'San Giljan'),
-    array(470, '49', 'San Gwann'),
-    array(470, '50', 'San Lawrenz'),
-    array(470, '51', 'San Pawl il-Bahar'),
-    array(470, '52', 'Sannat'),
-    array(470, '53', 'Santa Lucija'),
-    array(470, '54', 'Santa Venera'),
-    array(470, '55', 'Siggiewi'),
-    array(470, '56', 'Sliema'),
-    array(470, '57', 'Swiegi'),
-    array(470, '58', "Ta'Xbiex"),
-    array(470, '59', 'Tarxien'),
-    array(470, '60', 'Valletta'),
-    array(470, '61', 'Xaghra'),
-    array(470, '62', 'Xewkija'),
-    array(470, '63', 'Xghajra'),
-    array(470, '64', 'Zabbar'),
-    array(470, '65', 'Zebbug Ghawdex'),
-    array(470, '65', 'Zebbug Gozo'),
-    array(470, '66', 'Zebbug Malta'),
-    array(470, '67', 'Zejtun'),
-    array(470, '68', 'Zurrieg'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    470,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/marshall_islands_584_1.cif b/uc_store/countries/marshall_islands_584_1.cif
deleted file mode 100644
index 6654a64..0000000
--- a/uc_store/countries/marshall_islands_584_1.cif
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-function marshall_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 584,
-      'country_name' => 'Marshall Islands',
-      'country_iso_code_2' => 'MH',
-      'country_iso_code_3' => 'MHL',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(584, 'MH-ALL', 'Ailinglaplap'),
-    array(584, 'MH-ALK', 'Ailuk'),
-    array(584, 'MH-ARN', 'Arno'),
-    array(584, 'MH-AUR', 'Aur'),
-    array(584, 'MH-EBO', 'Ebon'),
-    array(584, 'MH-ENI', 'Enewetak'),
-    array(584, 'MH-JAB', 'Jabat'),
-    array(584, 'MH-JAL', 'Jaluit'),
-    array(584, 'MH-KIL', 'Kili'),
-    array(584, 'MH-KWA', 'Kwajalein'),
-    array(584, 'MH-LAE', 'Lae'),
-    array(584, 'MH-LIB', 'Lib'),
-    array(584, 'MH-LIK', 'Likiep'),
-    array(584, 'MH-MAJ', 'Majuro'),
-    array(584, 'MH-MAL', 'Maloelap'),
-    array(584, 'MH-MEJ', 'Mejit'),
-    array(584, 'MH-MIL', 'Mili'),
-    array(584, 'MH-NMK', 'Namdrik'),
-    array(584, 'MH-NMU', 'Namu'),
-    array(584, 'MH-RON', 'Rongelap'),
-    array(584, 'MH-UJA', 'Ujae'),
-    array(584, 'MH-UTI', 'Utirik'),
-    array(584, 'MH-WTH', 'Wotho'),
-    array(584, 'MH-WTJ', 'Wotje'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    584,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/martinique_474_1.cif b/uc_store/countries/martinique_474_1.cif
deleted file mode 100644
index 53ec058..0000000
--- a/uc_store/countries/martinique_474_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function martinique_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 474,
-      'country_name' => 'Martinique',
-      'country_iso_code_2' => 'MQ',
-      'country_iso_code_3' => 'MTQ',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    474,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/mauritania_478_1.cif b/uc_store/countries/mauritania_478_1.cif
deleted file mode 100644
index 575d574..0000000
--- a/uc_store/countries/mauritania_478_1.cif
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-function mauritania_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 478,
-      'country_name' => 'Mauritania',
-      'country_iso_code_2' => 'MR',
-      'country_iso_code_3' => 'MRT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(478, 'MR-NKC', 'Nouakchott'),
-    array(478, 'MR-07', 'Adrar'),
-    array(478, 'MR-03', 'Assaba'),
-    array(478, 'MR-05', 'Brakna'),
-    array(478, 'MR-08', 'Dakhlet Nouâdhibou'),
-    array(478, 'MR-04', 'Gorgol'),
-    array(478, 'MR-10', 'Guidimaka'),
-    array(478, 'MR-01', 'Hodh ech Chargui'),
-    array(478, 'MR-02', 'Hodh el Gharbi'),
-    array(478, 'MR-12', 'Inchiri'),
-    array(478, 'MR-09', 'Tagant'),
-    array(478, 'MR-11', 'Tiris Zemmour'),
-    array(478, 'MR-06', 'Trarza'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    478,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/mauritius_480_1.cif b/uc_store/countries/mauritius_480_1.cif
deleted file mode 100644
index 47253db..0000000
--- a/uc_store/countries/mauritius_480_1.cif
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function mauritius_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 480,
-      'country_name' => 'Mauritius',
-      'country_iso_code_2' => 'MU',
-      'country_iso_code_3' => 'MUS',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(480, 'AG', 'Agalega Islands'),
-    array(480, 'BR', 'Beau Bassin-Rose'),
-    array(480, 'BL', 'Black River'),
-    array(480, 'CC', 'Cargados Carajos'),
-    array(480, 'CU', 'Curepipe'),
-    array(480, 'FL', 'Flacq'),
-    array(480, 'GP', 'Grand Port'),
-    array(480, 'MO', 'Moka'),
-    array(480, 'PA', 'Pamplemousses'),
-    array(480, 'PW', 'Plaines Wilhems'),
-    array(480, 'PL', 'Port Louis'),
-    array(480, 'PU', 'Port Louis'),
-    array(480, 'QB', 'Quatre Bornes'),
-    array(480, 'RR', 'Riviere du Rempart'),
-    array(480, 'RO', 'Rodrigues Island'),
-    array(480, 'CC', 'Saint Brandon Islands'),
-    array(480, 'SA', 'Savanne'),
-    array(480, 'VP', 'Vacoas-Phoenix'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    480,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/mayotte_175_1.cif b/uc_store/countries/mayotte_175_1.cif
deleted file mode 100644
index 9e1878d..0000000
--- a/uc_store/countries/mayotte_175_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function mayotte_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 175,
-      'country_name' => 'Mayotte',
-      'country_iso_code_2' => 'YT',
-      'country_iso_code_3' => 'MYT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    175,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/mexico_484_1.cif b/uc_store/countries/mexico_484_1.cif
deleted file mode 100644
index f3fcc81..0000000
--- a/uc_store/countries/mexico_484_1.cif
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function mexico_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 484,
-      'country_name' => 'Mexico',
-      'country_iso_code_2' => 'MX',
-      'country_iso_code_3' => 'MEX',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(484, 'AGS', 'Aguascalientes'),
-    array(484, 'BC', 'Baja California'),
-    array(484, 'BCS', 'Baja California Sur'),
-    array(484, 'CAM', 'Campeche'),
-    array(484, 'CHIS', 'Chiapas'),
-    array(484, 'CHI', 'Chihuahua'),
-    array(484, 'COAH', 'Coahuila'),
-    array(484, 'COL', 'Colima'),
-    array(484, 'DF', 'Distrito Federal'),
-    array(484, 'DGO', 'Durango'),
-    array(484, 'GTO', 'Guanajuato'),
-    array(484, 'GRO', 'Guerrero'),
-    array(484, 'HGO', 'Hidalgo'),
-    array(484, 'JAL', 'Jalisco'),
-    array(484, 'ME', 'México'),
-    array(484, 'MICH', 'Michoacán'),
-    array(484, 'MOR', 'Morelos'),
-    array(484, 'NAY', 'Nayarit'),
-    array(484, 'NL', 'Nuevo León'),
-    array(484, 'OAX', 'Oaxaca'),
-    array(484, 'PUE', 'Puebla'),
-    array(484, 'QUE', 'Querétaro'),
-    array(484, 'QR', 'Quintana Roo'),
-    array(484, 'SLP', 'San Luis Potosi'),
-    array(484, 'SIN', 'Sinaloa'),
-    array(484, 'SON', 'Sonora'),
-    array(484, 'TAB', 'Tabasco'),
-    array(484, 'TAM', 'Tamaulipas'),
-    array(484, 'TLA', 'Tlaxcala'),
-    array(484, 'VER', 'Veracruz'),
-    array(484, 'YUC', 'Yucatán'),
-    array(484, 'ZAC', 'Zacatecas'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    484,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/micronesia_583_1.cif b/uc_store/countries/micronesia_583_1.cif
deleted file mode 100644
index 0c1277b..0000000
--- a/uc_store/countries/micronesia_583_1.cif
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-function micronesia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 583,
-      'country_name' => 'Micronesia, Federated States of',
-      'country_iso_code_2' => 'FM',
-      'country_iso_code_3' => 'FSM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(583, 'FM-TRK', 'Chuuk'),
-    array(583, 'FM-KSA', 'Kosrae'),
-    array(583, 'FM-PNI', 'Pohnpei'),
-    array(583, 'FM-YAP', 'Yap'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    583,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/moldova_498_1.cif b/uc_store/countries/moldova_498_1.cif
deleted file mode 100644
index 15543f0..0000000
--- a/uc_store/countries/moldova_498_1.cif
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-function moldova_install() {
-  // Make the entry in the country table.
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 498,
-      'country_name' => 'Moldovoa, Republic of',
-      'country_iso_code_2' => 'MD',
-      'country_iso_code_3' => 'MDA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(498, 'GA', 'Găgăuzia, Unitatea teritorială autonomă (UTAG)'),
-    array(498, 'BA', 'Bălţi'),
-    array(498, 'BD', 'Tighina'),
-    array(498, 'CU', 'Chişinău'),
-    array(498, 'AN', 'Anenii Noi'),
-    array(498, 'BS', 'Basarabeasca'),
-    array(498, 'BR', 'Briceni'),
-    array(498, 'CA', 'Cahul'),
-    array(498, 'CT', 'Cantemir'),
-    array(498, 'CL', 'Călăraşi'),
-    array(498, 'CS', 'Căuşeni'),
-    array(498, 'CM', 'Cimişlia'),
-    array(498, 'CR', 'Criuleni'),
-    array(498, 'DO', 'Donduşeni'),
-    array(498, 'DR', 'Drochia'),
-    array(498, 'DU', 'Dubăsari'),
-    array(498, 'ED', 'Edineţ'),
-    array(498, 'FA', 'Făleşti'),
-    array(498, 'FL', 'Floreşti'),
-    array(498, 'GL', 'Glodeni'),
-    array(498, 'HI', 'Hînceşti'),
-    array(498, 'IA', 'Ialoveni'),
-    array(498, 'LE', 'Leova'),
-    array(498, 'NI', 'Nisporeni'),
-    array(498, 'OC', 'Ocniţa'),
-    array(498, 'OR', 'Orhei'),
-    array(498, 'RE', 'Rezina'),
-    array(498, 'RI', 'Rîşcani'),
-    array(498, 'SI', 'Sîngerei'),
-    array(498, 'SO', 'Soroca'),
-    array(498, 'ST', 'Străşeni'),
-    array(498, 'SD', 'Şoldăneşti'),
-    array(498, 'SV', 'Ştefan Vodă'),
-    array(498, 'TA', 'Taraclia'),
-    array(498, 'TE', 'Teleneşti'),
-    array(498, 'UN', 'Ungheni'),
-    array(498, 'SN', 'Stînga Nistrului, unitatea teritorială din'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  uc_set_address_format(498, "!company\r\n!first_name !last_name\r\n!zone_name, !country_name_if\r\n!city, !postal_code\r\n!street1\r\n!street2");
-}
diff --git a/uc_store/countries/monaco_492_1.cif b/uc_store/countries/monaco_492_1.cif
deleted file mode 100644
index e742f24..0000000
--- a/uc_store/countries/monaco_492_1.cif
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function monaco_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 492,
-      'country_name' => 'Monaco',
-      'country_iso_code_2' => 'MC',
-      'country_iso_code_3' => 'MCO',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    492,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/mongolia_496_1.cif b/uc_store/countries/mongolia_496_1.cif
deleted file mode 100644
index 2adc9d0..0000000
--- a/uc_store/countries/mongolia_496_1.cif
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-function mongolia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 496,
-      'country_name' => 'Mongolia',
-      'country_iso_code_2' => 'MN',
-      'country_iso_code_3' => 'MNG',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(496, 'MN-1', 'Ulaanbaatar'),
-    array(496, 'MN-073', 'Arhangay'),
-    array(496, 'MN-069', 'Bayanhongor'),
-    array(496, 'MN-071', 'Bayan-Ölgiy'),
-    array(496, 'MN-067', 'Bulgan'),
-    array(496, 'MN-037', 'Darhan uul'),
-    array(496, 'MN-061', 'Dornod'),
-    array(496, 'MN-063', 'Dornogovĭ'),
-    array(496, 'MN-059', 'Dundgovĭ'),
-    array(496, 'MN-057', 'Dzavhan'),
-    array(496, 'MN-065', 'Govĭ-Altay'),
-    array(496, 'MN-064', 'Govĭ-Sümber'),
-    array(496, 'MN-039', 'Hentiy'),
-    array(496, 'MN-043', 'Hovd'),
-    array(496, 'MN-041', 'Hövsgöl'),
-    array(496, 'MN-053', 'Ömnögovĭ'),
-    array(496, 'MN-035', 'Orhon'),
-    array(496, 'MN-055', 'Övörhangay'),
-    array(496, 'MN-049', 'Selenge'),
-    array(496, 'MN-051', 'Sühbaatar'),
-    array(496, 'MN-047', 'Töv'),
-    array(496, 'MN-046', 'Uvs'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    496,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/montenegro_499_1.cif b/uc_store/countries/montenegro_499_1.cif
deleted file mode 100644
index d854443..0000000
--- a/uc_store/countries/montenegro_499_1.cif
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function montenegro_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 499,
-      'country_name' => 'Montenegro',
-      'country_iso_code_2' => 'ME',
-      'country_iso_code_3' => 'MNE',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(499, '01', 'Andrijevica'),
-    array(499, '02', 'Bar'),
-    array(499, '03', 'Berane'),
-    array(499, '04', 'Bijelo Polje'),
-    array(499, '05', 'Budva'),
-    array(499, '06', 'Cetinje'),
-    array(499, '07', 'Danilovgrad'),
-    array(499, '08', 'Herceq-Novi'),
-    array(499, '09', 'Kolasin'),
-    array(499, '10', 'Kotor'),
-    array(499, '11', 'Mojkovac'),
-    array(499, '12', 'Niksic'),
-    array(499, '13', 'Plav'),
-    array(499, '14', 'Pljevlja'),
-    array(499, '15', 'Pluzine'),
-    array(499, '16', 'Podgorica'),
-    array(499, '17', 'Rozaje'),
-    array(499, '18', 'Savnik'),
-    array(499, '19', 'Tivat'),
-    array(499, '20', 'Ulcinj'),
-    array(499, '21', 'Zabljak'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    499,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/montserrat_500_1.cif b/uc_store/countries/montserrat_500_1.cif
deleted file mode 100644
index ead462e..0000000
--- a/uc_store/countries/montserrat_500_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function montserrat_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 500,
-      'country_name' => 'Montserrat',
-      'country_iso_code_2' => 'MS',
-      'country_iso_code_3' => 'MSR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    500,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/morocco_504_1.cif b/uc_store/countries/morocco_504_1.cif
deleted file mode 100644
index db2afb8..0000000
--- a/uc_store/countries/morocco_504_1.cif
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function morocco_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 504,
-      'country_name' => 'Morocco',
-      'country_iso_code_2' => 'MA',
-      'country_iso_code_3' => 'MAR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(504, '09', 'Chaouia-Ouardigha'),
-    array(504, '10', 'Doukkala-Abda'),
-    array(504, '05', 'Fes-Boulemane'),
-    array(504, '02', 'Gharb-Chrarda-Beni Hssen'),
-    array(504, '08', 'Grand Casablanca'),
-    array(504, '14', 'Guelmim-Es Smara'),
-    array(504, '15', 'Laayoune-Boujdour-Sakia el Hamra'),
-    array(504, '04', 'L-Oriental'),
-    array(504, '11', 'Marrakech-Tensift-Al Haouz'),
-    array(504, '06', 'Meknes-Tafilalet'),
-    array(504, '16', 'Oued ed Dahab-Lagouira'),
-    array(504, '07', 'Rabat-Sale-Zemmour-Zaer'),
-    array(504, '13', 'Sous-Massa-Draa'),
-    array(504, '12', 'Tadla-Azilal'),
-    array(504, '01', 'Tanger-Tetouan'),
-    array(504, '03', 'Taza-Al Hoceima-Taounate'),
-    array(504, 'CHE', 'Chefchaouene'),
-    array(504, 'LAR', 'Larache'),
-    array(504, 'TNG', 'Tanger'),
-    array(504, 'TET', 'Tetouan'),
-    array(504, 'KEN', 'Kenitra'),
-    array(504, 'SIK', 'Sidi Kacem'),
-    array(504, 'HOC', 'AL Hoceima'),
-    array(504, 'TAO', 'Taounate'),
-    array(504, 'TAZ', 'Taza'),
-    array(504, 'BER', 'Berkane'),
-    array(504, 'FIG', 'Figuig'),
-    array(504, 'JRA', 'Jerada'),
-    array(504, 'NAD', 'Nador'),
-    array(504, 'OUJ', 'Oujda'),
-    array(504, 'BOM', 'Boulemane'),
-    array(504, 'FES', 'Fes'),
-    array(504, 'SEF', 'Sefrou'),
-    array(504, 'HAJ', 'El Hajeb'),
-    array(504, 'ERR', 'Errachidia'),
-    array(504, 'IFR', 'Ifrane'),
-    array(504, 'KHN', 'Khenifra'),
-    array(504, 'MEK', 'Meknes'),
-    array(504, 'KHE', 'Khemisset'),
-    array(504, 'RBA', 'Rabat-Sale'),
-    array(504, 'CAS', 'Casablanca'),
-    array(504, 'CAS', 'Dar el Beida'),
-    array(504, 'BES', 'Ben Slimane'),
-    array(504, 'KHO', 'Khouribga'),
-    array(504, 'SET', 'Settat'),
-    array(504, 'JDI', 'El Jadida'),
-    array(504, 'SAF', 'Safi'),
-    array(504, 'HAO', 'Al Haouz'),
-    array(504, 'CHI', 'Chichaoua'),
-    array(504, 'ESI', 'Essaouira'),
-    array(504, 'KES', 'Kelaat Sraghna'),
-    array(504, 'MAR', 'Marrakech'),
-    array(504, 'AZI', 'Azilal'),
-    array(504, 'BEM', 'Beni Mellal'),
-    array(504, 'AGD', 'Agadir'),
-    array(504, 'BAH', 'Ait Baha'),
-    array(504, 'MEL', 'Ait Melloul'),
-    array(504, 'OUA', 'Ouarzazate'),
-    array(504, 'TAR', 'Taroudannt'),
-    array(504, 'TIZ', 'Tiznit'),
-    array(504, 'ASZ', 'Assa-Zaq'),
-    array(504, 'ESM', 'Es Smara'),
-    array(504, 'GUE', 'Guelmim'),
-    array(504, 'TNT', 'Tan-Tan'),
-    array(504, 'TAT', 'Tata'),
-    array(504, 'BOD', 'Boujdour'),
-    array(504, 'LAA', 'Laayoune'),
-    array(504, 'OUD', 'Oued ed Dahab'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    504,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/mozambique_508_1.cif b/uc_store/countries/mozambique_508_1.cif
deleted file mode 100644
index 4d28f70..0000000
--- a/uc_store/countries/mozambique_508_1.cif
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-function mozambique_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 508,
-      'country_name' => 'Mozambique',
-      'country_iso_code_2' => 'MZ',
-      'country_iso_code_3' => 'MOZ',
-      'version' => 1,
-    ))
-    ->execute();
-
-  $zones = array(
-    array(508, 'POL', 'Cabo Delgado'),
-    array(508, 'VJB', 'Gaza'),
-    array(508, 'INH', 'Inhambane'),
-    array(508, 'CHI', 'Manica'),
-    array(508, 'MPM', 'Maputo'),
-    array(508, 'APL', 'Nampula'),
-    array(508, 'VXC', 'Niassa'),
-    array(508, 'BEW', 'Sofala'),
-    array(508, 'TCV', 'Tete'),
-    array(508, 'UEL', 'Zambezia'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    508,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name\r\n".
-    "!country_name"
-  );
-}
diff --git a/uc_store/countries/myanmar_104_1.cif b/uc_store/countries/myanmar_104_1.cif
deleted file mode 100644
index e4910e0..0000000
--- a/uc_store/countries/myanmar_104_1.cif
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function myanmar_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 104,
-      'country_name' => 'Myanmar',
-      'country_iso_code_2' => 'MM',
-      'country_iso_code_3' => 'MMR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(104, '07', 'Ayeyarwady'),
-    array(104, '02', 'Bago'),
-    array(104, '14', 'Chin'),
-    array(104, '11', 'Kachin'),
-    array(104, '12', 'Kayah'),
-    array(104, '13', 'Kayin'),
-    array(104, '03', 'Magway'),
-    array(104, '04', 'Mandalay'),
-    array(104, '15', 'Mon'),
-    array(104, '16', 'Rakhine'),
-    array(104, '01', 'Sagaing'),
-    array(104, '17', 'Shan'),
-    array(104, '05', 'Tanintharyi'),
-    array(104, '06', 'Yangon'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    104,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/namibia_516_1.cif b/uc_store/countries/namibia_516_1.cif
deleted file mode 100644
index f0268b9..0000000
--- a/uc_store/countries/namibia_516_1.cif
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-function namibia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 516,
-      'country_name' => 'Namibia',
-      'country_iso_code_2' => 'NA',
-      'country_iso_code_3' => 'NAM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(516, 'NA-CA', 'Caprivi'),
-    array(516, 'NA-ER', 'Erongo'),
-    array(516, 'NA-HA', 'Hardap'),
-    array(516, 'NA-KA', 'Karas'),
-    array(516, 'NA-KH', 'Khomas'),
-    array(516, 'NA-KU', 'Kunene'),
-    array(516, 'NA-OW', 'Ohangwena'),
-    array(516, 'NA-OK', 'Okavango'),
-    array(516, 'NA-OH', 'Omaheke'),
-    array(516, 'NA-OS', 'Omusati'),
-    array(516, 'NA-ON', 'Oshana'),
-    array(516, 'NA-OT', 'Oshikoto'),
-    array(516, 'NA-OD', 'Otjozondjupa'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    516,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/nauru_520_1.cif b/uc_store/countries/nauru_520_1.cif
deleted file mode 100644
index 85f940f..0000000
--- a/uc_store/countries/nauru_520_1.cif
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-function nauru_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 520,
-      'country_name' => 'Nauru',
-      'country_iso_code_2' => 'NR',
-      'country_iso_code_3' => 'NRU',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(520, 'NR-01', 'Aiwo'),
-    array(520, 'NR-02', 'Anabar'),
-    array(520, 'NR-03', 'Anetan'),
-    array(520, 'NR-04', 'Anibare'),
-    array(520, 'NR-05', 'Baiti'),
-    array(520, 'NR-06', 'Boe'),
-    array(520, 'NR-07', 'Buada'),
-    array(520, 'NR-08', 'Denigomodu'),
-    array(520, 'NR-09', 'Ewa'),
-    array(520, 'NR-10', 'Ijuw'),
-    array(520, 'NR-11', 'Meneng'),
-    array(520, 'NR-12', 'Nibok'),
-    array(520, 'NR-13', 'Uaboe'),
-    array(520, 'NR-14', 'Yaren'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    520,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/nepal_524_1.cif b/uc_store/countries/nepal_524_1.cif
deleted file mode 100644
index 7512afd..0000000
--- a/uc_store/countries/nepal_524_1.cif
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function nepal_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 524,
-      'country_name' => 'Nepal',
-      'country_iso_code_2' => 'NP',
-      'country_iso_code_3' => 'NPL',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(524, '2', 'Madhya Pashchimanchal'),
-    array(524, '1', 'Madhyamanchal'),
-    array(524, '3', 'Pashchimanchal'),
-    array(524, '4', 'Purwanchal'),
-    array(524, '5', 'Sudur Pashchimanchal'),
-    array(524, 'BA', 'Bagmati'),
-    array(524, 'JA', 'Janakpur'),
-    array(524, 'NA', 'Narayani'),
-    array(524, 'BH', 'Bheri'),
-    array(524, 'KA', 'Karnali'),
-    array(524, 'RA', 'Rapti'),
-    array(524, 'DH', 'Dhawalagiri'),
-    array(524, 'GA', 'Gandaki'),
-    array(524, 'LU', 'Lumbini'),
-    array(524, 'KO', 'Koshi'),
-    array(524, 'KO', 'Kosi'),
-    array(524, 'ME', 'Mechi'),
-    array(524, 'SA', 'Sagarmatha'),
-    array(524, 'MA', 'Mahakali'),
-    array(524, 'SE', 'Seti'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    524,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/netherlands_528_1.cif b/uc_store/countries/netherlands_528_1.cif
deleted file mode 100644
index 7ee12e5..0000000
--- a/uc_store/countries/netherlands_528_1.cif
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-function netherlands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 528,
-      'country_name' => 'Netherlands',
-      'country_iso_code_2' => 'NL',
-      'country_iso_code_3' => 'NLD',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(528, 'ZHL', 'Zuid-Holland'),
-    array(528, 'NHL', 'Noord-Holland'),
-    array(528, 'NBR', 'Noord-Brabant'),
-    array(528, 'GLD', 'Gelderland'),
-    array(528, 'UTR', 'Utrecht'),
-    array(528, 'LIM', 'Limburg'),
-    array(528, 'OVE', 'Overijssel'),
-    array(528, 'FRL', 'Friesland'),
-    array(528, 'GRO', 'Groningen'),
-    array(528, 'DRE', 'Drenthe'),
-    array(528, 'ZLD', 'Zeeland'),
-    array(528, 'FLD', 'Flevoland'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    528,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/new_caledonia_540_1.cif b/uc_store/countries/new_caledonia_540_1.cif
deleted file mode 100644
index 0958d69..0000000
--- a/uc_store/countries/new_caledonia_540_1.cif
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function new_caledonia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 540,
-      'country_name' => 'New Caledonia',
-      'country_iso_code_2' => 'NC',
-      'country_iso_code_3' => 'NCL',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    540,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/new_zealand_554_3.cif b/uc_store/countries/new_zealand_554_3.cif
deleted file mode 100644
index b81b3cb..0000000
--- a/uc_store/countries/new_zealand_554_3.cif
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-function new_zealand_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 554,
-      'country_name' => 'New Zealand',
-      'country_iso_code_2' => 'NZ',
-      'country_iso_code_3' => 'NZL',
-      'version' => 3,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(554, 'AUK', 'Auckland'),
-    array(554, 'BOP', 'Bay of Plenty'),
-    array(554, 'CAN', 'Canterbury'),
-    array(554, 'COR', 'Coromandel'),
-    array(554, 'GIS', 'Gisborne'),
-    array(554, 'FIO', 'Fiordland'),
-    array(554, 'HKB', "Hawke's Bay"),
-    array(554, 'MBH', 'Marlborough'),
-    array(554, 'MWT', 'Manawatu-Wanganui'),
-    array(554, 'MCM', 'Mt Cook-Mackenzie'),
-    array(554, 'NSN', 'Nelson'),
-    array(554, 'NTL', 'Northland'),
-    array(554, 'OTA', 'Otago'),
-    array(554, 'STL', 'Southland'),
-    array(554, 'TKI', 'Taranaki'),
-    array(554, 'WGN', 'Wellington'),
-    array(554, 'WKO', 'Waikato'),
-    array(554, 'WAI', 'Wairarapa'),
-    array(554, 'WTC', 'West Coast'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    554,
-    "!first_name !last_name\r\n".
-    "!company\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function new_zealand_update($version) {
-  switch ($version) {
-    case 2:
-      $zones = array(
-        array(554, 'AUK', 'Auckland'),
-        array(554, 'BOP', 'Bay of Plenty'),
-        array(554, 'CAN', 'Canterbury'),
-        array(554, 'COR', 'Coromandel'),
-        array(554, 'GIS', 'Gisborne'),
-        array(554, 'FIO', 'Fiordland'),
-        array(554, 'HKB', "Hawke's Bay"),
-        array(554, 'MBH', 'Marlborough'),
-        array(554, 'MWT', 'Manawatu-Wanganui'),
-        array(554, 'MCM', 'Mt Cook-Mackenzie'),
-        array(554, 'NSN', 'Nelson'),
-        array(554, 'NTL', 'Northland'),
-        array(554, 'OTA', 'Otago'),
-        array(554, 'STL', 'Southland'),
-        array(554, 'TKI', 'Taranaki'),
-        array(554, 'WGN', 'Wellington'),
-        array(554, 'WKO', 'Waikato'),
-        array(554, 'WAI', 'Wairarapa'),
-        array(554, 'WTC', 'West Coast'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-      break;
-
-    case 3:
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Wairarapa'))
-        ->condition('zone_name', 'Wairprarapa')
-        ->execute();
-      break;
-  }
-}
diff --git a/uc_store/countries/nicaragua_558_1.cif b/uc_store/countries/nicaragua_558_1.cif
deleted file mode 100644
index dc11832..0000000
--- a/uc_store/countries/nicaragua_558_1.cif
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function nicaragua_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 558,
-      'country_name' => 'Nicaragua',
-      'country_iso_code_2' => 'NI',
-      'country_iso_code_3' => 'NIC',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(558, 'AN', 'Atlantico Norte'),
-    array(558, 'AS', 'Atlantico Sur'),
-    array(558, 'BO', 'Boaco'),
-    array(558, 'CA', 'Carazo'),
-    array(558, 'CI', 'Chinandega'),
-    array(558, 'CO', 'Chontales'),
-    array(558, 'ES', 'Esteli'),
-    array(558, 'GR', 'Granada'),
-    array(558, 'JI', 'Jinotega'),
-    array(558, 'LE', 'Leon'),
-    array(558, 'MD', 'Madriz'),
-    array(558, 'MN', 'Managua'),
-    array(558, 'MS', 'Masaya'),
-    array(558, 'MT', 'Matagalpa'),
-    array(558, 'NS', 'Nueva Segovia'),
-    array(558, 'SJ', 'Rio San Juan'),
-    array(558, 'RI', 'Rivas'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    558,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/niger_562_1.cif b/uc_store/countries/niger_562_1.cif
deleted file mode 100644
index 7053edf..0000000
--- a/uc_store/countries/niger_562_1.cif
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-function niger_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 562,
-      'country_name' => 'Niger',
-      'country_iso_code_2' => 'NE',
-      'country_iso_code_3' => 'NER',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(562, 'NE-8', 'Niamey'),
-    array(562, 'NE-1', 'Agadez'),
-    array(562, 'NE-2', 'Diffa'),
-    array(562, 'NE-3', 'Dosso'),
-    array(562, 'NE-4', 'Maradi'),
-    array(562, 'NE-5', 'Tahoua '),
-    array(562, 'NE-6', 'Tillabéri'),
-    array(562, 'NE-7', 'Zinder'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    562,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/nigeria_566_1.cif b/uc_store/countries/nigeria_566_1.cif
deleted file mode 100644
index 87f12a5..0000000
--- a/uc_store/countries/nigeria_566_1.cif
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-function nigeria_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 566,
-      'country_name' => 'Nigeria',
-      'country_iso_code_2' => 'NG',
-      'country_iso_code_3' => 'NGA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(566, 'AB', 'Abia'),
-    array(566, 'AD', 'Adamawa'),
-    array(566, 'AK', 'Akwa Ibom'),
-    array(566, 'AN', 'Anambra'),
-    array(566, 'BA', 'Bauchi'),
-    array(566, 'BY', 'Bayelsa'),
-    array(566, 'BN', 'Benue'),
-    array(566, 'BO', 'Borno'),
-    array(566, 'CR', 'Cross River'),
-    array(566, 'DT', 'Delta'),
-    array(566, 'EB', 'Ebonyi'),
-    array(566, 'ED', 'Edo'),
-    array(566, 'EK', 'Ekiti'),
-    array(566, 'EN', 'Enugu'),
-    array(566, 'FC', 'FCT - Abuja'),
-    array(566, 'GB', 'Gombe'),
-    array(566, 'IM', 'Imo'),
-    array(566, 'JG', 'Jigawa'),
-    array(566, 'KD', 'Kaduna'),
-    array(566, 'KN', 'Kano'),
-    array(566, 'KT', 'Katsina'),
-    array(566, 'KB', 'Kebbi'),
-    array(566, 'KG', 'Kogi'),
-    array(566, 'KW', 'Kwara'),
-    array(566, 'LA', 'Lagos'),
-    array(566, 'NS', 'Nassarawa'),
-    array(566, 'NG', 'Niger'),
-    array(566, 'OG', 'Ogun'),
-    array(566, 'ON', 'Ondo'),
-    array(566, 'OS', 'Osun'),
-    array(566, 'OY', 'Oyo'),
-    array(566, 'PL', 'Plateau'),
-    array(566, 'RV', 'Rivers'),
-    array(566, 'SO', 'Sokoto'),
-    array(566, 'TB', 'Taraba'),
-    array(566, 'YB', 'Yobe'),
-    array(566, 'ZM', 'Zamfara'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    566,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city - !postal_code\r\n".
-    "!zone_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/niue_570_1.cif b/uc_store/countries/niue_570_1.cif
deleted file mode 100644
index b2059c0..0000000
--- a/uc_store/countries/niue_570_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function niue_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 570,
-      'country_name' => 'Niue',
-      'country_iso_code_2' => 'NU',
-      'country_iso_code_3' => 'NIU',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    570,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/norfolk_island_574_1.cif b/uc_store/countries/norfolk_island_574_1.cif
deleted file mode 100644
index 53769bc..0000000
--- a/uc_store/countries/norfolk_island_574_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function norfolk_island_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 574,
-      'country_name' => 'Norfolk Island',
-      'country_iso_code_2' => 'NF',
-      'country_iso_code_3' => 'NFK',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    574,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/northern_mariana_islands_580_1.cif b/uc_store/countries/northern_mariana_islands_580_1.cif
deleted file mode 100644
index aaadf35..0000000
--- a/uc_store/countries/northern_mariana_islands_580_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function northern_mariana_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 580,
-      'country_name' => 'Northern Mariana Islands',
-      'country_iso_code_2' => 'MP',
-      'country_iso_code_3' => 'MNP',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    580,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/norway_578_1.cif b/uc_store/countries/norway_578_1.cif
deleted file mode 100644
index 0ea4fec..0000000
--- a/uc_store/countries/norway_578_1.cif
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function norway_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 578,
-      'country_name' => 'Norway',
-      'country_iso_code_2' => 'NO',
-      'country_iso_code_3' => 'NOR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(578, 'AK', 'Akershus'),
-    array(578, 'AA', 'Aust-Agder'),
-    array(578, 'BU', 'Buskerud'),
-    array(578, 'FM', 'Finnmark'),
-    array(578, 'HM', 'Hedmark'),
-    array(578, 'HL', 'Hordaland'),
-    array(578, 'MR', 'More og Romdal'),
-    array(578, 'NT', 'Nord-Trondelag'),
-    array(578, 'NL', 'Nordland'),
-    array(578, 'OF', 'Ostfold'),
-    array(578, 'OP', 'Oppland'),
-    array(578, 'OL', 'Oslo'),
-    array(578, 'RL', 'Rogaland'),
-    array(578, 'ST', 'Sor-Trondelag'),
-    array(578, 'SJ', 'Sogn og Fjordane'),
-    array(578, 'SV', 'Svalbard'),
-    array(578, 'TM', 'Telemark'),
-    array(578, 'TR', 'Troms'),
-    array(578, 'VA', 'Vest-Agder'),
-    array(578, 'VF', 'Vestfold'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    578,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/oman_512_1.cif b/uc_store/countries/oman_512_1.cif
deleted file mode 100644
index 5d82ea1..0000000
--- a/uc_store/countries/oman_512_1.cif
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-function oman_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 512,
-      'country_name' => 'Oman',
-      'country_iso_code_2' => 'OM',
-      'country_iso_code_3' => 'OMN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  $zones = array(
-    array(512, 'BA', 'Al Batinah'),
-    array(512, 'DA', 'Ad Dakhiliyah'),
-    array(512, 'JA', 'Al Janubiyah'),
-    array(512, 'MA', 'Masqat'),
-    array(512, 'MU', 'Musandam'),
-    array(512, 'SH', 'Ash Sharqiyah'),
-    array(512, 'WU', 'Al Wusta'),
-    array(512, 'ZA', 'Az Zahirah'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    512,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city\r\n".
-    "!zone_name, !country_name_if"
-  );
-}
diff --git a/uc_store/countries/pakistan_586_1.cif b/uc_store/countries/pakistan_586_1.cif
deleted file mode 100644
index 20bfc6d..0000000
--- a/uc_store/countries/pakistan_586_1.cif
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-function pakistan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 586,
-      'country_name' => 'Pakistan',
-      'country_iso_code_2' => 'PK',
-      'country_iso_code_3' => 'PAK',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.  Use %d for the zone_id and the
-  // VALUES = Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(586, 'PB', 'Punjab'),
-    array(586, 'SN', 'Sindh'),
-    array(586, 'BL', 'Balochistan'),
-    array(586, 'NW', 'N.W.F.P'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    586,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/palau_585_1.cif b/uc_store/countries/palau_585_1.cif
deleted file mode 100644
index 0ffeb6e..0000000
--- a/uc_store/countries/palau_585_1.cif
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-function palau_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 585,
-      'country_name' => 'Palau',
-      'country_iso_code_2' => 'PW',
-      'country_iso_code_3' => 'PLW',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(585, 'PW-002', 'Aimeliik'),
-    array(585, 'PW-004', 'Airai'),
-    array(585, 'PW-010', 'Angaur'),
-    array(585, 'PW-050', 'Hatobohei'),
-    array(585, 'PW-100', 'Kayangel'),
-    array(585, 'PW-150', 'Koror'),
-    array(585, 'PW-212', 'Melekeok'),
-    array(585, 'PW-214', 'Ngaraard'),
-    array(585, 'PW-218', 'Ngarchelong'),
-    array(585, 'PW-222', 'Ngardmau'),
-    array(585, 'PW-224', 'Ngatpang'),
-    array(585, 'PW-226', 'Ngchesar'),
-    array(585, 'PW-227', 'Ngeremlengui'),
-    array(585, 'PW-228', 'Ngiwal'),
-    array(585, 'PW-350', 'Peleliu'),
-    array(585, 'PW-370', 'Sonsorol'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    585,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/palestine_275_1.cif b/uc_store/countries/palestine_275_1.cif
deleted file mode 100644
index 62dd3b2..0000000
--- a/uc_store/countries/palestine_275_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function palestine_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 275,
-      'country_name' => 'Palestinian Territory, Occupied',
-      'country_iso_code_2' => 'PS',
-      'country_iso_code_3' => 'PSE',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    275,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/panama_591_1.cif b/uc_store/countries/panama_591_1.cif
deleted file mode 100644
index 13f9428..0000000
--- a/uc_store/countries/panama_591_1.cif
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function panama_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 591,
-      'country_name' => 'Panama',
-      'country_iso_code_2' => 'PA',
-      'country_iso_code_3' => 'PAN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(591, '1', 'Bocas del Toro'),
-    array(591, '4', 'Chiriqui'),
-    array(591, '2', 'Cocle'),
-    array(591, '3', 'Colon'),
-    array(591, '0', 'Comarca de San Blas'),
-    array(591, '5', 'Darien'),
-    array(591, '6', 'Herrera'),
-    array(591, '7', 'Los Santos'),
-    array(591, '8', 'Panama'),
-    array(591, '9', 'Veraguas'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    591,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/papua_new_guinea_598_1.cif b/uc_store/countries/papua_new_guinea_598_1.cif
deleted file mode 100644
index a6930d0..0000000
--- a/uc_store/countries/papua_new_guinea_598_1.cif
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function papua_new_guinea_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 598,
-      'country_name' => 'Papua New Guinea',
-      'country_iso_code_2' => 'PG',
-      'country_iso_code_3' => 'PNG',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(598, 'CPM', 'Central'),
-    array(598, 'CPK', 'Chimbu'),
-    array(598, 'EHG', 'Eastern Highlands'),
-    array(598, 'EBR', 'East New Britain'),
-    array(598, 'ESW', 'East Sepik'),
-    array(598, 'EPW', 'Enga'),
-    array(598, 'GPK', 'Gulf'),
-    array(598, 'MPM', 'Madang'),
-    array(598, 'MRL', 'Manus'),
-    array(598, 'MBA', 'Milne Bay'),
-    array(598, 'MPL', 'Morobe'),
-    array(598, 'NCD', 'National Capital District (Port Moresby)'),
-    array(598, 'NIK', 'New Ireland'),
-    array(598, 'NPP', 'Northern'),
-    array(598, 'NSA', 'North Solomons'),
-    array(598, 'SAN', 'Sandaun [West Sepik]'),
-    array(598, 'SHM', 'Southern Highlands'),
-    array(598, 'WPD', 'Western'),
-    array(598, 'WHM', 'Western Highlands'),
-    array(598, 'WBK', 'West New Britain'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    598,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/paraguay_600_1.cif b/uc_store/countries/paraguay_600_1.cif
deleted file mode 100644
index a30562c..0000000
--- a/uc_store/countries/paraguay_600_1.cif
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-function paraguay_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 600,
-      'country_name' => 'Paraguay',
-      'country_iso_code_2' => 'PY',
-      'country_iso_code_3' => 'PRY',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(600, 'PY-ASU', 'Asunción'),
-    array(600, 'PY-16', 'Alto Paraguay'),
-    array(600, 'PY-10', 'Alto Paraná'),
-    array(600, 'PY-13', 'Amambay'),
-    array(600, 'PY-19', 'Boquerón'),
-    array(600, 'PY-05', 'Caaguazú'),
-    array(600, 'PY-06', 'Caazapá'),
-    array(600, 'PY-14', 'Canindeyú'),
-    array(600, 'PY-11', 'Central'),
-    array(600, 'PY-01', 'Concepción'),
-    array(600, 'PY-03', 'Cordillera'),
-    array(600, 'PY-04', 'Guairá'),
-    array(600, 'PY-07', 'Itapúa'),
-    array(600, 'PY-08', 'Misiones'),
-    array(600, 'PY-12', 'Ñeembucú'),
-    array(600, 'PY-09', 'Paraguarí'),
-    array(600, 'PY-15', 'Presidente Hayes'),
-    array(600, 'PY-02', 'San Pedro'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    600,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/peru_604_1.cif b/uc_store/countries/peru_604_1.cif
deleted file mode 100644
index 37f59ad..0000000
--- a/uc_store/countries/peru_604_1.cif
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-function peru_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 604,
-      'country_name' => 'Peru',
-      'country_iso_code_2' => 'PE',
-      'country_iso_code_3' => 'PER',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(604, 'AMA', 'Amazonas'),
-    array(604, 'ANC', 'Ancash'),
-    array(604, 'APU', 'Apurímac'),
-    array(604, 'ARE', 'Arequipa'),
-    array(604, 'AYA', 'Ayacucho'),
-    array(604, 'CAJ', 'Cajamarca'),
-    array(604, 'CAL', 'Callao'),
-    array(604, 'CUS', 'Cusco'),
-    array(604, 'HUV', 'Huancavelica'),
-    array(604, 'HUC', 'Huánuco'),
-    array(604, 'ICA', 'Ica'),
-    array(604, 'JUN', 'Junín'),
-    array(604, 'LAL', 'La Libertad'),
-    array(604, 'LAM', 'Lambayeque'),
-    array(604, 'LIM', 'Lima'),
-    array(604, 'LOR', 'Loreto'),
-    array(604, 'MDD', 'Madre de Dios'),
-    array(604, 'MOQ', 'Moquegua'),
-    array(604, 'PAS', 'Pasco'),
-    array(604, 'PIU', 'Piura'),
-    array(604, 'PUN', 'Puno'),
-    array(604, 'SAM', 'San Martín'),
-    array(604, 'TAC', 'Tacna'),
-    array(604, 'TUM', 'Tumbes'),
-    array(604, 'UCA', 'Ucayali'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    604,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/philippines_608_2.cif b/uc_store/countries/philippines_608_2.cif
deleted file mode 100644
index b3265bd..0000000
--- a/uc_store/countries/philippines_608_2.cif
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-function philippines_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 608,
-      'country_name' => 'Philippines',
-      'country_iso_code_2' => 'PH',
-      'country_iso_code_3' => 'PHL',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(608, 'ABR', 'Abra'),
-    array(608, 'ANO', 'Agusan del Norte'),
-    array(608, 'ASU', 'Agusan del Sur'),
-    array(608, 'AKL', 'Aklan'),
-    array(608, 'ALB', 'Albay'),
-    array(608, 'ANT', 'Antique'),
-    array(608, 'APY', 'Apayao'),
-    array(608, 'AUR', 'Aurora'),
-    array(608, 'BAS', 'Basilan'),
-    array(608, 'BTA', 'Bataan'),
-    array(608, 'BTE', 'Batanes'),
-    array(608, 'BTG', 'Batangas'),
-    array(608, 'BEN', 'Benguet'),
-    array(608, 'BLR', 'Biliran'),
-    array(608, 'BOL', 'Bohol'),
-    array(608, 'BUK', 'Bukidnon'),
-    array(608, 'BUL', 'Bulacan'),
-    array(608, 'CAG', 'Cagayan'),
-    array(608, 'CNO', 'Camarines Norte'),
-    array(608, 'CSU', 'Camarines Sur'),
-    array(608, 'CAM', 'Camiguin'),
-    array(608, 'CAP', 'Capiz'),
-    array(608, 'CAT', 'Catanduanes'),
-    array(608, 'CAV', 'Cavite'),
-    array(608, 'CEB', 'Cebu'),
-    array(608, 'CMP', 'Compostela Valley'),
-    array(608, 'DNO', 'Davao del Norte'),
-    array(608, 'DSU', 'Davao del Sur'),
-    array(608, 'DOR', 'Davao Oriental'),
-    array(608, 'DGI', 'Dinagat Islands'),
-    array(608, 'ESA', 'Eastern Samar'),
-    array(608, 'GUI', 'Guimaras'),
-    array(608, 'IFU', 'Ifugao'),
-    array(608, 'INO', 'Ilocos Norte'),
-    array(608, 'ISU', 'Ilocos Sur'),
-    array(608, 'ILO', 'Iloilo'),
-    array(608, 'ISA', 'Isabela'),
-    array(608, 'KAL', 'Kalinga'),
-    array(608, 'LAG', 'Laguna'),
-    array(608, 'LNO', 'Lanao del Norte'),
-    array(608, 'LSU', 'Lanao del Sur'),
-    array(608, 'UNI', 'La Union'),
-    array(608, 'LEY', 'Leyte'),
-    array(608, 'MAG', 'Maguindanao'),
-    array(608, 'MRN', 'Marinduque'),
-    array(608, 'MSB', 'Masbate'),
-    array(608, 'MLA', 'Metro Manila'),
-    array(608, 'MIC', 'Mindoro Occidental'),
-    array(608, 'MIR', 'Mindoro Oriental'),
-    array(608, 'MSC', 'Misamis Occidental'),
-    array(608, 'MOR', 'Misamis Oriental'),
-    array(608, 'MOP', 'Mountain Province'),
-    array(608, 'NOC', 'Negros Occidental'),
-    array(608, 'NOR', 'Negros Oriental'),
-    array(608, 'NCT', 'North Cotabato'),
-    array(608, 'NSM', 'Northern Samar'),
-    array(608, 'NEC', 'Nueva Ecija'),
-    array(608, 'NVZ', 'Nueva Vizcaya'),
-    array(608, 'PLW', 'Palawan'),
-    array(608, 'PMP', 'Pampanga'),
-    array(608, 'PNG', 'Pangasinan'),
-    array(608, 'QZN', 'Quezon'),
-    array(608, 'QRN', 'Quirino'),
-    array(608, 'RIZ', 'Rizal'),
-    array(608, 'ROM', 'Romblon'),
-    array(608, 'SMR', 'Samar'),
-    array(608, 'SRG', 'Sarangani'),
-    array(608, 'SHK', 'Shariff Kabunsuan'),
-    array(608, 'SQJ', 'Siquijor'),
-    array(608, 'SRS', 'Sorsogon'),
-    array(608, 'SCO', 'South Cotabato'),
-    array(608, 'SLE', 'Southern Leyte'),
-    array(608, 'SKU', 'Sultan Kudarat'),
-    array(608, 'SLU', 'Sulu'),
-    array(608, 'SNO', 'Surigao del Norte'),
-    array(608, 'SSU', 'Surigao del Sur'),
-    array(608, 'TAR', 'Tarlac'),
-    array(608, 'TAW', 'Tawi-Tawi'),
-    array(608, 'ZBL', 'Zambales'),
-    array(608, 'ZNO', 'Zamboanga del Norte'),
-    array(608, 'ZSU', 'Zamboanga del Sur'),
-    array(608, 'ZSI', 'Zamboanga Sibugay'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    608,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/pitcairn_612_1.cif b/uc_store/countries/pitcairn_612_1.cif
deleted file mode 100644
index 523e49a..0000000
--- a/uc_store/countries/pitcairn_612_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function pitcairn_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 612,
-      'country_name' => 'Pitcairn',
-      'country_iso_code_2' => 'PN',
-      'country_iso_code_3' => 'PCN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    612,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/poland_616_1.cif b/uc_store/countries/poland_616_1.cif
deleted file mode 100644
index e419f3e..0000000
--- a/uc_store/countries/poland_616_1.cif
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-function poland_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 616,
-      'country_name' => 'Poland',
-      'country_iso_code_2' => 'PL',
-      'country_iso_code_3' => 'POL',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(616, 'DO', 'Dolnośląskie'),
-    array(616, 'KP', 'Kujawsko-Pomorskie'),
-    array(616, 'LO', 'Łódzkie'),
-    array(616, 'LL', 'Lubelskie'),
-    array(616, 'LU', 'Lubuskie'),
-    array(616, 'ML', 'Małopolskie'),
-    array(616, 'MZ', 'Mazowieckie'),
-    array(616, 'OP', 'Opolskie'),
-    array(616, 'PP', 'Podkarpackie'),
-    array(616, 'PL', 'Podlaskie'),
-    array(616, 'PM', 'Pomorskie'),
-    array(616, 'SL', 'Śląskie'),
-    array(616, 'SW', 'Świętokrzyskie'),
-    array(616, 'WM', 'Warmińsko-Mazurskie'),
-    array(616, 'WP', 'Wielkopolskie'),
-    array(616, 'ZA', 'Zachodniopomorskie'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    616,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/portugal_620_1.cif b/uc_store/countries/portugal_620_1.cif
deleted file mode 100644
index 5fe327b..0000000
--- a/uc_store/countries/portugal_620_1.cif
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-function portugal_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 620,
-      'country_name' => 'Portugal',
-      'country_iso_code_2' => 'PT',
-      'country_iso_code_3' => 'PRT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.  Use %d for the zone_id and the
-  // function uc_get_zone_ids($num) as the second argument for db_query() where
-  // $num is the number of zones in the INSERT query.
-  // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(620, 'AVE', 'Aveiro'),
-    array(620, 'BEJ', 'Beja'),
-    array(620, 'BRA', 'Braga'),
-    array(620, 'BGA', 'Bragança'),
-    array(620, 'CAB', 'Castelo Branco'),
-    array(620, 'COI', 'Coimbra'),
-    array(620, 'EVO', 'Évora'),
-    array(620, 'FAR', 'Faro'),
-    array(620, 'GUA', 'Guarda'),
-    array(620, 'LEI', 'Leiria'),
-    array(620, 'LIS', 'Lisboa'),
-    array(620, 'PTL', 'Portalegre'),
-    array(620, 'POR', 'Porto'),
-    array(620, 'STR', 'Santarém'),
-    array(620, 'SET', 'Setúbal'),
-    array(620, 'VIC', 'Viana do Castelo'),
-    array(620, 'VIR', 'Vila Real'),
-    array(620, 'VIS', 'Viseu'),
-    array(620, 'ACO', 'Reg. Autónoma Açores'),
-    array(620, 'MAD', 'Reg. Autónoma Madeira'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    620,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name\r\n".
-    "!country_name"
-  );
-}
diff --git a/uc_store/countries/puerto_rico_630_1.cif b/uc_store/countries/puerto_rico_630_1.cif
deleted file mode 100644
index 51cbb40..0000000
--- a/uc_store/countries/puerto_rico_630_1.cif
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function puerto_rico_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 630,
-      'country_name' => 'Puerto Rico',
-      'country_iso_code_2' => 'PR',
-      'country_iso_code_3' => 'PRI',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    630,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/qatar_634_1.cif b/uc_store/countries/qatar_634_1.cif
deleted file mode 100644
index 1ea2dd7..0000000
--- a/uc_store/countries/qatar_634_1.cif
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-function qatar_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 634,
-      'country_name' => 'Qatar',
-      'country_iso_code_2' => 'QA',
-      'country_iso_code_3' => 'QAT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(634, 'QA-DA', 'Ad Dawḩah'),
-    array(634, 'QA-GH', 'Al Ghuwayrīyah'),
-    array(634, 'QA-JU', 'Al Jumaylīyah'),
-    array(634, 'QA-KH', 'Al Khawr'),
-    array(634, 'QA-WA', 'Al Wakrah'),
-    array(634, 'QA-RA', 'Ar Rayyān'),
-    array(634, 'QA-JB', 'Jarīyān al Bāţnah'),
-    array(634, 'QA-MS', 'Madīnat ash Shamāl'),
-    array(634, 'QA-US', 'Umm Şalāl'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    634,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/reunion_638_2.cif b/uc_store/countries/reunion_638_2.cif
deleted file mode 100644
index a94932e..0000000
--- a/uc_store/countries/reunion_638_2.cif
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function reunion_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 638,
-      'country_name' => 'Réunion',
-      'country_iso_code_2' => 'RE',
-      'country_iso_code_3' => 'REU',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    638,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function reunion_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => 'Réunion'))
-        ->condition('country_id', 638)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/romania_642_2.cif b/uc_store/countries/romania_642_2.cif
deleted file mode 100644
index 9e01f07..0000000
--- a/uc_store/countries/romania_642_2.cif
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-function romania_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 642,
-      'country_name' => 'Romania',
-      'country_iso_code_2' => 'RO',
-      'country_iso_code_3' => 'ROU',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(642, 'AB', 'Alba'),
-    array(642, 'AR', 'Arad'),
-    array(642, 'AG', 'Arges'),
-    array(642, 'BC', 'Bacau'),
-    array(642, 'BH', 'Bihor'),
-    array(642, 'BN', 'Bistrita-Nasaud'),
-    array(642, 'BT', 'Botosani'),
-    array(642, 'BV', 'Brasov'),
-    array(642, 'BR', 'Braila'),
-    array(642, 'B',  'Bucuresti'),
-    array(642, 'BZ', 'Buzau'),
-    array(642, 'CS', 'Caras-Severin'),
-    array(642, 'CL', 'Calarasi'),
-    array(642, 'CJ', 'Cluj'),
-    array(642, 'CT', 'Constanta'),
-    array(642, 'CV', 'Covasna'),
-    array(642, 'DB', 'Dimbovita'),
-    array(642, 'DJ', 'Dolj'),
-    array(642, 'GL', 'Galati'),
-    array(642, 'GR', 'Giurgiu'),
-    array(642, 'GJ', 'Gorj'),
-    array(642, 'HR', 'Harghita'),
-    array(642, 'HD', 'Hunedoara'),
-    array(642, 'IL', 'Ialomita'),
-    array(642, 'IS', 'Iasi'),
-    array(642, 'IF', 'Ilfov'),
-    array(642, 'MM', 'Maramures'),
-    array(642, 'MH', 'Mehedinti'),
-    array(642, 'MS', 'Mures'),
-    array(642, 'NT', 'Neamt'),
-    array(642, 'OT', 'Olt'),
-    array(642, 'PH', 'Prahova'),
-    array(642, 'SM', 'Satu-Mare'),
-    array(642, 'SJ', 'Salaj'),
-    array(642, 'SB', 'Sibiu'),
-    array(642, 'SV', 'Suceava'),
-    array(642, 'TR', 'Teleorman'),
-    array(642, 'TM', 'Timis'),
-    array(642, 'TL', 'Tulcea'),
-    array(642, 'VS', 'Vaslui'),
-    array(642, 'VL', 'Valcea'),
-    array(642, 'VN', 'Vrancea'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    642,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !postal_code\r\n".
-    "!zone_name, !country_name_if"
-  );
-}
-
-function romania_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_iso_code_3' => 'ROU'))
-        ->condition('country_id', 642)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/russia_643_2.cif b/uc_store/countries/russia_643_2.cif
deleted file mode 100644
index 3d7aebe..0000000
--- a/uc_store/countries/russia_643_2.cif
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-function russia_install() {
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 643,
-      'country_name' => 'Russian Federation',
-      'country_iso_code_2' => 'RU',
-      'country_iso_code_3' => 'RUS',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(643, 'AD', 'Республика Адыгея'),
-    array(643, 'AL', 'Республика Алтай'),
-    array(643, 'BA', 'Республика Башкортостан'),
-    array(643, 'BU', 'Республика Бурятия'),
-    array(643, 'DA', 'Республика Дагестан'),
-    array(643, 'IN', 'Республика Ингушетия'),
-    array(643, 'KB', 'Кабардино-Балкарская Республика'),
-    array(643, 'KL', 'Республика Калмыкия'),
-    array(643, 'KC', 'Карачаево-Черкесская республика'),
-    array(643, 'KR', 'Республика Карелия'),
-    array(643, 'KO', 'Республика Коми'),
-    array(643, 'ME', 'Республика Марий Эл'),
-    array(643, 'MO', 'Республика Мордовия'),
-    array(643, 'SA', 'Республика Саха (Якутия)'),
-    array(643, 'SE', 'Республика Северная Осетия-Алания'),
-    array(643, 'TA', 'Республика Татарстан'),
-    array(643, 'TY', 'Республика Тыва'),
-    array(643, 'UD', 'Удмуртская Республика'),
-    array(643, 'KK', 'Республика Хакасия'),
-    array(643, 'CE', 'Чеченская республика'),
-    array(643, 'CU', 'Чувашская Республика'),
-    array(643, 'ALT', 'Алтайский край'),
-    array(643, 'KDA', 'Краснодарский край'),
-    array(643, 'KIA', 'Красноярский край'),
-    array(643, 'PER', 'Пермский край'),
-    array(643, 'PRI', 'Приморский край'),
-    array(643, 'STA', 'Ставропольский край'),
-    array(643, 'KHA', 'Хабаровский край'),
-    array(643, 'AMU', 'Амурская область'),
-    array(643, 'ARK', 'Архангельская область'),
-    array(643, 'AST', 'Астраханская область'),
-    array(643, 'BEL', 'Белгородская область'),
-    array(643, 'BRY', 'Брянская область'),
-    array(643, 'VLA', 'Владимирская область'),
-    array(643, 'VGG', 'Волгоградская область'),
-    array(643, 'VLG', 'Вологодская область'),
-    array(643, 'VOR', 'Воронежская область'),
-    array(643, 'IVA', 'Ивановская область'),
-    array(643, 'IRK', 'Иркутская область'),
-    array(643, 'KGD', 'Калининградская область'),
-    array(643, 'KLU', 'Калужская область'),
-    array(643, 'KAM', 'Камчатский край'),
-    array(643, 'KEM', 'Кемеровская область'),
-    array(643, 'KIR', 'Кировская область'),
-    array(643, 'KOS', 'Костромская область'),
-    array(643, 'KGN', 'Курганская область'),
-    array(643, 'KRS', 'Курская область'),
-    array(643, 'LEN', 'Ленинградская область'),
-    array(643, 'LIP', 'Липецкая область'),
-    array(643, 'MAG', 'Магаданская область'),
-    array(643, 'MOS', 'Московская область'),
-    array(643, 'MUR', 'Мурманская область'),
-    array(643, 'NIZ', 'Нижегородская область'),
-    array(643, 'NGR', 'Новгородская область'),
-    array(643, 'NVS', 'Новосибирская область'),
-    array(643, 'OMS', 'Омская область'),
-    array(643, 'ORE', 'Оренбургская область'),
-    array(643, 'ORL', 'Орловская область'),
-    array(643, 'PNZ', 'Пензенская область'),
-    array(643, 'PSK', 'Псковская область'),
-    array(643, 'ROS', 'Ростовская область'),
-    array(643, 'RYA', 'Рязанская область'),
-    array(643, 'SAM', 'Самарская область'),
-    array(643, 'SAR', 'Саратовская область'),
-    array(643, 'SAK', 'Сахалинская область'),
-    array(643, 'SVE', 'Свердловская область'),
-    array(643, 'SMO', 'Смоленская область'),
-    array(643, 'TAM', 'Тамбовская область'),
-    array(643, 'TVE', 'Тверская область'),
-    array(643, 'TOM', 'Томская область'),
-    array(643, 'TUL', 'Тульская область'),
-    array(643, 'TYU', 'Тюменская область'),
-    array(643, 'ULY', 'Ульяновская область'),
-    array(643, 'CHE', 'Челябинская область'),
-    array(643, 'YAR', 'Ярославская область'),
-    array(643, 'MOW', 'Москва'),
-    array(643, 'SPE', 'Санкт-Петербург'),
-    array(643, 'YEV', 'Еврейская автономная область'),
-    array(643, 'NEN', 'Ненецкий автономный округ'),
-    array(643, 'KHM', 'Ханты-Мансийский автономный округ - Югра'),
-    array(643, 'CHU', 'Чукотский автономный округ'),
-    array(643, 'YAN', 'Ямало-Ненецкий автономный округ'),
-    array(643, 'ZAB', 'Забайкальский край'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    643,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
-
-function russia_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => 'Russian Federation'))
-        ->condition('country_id', 643)
-        ->execute();
-
-      // Remove old obsolete zones
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 643)
-          ->condition('zone_code', 'AGB'))
-        ->execute();
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 643)
-          ->condition('zone_code', 'CHI'))
-        ->execute();
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 643)
-          ->condition('zone_code', 'KOR'))
-        ->execute();
-      db_delete('uc_zones')
-        ->condition(db_and()
-          ->condition('zone_country_id', 643)
-          ->condition('zone_code', 'UOB'))
-        ->execute();
-
-      // Add some new zones
-      $zones = array(
-        array(643, 'ZAB', 'Забайкальский край'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-
-      // Rename other zones
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Камчатский край', 'zone_code' => 'KAM'))
-        ->condition('zone_country_id', 643)
-        ->condition('zone_code', 'KAM')
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/rwanda_646_1.cif b/uc_store/countries/rwanda_646_1.cif
deleted file mode 100644
index 646e9b6..0000000
--- a/uc_store/countries/rwanda_646_1.cif
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-function rwanda_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 646,
-      'country_name' => 'Rwanda',
-      'country_iso_code_2' => 'RW',
-      'country_iso_code_3' => 'RWA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(646, 'RW-01', 'Ville de Kigali'),
-    array(646, 'RW-02', 'Est'),
-    array(646, 'RW-03', 'Nord'),
-    array(646, 'RW-04', 'Ouest'),
-    array(646, 'RW-05', 'Sud'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    646,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/saint_barthelemy_652_2.cif b/uc_store/countries/saint_barthelemy_652_2.cif
deleted file mode 100644
index 6c9b6b7..0000000
--- a/uc_store/countries/saint_barthelemy_652_2.cif
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-function saint_barthelemy_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 652,
-      'country_name' => 'Saint Barthélemy',
-      'country_iso_code_2' => 'BL',
-      'country_iso_code_3' => 'BLM',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    652,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function saint_barthelemy_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => 'Saint Barthélemy'))
-        ->condition('country_id', 652)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/saint_helena_654_1.cif b/uc_store/countries/saint_helena_654_1.cif
deleted file mode 100644
index 277b5c4..0000000
--- a/uc_store/countries/saint_helena_654_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function saint_helena_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 654,
-      'country_name' => 'Saint Helena, Ascension and Tristan da Cunha',
-      'country_iso_code_2' => 'SH',
-      'country_iso_code_3' => 'SHN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    654,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/saint_kitts_nevis_659_1.cif b/uc_store/countries/saint_kitts_nevis_659_1.cif
deleted file mode 100644
index 4179505..0000000
--- a/uc_store/countries/saint_kitts_nevis_659_1.cif
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-function saint_kitts_nevis_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 659,
-      'country_name' => 'Saint Kitts and Nevis',
-      'country_iso_code_2' => 'KN',
-      'country_iso_code_3' => 'KNA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(659, 'CCN', 'Christ Church Nichola Town'),
-    array(659, 'ASP', 'Saint Anne Sandy Point'),
-    array(659, 'GBA', 'Saint George Basseterre'),
-    array(659, 'GGI', 'Saint George Gingerland'),
-    array(659, 'JWI', 'Saint James Windward'),
-    array(659, 'JCA', 'Saint John Capisterre'),
-    array(659, 'JFI', 'Saint John Figtree'),
-    array(659, 'MCA', 'Saint Mary Cayon'),
-    array(659, 'PCA', 'Saint Paul Capisterre'),
-    array(659, 'PCH', 'Saint Paul Charlestown'),
-    array(659, 'PBS', 'Saint Peter Basseterre'),
-    array(659, 'TLO', 'Saint Thomas Lowland'),
-    array(659, 'TMI', 'Saint Thomas Middle Island'),
-    array(659, 'TPP', 'Trinity Palmetto Point'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    659,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/saint_lucia_662_1.cif b/uc_store/countries/saint_lucia_662_1.cif
deleted file mode 100644
index 29134d2..0000000
--- a/uc_store/countries/saint_lucia_662_1.cif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function saint_lucia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 662,
-      'country_name' => 'Saint Lucia',
-      'country_iso_code_2' => 'LC',
-      'country_iso_code_3' => 'LCA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(662, 'AR', 'Anse-la-Raye'),
-    array(662, 'CA', 'Castries'),
-    array(662, 'CH', 'Choiseul'),
-    array(662, 'DA', 'Dauphin'),
-    array(662, 'DE', 'Dennery'),
-    array(662, 'GI', 'Gros-Islet'),
-    array(662, 'LA', 'Laborie'),
-    array(662, 'MI', 'Micoud'),
-    array(662, 'PR', 'Praslin'),
-    array(662, 'SO', 'Soufriere'),
-    array(662, 'VF', 'Vieux-Fort'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    662,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/saint_martin_663_1.cif b/uc_store/countries/saint_martin_663_1.cif
deleted file mode 100644
index 06e04e9..0000000
--- a/uc_store/countries/saint_martin_663_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function saint_martin_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 663,
-      'country_name' => 'Saint Martin (French part)',
-      'country_iso_code_2' => 'MF',
-      'country_iso_code_3' => 'MAF',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    663,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/saint_pierre_miquelon_666_1.cif b/uc_store/countries/saint_pierre_miquelon_666_1.cif
deleted file mode 100644
index a66db12..0000000
--- a/uc_store/countries/saint_pierre_miquelon_666_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function saint_pierre_miquelon_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 666,
-      'country_name' => 'Saint Pierre and Miquelon',
-      'country_iso_code_2' => 'PM',
-      'country_iso_code_3' => 'SPM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    666,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/saint_vincent_grenadines_670_1.cif b/uc_store/countries/saint_vincent_grenadines_670_1.cif
deleted file mode 100644
index ec0803d..0000000
--- a/uc_store/countries/saint_vincent_grenadines_670_1.cif
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-function saint_vincent_grenadines_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 670,
-      'country_name' => 'Saint Vincent and the Grenadines',
-      'country_iso_code_2' => 'VC',
-      'country_iso_code_3' => 'VCT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(670, 'VC-01', 'Charlotte'),
-    array(670, 'VC-06', 'Grenadines'),
-    array(670, 'VC-02', 'Saint Andrew'),
-    array(670, 'VC-03', 'Saint David'),
-    array(670, 'VC-04', 'Saint George'),
-    array(670, 'VC-05', 'Saint Patrick'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    670,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/samoa_882_1.cif b/uc_store/countries/samoa_882_1.cif
deleted file mode 100644
index 7eeadb9..0000000
--- a/uc_store/countries/samoa_882_1.cif
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-function samoa_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 882,
-      'country_name' => 'Samoa',
-      'country_iso_code_2' => 'WS',
-      'country_iso_code_3' => 'WSM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(882, 'WS-AA', "A'ana"),
-    array(882, 'WS-AL', 'Aiga-i-le-Tai'),
-    array(882, 'WS-AT', 'Atua'),
-    array(882, 'WS-FA', "Fa'asaleleaga"),
-    array(882, 'WS-GE', "Gaga'emauga"),
-    array(882, 'WS-GI', 'Gagaifomauga'),
-    array(882, 'WS-PA', 'Palauli'),
-    array(882, 'WS-SA', "Satupa'itea"),
-    array(882, 'WS-TU', 'Tuamasaga'),
-    array(882, 'WS-VF', "Va'a-o-Fonoti"),
-    array(882, 'WS-VS', 'Vaisigano'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    882,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/san_marino_674_1.cif b/uc_store/countries/san_marino_674_1.cif
deleted file mode 100644
index f88346f..0000000
--- a/uc_store/countries/san_marino_674_1.cif
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-function san_marino_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 674,
-      'country_name' => 'San Marino',
-      'country_iso_code_2' => 'SM',
-      'country_iso_code_3' => 'SMR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(674, 'SM-01', 'Acquaviva'),
-    array(674, 'SM-06', 'Borgo Maggiore'),
-    array(674, 'SM-02', 'Chiesanuova'),
-    array(674, 'SM-03', 'Domagnano'),
-    array(674, 'SM-04', 'Faetano'),
-    array(674, 'SM-05', 'Fiorentino'),
-    array(674, 'SM-08', 'Montegiardino'),
-    array(674, 'SM-07', 'San Marino'),
-    array(674, 'SM-09', 'Serravalle'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    674,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/sao_tome_principe_678_1.cif b/uc_store/countries/sao_tome_principe_678_1.cif
deleted file mode 100644
index 66acffe..0000000
--- a/uc_store/countries/sao_tome_principe_678_1.cif
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-function sao_tome_principe_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 678,
-      'country_name' => 'Sao Tome and Principe',
-      'country_iso_code_2' => 'ST',
-      'country_iso_code_3' => 'STP',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(678, 'ST-P', 'Príncipe'),
-    array(678, 'ST-S', 'São Tomé'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    678,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/saudi_arabia_682_2.cif b/uc_store/countries/saudi_arabia_682_2.cif
deleted file mode 100644
index 6da7bb2..0000000
--- a/uc_store/countries/saudi_arabia_682_2.cif
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function saudi_arabia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 682,
-      'country_name' => 'Saudi Arabia',
-      'country_iso_code_2' => 'SA',
-      'country_iso_code_3' => 'SAU',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  // VALUES = Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(682, 'AL BAHAH', 'Al Bahah'),
-    array(682, 'NORTHERN BORDER', 'Northern Border'),
-    array(682, 'AL JAWF', 'Al Jawf'),
-    array(682, 'AL MADINAH', 'Al Madinah'),
-    array(682, 'AL QASIM', 'Al Qasim'),
-    array(682, 'HAIL', 'Hail'),
-    array(682, 'ASIR', 'Asir'),
-    array(682, 'EASTERN PROVINCE', 'Eastern Province'),
-    array(682, 'AL RIYADH', 'Al Riyadh'),
-    array(682, 'TABUK', 'Tabuk'),
-    array(682, 'NAJRAN', 'Najran'),
-    array(682, 'MAKKAH', 'Makkah'),
-    array(682, 'JIZAN', 'Jizan'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    682,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/senegal_686_1.cif b/uc_store/countries/senegal_686_1.cif
deleted file mode 100644
index f56c57d..0000000
--- a/uc_store/countries/senegal_686_1.cif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function senegal_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 686,
-      'country_name' => 'Senegal',
-      'country_iso_code_2' => 'SN',
-      'country_iso_code_3' => 'SEN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(686, 'DK', 'Dakar'),
-    array(686, 'DB', 'Diourbel'),
-    array(686, 'FK', 'Fatick'),
-    array(686, 'KL', 'Kaolack'),
-    array(686, 'KD', 'Kolda'),
-    array(686, 'LG', 'Louga'),
-    array(686, 'MT', 'Matam'),
-    array(686, 'SL', 'Saint-Louis'),
-    array(686, 'TC', 'Tambacounda'),
-    array(686, 'TH', 'Thies'),
-    array(686, 'ZH', 'Ziguinchor'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    686,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/serbia_688_1.cif b/uc_store/countries/serbia_688_1.cif
deleted file mode 100644
index a09f0e1..0000000
--- a/uc_store/countries/serbia_688_1.cif
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function serbia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 688,
-      'country_name' => 'Serbia',
-      'country_iso_code_2' => 'RS',
-      'country_iso_code_3' => 'SRB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(688, '00', 'Beograd'),
-    array(688, '14', 'Bor'),
-    array(688, '11', 'Barnicevo'),
-    array(688, '23', 'Jablanica'),
-    array(688, '09', 'Kolubara'),
-    array(688, 'KM', 'Kosovo-Metohija'),
-    array(688, '08', 'Macva'),
-    array(688, '17', 'Moravica'),
-    array(688, '20', 'Nisava'),
-    array(688, '24', 'Pcinja'),
-    array(688, '22', 'Pirot'),
-    array(688, '10', 'Podunavlje'),
-    array(688, '13', 'Pomoravlje'),
-    array(688, '19', 'Rasina'),
-    array(688, '18', 'Raska'),
-    array(688, '12', 'Sumadija'),
-    array(688, '21', 'Toplica'),
-    array(688, 'VO', 'Vojvodina'),
-    array(688, '15', 'Zajecar'),
-    array(688, '16', 'Zlatibor'),
-    array(688, '25', 'Kosovo'),
-    array(688, '29', 'Kosovo-Pomoravlje'),
-    array(688, '28', 'Kosovska Mitrovica'),
-    array(688, '26', 'Pec'),
-    array(688, '27', 'Prizren'),
-    array(688, '06', 'Juzna Backa'),
-    array(688, '04', 'Juzni Banat'),
-    array(688, '01', 'Severna Backa'),
-    array(688, '03', 'Severni Banat'),
-    array(688, '02', 'Srednji Banat'),
-    array(688, '07', 'Srem'),
-    array(688, '05', 'Zapadna Backa'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    688,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/seychelles_690_1.cif b/uc_store/countries/seychelles_690_1.cif
deleted file mode 100644
index ce3fce4..0000000
--- a/uc_store/countries/seychelles_690_1.cif
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function seychelles_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 690,
-      'country_name' => 'Seychelles',
-      'country_iso_code_2' => 'SC',
-      'country_iso_code_3' => 'SYC',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(690, '01', 'Anse aux Pins'),
-    array(690, '02', 'Anse Boileau'),
-    array(690, '03', 'Anse Etoile'),
-    array(690, '04', 'Anse Louis'),
-    array(690, '05', 'Anse Royale'),
-    array(690, '06', 'Baie Lazare'),
-    array(690, '07', 'Baie Sainte Anne'),
-    array(690, '08', 'Beau Vallon'),
-    array(690, '09', 'Bel Air'),
-    array(690, '10', 'Bel Ombre'),
-    array(690, '11', 'Cascade'),
-    array(690, '12', 'Glacis'),
-    array(690, '13', "Grand' Anse Mahe"),
-    array(690, '14', "Grand' Anse Praslin"),
-    array(690, '15', 'La Digue'),
-    array(690, '16', 'La Riviere Anglaise'),
-    array(690, '17', 'Mont Buxton'),
-    array(690, '18', 'Mont Fleuri'),
-    array(690, '19', 'Plaisance'),
-    array(690, '20', 'Pointe La Rue'),
-    array(690, '21', 'Port Glaud'),
-    array(690, '22', 'Saint Louis'),
-    array(690, '23', 'Takamaka'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    690,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/sierra_leone_694_1.cif b/uc_store/countries/sierra_leone_694_1.cif
deleted file mode 100644
index 8666c06..0000000
--- a/uc_store/countries/sierra_leone_694_1.cif
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-function sierra_leone_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 694,
-      'country_name' => 'Sierra Leone',
-      'country_iso_code_2' => 'SL',
-      'country_iso_code_3' => 'SLE',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(694, 'SL-W', 'Western Area (Freetown)'),
-    array(694, 'SL-E', 'Eastern'),
-    array(694, 'SL-N', 'Northern'),
-    array(694, 'SL-S', 'Southern'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    694,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/singapore_702_2.cif b/uc_store/countries/singapore_702_2.cif
deleted file mode 100644
index 512ec67..0000000
--- a/uc_store/countries/singapore_702_2.cif
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Implements hook_install().
- */
-function singapore_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 702,
-      'country_name' => 'Singapore',
-      'country_iso_code_2' => 'SG',
-      'country_iso_code_3' => 'SGP',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(702, 'SG-01', 'Central Singapore'),
-    array(702, 'SG-02', 'North East'),
-    array(702, 'SG-03', 'North West'),
-    array(702, 'SG-04', 'South East'),
-    array(702, 'SG-05', 'South West'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    702,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!country_name, !postal_code"
-  );
-}
-
-/**
- * Implements hook_update() with $version being the only argument.
- * Add a new case for each version update, and be sure to always include the
- * latest changes in the install function.
- */
-function singapore_update($version) {
-  switch ($version) {
-    case 2:
-      $zones = array(
-        array(702, 'SG-01', 'Central Singapore'),
-        array(702, 'SG-02', 'North East'),
-        array(702, 'SG-03', 'North West'),
-        array(702, 'SG-04', 'South East'),
-        array(702, 'SG-05', 'South West'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-      break;
-  }
-}
diff --git a/uc_store/countries/sint_maarten_534_1.cif b/uc_store/countries/sint_maarten_534_1.cif
deleted file mode 100644
index 81c904b..0000000
--- a/uc_store/countries/sint_maarten_534_1.cif
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-function sint_maarten_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 534,
-      'country_name' => 'Sint Maarten',
-      'country_iso_code_2' => 'SX',
-      'country_iso_code_3' => 'SXM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(534, 'AD', 'Almond Grove'),
-    array(534, 'BH', 'Beacon Hill'),
-    array(534, 'BV', 'Belvedere'),
-    array(534, 'CB', 'Cole Bay'),
-    array(534, 'CC', 'Cupecoy'),
-    array(534, 'CH', 'Cay Hill'),
-    array(534, 'DB', 'Dawn Beach'),
-    array(534, 'DC', 'Dutch Cul De Sac'),
-    array(534, 'DF', 'Defiance'),
-    array(534, 'DQ', 'Dutch Quarter'),
-    array(534, 'EZ', 'Ebenezer'),
-    array(534, 'FP', 'Fresh Pond'),
-    array(534, 'GB', 'Guana Bay'),
-    array(534, 'GR', 'Great Bay'),
-    array(534, 'HE', 'Hope Estate'),
-    array(534, 'KB', 'Cay Bay'),
-    array(534, 'LB', 'Little Bay'),
-    array(534, 'LL', 'Low Lands'),
-    array(534, 'LP', 'Lower Prince Quarter'),
-    array(534, 'MA', 'Marian Estate'),
-    array(534, 'MB', 'Mullet Bay'),
-    array(534, 'MD', 'Madam Estate'),
-    array(534, 'MH', 'Maho'),
-    array(534, 'ML', 'Middle Land'),
-    array(534, 'OP', 'Oyster Pond'),
-    array(534, 'PB', 'Point Blanche'),
-    array(534, 'PH', 'Philispburg'),
-    array(534, 'SB', 'Simpson Bay'),
-    array(534, 'SD', 'Saunders'),
-    array(534, 'SG', 'Sucker Garden'),
-    array(534, 'SP', 'St Peters'),
-    array(534, 'SR', 'South Reward'),
-    array(534, 'UP', 'Upper Prince Quarter'),
-    array(534, 'VY', 'Vineyard'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    534,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/slovakia_703_1.cif b/uc_store/countries/slovakia_703_1.cif
deleted file mode 100644
index 4714416..0000000
--- a/uc_store/countries/slovakia_703_1.cif
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function slovakia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 703,
-      'country_name' => 'Slovakia',
-      'country_iso_code_2' => 'SK',
-      'country_iso_code_3' => 'SVK',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(703, 'BC', 'Banskobystricky kraj'),
-    array(703, 'BL', 'Bratislavsky kraj'),
-    array(703, 'KI', 'Kosicky kraj'),
-    array(703, 'NI', 'Nitriansky kraj'),
-    array(703, 'PV', 'Presovsky kraj'),
-    array(703, 'TC', 'Trenciansky kraj'),
-    array(703, 'TA', 'Trnavsky kraj'),
-    array(703, 'ZI', 'Zilinsky kraj'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    703,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/slovenia_705_1.cif b/uc_store/countries/slovenia_705_1.cif
deleted file mode 100644
index 4dd2561..0000000
--- a/uc_store/countries/slovenia_705_1.cif
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function slovenia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 705,
-      'country_name' => 'Slovenia',
-      'country_iso_code_2' =>'SI',
-      'country_iso_code_3' => 'SVN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(705, '002', 'Beltinci'),
-    array(705, '148', 'Benedikt'),
-    array(705, '149', 'Bistrica ob Sotli'),
-    array(705, '003', 'Bled'),
-    array(705, '150', 'Bloke'),
-    array(705, '004', 'Bohinj'),
-    array(705, '005', 'Borovnica'),
-    array(705, '006', 'Bovec'),
-    array(705, '151', 'Braslovce'),
-    array(705, '007', 'Brda'),
-    array(705, '009', 'Brezice'),
-    array(705, '008', 'Brezovica'),
-    array(705, '152', 'Cankova'),
-    array(705, '011', 'Celje'),
-    array(705, '012', 'Cerklje na Gorenjskem'),
-    array(705, '013', 'Cerknica'),
-    array(705, '014', 'Cerkno'),
-    array(705, '153', 'Cerkvenjak'),
-    array(705, '015', 'Crensovci'),
-    array(705, '016', 'Crna na Koroskem'),
-    array(705, '017', 'Crnomelj'),
-    array(705, '018', 'Destrnik'),
-    array(705, '019', 'Divaca'),
-    array(705, '154', 'Dobje'),
-    array(705, '020', 'Dobrepolje'),
-    array(705, '155', 'Dobrna'),
-    array(705, '021', 'Dobrova-Horjul-Polhov Gradec'),
-    array(705, '156', 'Dobrovnik'),
-    array(705, '022', 'Dol pri Ljublijani'),
-    array(705, '157', 'Dolenjske Toplice'),
-    array(705, '023', 'Domzale'),
-    array(705, '024', 'Dornava'),
-    array(705, '025', 'Dravograd'),
-    array(705, '026', 'Duplek'),
-    array(705, '027', 'Gorenja vas-Poljane'),
-    array(705, '028', 'Gorisnica'),
-    array(705, '029', 'Gornja Radgona'),
-    array(705, '030', 'Gornji Grad'),
-    array(705, '031', 'Gornji Petrovci'),
-    array(705, '158', 'Grad'),
-    array(705, '032', 'Grosuplje'),
-    array(705, '159', 'Hajdina'),
-    array(705, '160', 'Hoce-Slivnica'),
-    array(705, '161', 'Hodos'),
-    array(705, '162', 'Horjul'),
-    array(705, '034', 'Hrastnik'),
-    array(705, '035', 'Hrpelje-Kozina'),
-    array(705, '036', 'Idrija'),
-    array(705, '037', 'Ig'),
-    array(705, '038', 'Illirska Bistrica'),
-    array(705, '039', 'Ivancna Gorica'),
-    array(705, '040', 'Izola/Isola'),
-    array(705, '041', 'Jesenice'),
-    array(705, '163', 'Jezersko'),
-    array(705, '042', 'Jursinci'),
-    array(705, '043', 'Kamnik'),
-    array(705, '044', 'Kanal'),
-    array(705, '045', 'Kidricevo'),
-    array(705, '046', 'Kobarid'),
-    array(705, '047', 'Kobilje'),
-    array(705, '048', 'Kocevje'),
-    array(705, '049', 'Komen'),
-    array(705, '164', 'Komenda'),
-    array(705, '050', 'Koper/Capodistria'),
-    array(705, '165', 'Kostel'),
-    array(705, '051', 'Kozje'),
-    array(705, '052', 'Kranj'),
-    array(705, '053', 'Kranjska Gora'),
-    array(705, '166', 'Krizevci'),
-    array(705, '054', 'Krsko'),
-    array(705, '055', 'Kungota'),
-    array(705, '056', 'Kuzma'),
-    array(705, '057', 'Lasko'),
-    array(705, '058', 'Lenart'),
-    array(705, '059', 'Lendava'),
-    array(705, '060', 'Litija'),
-    array(705, '061', 'Ljubljana'),
-    array(705, '062', 'Ljubno'),
-    array(705, '063', 'Ljutomer'),
-    array(705, '064', 'Logatec'),
-    array(705, '065', 'Loska Dolina'),
-    array(705, '066', 'Loski Potok'),
-    array(705, '167', 'Lovrenc na Pohorju'),
-    array(705, '067', 'Luce'),
-    array(705, '068', 'Lukovica'),
-    array(705, '069', 'Majsperk'),
-    array(705, '070', 'Maribor'),
-    array(705, '168', 'Markovci'),
-    array(705, '071', 'Medvode'),
-    array(705, '072', 'Menges'),
-    array(705, '073', 'Metlika'),
-    array(705, '074', 'Mezica'),
-    array(705, '169', 'Miklavz na Dravskem Polju'),
-    array(705, '075', 'Miren-Kostanjevica'),
-    array(705, '170', 'Mirna Pec'),
-    array(705, '076', 'Mislinja'),
-    array(705, '077', 'Moravce'),
-    array(705, '078', 'Moravske Toplice'),
-    array(705, '079', 'Mozirje'),
-    array(705, '080', 'Murska Sobota'),
-    array(705, '081', 'Muta'),
-    array(705, '082', 'Naklo'),
-    array(705, '083', 'Nazarje'),
-    array(705, '084', 'Nova Gorica'),
-    array(705, '085', 'Novo Mesto'),
-    array(705, '086', 'Odranci'),
-    array(705, '171', 'Oplotnica'),
-    array(705, '087', 'Ormoz'),
-    array(705, '088', 'Osilnica'),
-    array(705, '089', 'Pesnica'),
-    array(705, '090', 'Piran'),
-    array(705, '090', 'Pirano'),
-    array(705, '091', 'Pivka'),
-    array(705, '092', 'Podcetrtek'),
-    array(705, '172', 'Podlehnik'),
-    array(705, '093', 'Podvelka'),
-    array(705, '173', 'Polzela'),
-    array(705, '094', 'Postojna'),
-    array(705, '174', 'Prebold'),
-    array(705, '095', 'Preddvor'),
-    array(705, '175', 'Prevalje'),
-    array(705, '096', 'Ptuj'),
-    array(705, '097', 'Puconci'),
-    array(705, '098', 'Race-Fram'),
-    array(705, '099', 'Radece'),
-    array(705, '100', 'Radenci'),
-    array(705, '101', 'Radlje ob Dravi'),
-    array(705, '102', 'Radovljica'),
-    array(705, '103', 'Ravne na Koroskem'),
-    array(705, '176', 'Razkrizje'),
-    array(705, '104', 'Ribnica'),
-    array(705, '177', 'Ribnica na Pohorju'),
-    array(705, '106', 'Rogaska Slatina'),
-    array(705, '105', 'Rogasovci'),
-    array(705, '107', 'Rogatec'),
-    array(705, '108', 'Ruse'),
-    array(705, '033', 'Salovci'),
-    array(705, '178', 'Selnica ob Dravi'),
-    array(705, '109', 'Semic'),
-    array(705, '183', 'Sempeter-Vrtojba'),
-    array(705, '117', 'Sencur'),
-    array(705, '118', 'Sentilj'),
-    array(705, '119', 'Sentjernej'),
-    array(705, '120', 'Sentjur pri Celju'),
-    array(705, '110', 'Sevnica'),
-    array(705, '111', 'Sezana'),
-    array(705, '121', 'Skocjan'),
-    array(705, '122', 'Skofja Loka'),
-    array(705, '123', 'Skofljica'),
-    array(705, '112', 'Slovenj Gradec'),
-    array(705, '113', 'Slovenska Bistrica'),
-    array(705, '114', 'Slovenske Konjice'),
-    array(705, '124', 'Smarje pri Jelsah'),
-    array(705, '125', 'Smartno ob Paki'),
-    array(705, '194', 'Smartno pri Litiji'),
-    array(705, '179', 'Sodrazica'),
-    array(705, '180', 'Solcava'),
-    array(705, '126', 'Sostanj'),
-    array(705, '115', 'Starse'),
-    array(705, '127', 'Store'),
-    array(705, '181', 'Sveta Ana'),
-    array(705, '182', 'Sveti Andraz v Slovenskih Goricah'),
-    array(705, '116', 'Sveti Jurij'),
-    array(705, '184', 'Tabor'),
-    array(705, '010', 'Tisina'),
-    array(705, '128', 'Tolmin'),
-    array(705, '129', 'Trbovlje'),
-    array(705, '130', 'Trebnje'),
-    array(705, '185', 'Trnovska Vas'),
-    array(705, '131', 'Trzic'),
-    array(705, '186', 'Trzin'),
-    array(705, '132', 'Turnisce'),
-    array(705, '133', 'Velenje'),
-    array(705, '187', 'Velika Polana'),
-    array(705, '134', 'Velike Lasce'),
-    array(705, '188', 'Verzej'),
-    array(705, '135', 'Videm'),
-    array(705, '136', 'Vipava'),
-    array(705, '137', 'Vitanje'),
-    array(705, '138', 'Vodice'),
-    array(705, '139', 'Vojnik'),
-    array(705, '189', 'Vransko'),
-    array(705, '140', 'Vrhnika'),
-    array(705, '141', 'Vuzenica'),
-    array(705, '142', 'Zagorje ob Savi'),
-    array(705, '190', 'Zalec'),
-    array(705, '143', 'Zavrc'),
-    array(705, '146', 'Zelezniki'),
-    array(705, '191', 'Zetale'),
-    array(705, '147', 'Ziri'),
-    array(705, '192', 'Zirovnica'),
-    array(705, '144', 'Zrece'),
-    array(705, '193', 'Zuzemberk'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    705,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/solomon_islands_90_1.cif b/uc_store/countries/solomon_islands_90_1.cif
deleted file mode 100644
index da22a61..0000000
--- a/uc_store/countries/solomon_islands_90_1.cif
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-function solomon_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 90,
-      'country_name' => 'Solomon Islands',
-      'country_iso_code_2' => 'SB',
-      'country_iso_code_3' => 'SLB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(90, 'SB-CT', 'Capital Territory (Honiara)'),
-    array(90, 'SB-CE', 'Central'),
-    array(90, 'SB-CH', 'Choiseul'),
-    array(90, 'SB-GU', 'Guadalcanal'),
-    array(90, 'SB-IS', 'Isabel'),
-    array(90, 'SB-MK', 'Makira'),
-    array(90, 'SB-ML', 'Malaita'),
-    array(90, 'SB-RB', 'Rennell and Bellona'),
-    array(90, 'SB-TE', 'Temotu'),
-    array(90, 'SB-WE', 'Western'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    90,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/somalia_706_1.cif b/uc_store/countries/somalia_706_1.cif
deleted file mode 100644
index d23918d..0000000
--- a/uc_store/countries/somalia_706_1.cif
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-function somalia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 706,
-      'country_name' => 'Somalia',
-      'country_iso_code_2' => 'SO',
-      'country_iso_code_3' => 'SOM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(706, 'SO-AW', 'Awdal'),
-    array(706, 'SO-BK', 'Bakool'),
-    array(706, 'SO-BN', 'Banaadir'),
-    array(706, 'SO-BR', 'Bari'),
-    array(706, 'SO-BY', 'Bay'),
-    array(706, 'SO-GA', 'Galguduud'),
-    array(706, 'SO-GE', 'Gedo'),
-    array(706, 'SO-HI', 'Hiiraan'),
-    array(706, 'SO-JD', 'Jubbada Dhexe'),
-    array(706, 'SO-JH', 'Jubbada Hoose'),
-    array(706, 'SO-MU', 'Mudug'),
-    array(706, 'SO-NU', 'Nugaal'),
-    array(706, 'SO-SA', 'Sanaag'),
-    array(706, 'SO-SD', 'Shabeellaha Dhexe'),
-    array(706, 'SO-SH', 'Shabeellaha Hoose'),
-    array(706, 'SO-SO', 'Sool'),
-    array(706, 'SO-TO', 'Togdheer'),
-    array(706, 'SO-WO', 'Woqooyi Galbeed'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    706,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/south_africa_710_1.cif b/uc_store/countries/south_africa_710_1.cif
deleted file mode 100644
index 37ca70a..0000000
--- a/uc_store/countries/south_africa_710_1.cif
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function south_africa_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 710,
-      'country_name' => 'South Africa',
-      'country_iso_code_2' => 'ZA',
-      'country_iso_code_3' => 'ZAF',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(710, 'EC', 'Eastern Cape'),
-    array(710, 'FS', 'Free State'),
-    array(710, 'GT', 'Gauteng'),
-    array(710, 'KZN', 'KwaZulu-Natal'),
-    array(710, 'LP', 'Limpopo'),
-    array(710, 'MP', 'Mpumalanga'),
-    array(710, 'NC', 'Northern Cape'),
-    array(710, 'NW', 'North West'),
-    array(710, 'WC', 'Western Cape'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // South African postal codes are simple 4 digit numbers.
-
-  // Set address format
-  uc_set_address_format(
-    710,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city\r\n".
-    "!postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/south_georgia_south_sandwich_islands_239_1.cif b/uc_store/countries/south_georgia_south_sandwich_islands_239_1.cif
deleted file mode 100644
index 8580f51..0000000
--- a/uc_store/countries/south_georgia_south_sandwich_islands_239_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function south_georgia_south_sandwich_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 239,
-      'country_name' => 'South Georgia and the South Sandwich Islands',
-      'country_iso_code_2' => 'GS',
-      'country_iso_code_3' => 'SGS',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    239,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/spain_724_1.cif b/uc_store/countries/spain_724_1.cif
deleted file mode 100644
index 831282d..0000000
--- a/uc_store/countries/spain_724_1.cif
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function spain_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 724,
-      'country_name' => 'Spain',
-      'country_iso_code_2' => 'ES',
-      'country_iso_code_3' => 'ESP',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(724, 'CA', 'A Coruña'),
-    array(724, 'AL', 'Álava'),
-    array(724, 'AB', 'Albacete'),
-    array(724, 'AC', 'Alicante'),
-    array(724, 'AM', 'Almería'),
-    array(724, 'AS', 'Asturias'),
-    array(724, 'AV', 'Ávila'),
-    array(724, 'BJ', 'Badajoz'),
-    array(724, 'IB', 'Baleares'),
-    array(724, 'BA', 'Barcelona'),
-    array(724, 'BU', 'Burgos'),
-    array(724, 'CC', 'Cáceres'),
-    array(724, 'CZ', 'Cádiz'),
-    array(724, 'CT', 'Cantabria'),
-    array(724, 'CL', 'Castellón'),
-    array(724, 'CE', 'Ceuta'),
-    array(724, 'CR', 'Ciudad Real'),
-    array(724, 'CD', 'Córdoba'),
-    array(724, 'CU', 'Cuenca'),
-    array(724, 'GI', 'Girona'),
-    array(724, 'GD', 'Granada'),
-    array(724, 'GJ', 'Guadalajara'),
-    array(724, 'GP', 'Guipúzcoa'),
-    array(724, 'HL', 'Huelva'),
-    array(724, 'HS', 'Huesca'),
-    array(724, 'JN', 'Jaén'),
-    array(724, 'RJ', 'La Rioja'),
-    array(724, 'PM', 'Las Palmas'),
-    array(724, 'LE', 'León'),
-    array(724, 'LL', 'Lleida'),
-    array(724, 'LG', 'Lugo'),
-    array(724, 'MD', 'Madrid'),
-    array(724, 'MA', 'Málaga'),
-    array(724, 'ML', 'Melilla'),
-    array(724, 'MU', 'Murcia'),
-    array(724, 'NV', 'Navarra'),
-    array(724, 'OU', 'Ourense'),
-    array(724, 'PL', 'Palencia'),
-    array(724, 'PO', 'Pontevedra'),
-    array(724, 'SL', 'Salamanca'),
-    array(724, 'SC', 'Santa Cruz de Tenerife'),
-    array(724, 'SG', 'Segovia'),
-    array(724, 'SV', 'Sevilla'),
-    array(724, 'SO', 'Soria'),
-    array(724, 'TA', 'Tarragona'),
-    array(724, 'TE', 'Teruel'),
-    array(724, 'TO', 'Toledo'),
-    array(724, 'VC', 'Valencia'),
-    array(724, 'VD', 'Valladolid'),
-    array(724, 'VZ', 'Vizcaya'),
-    array(724, 'ZM', 'Zamora'),
-    array(724, 'ZR', 'Zaragoza'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    724,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/sri_lanka_144_1.cif b/uc_store/countries/sri_lanka_144_1.cif
deleted file mode 100644
index d402fd5..0000000
--- a/uc_store/countries/sri_lanka_144_1.cif
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function sri_lanka_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 144,
-      'country_name' => 'Sri Lanka',
-      'country_iso_code_2' => 'LK',
-      'country_iso_code_3' => 'LKA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(144, '1', 'Basnahira Palata'),
-    array(144, '2', 'Central Province'),
-    array(144, '3', 'Dakunu Palata'),
-    array(144, '5', 'Eastern Province'),
-    array(144, '2', 'Madhyama Palata'),
-    array(144, '5', 'Negenahira Palata'),
-    array(144, '7', 'North Central Province'),
-    array(144, '6', 'North Western Province'),
-    array(144, '4', 'Northern Province'),
-    array(144, '9', 'Sabaragamuwa Palata'),
-    array(144, '3', 'Southern Province'),
-    array(144, '4', 'Uturu Palata'),
-    array(144, '7', 'Uturumeda Palata'),
-    array(144, '8', 'Uva Palata'),
-    array(144, '6', 'Wayamba Palata'),
-    array(144, '1', 'Western Province'),
-    array(144, '11', 'Colombo'),
-    array(144, '12', 'Gampaha'),
-    array(144, '13', 'Kalutara'),
-    array(144, '21', 'Kandy'),
-    array(144, '22', 'Matale'),
-    array(144, '23', 'Nuwara Eliya'),
-    array(144, '31', 'Galle'),
-    array(144, '33', 'Hambantota'),
-    array(144, '32', 'Matara'),
-    array(144, '41', 'Jaffna'),
-    array(144, '42', 'Kilinochchi'),
-    array(144, '43', 'Mannar'),
-    array(144, '45', 'Mullaittivu'),
-    array(144, '44', 'Vavuniya'),
-    array(144, '52', 'Ampara'),
-    array(144, '51', 'Batticaloa'),
-    array(144, '53', 'Trincomalee'),
-    array(144, '61', 'Kurunegala'),
-    array(144, '62', 'Puttalam'),
-    array(144, '71', 'Anuradhapura'),
-    array(144, '72', 'Polonnaruwa'),
-    array(144, '81', 'Badulla'),
-    array(144, '82', 'Monaragala'),
-    array(144, '92', 'Kegalla'),
-    array(144, '91', 'Ratnapura'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    144,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/sudan_736_1.cif b/uc_store/countries/sudan_736_1.cif
deleted file mode 100644
index 9786263..0000000
--- a/uc_store/countries/sudan_736_1.cif
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-function sudan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 736,
-      'country_name' => 'Sudan',
-      'country_iso_code_2' => 'SD',
-      'country_iso_code_3' => 'SDN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(736, 'SD-23', "Ā'ٰālī an Nīl"),
-    array(736, 'SD-26', 'Al Baḩr al Aḩmar'),
-    array(736, 'SD-18', 'Al Buḩayrāt'),
-    array(736, 'SD-07', 'Al Jazīrah'),
-    array(736, 'SD-03', 'Al Kharţūm'),
-    array(736, 'SD-06', 'Al Qaḑārif'),
-    array(736, 'SD-22', 'Al Waḩdah'),
-    array(736, 'SD-04', 'An Nīl'),
-    array(736, 'SD-08', 'An Nīl al Abyaḑ'),
-    array(736, 'SD-24', 'An Nīl al Azraq'),
-    array(736, 'SD-01', 'Ash Shamālīyah'),
-    array(736, 'SD-17', 'Baḩr al Jabal'),
-    array(736, 'SD-16', "Gharb al Istiwā'īyah"),
-    array(736, 'SD-14', 'Gharb Baḩr al Ghazāl'),
-    array(736, 'SD-12', 'Gharb Dārfūr'),
-    array(736, 'SD-11', 'Janūb Dārfūr'),
-    array(736, 'SD-13', 'Janūb Kurdufān'),
-    array(736, 'SD-20', 'Jūnqalī'),
-    array(736, 'SD-05', 'Kassalā'),
-    array(736, 'SD-15', 'Shamāl Baḩr al Ghazāl'),
-    array(736, 'SD-02', 'Shamāl Dārfūr'),
-    array(736, 'SD-09', 'Shamāl Kurdufān'),
-    array(736, 'SD-19', "Sharq al Istiwā'īyah"),
-    array(736, 'SD-25', 'Sinnār'),
-    array(736, 'SD-21', 'Wārāb'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    736,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/suriname_740_1.cif b/uc_store/countries/suriname_740_1.cif
deleted file mode 100644
index 51e8d1e..0000000
--- a/uc_store/countries/suriname_740_1.cif
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function suriname_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 740,
-      'country_name' => 'Suriname',
-      'country_iso_code_2' => 'SR',
-      'country_iso_code_3' => 'SUR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(740, 'BR', 'Brokopondo'),
-    array(740, 'CM', 'Commonwijne'),
-    array(740, 'CR', 'Coronie'),
-    array(740, 'MA', 'Marowijne'),
-    array(740, 'NI', 'Nickerie'),
-    array(740, 'PR', 'Para'),
-    array(740, 'PM', 'Paramaribo'),
-    array(740, 'SA', 'Saramacca'),
-    array(740, 'SI', 'Sipaliwini'),
-    array(740, 'WA', 'Wanica'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    740,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/svalbard_jan_mayen_744_1.cif b/uc_store/countries/svalbard_jan_mayen_744_1.cif
deleted file mode 100644
index 52c2ca5..0000000
--- a/uc_store/countries/svalbard_jan_mayen_744_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function svalbard_jan_mayen_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 744,
-      'country_name' => 'Svalbard and Jan Mayen',
-      'country_iso_code_2' => 'SJ',
-      'country_iso_code_3' => 'SJM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    744,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/swaziland_748_1.cif b/uc_store/countries/swaziland_748_1.cif
deleted file mode 100644
index ee46420..0000000
--- a/uc_store/countries/swaziland_748_1.cif
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-function swaziland_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 748,
-      'country_name' => 'Swaziland',
-      'country_iso_code_2' => 'SZ',
-      'country_iso_code_3' => 'SWZ',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(748, 'SZ-HH', 'Hhohho'),
-    array(748, 'SZ-LU', 'Lubombo'),
-    array(748, 'SZ-MA', 'Manzini'),
-    array(748, 'SZ-SH', 'Shiselweni'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    748,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/sweden_752_1.cif b/uc_store/countries/sweden_752_1.cif
deleted file mode 100644
index 45eac01..0000000
--- a/uc_store/countries/sweden_752_1.cif
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function sweden_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 752,
-      'country_name' => 'Sweden',
-      'country_iso_code_2' => 'SE',
-      'country_iso_code_3' => 'SWE',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(752, 'BL', 'Blekinge'),
-    array(752, 'DA', 'Dalarna'),
-    array(752, 'GA', 'Gavleborg'),
-    array(752, 'GO', 'Gotland'),
-    array(752, 'HA', 'Halland'),
-    array(752, 'JA', 'Jamtland'),
-    array(752, 'JO', 'Jonkoping'),
-    array(752, 'KA', 'Kalmar'),
-    array(752, 'KR', 'Kronoberg'),
-    array(752, 'NO', 'Norrbotten'),
-    array(752, 'OR', 'Orebro'),
-    array(752, 'OS', 'Ostergotland'),
-    array(752, 'SK', 'Skane'),
-    array(752, 'SO', 'Sodermanland'),
-    array(752, 'ST', 'Stockholm'),
-    array(752, 'UP', 'Uppsala'),
-    array(752, 'VL', 'Varmland'),
-    array(752, 'VB', 'Vasterbotten'),
-    array(752, 'VN', 'Vasternorrland'),
-    array(752, 'VM', 'Vastmanland'),
-    array(752, 'VG', 'Vastra Gotaland'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    752,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/switzerland_756_1.cif b/uc_store/countries/switzerland_756_1.cif
deleted file mode 100644
index f54ad0e..0000000
--- a/uc_store/countries/switzerland_756_1.cif
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function switzerland_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 756,
-      'country_name' => 'Switzerland',
-      'country_iso_code_2' => 'CH',
-      'country_iso_code_3' => 'CHE',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(756, 'AG', 'Aargau'),
-    array(756, 'AI', 'Appenzell Innerrhoden'),
-    array(756, 'AR', 'Appenzell Ausserrhoden'),
-    array(756, 'BS', 'Basel-Stadt'),
-    array(756, 'BL', 'Basel-Landschaft'),
-    array(756, 'BE', 'Bern'),
-    array(756, 'FR', 'Fribourg'),
-    array(756, 'GE', 'Geneva'),
-    array(756, 'GL', 'Glarus'),
-    array(756, 'GR', 'Graubünden'),
-    array(756, 'JU', 'Jura'),
-    array(756, 'LU', 'Luzern'),
-    array(756, 'NE', 'Neuchâtel'),
-    array(756, 'NW', 'Nidwalden'),
-    array(756, 'OW', 'Obwalden'),
-    array(756, 'SH', 'Schaffhausen'),
-    array(756, 'SZ', 'Schwyz'),
-    array(756, 'SO', 'Solothurn'),
-    array(756, 'SG', 'St. Gallen'),
-    array(756, 'TG', 'Thurgau'),
-    array(756, 'TI', 'Ticino'),
-    array(756, 'UR', 'Uri'),
-    array(756, 'VS', 'Valais'),
-    array(756, 'VD', 'Vaud'),
-    array(756, 'ZG', 'Zug'),
-    array(756, 'ZH', 'Zürich'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    756,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code !city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/syria_760_1.cif b/uc_store/countries/syria_760_1.cif
deleted file mode 100644
index e94c098..0000000
--- a/uc_store/countries/syria_760_1.cif
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-function syria_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 760,
-      'country_name' => 'Syrian Arab Republic',
-      'country_iso_code_2' => 'SY',
-      'country_iso_code_3' => 'SYR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(760, 'SY-HA', 'Al Hasakah'),
-    array(760, 'SY-LA', 'Al Lādhiqīyah'),
-    array(760, 'SY-QU', 'Al Qunayţirah'),
-    array(760, 'SY-RA', 'Ar Raqqah'),
-    array(760, 'SY-SU', "As Suwaydā'"),
-    array(760, 'SY-DR', 'Darٰā'),
-    array(760, 'SY-DY', 'Dayr az Zawr'),
-    array(760, 'SY-DI', 'Dimashq'),
-    array(760, 'SY-HL', 'Halab'),
-    array(760, 'SY-HM', 'Hamāh'),
-    array(760, 'SY-HI', 'Himş'),
-    array(760, 'SY-ID', 'Idlib'),
-    array(760, 'SY-RD', 'Rīf Dimashq'),
-    array(760, 'SY-TA', 'Ţarţūs'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    760,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/taiwan_158_2.cif b/uc_store/countries/taiwan_158_2.cif
deleted file mode 100644
index 4888a71..0000000
--- a/uc_store/countries/taiwan_158_2.cif
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function taiwan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 158,
-      'country_name' => 'Taiwan, Province of China',
-      'country_iso_code_2' => 'TW',
-      'country_iso_code_3' => 'TWN',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(158, '01', 'ChangHua County'),
-    array(158, '02', 'ChiaYi City'),
-    array(158, '03', 'ChiaYi County'),
-    array(158, '04', 'HsinChu City'),
-    array(158, '05', 'HsinChu County'),
-    array(158, '06', 'HuaLien County'),
-    array(158, '07', 'KaoHsiung City'),
-    array(158, '08', 'KaoHsiung County'),
-    array(158, '09', 'KeeLung City '),
-    array(158, '10', 'KinMen County'),
-    array(158, '11', 'LienChiang County'),
-    array(158, '12', 'MiaoLi County'),
-    array(158, '13', 'NanHai'),
-    array(158, '14', 'NanTou County'),
-    array(158, '15', 'PengHu County'),
-    array(158, '16', 'PingTung County'),
-    array(158, '17', 'TaiChung City'),
-    array(158, '18', 'TaiChung County'),
-    array(158, '19', 'TaiNan City'),
-    array(158, '20', 'TaiNan County'),
-    array(158, '21', 'Taipei City'),
-    array(158, '22', 'Taipei County'),
-    array(158, '23', 'TaiTung County'),
-    array(158, '24', 'TaoYuan County'),
-    array(158, '25', 'Yilan County'),
-    array(158, '26', 'YunLin County'),
-    array(158, '27', '南投縣'),
-    array(158, '28', '南海諸島'),
-    array(158, '29', '嘉義市'),
-    array(158, '30', '嘉義縣'),
-    array(158, '31', '基隆市'),
-    array(158, '32', '宜蘭縣'),
-    array(158, '33', '屏東縣'),
-    array(158, '34', '彰化縣'),
-    array(158, '35', '新竹市'),
-    array(158, '36', '新竹縣'),
-    array(158, '37', '桃園縣'),
-    array(158, '38', '澎湖縣'),
-    array(158, '39', '臺中市'),
-    array(158, '40', '臺中縣'),
-    array(158, '41', '臺北市'),
-    array(158, '42', '臺北縣'),
-    array(158, '43', '臺南市'),
-    array(158, '44', '臺南縣'),
-    array(158, '45', '臺東縣'),
-    array(158, '46', '花蓮縣'),
-    array(158, '47', '苗栗縣'),
-    array(158, '48', '連江縣'),
-    array(158, '49', '金門縣'),
-    array(158, '50', '雲林縣'),
-    array(158, '51', '高雄市'),
-    array(158, '52', '高雄縣'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    158,
-    "!company\r\n".
-    "!last_name !first_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function taiwan_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => 'Taiwan, Province of China'))
-        ->condition('country_id', 158)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/tajikistan_762_1.cif b/uc_store/countries/tajikistan_762_1.cif
deleted file mode 100644
index 9246965..0000000
--- a/uc_store/countries/tajikistan_762_1.cif
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-function tajikistan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 762,
-      'country_name' => 'Tajikistan',
-      'country_iso_code_2' => 'TJ',
-      'country_iso_code_3' => 'TJK',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(762, 'TJ-GB', 'Gorno-Badakhshan'),
-    array(762, 'TJ-KT', 'Khatlon'),
-    array(762, 'TJ-SU', 'Sughd'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    762,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/tanzania_834_2.cif b/uc_store/countries/tanzania_834_2.cif
deleted file mode 100644
index 21b66bf..0000000
--- a/uc_store/countries/tanzania_834_2.cif
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function tanzania_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 834,
-      'country_name' => 'Tanzania, United Republic of',
-      'country_iso_code_2' => 'TZ',
-      'country_iso_code_3' => 'TZA',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(834, '01', 'Arusha'),
-    array(834, '19', 'Coast'),
-    array(834, '02', 'Dar es Salaam'),
-    array(834, '03', 'Dodoma'),
-    array(834, '04', 'Iringa'),
-    array(834, '05', 'Kagera'),
-    array(834, '06', 'Kaskazini Pemba'),
-    array(834, '07', 'Kaskazini Unguja'),
-    array(834, '08', 'Kigoma'),
-    array(834, '09', 'Kilimanjaro'),
-    array(834, '10', 'Kusini Pemba'),
-    array(834, '11', 'Kusini Unguja'),
-    array(834, '12', 'Lindi'),
-    array(834, '26', 'Manyara'),
-    array(834, '13', 'Mara'),
-    array(834, '14', 'Mbeya'),
-    array(834, '15', 'Mjini Mgharibi'),
-    array(834, '16', 'Morogoro'),
-    array(834, '17', 'Mtwara'),
-    array(834, '18', 'Mwanza'),
-    array(834, '06', 'Pemba North'),
-    array(834, '10', 'Pemba South'),
-    array(834, '19', 'Pwani'),
-    array(834, '20', 'Rukwa'),
-    array(834, '21', 'Ruvuma'),
-    array(834, '22', 'Shinyanga'),
-    array(834, '23', 'Singida'),
-    array(834, '24', 'Tabora'),
-    array(834, '25', 'Tanga'),
-    array(834, '07', 'Zanzibar North'),
-    array(834, '11', 'Zanzibar South'),
-    array(834, '15', 'Zanzibar West'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    834,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function tanzania_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => 'Tanzania, United Republic of'))
-        ->condition('country_id', 834)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/thailand_764_3.cif b/uc_store/countries/thailand_764_3.cif
deleted file mode 100644
index 39989a9..0000000
--- a/uc_store/countries/thailand_764_3.cif
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function thailand_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 764,
-      'country_name' => 'Thailand',
-      'country_iso_code_2' => 'TH',
-      'country_iso_code_3' => 'THA',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(764, 'TH-10', 'Bangkok <Krung Thep Maha Nakhon>'),
-    array(764, 'TH-S', 'Pattaya'),
-    array(764, 'TH-37', 'Amnat Charoen'),
-    array(764, 'TH-15', 'Ang Thong'),
-    array(764, 'TH-31', 'Buri Ram'),
-    array(764, 'TH-24', 'Chachoengsao'),
-    array(764, 'TH-18', 'Chai Nat'),
-    array(764, 'TH-36', 'Chaiyaphum'),
-    array(764, 'TH-22', 'Chanthaburi'),
-    array(764, 'TH-50', 'Chiang Mai'),
-    array(764, 'TH-57', 'Chiang Rai'),
-    array(764, 'TH-20', 'Chon Buri'),
-    array(764, 'TH-86', 'Chumphon'),
-    array(764, 'TH-46', 'Kalasin'),
-    array(764, 'TH-62', 'Kamphaeng Phet'),
-    array(764, 'TH-71', 'Kanchanaburi'),
-    array(764, 'TH-40', 'Khon Kaen'),
-    array(764, 'TH-81', 'Krabi'),
-    array(764, 'TH-52', 'Lampang'),
-    array(764, 'TH-51', 'Lamphun'),
-    array(764, 'TH-42', 'Loei'),
-    array(764, 'TH-16', 'Lop Buri'),
-    array(764, 'TH-58', 'Mae Hong Son'),
-    array(764, 'TH-44', 'Maha Sarakham'),
-    array(764, 'TH-49', 'Mukdahan'),
-    array(764, 'TH-26', 'Nakhon Nayok'),
-    array(764, 'TH-73', 'Nakhon Pathom'),
-    array(764, 'TH-48', 'Nakhon Phanom'),
-    array(764, 'TH-30', 'Nakhon Ratchasima'),
-    array(764, 'TH-60', 'Nakhon Sawan'),
-    array(764, 'TH-80', 'Nakhon Si Thammarat'),
-    array(764, 'TH-55', 'Nan'),
-    array(764, 'TH-96', 'Narathiwat'),
-    array(764, 'TH-39', 'Nong Bua Lam Phu'),
-    array(764, 'TH-43', 'Nong Khai'),
-    array(764, 'TH-12', 'Nonthaburi'),
-    array(764, 'TH-13', 'Pathum Thani'),
-    array(764, 'TH-94', 'Pattani'),
-    array(764, 'TH-82', 'Phangnga'),
-    array(764, 'TH-93', 'Phatthalung'),
-    array(764, 'TH-56', 'Phayao'),
-    array(764, 'TH-67', 'Phetchabun'),
-    array(764, 'TH-76', 'Phetchaburi'),
-    array(764, 'TH-66', 'Phichit'),
-    array(764, 'TH-65', 'Phitsanulok'),
-    array(764, 'TH-54', 'Phrae'),
-    array(764, 'TH-14', 'Phra Nakhon Si Ayutthaya'),
-    array(764, 'TH-83', 'Phuket'),
-    array(764, 'TH-25', 'Prachin Buri'),
-    array(764, 'TH-77', 'Prachuap Khiri Khan'),
-    array(764, 'TH-85', 'Ranong'),
-    array(764, 'TH-70', 'Ratchaburi'),
-    array(764, 'TH-21', 'Rayong'),
-    array(764, 'TH-45', 'Roi Et'),
-    array(764, 'TH-27', 'Sa Kaeo'),
-    array(764, 'TH-47', 'Sakon Nakhon'),
-    array(764, 'TH-11', 'Samut Prakan'),
-    array(764, 'TH-74', 'Samut Sakhon'),
-    array(764, 'TH-75', 'Samut Songkhram'),
-    array(764, 'TH-19', 'Saraburi'),
-    array(764, 'TH-91', 'Satun'),
-    array(764, 'TH-17', 'Sing Buri'),
-    array(764, 'TH-33', 'Si Sa Ket'),
-    array(764, 'TH-90', 'Songkhla'),
-    array(764, 'TH-64', 'Sukhothai'),
-    array(764, 'TH-72', 'Suphan Buri'),
-    array(764, 'TH-84', 'Surat Thani'),
-    array(764, 'TH-32', 'Surin'),
-    array(764, 'TH-63', 'Tak'),
-    array(764, 'TH-92', 'Trang'),
-    array(764, 'TH-23', 'Trat'),
-    array(764, 'TH-34', 'Ubon Ratchathani'),
-    array(764, 'TH-41', 'Udon Thani'),
-    array(764, 'TH-61', 'Uthai Thani'),
-    array(764, 'TH-53', 'Uttaradit'),
-    array(764, 'TH-95', 'Yala'),
-    array(764, 'TH-35', 'Yasothon'),
-    array(764, 'TH-38', 'Bueng Kan'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    764,
-    "!first_name !last_name\r\n".
-    "!company\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name !postal_code\r\n".
-    "!country_name"
-  );
-}
-
-function thailand_update($version) {
-  switch ($version) {
-    case 3:
-
-      // Add some new zones
-      $zones = array(
-        array(764, 'TH-S', 'Pattaya'),
-        array(764, 'TH-38', 'Bueng Kan'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-
-      // Rename remaining zones
-      $zones = array(
-        array(764, '1', 'TH-10', 'Bangkok <Krung Thep Maha Nakhon>'),
-        array(764, '2', 'TH-12', 'Nonthaburi'),
-        array(764, '3', 'TH-11', 'Samut Prakan'),
-        array(764, '4', 'TH-13', 'Pathum Thani'),
-        array(764, '5', 'TH-83', 'Phuket'),
-        array(764, '6', 'TH-74', 'Samut Sakhon'),
-        array(764, '7', 'TH-75', 'Samut Songkhram'),
-        array(764, '8', 'TH-73', 'Nakhon Pathom'),
-        array(764, '9', 'TH-94', 'Pattani'),
-        array(764, '10', 'TH-14', 'Phra Nakhon Si Ayutthaya'),
-        array(764, '11', 'TH-15', 'Ang Thong'),
-        array(764, '12', 'TH-20', 'Chon Buri'),
-        array(764, '13', 'TH-17', 'Sing Buri'),
-        array(764, '14', 'TH-90', 'Songkhla'),
-        array(764, '15', 'TH-44', 'Maha Sarakham'),
-        array(764, '16', 'TH-19', 'Saraburi'),
-        array(764, '17', 'TH-32', 'Surin'),
-        array(764, '18', 'TH-21', 'Rayong'),
-        array(764, '19', 'TH-33', 'Si Sa Ket'),
-        array(764, '20', 'TH-40', 'Khon Kaen'),
-        array(764, '21', 'TH-70', 'Ratchaburi'),
-        array(764, '22', 'TH-96', 'Narathiwat'),
-        array(764, '23', 'TH-45', 'Roi Et'),
-        array(764, '24', 'TH-72', 'Suphan Buri'),
-        array(764, '25', 'TH-80', 'Nakhon Si Thammarat'),
-        array(764, '26', 'TH-31', 'Buri Ram'),
-        array(764, '27', 'TH-93', 'Phatthalung'),
-        array(764, '28', 'TH-46', 'Kalasin'),
-        array(764, '29', 'TH-18', 'Chai Nat'),
-        array(764, '30', 'TH-41', 'Udon Thani'),
-        array(764, '31', 'TH-35', 'Yasothon'),
-        array(764, '32', 'TH-39', 'Nong Bua Lam Phu'),
-        array(764, '33', 'TH-48', 'Nakhon Phanom'),
-        array(764, '34', 'TH-30', 'Nakhon Ratchasima'),
-        array(764, '35', 'TH-92', 'Trang'),
-        array(764, '36', 'TH-24', 'Chachoengsao'),
-        array(764, '37', 'TH-43', 'Nong Khai'),
-        array(764, '38', 'TH-66', 'Phichit'),
-        array(764, '39', 'TH-16', 'Lop Buri'),
-        array(764, '40', 'TH-26', 'Nakhon Nayok'),
-        array(764, '41', 'TH-37', 'Amnat Charoen'),
-        array(764, '42', 'TH-47', 'Sakon Nakhon'),
-        array(764, '43', 'TH-91', 'Satun'),
-        array(764, '44', 'TH-34', 'Ubon Ratchathani'),
-        array(764, '45', 'TH-60', 'Nakhon Sawan'),
-        array(764, '46', 'TH-57', 'Chiang Rai'),
-        array(764, '47', 'TH-95', 'Yala'),
-        array(764, '48', 'TH-25', 'Prachin Buri'),
-        array(764, '49', 'TH-64', 'Sukhothai'),
-        array(764, '50', 'TH-51', 'Lamphun'),
-        array(764, '51', 'TH-36', 'Chaiyaphum'),
-        array(764, '52', 'TH-81', 'Krabi'),
-        array(764, '53', 'TH-62', 'Kamphaeng Phet'),
-        array(764, '54', 'TH-50', 'Chiang Mai'),
-        array(764, '55', 'TH-86', 'Chumphon'),
-        array(764, '56', 'TH-22', 'Chanthaburi'),
-        array(764, '57', 'TH-67', 'Phetchabun'),
-        array(764, '58', 'TH-23', 'Trat'),
-        array(764, '59', 'TH-65', 'Phitsanulok'),
-        array(764, '60', 'TH-77', 'Prachuap Khiri Khan'),
-        array(764, '61', 'TH-49', 'Mukdahan'),
-        array(764, '62', 'TH-56', 'Phayao'),
-        array(764, '63', 'TH-84', 'Surat Thani'),
-        array(764, '64', 'TH-27', 'Sa Kaeo'),
-        array(764, '65', 'TH-76', 'Phetchaburi'),
-        array(764, '66', 'TH-54', 'Phrae'),
-        array(764, '67', 'TH-52', 'Lampang'),
-        array(764, '68', 'TH-53', 'Uttaradit'),
-        array(764, '69', 'TH-82', 'Phangnga'),
-        array(764, '70', 'TH-85', 'Ranong'),
-        array(764, '71', 'TH-42', 'Loei'),
-        array(764, '72', 'TH-61', 'Uthai Thani'),
-        array(764, '73', 'TH-71', 'Kanchanaburi'),
-        array(764, '74', 'TH-55', 'Nan'),
-        array(764, '75', 'TH-63', 'Tak'),
-        array(764, '76', 'TH-58', 'Mae Hong Son'),
-      );
-
-      foreach ($zones as $zone) {
-        db_update('uc_zones')
-          ->fields(array(
-            'zone_name' => $zone[3],
-            'zone_code' => $zone[2],
-          ))
-          ->condition('zone_country_id', $zone[0])
-          ->condition('zone_code', $zone[1])
-          ->execute();
-      }
-
-      break;
-  }
-}
diff --git a/uc_store/countries/timor_leste_626_1.cif b/uc_store/countries/timor_leste_626_1.cif
deleted file mode 100644
index 0c5f864..0000000
--- a/uc_store/countries/timor_leste_626_1.cif
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-function timor_leste_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 626,
-      'country_name' => 'Timor-Leste',
-      'country_iso_code_2' => 'TL',
-      'country_iso_code_3' => 'TLS',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(626, 'TL-AL', 'Aileu'),
-    array(626, 'TL-AN', 'Ainaro'),
-    array(626, 'TL-BA', 'Baucau'),
-    array(626, 'TL-BO', 'Bobonaro'),
-    array(626, 'TL-CO', 'Cova Lima'),
-    array(626, 'TL-DI', 'Dili'),
-    array(626, 'TL-ER', 'Ermera'),
-    array(626, 'TL-LA', 'Lautem'),
-    array(626, 'TL-LI', 'Liquiça'),
-    array(626, 'TL-MT', 'Manatuto'),
-    array(626, 'TL-MF', 'Manufahi'),
-    array(626, 'TL-OE', 'Oecussi'),
-    array(626, 'TL-VI', 'Viqueque'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    626,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/togo_768_1.cif b/uc_store/countries/togo_768_1.cif
deleted file mode 100644
index 79fc1e9..0000000
--- a/uc_store/countries/togo_768_1.cif
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-function togo_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 768,
-      'country_name' => 'Togo',
-      'country_iso_code_2' => 'TG',
-      'country_iso_code_3' => 'TGO',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(768, 'TG-C', 'Centre'),
-    array(768, 'TG-K', 'Kara'),
-    array(768, 'TG-M', 'Maritime (Région)'),
-    array(768, 'TG-P', 'Plateaux'),
-    array(768, 'TG-S', 'Savannes'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    768,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/tokelau_772_1.cif b/uc_store/countries/tokelau_772_1.cif
deleted file mode 100644
index 2909914..0000000
--- a/uc_store/countries/tokelau_772_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function tokelau_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 772,
-      'country_name' => 'Tokelau',
-      'country_iso_code_2' => 'TK',
-      'country_iso_code_3' => 'TKL',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    772,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/tonga_776_1.cif b/uc_store/countries/tonga_776_1.cif
deleted file mode 100644
index 52009ea..0000000
--- a/uc_store/countries/tonga_776_1.cif
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-function tonga_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 776,
-      'country_name' => 'Tonga',
-      'country_iso_code_2' => 'TO',
-      'country_iso_code_3' => 'TON',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(776, 'TO-01', "'Eua"),
-    array(776, 'TO-02', "Ha'apai"),
-    array(776, 'TO-03', 'Niuas'),
-    array(776, 'TO-04', 'Tongatapu'),
-    array(776, 'TO-05', "Vava'u"),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    776,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/trinidad_tobago_780_1.cif b/uc_store/countries/trinidad_tobago_780_1.cif
deleted file mode 100644
index e9bbe23..0000000
--- a/uc_store/countries/trinidad_tobago_780_1.cif
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-function trinidad_tobago_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 780,
-      'country_name' => 'Trinidad and Tobago',
-      'country_iso_code_2' => 'TT',
-      'country_iso_code_3' => 'TTO',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(780, 'TT-CTT', 'Couva-Tabaquite-Talparo'),
-    array(780, 'TT-DMN', 'Diego Martin'),
-    array(780, 'TT-ETO', 'Eastern Tobago'),
-    array(780, 'TT-PED', 'Penal-Debe'),
-    array(780, 'TT-PRT', 'Princes Town'),
-    array(780, 'TT-RCM', 'Rio Claro-Mayaro'),
-    array(780, 'TT-SGE', 'Sangre Grande'),
-    array(780, 'TT-SJL', 'San Juan-Laventille'),
-    array(780, 'TT-SIP', 'Siparia'),
-    array(780, 'TT-TUP', 'Tunapuna-Piarco'),
-    array(780, 'TT-WTO', 'Western Tobago'),
-    array(780, 'TT-ARI', 'Arima'),
-    array(780, 'TT-CHA', 'Chaguanas'),
-    array(780, 'TT-PTF', 'Point Fortin'),
-    array(780, 'TT-POS', 'Port of Spain'),
-    array(780, 'TT-SFO', 'San Fernando'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    780,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/tunisia_788_1.cif b/uc_store/countries/tunisia_788_1.cif
deleted file mode 100644
index e88713a..0000000
--- a/uc_store/countries/tunisia_788_1.cif
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function tunisia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 788,
-      'country_name' => 'Tunisia',
-      'country_iso_code_2' => 'TN',
-      'country_iso_code_3' => 'TUN',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(788, '31', 'Beja'),
-    array(788, '13', 'Ben Arous'),
-    array(788, '23', 'Bizerte'),
-    array(788, '81', 'Gabes'),
-    array(788, '71', 'Gafsa'),
-    array(788, '32', 'Jendouba'),
-    array(788, '41', 'Kairouan'),
-    array(788, '42', 'Kasserine'),
-    array(788, '73', 'Kebili'),
-    array(788, '14', 'La Manouba'),
-    array(788, '12', "L'Ariana"),
-    array(788, '33', 'Le Kef'),
-    array(788, '53', 'Mahdia'),
-    array(788, '82', 'Medenine'),
-    array(788, '52', 'Monastir'),
-    array(788, '21', 'Nabeul'),
-    array(788, '61', 'Sfax'),
-    array(788, '43', 'Sidi Bouzid'),
-    array(788, '34', 'Siliana'),
-    array(788, '51', 'Sousse'),
-    array(788, '83', 'Tataouine'),
-    array(788, '72', 'Tozeur'),
-    array(788, '11', 'Tunis'),
-    array(788, '22', 'Zaghouan'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    788,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/turkey_792_3.cif b/uc_store/countries/turkey_792_3.cif
deleted file mode 100644
index a1d80b2..0000000
--- a/uc_store/countries/turkey_792_3.cif
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-
-/**
-* Implements hook_install() using the name of the country as the base of
-* the function name.
-*/
-function turkey_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 792,
-      'country_name' => 'Turkey',
-      'country_iso_code_2' => 'TR',
-      'country_iso_code_3' => 'TUR',
-      'version' => 3,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(792, 'TR-01', 'Adana'),
-    array(792, 'TR-02', 'Adıyaman'),
-    array(792, 'TR-03', 'Afyon'),
-    array(792, 'TR-04', 'Ağrı'),
-    array(792, 'TR-68', 'Aksaray'),
-    array(792, 'TR-05', 'Amasya'),
-    array(792, 'TR-06', 'Ankara'),
-    array(792, 'TR-07', 'Antalya'),
-    array(792, 'TR-75', 'Ardahan'),
-    array(792, 'TR-08', 'Artvin'),
-    array(792, 'TR-09', 'Aydın'),
-    array(792, 'TR-10', 'Balıkesir'),
-    array(792, 'TR-74', 'Bartın'),
-    array(792, 'TR-72', 'Batman'),
-    array(792, 'TR-69', 'Bayburt'),
-    array(792, 'TR-11', 'Bilecik'),
-    array(792, 'TR-12', 'Bingöl'),
-    array(792, 'TR-13', 'Bitlis'),
-    array(792, 'TR-14', 'Bolu'),
-    array(792, 'TR-15', 'Burdur'),
-    array(792, 'TR-16', 'Bursa'),
-    array(792, 'TR-17', 'Çanakkale'),
-    array(792, 'TR-18', 'Çankırı'),
-    array(792, 'TR-19', 'Çorum'),
-    array(792, 'TR-20', 'Denizli'),
-    array(792, 'TR-21', 'Diyarbakır'),
-    array(792, 'TR-81', 'Düzce'),
-    array(792, 'TR-22', 'Edirne'),
-    array(792, 'TR-23', 'Elazığ'),
-    array(792, 'TR-24', 'Erzincan'),
-    array(792, 'TR-25', 'Erzurum'),
-    array(792, 'TR-26', 'Eskişehir'),
-    array(792, 'TR-27', 'Gaziantep'),
-    array(792, 'TR-28', 'Giresun'),
-    array(792, 'TR-29', 'Gümüşhane'),
-    array(792, 'TR-30', 'Hakkâri'),
-    array(792, 'TR-31', 'Hatay'),
-    array(792, 'TR-76', 'Iğdır'),
-    array(792, 'TR-32', 'Isparta'),
-    array(792, 'TR-33', 'İçel'),
-    array(792, 'TR-34', 'İstanbul'),
-    array(792, 'TR-35', 'İzmir'),
-    array(792, 'TR-46', 'Kahramanmaraş'),
-    array(792, 'TR-78', 'Karabük'),
-    array(792, 'TR-70', 'Karaman'),
-    array(792, 'TR-36', 'Kars'),
-    array(792, 'TR-37', 'Kastamonu'),
-    array(792, 'TR-38', 'Kayseri'),
-    array(792, 'TR-71', 'Kırıkkale'),
-    array(792, 'TR-39', 'Kırklareli'),
-    array(792, 'TR-40', 'Kırşehir'),
-    array(792, 'TR-79', 'Kilis'),
-    array(792, 'TR-41', 'Kocaeli'),
-    array(792, 'TR-42', 'Konya'),
-    array(792, 'TR-43', 'Kütahya'),
-    array(792, 'TR-44', 'Malatya'),
-    array(792, 'TR-45', 'Manisa'),
-    array(792, 'TR-47', 'Mardin'),
-    array(792, 'TR-48', 'Muğla'),
-    array(792, 'TR-49', 'Muş'),
-    array(792, 'TR-50', 'Nevşehir'),
-    array(792, 'TR-51', 'Niğde'),
-    array(792, 'TR-52', 'Ordu'),
-    array(792, 'TR-80', 'Osmaniye'),
-    array(792, 'TR-53', 'Rize'),
-    array(792, 'TR-54', 'Sakarya'),
-    array(792, 'TR-55', 'Samsun'),
-    array(792, 'TR-56', 'Siirt'),
-    array(792, 'TR-57', 'Sinop'),
-    array(792, 'TR-58', 'Sivas'),
-    array(792, 'TR-63', 'Şanlıurfa'),
-    array(792, 'TR-73', 'Şırnak'),
-    array(792, 'TR-59', 'Tekirdağ'),
-    array(792, 'TR-60', 'Tokat'),
-    array(792, 'TR-61', 'Trabzon'),
-    array(792, 'TR-62', 'Tunceli'),
-    array(792, 'TR-64', 'Uşak'),
-    array(792, 'TR-65', 'Van'),
-    array(792, 'TR-77', 'Yalova'),
-    array(792, 'TR-66', 'Yozgat'),
-    array(792, 'TR-67', 'Zonguldak'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    792,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!postal_code, !city\r\n".
-    "!country_name_if"
-  );
-}
-
-/**
-* Implements hook_update() with $version being the only argument.
-* Add a new case for each version update, and be sure to always include the
-* latest changes in the install function.
-*/
-function turkey_update($version) {
-  switch ($version) {
-    case 2:
-      db_update('uc_countries')
-        ->fields(array('country_iso_code_2' => 'TR'))
-        ->condition('country_id', 792)
-        ->execute();
-      break;
-
-    case 3:
-      $zones = array(
-        array(792, 'TR-01', 'Adana'),
-        array(792, 'TR-02', 'Adıyaman'),
-        array(792, 'TR-03', 'Afyon'),
-        array(792, 'TR-04', 'Ağrı'),
-        array(792, 'TR-68', 'Aksaray'),
-        array(792, 'TR-05', 'Amasya'),
-        array(792, 'TR-06', 'Ankara'),
-        array(792, 'TR-07', 'Antalya'),
-        array(792, 'TR-75', 'Ardahan'),
-        array(792, 'TR-08', 'Artvin'),
-        array(792, 'TR-09', 'Aydın'),
-        array(792, 'TR-10', 'Balıkesir'),
-        array(792, 'TR-74', 'Bartın'),
-        array(792, 'TR-72', 'Batman'),
-        array(792, 'TR-69', 'Bayburt'),
-        array(792, 'TR-11', 'Bilecik'),
-        array(792, 'TR-12', 'Bingöl'),
-        array(792, 'TR-13', 'Bitlis'),
-        array(792, 'TR-14', 'Bolu'),
-        array(792, 'TR-15', 'Burdur'),
-        array(792, 'TR-16', 'Bursa'),
-        array(792, 'TR-17', 'Çanakkale'),
-        array(792, 'TR-18', 'Çankırı'),
-        array(792, 'TR-19', 'Çorum'),
-        array(792, 'TR-20', 'Denizli'),
-        array(792, 'TR-21', 'Diyarbakır'),
-        array(792, 'TR-81', 'Düzce'),
-        array(792, 'TR-22', 'Edirne'),
-        array(792, 'TR-23', 'Elazığ'),
-        array(792, 'TR-24', 'Erzincan'),
-        array(792, 'TR-25', 'Erzurum'),
-        array(792, 'TR-26', 'Eskişehir'),
-        array(792, 'TR-27', 'Gaziantep'),
-        array(792, 'TR-28', 'Giresun'),
-        array(792, 'TR-29', 'Gümüşhane'),
-        array(792, 'TR-30', 'Hakkâri'),
-        array(792, 'TR-31', 'Hatay'),
-        array(792, 'TR-76', 'Iğdır'),
-        array(792, 'TR-32', 'Isparta'),
-        array(792, 'TR-33', 'İçel'),
-        array(792, 'TR-34', 'İstanbul'),
-        array(792, 'TR-35', 'İzmir'),
-        array(792, 'TR-46', 'Kahramanmaraş'),
-        array(792, 'TR-78', 'Karabük'),
-        array(792, 'TR-70', 'Karaman'),
-        array(792, 'TR-36', 'Kars'),
-        array(792, 'TR-37', 'Kastamonu'),
-        array(792, 'TR-38', 'Kayseri'),
-        array(792, 'TR-71', 'Kırıkkale'),
-        array(792, 'TR-39', 'Kırklareli'),
-        array(792, 'TR-40', 'Kırşehir'),
-        array(792, 'TR-79', 'Kilis'),
-        array(792, 'TR-41', 'Kocaeli'),
-        array(792, 'TR-42', 'Konya'),
-        array(792, 'TR-43', 'Kütahya'),
-        array(792, 'TR-44', 'Malatya'),
-        array(792, 'TR-45', 'Manisa'),
-        array(792, 'TR-47', 'Mardin'),
-        array(792, 'TR-48', 'Muğla'),
-        array(792, 'TR-49', 'Muş'),
-        array(792, 'TR-50', 'Nevşehir'),
-        array(792, 'TR-51', 'Niğde'),
-        array(792, 'TR-52', 'Ordu'),
-        array(792, 'TR-80', 'Osmaniye'),
-        array(792, 'TR-53', 'Rize'),
-        array(792, 'TR-54', 'Sakarya'),
-        array(792, 'TR-55', 'Samsun'),
-        array(792, 'TR-56', 'Siirt'),
-        array(792, 'TR-57', 'Sinop'),
-        array(792, 'TR-58', 'Sivas'),
-        array(792, 'TR-63', 'Şanlıurfa'),
-        array(792, 'TR-73', 'Şırnak'),
-        array(792, 'TR-59', 'Tekirdağ'),
-        array(792, 'TR-60', 'Tokat'),
-        array(792, 'TR-61', 'Trabzon'),
-        array(792, 'TR-62', 'Tunceli'),
-        array(792, 'TR-64', 'Uşak'),
-        array(792, 'TR-65', 'Van'),
-        array(792, 'TR-77', 'Yalova'),
-        array(792, 'TR-66', 'Yozgat'),
-        array(792, 'TR-67', 'Zonguldak'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-      break;
-  }
-}
diff --git a/uc_store/countries/turkmenistan_795_1.cif b/uc_store/countries/turkmenistan_795_1.cif
deleted file mode 100644
index f729989..0000000
--- a/uc_store/countries/turkmenistan_795_1.cif
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-function turkmenistan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 795,
-      'country_name' => 'Turkmenistan',
-      'country_iso_code_2' => 'TM',
-      'country_iso_code_3' => 'TKM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(795, 'TM-A', 'Ahal'),
-    array(795, 'TM-B', 'Balkan'),
-    array(795, 'TM-D', 'Daşoguz'),
-    array(795, 'TM-L', 'Lebap'),
-    array(795, 'TM-M', 'Mary'),
-    array(795, 'TM-S', 'Aşgabat'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    795,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/turks_caicos_islands_796_1.cif b/uc_store/countries/turks_caicos_islands_796_1.cif
deleted file mode 100644
index 6d6df65..0000000
--- a/uc_store/countries/turks_caicos_islands_796_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function turks_caicos_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 796,
-      'country_name' => 'Turks and Caicos Islands',
-      'country_iso_code_2' => 'TC',
-      'country_iso_code_3' => 'TCA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    796,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/tuvalu_798_1.cif b/uc_store/countries/tuvalu_798_1.cif
deleted file mode 100644
index fb536e8..0000000
--- a/uc_store/countries/tuvalu_798_1.cif
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-function tuvalu_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 798,
-      'country_name' => 'Tuvalu',
-      'country_iso_code_2' => 'TV',
-      'country_iso_code_3' => 'TUV',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(798, 'TV-FUN', 'Funafuti'),
-    array(798, 'TV-NMG', 'Nanumanga'),
-    array(798, 'TV-NMA', 'Nanumea'),
-    array(798, 'TV-NIT', 'Niutao'),
-    array(798, 'TV-NUI', 'Nui'),
-    array(798, 'TV-NKF', 'Nukufetau'),
-    array(798, 'TV-NKL', 'Nukulaelae'),
-    array(798, 'TV-VAI', 'Vaitupu'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    798,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/uganda_800_1.cif b/uc_store/countries/uganda_800_1.cif
deleted file mode 100644
index d6549ab..0000000
--- a/uc_store/countries/uganda_800_1.cif
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-function uganda_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 800,
-      'country_name' => 'Uganda',
-      'country_iso_code_2' => 'UG',
-      'country_iso_code_3' => 'UGA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(800, 'UG-317', 'Abim'),
-    array(800, 'UG-301', 'Adjumani'),
-    array(800, 'UG-314', 'Amolatar'),
-    array(800, 'UG-216', 'Amuria'),
-    array(800, 'UG-319', 'Amuru'),
-    array(800, 'UG-302', 'Apac'),
-    array(800, 'UG-303', 'Arua'),
-    array(800, 'UG-217', 'Budaka'),
-    array(800, 'UG-223', 'Bududa'),
-    array(800, 'UG-201', 'Bugiri'),
-    array(800, 'UG-224', 'Bukedea'),
-    array(800, 'UG-218', 'Bukwa'),
-    array(800, 'UG-419', 'Buliisa'),
-    array(800, 'UG-401', 'Bundibugyo'),
-    array(800, 'UG-402', 'Bushenyi'),
-    array(800, 'UG-202', 'Busia'),
-    array(800, 'UG-219', 'Butaleja'),
-    array(800, 'UG-318', 'Dokolo'),
-    array(800, 'UG-304', 'Gulu'),
-    array(800, 'UG-403', 'Hoima'),
-    array(800, 'UG-416', 'Ibanda'),
-    array(800, 'UG-203', 'Iganga'),
-    array(800, 'UG-417', 'Isingiro'),
-    array(800, 'UG-204', 'Jinja'),
-    array(800, 'UG-315', 'Kaabong'),
-    array(800, 'UG-404', 'Kabale'),
-    array(800, 'UG-405', 'Kabarole'),
-    array(800, 'UG-213', 'Kaberamaido'),
-    array(800, 'UG-101', 'Kalangala'),
-    array(800, 'UG-220', 'Kaliro'),
-    array(800, 'UG-102', 'Kampala'),
-    array(800, 'UG-205', 'Kamuli'),
-    array(800, 'UG-413', 'Kamwenge'),
-    array(800, 'UG-414', 'Kanungu'),
-    array(800, 'UG-206', 'Kapchorwa'),
-    array(800, 'UG-406', 'Kasese'),
-    array(800, 'UG-207', 'Katakwi'),
-    array(800, 'UG-112', 'Kayunga'),
-    array(800, 'UG-407', 'Kibaale'),
-    array(800, 'UG-103', 'Kiboga'),
-    array(800, 'UG-418', 'Kiruhura'),
-    array(800, 'UG-408', 'Kisoro'),
-    array(800, 'UG-305', 'Kitgum'),
-    array(800, 'UG-316', 'Koboko'),
-    array(800, 'UG-306', 'Kotido'),
-    array(800, 'UG-208', 'Kumi'),
-    array(800, 'UG-415', 'Kyenjojo'),
-    array(800, 'UG-307', 'Lira'),
-    array(800, 'UG-104', 'Luwero'),
-    array(800, 'UG-116', 'Lyantonde'),
-    array(800, 'UG-221', 'Manafwa'),
-    array(800, 'UG-320', 'Maracha'),
-    array(800, 'UG-105', 'Masaka'),
-    array(800, 'UG-409', 'Masindi'),
-    array(800, 'UG-214', 'Mayuge'),
-    array(800, 'UG-209', 'Mbale'),
-    array(800, 'UG-410', 'Mbarara'),
-    array(800, 'UG-114', 'Mityana'),
-    array(800, 'UG-308', 'Moroto'),
-    array(800, 'UG-309', 'Moyo'),
-    array(800, 'UG-106', 'Mpigi'),
-    array(800, 'UG-107', 'Mubende'),
-    array(800, 'UG-108', 'Mukono'),
-    array(800, 'UG-311', 'Nakapiripirit'),
-    array(800, 'UG-115', 'Nakaseke'),
-    array(800, 'UG-109', 'Nakasongola'),
-    array(800, 'UG-222', 'Namutumba'),
-    array(800, 'UG-310', 'Nebbi'),
-    array(800, 'UG-411', 'Ntungamo'),
-    array(800, 'UG-321', 'Oyam'),
-    array(800, 'UG-312', 'Pader'),
-    array(800, 'UG-210', 'Pallisa'),
-    array(800, 'UG-110', 'Rakai'),
-    array(800, 'UG-412', 'Rukungiri'),
-    array(800, 'UG-111', 'Sembabule'),
-    array(800, 'UG-215', 'Sironko'),
-    array(800, 'UG-211', 'Soroti'),
-    array(800, 'UG-212', 'Tororo'),
-    array(800, 'UG-113', 'Wakiso'),
-    array(800, 'UG-313', 'Yumbe'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    800,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/ukraine_804_1.cif b/uc_store/countries/ukraine_804_1.cif
deleted file mode 100644
index 3ec6a7e..0000000
--- a/uc_store/countries/ukraine_804_1.cif
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-function ukraine_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 804,
-      'country_name' => 'Ukraine',
-      'country_iso_code_2' => 'UA',
-      'country_iso_code_3' => 'UKR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(804, 'VN', 'Вінницька область'),
-    array(804, 'LT', 'Волинська область'),
-    array(804, 'DP', 'Дніпропетровська область'),
-    array(804, 'DN', 'Донецька область'),
-    array(804, 'ZT', 'Житомирська область'),
-    array(804, 'UZ', 'Закарпатська область'),
-    array(804, 'ZP', 'Запорізька область'),
-    array(804, 'IF', 'Івано-Франківська область'),
-    array(804, 'KV', 'Київська область'),
-    array(804, 'KR', 'Кіровоградська область'),
-    array(804, 'LG', 'Луганська область'),
-    array(804, 'LV', 'Львівська область'),
-    array(804, 'MK', 'Миколаївська область'),
-    array(804, 'OD', 'Одеська область'),
-    array(804, 'PL', 'Полтавська область'),
-    array(804, 'RV', 'Рівненська область'),
-    array(804, 'SM', 'Сумська область'),
-    array(804, 'TE', 'Тернопільська область'),
-    array(804, 'KH', 'Харківська область'),
-    array(804, 'KS', 'Херсонська область'),
-    array(804, 'KM', 'Хмельницька область'),
-    array(804, 'CK', 'Черкаська область'),
-    array(804, 'CN', 'Чернігівська область'),
-    array(804, 'CV', 'Чернівецька область'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    804,
-    "!country_name\r\n".
-    "!zone_name\r\n".
-    "!city\r\n".
-    "!postal_code\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!company\r\n".
-    "!first_name !last_name"
-  );
-}
diff --git a/uc_store/countries/united_arab_emirates_784_1.cif b/uc_store/countries/united_arab_emirates_784_1.cif
deleted file mode 100644
index b852f2f..0000000
--- a/uc_store/countries/united_arab_emirates_784_1.cif
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-function united_arab_emirates_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 784,
-      'country_name' => 'United Arab Emirates',
-      'country_iso_code_2' => 'AE',
-      'country_iso_code_3' => 'ARE',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(784, 'DXB', 'Dubai'),
-    array(784, 'SHJ', 'Sharjah'),
-    array(784, 'ABU', 'Abu dhabi'),
-    array(784, 'UAQ', 'UM Al Quwain'),
-    array(784, 'FUJ', 'Fujairah'),
-    array(784, 'Ala', 'Al Ain'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    784,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/united_kingdom_826_2.cif b/uc_store/countries/united_kingdom_826_2.cif
deleted file mode 100644
index 2c43327..0000000
--- a/uc_store/countries/united_kingdom_826_2.cif
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function united_kingdom_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 826,
-      'country_name' => 'United Kingdom',
-      'country_iso_code_2' => 'GB',
-      'country_iso_code_3' => 'GBR',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(826, 'ABN', 'Aberdeen'),
-    array(826, 'ABNS', 'Aberdeenshire'),
-    array(826, 'ANG', 'Anglesey'),
-    array(826, 'AGS', 'Angus'),
-    array(826, 'ARY', 'Argyll and Bute'),
-    array(826, 'AVON', 'Avon'),
-    array(826, 'BEDS', 'Bedfordshire'),
-    array(826, 'BERKS', 'Berkshire'),
-    array(826, 'BLA', 'Blaenau Gwent'),
-    array(826, 'BRI', 'Bridgend'),
-    array(826, 'BSTL', 'Bristol'),
-    array(826, 'BUCKS', 'Buckinghamshire'),
-    array(826, 'CAE', 'Caerphilly'),
-    array(826, 'CAMBS', 'Cambridgeshire'),
-    array(826, 'CDF', 'Cardiff'),
-    array(826, 'CARM', 'Carmarthenshire'),
-    array(826, 'CDGN', 'Ceredigion'),
-    array(826, 'CHES', 'Cheshire'),
-    array(826, 'CLACK', 'Clackmannanshire'),
-    array(826, 'CLVD', 'Cleveland'),
-    array(826, 'CON', 'Conwy'),
-    array(826, 'CORN', 'Cornwall'),
-    array(826, 'COAN', 'County Antrim'),
-    array(826, 'COAR', 'County Armagh'),
-    array(826, 'CODN', 'County Down'),
-    array(826, 'COFE', 'County Fermanagh'),
-    array(826, 'COLO', 'County Londonderry'),
-    array(826, 'COTY', 'County Tyrone'),
-    array(826, 'CMA', 'Cumbria'),
-    array(826, 'DNBG', 'Denbighshire'),
-    array(826, 'DERBY', 'Derbyshire'),
-    array(826, 'DVN', 'Devon'),
-    array(826, 'DOR', 'Dorset'),
-    array(826, 'DGL', 'Dumfries and Galloway'),
-    array(826, 'DUND', 'Dundee'),
-    array(826, 'DHM', 'Durham'),
-    array(826, 'ARYE', 'East Ayrshire'),
-    array(826, 'DUNBE', 'East Dunbartonshire'),
-    array(826, 'LOTE', 'East Lothian'),
-    array(826, 'RENE', 'East Renfrewshire'),
-    array(826, 'ERYS', 'East Riding of Yorkshire'),
-    array(826, 'SXE', 'East Sussex'),
-    array(826, 'EDIN', 'Edinburgh'),
-    array(826, 'ESX', 'Essex'),
-    array(826, 'FALK', 'Falkirk'),
-    array(826, 'FFE', 'Fife'),
-    array(826, 'FLINT', 'Flintshire'),
-    array(826, 'GLAS', 'Glasgow'),
-    array(826, 'GLOS', 'Gloucestershire'),
-    array(826, 'MAN', 'Greater Manchester'),
-    array(826, 'GDD', 'Gwynedd'),
-    array(826, 'HANTS', 'Hampshire'),
-    array(826, 'HWR', 'Herefordshire'),
-    array(826, 'HERTS', 'Hertfordshire'),
-    array(826, 'HLD', 'Highlands'),
-    array(826, 'IVER', 'Inverclyde'),
-    array(826, 'IOW', 'Isle of Wight'),
-    array(826, 'IOS', 'Isles of Scilly'),
-    array(826, 'KNT', 'Kent'),
-    array(826, 'LANCS', 'Lancashire'),
-    array(826, 'LEICS', 'Leicestershire'),
-    array(826, 'LINCS', 'Lincolnshire'),
-    array(826, 'LDN', 'London'),
-    array(826, 'MSY', 'Merseyside'),
-    array(826, 'MERT', 'Merthyr Tydfil'),
-    array(826, 'MIDDX', 'Middlesex'),
-    array(826, 'MLOT', 'Midlothian'),
-    array(826, 'MMOUTH', 'Monmouthshire'),
-    array(826, 'MORAY', 'Moray'),
-    array(826, 'NPRTAL', 'Neath Port Talbot'),
-    array(826, 'NEWPT', 'Newport'),
-    array(826, 'NOR', 'Norfolk'),
-    array(826, 'ARYN', 'North Ayrshire'),
-    array(826, 'LANN', 'North Lanarkshire'),
-    array(826, 'YSN', 'North Yorkshire'),
-    array(826, 'NHM', 'Northamptonshire'),
-    array(826, 'NLD', 'Northumberland'),
-    array(826, 'NOT', 'Nottinghamshire'),
-    array(826, 'ORK', 'Orkney Islands'),
-    array(826, 'OFE', 'Oxfordshire'),
-    array(826, 'PEM', 'Pembrokeshire'),
-    array(826, 'PERTH', 'Perth and Kinross'),
-    array(826, 'PWS', 'Powys'),
-    array(826, 'REN', 'Renfrewshire'),
-    array(826, 'RHON', 'Rhondda Cynon Taff'),
-    array(826, 'RUT', 'Rutland'),
-    array(826, 'BOR', 'Scottish Borders'),
-    array(826, 'SHET', 'Shetland Islands'),
-    array(826, 'SPE', 'Shropshire'),
-    array(826, 'SOM', 'Somerset'),
-    array(826, 'ARYS', 'South Ayrshire'),
-    array(826, 'LANS', 'South Lanarkshire'),
-    array(826, 'YSS', 'South Yorkshire'),
-    array(826, 'SFD', 'Staffordshire'),
-    array(826, 'STIR', 'Stirling'),
-    array(826, 'SFK', 'Suffolk'),
-    array(826, 'SRY', 'Surrey'),
-    array(826, 'SWAN', 'Swansea'),
-    array(826, 'TORF', 'Torfaen'),
-    array(826, 'TWR', 'Tyne and Wear'),
-    array(826, 'VGLAM', 'Vale of Glamorgan'),
-    array(826, 'WARKS', 'Warwickshire'),
-    array(826, 'WDUN', 'West Dunbartonshire'),
-    array(826, 'WLOT', 'West Lothian'),
-    array(826, 'WMD', 'West Midlands'),
-    array(826, 'SXW', 'West Sussex'),
-    array(826, 'YSW', 'West Yorkshire'),
-    array(826, 'WIL', 'Western Isles'),
-    array(826, 'WLT', 'Wiltshire'),
-    array(826, 'WORCS', 'Worcestershire'),
-    array(826, 'WRX', 'Wrexham')
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    826,
-    "!first_name !last_name\r\n".
-    "!company\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city\r\n".
-    "!postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-/**
- * Implements hook_update() with $version being the only argument.
- * Add a new case for each version update, and be sure to always include the
- * latest changes in the install function.
- */
-function united_kingdom_update($version) {
-  switch ($version) {
-    case 2:
-      $zones = array(
-        array(826, 'AVON', 'Avon'),
-        array(826, 'COAN', 'County Antrim'),
-        array(826, 'COAR', 'County Armagh'),
-        array(826, 'CODN', 'County Down'),
-        array(826, 'COFE', 'County Fermanagh'),
-        array(826, 'COLO', 'County Londonderry'),
-        array(826, 'COTY', 'County Tyrone'),
-        array(826, 'CLVD', 'Cleveland'),
-        array(826, 'IOS', 'Isles of Scilly'),
-        array(826, 'MIDDX', 'Middlesex'),
-      );
-
-      $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-      foreach ($zones as $zone) {
-        $query->values($zone);
-      }
-      $query->execute();
-
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Greater Manchester'))
-        ->condition('zone_country_id', 826)
-        ->condition('zone_name', 'Manchester')
-        ->execute();
-
-      uc_set_address_format(
-        826,
-        "!first_name !last_name\r\n".
-        "!company\r\n".
-        "!street1\r\n".
-        "!street2\r\n".
-        "!city\r\n".
-        "!postal_code\r\n".
-        "!country_name_if"
-      );
-      break;
-  }
-}
diff --git a/uc_store/countries/united_states_840_1.cif b/uc_store/countries/united_states_840_1.cif
deleted file mode 100644
index 5262851..0000000
--- a/uc_store/countries/united_states_840_1.cif
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-function united_states_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 840,
-      'country_name' => 'United States',
-      'country_iso_code_2' => 'US',
-      'country_iso_code_3' => 'USA',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(840, 'AL', 'Alabama'),
-    array(840, 'AK', 'Alaska'),
-    array(840, 'AS', 'American Samoa'),
-    array(840, 'AZ', 'Arizona'),
-    array(840, 'AR', 'Arkansas'),
-    array(840, 'AF', 'Armed Forces Africa'),
-    array(840, 'AA', 'Armed Forces Americas'),
-    array(840, 'AC', 'Armed Forces Canada'),
-    array(840, 'AE', 'Armed Forces Europe'),
-    array(840, 'AM', 'Armed Forces Middle East'),
-    array(840, 'AP', 'Armed Forces Pacific'),
-    array(840, 'CA', 'California'),
-    array(840, 'CO', 'Colorado'),
-    array(840, 'CT', 'Connecticut'),
-    array(840, 'DE', 'Delaware'),
-    array(840, 'DC', 'District of Columbia'),
-    array(840, 'FM', 'Federated States Of Micronesia'),
-    array(840, 'FL', 'Florida'),
-    array(840, 'GA', 'Georgia'),
-    array(840, 'GU', 'Guam'),
-    array(840, 'HI', 'Hawaii'),
-    array(840, 'ID', 'Idaho'),
-    array(840, 'IL', 'Illinois'),
-    array(840, 'IN', 'Indiana'),
-    array(840, 'IA', 'Iowa'),
-    array(840, 'KS', 'Kansas'),
-    array(840, 'KY', 'Kentucky'),
-    array(840, 'LA', 'Louisiana'),
-    array(840, 'ME', 'Maine'),
-    array(840, 'MH', 'Marshall Islands'),
-    array(840, 'MD', 'Maryland'),
-    array(840, 'MA', 'Massachusetts'),
-    array(840, 'MI', 'Michigan'),
-    array(840, 'MN', 'Minnesota'),
-    array(840, 'MS', 'Mississippi'),
-    array(840, 'MO', 'Missouri'),
-    array(840, 'MT', 'Montana'),
-    array(840, 'NE', 'Nebraska'),
-    array(840, 'NV', 'Nevada'),
-    array(840, 'NH', 'New Hampshire'),
-    array(840, 'NJ', 'New Jersey'),
-    array(840, 'NM', 'New Mexico'),
-    array(840, 'NY', 'New York'),
-    array(840, 'NC', 'North Carolina'),
-    array(840, 'ND', 'North Dakota'),
-    array(840, 'MP', 'Northern Mariana Islands'),
-    array(840, 'OH', 'Ohio'),
-    array(840, 'OK', 'Oklahoma'),
-    array(840, 'OR', 'Oregon'),
-    array(840, 'PW', 'Palau'),
-    array(840, 'PA', 'Pennsylvania'),
-    array(840, 'PR', 'Puerto Rico'),
-    array(840, 'RI', 'Rhode Island'),
-    array(840, 'SC', 'South Carolina'),
-    array(840, 'SD', 'South Dakota'),
-    array(840, 'TN', 'Tennessee'),
-    array(840, 'TX', 'Texas'),
-    array(840, 'UT', 'Utah'),
-    array(840, 'VT', 'Vermont'),
-    array(840, 'VI', 'Virgin Islands'),
-    array(840, 'VA', 'Virginia'),
-    array(840, 'WA', 'Washington'),
-    array(840, 'WV', 'West Virginia'),
-    array(840, 'WI', 'Wisconsin'),
-    array(840, 'WY', 'Wyoming'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  // Have to call variable_set() instead of uc_set_address_format()
-  // because the Canada .cif file is loaded during the installation
-  // of the uc_store module, before uc_set_address_format() is available
-  // to use.
-  /*
-  variable_set(
-    'uc_address_format_840',
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-  */
-}
diff --git a/uc_store/countries/united_states_minor_outlying_islands_581_1.cif b/uc_store/countries/united_states_minor_outlying_islands_581_1.cif
deleted file mode 100644
index d655e6f..0000000
--- a/uc_store/countries/united_states_minor_outlying_islands_581_1.cif
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-function united_states_minor_outlying_islands_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 581,
-      'country_name' => 'United States Minor Outlying Islands',
-      'country_iso_code_2' => 'UM',
-      'country_iso_code_3' => 'UMI',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(581, 'UM-81', 'Baker Island'),
-    array(581, 'UM-84', 'Howland Island'),
-    array(581, 'UM-86', 'Jarvis Island'),
-    array(581, 'UM-67', 'Johnston Atoll'),
-    array(581, 'UM-89', 'Kingman Reef'),
-    array(581, 'UM-71', 'Midway Islands'),
-    array(581, 'UM-76', 'Navassa Island'),
-    array(581, 'UM-95', 'Palmyra Atoll'),
-    array(581, 'UM-79', 'Wake Island'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    581,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/uruguay_858_1.cif b/uc_store/countries/uruguay_858_1.cif
deleted file mode 100644
index 210702e..0000000
--- a/uc_store/countries/uruguay_858_1.cif
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function uruguay_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 858,
-      'country_name' => 'Uruguay',
-      'country_iso_code_2' => 'UY',
-      'country_iso_code_3' => 'URY',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(858, 'AR', 'Artigas'),
-    array(858, 'CA', 'Canelones'),
-    array(858, 'CL', 'Cerro Largo'),
-    array(858, 'CO', 'Colonia'),
-    array(858, 'DU', 'Durazno'),
-    array(858, 'FS', 'Flores'),
-    array(858, 'FD', 'Florida'),
-    array(858, 'LA', 'Lavalleja'),
-    array(858, 'MA', 'Maldonado'),
-    array(858, 'MO', 'Montevideo'),
-    array(858, 'PA', 'Paysandu'),
-    array(858, 'RN', 'Rio Negro'),
-    array(858, 'RV', 'Rivera'),
-    array(858, 'RO', 'Rocha'),
-    array(858, 'SA', 'Salto'),
-    array(858, 'SJ', 'San Jose'),
-    array(858, 'SO', 'Soriano'),
-    array(858, 'TA', 'Tacuarembo'),
-    array(858, 'TT', 'Treinta y Tres'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    858,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/uzbekistan_860_1.cif b/uc_store/countries/uzbekistan_860_1.cif
deleted file mode 100644
index 8a53021..0000000
--- a/uc_store/countries/uzbekistan_860_1.cif
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-function uzbekistan_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 860,
-      'country_name' => 'Uzbekistan',
-      'country_iso_code_2' => 'UZ',
-      'country_iso_code_3' => 'UZB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(860, 'UZ-TK', 'Toshkent'),
-    array(860, 'UZ-AN', 'Andijon'),
-    array(860, 'UZ-BU', 'Buxoro'),
-    array(860, 'UZ-FA', 'Farg‘ona'),
-    array(860, 'UZ-JI', 'Jizzax'),
-    array(860, 'UZ-NG', 'Namangan'),
-    array(860, 'UZ-NW', 'Navoiy'),
-    array(860, 'UZ-QA', 'Qashqadaryo'),
-    array(860, 'UZ-SA', 'Samarqand'),
-    array(860, 'UZ-SI', 'Sirdaryo'),
-    array(860, 'UZ-SU', 'Surxondaryo'),
-    array(860, 'UZ-TO', 'Toshkent'),
-    array(860, 'UZ-XO', 'Xorazm'),
-    array(860, 'UZ-QR', 'Qoraqalpog‘iston Respublikasi'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    860,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/vanuatu_548_1.cif b/uc_store/countries/vanuatu_548_1.cif
deleted file mode 100644
index 8f28cd0..0000000
--- a/uc_store/countries/vanuatu_548_1.cif
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-function vanuatu_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 548,
-      'country_name' => 'Vanuatu',
-      'country_iso_code_2' => 'VU',
-      'country_iso_code_3' => 'VUT',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(548, 'VU-MAP', 'Malampa'),
-    array(548, 'VU-PAM', 'Pénama'),
-    array(548, 'VU-SAM', 'Sanma'),
-    array(548, 'VU-SEE', 'Shéfa'),
-    array(548, 'VU-TAE', 'Taféa'),
-    array(548, 'VU-TOB', 'Torba'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    548,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/venezuela_862_2.cif b/uc_store/countries/venezuela_862_2.cif
deleted file mode 100644
index 5486991..0000000
--- a/uc_store/countries/venezuela_862_2.cif
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function venezuela_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 862,
-      'country_name' => 'Venezuela, Bolivarian Republic of',
-      'country_iso_code_2' => 'VE',
-      'country_iso_code_3' => 'VEN',
-      'version' => 2,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(862, 'AM', 'Amazonas'),
-    array(862, 'AN', 'Anzoátegui'),
-    array(862, 'AP', 'Apure'),
-    array(862, 'AR', 'Aragua'),
-    array(862, 'BA', 'Barinas'),
-    array(862, 'BO', 'Bolívar'),
-    array(862, 'CA', 'Carabobo'),
-    array(862, 'CO', 'Cojedes'),
-    array(862, 'DA', 'Delta Amacuro'),
-    array(862, 'DF', 'Dependencias Federales'),
-    array(862, 'DC', 'Distrito Capital'),
-    array(862, 'FA', 'Falcón'),
-    array(862, 'GU', 'Guárico'),
-    array(862, 'LA', 'Lara'),
-    array(862, 'ME', 'Mérida'),
-    array(862, 'MI', 'Miranda'),
-    array(862, 'MO', 'Monagas'),
-    array(862, 'NE', 'Nueva Esparta'),
-    array(862, 'PO', 'Portuguesa'),
-    array(862, 'SU', 'Sucre'),
-    array(862, 'TA', 'Táchira'),
-    array(862, 'TR', 'Trujillo'),
-    array(862, 'VA', 'Vargas'),
-    array(862, 'YA', 'Yaracuy'),
-    array(862, 'ZU', 'Zulia'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    862,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function venezuela_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => 'Venezuela, Bolivarian Republic of'))
-        ->condition('country_id', 862)
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/vietnam_704_2.cif b/uc_store/countries/vietnam_704_2.cif
deleted file mode 100644
index fa6bc0e..0000000
--- a/uc_store/countries/vietnam_704_2.cif
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-function vietnam_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 704,
-      'country_name' => 'Viet Nam',
-      'country_iso_code_2' => 'VN',
-      'country_iso_code_3' => 'VNM',
-      'version' => 2,
-    ))
-    ->execute();
-
-  $zones = array(
-    array(704, 'AG', 'An Giang'),
-    array(704, 'BV', 'Ba Ria-Vung Tau'),
-    array(704, 'BK', 'Bac Can'),
-    array(704, 'BG', 'Bac Giang'),
-    array(704, 'BL', 'Bac Lieu'),
-    array(704, 'BN', 'Bac Ninh'),
-    array(704, 'BR', 'Ben Tre'),
-    array(704, 'BD', 'Binh Dinh'),
-    array(704, 'BI', 'Binh Duong'),
-    array(704, 'BP', 'Binh Phuoc'),
-    array(704, 'BU', 'Binh Thuan'),
-    array(704, 'CM', 'Ca Mau'),
-    array(704, 'CN', 'Can Tho'),
-    array(704, 'CB', 'Cao Bang'),
-    array(704, 'DA', 'Da Nang'),
-    array(704, 'DC', 'Dac Lac'),
-    array(704, 'DO', 'Dak Nong'),
-    array(704, 'DB', 'Dien Bien'),
-    array(704, 'DN', 'Dong Nai'),
-    array(704, 'DT', 'Dong Thap'),
-    array(704, 'GL', 'Gia Lai'),
-    array(704, 'HG', 'Ha Giang'),
-    array(704, 'HM', 'Ha Nam'),
-    array(704, 'HA', 'Ha Tay'),
-    array(704, 'HT', 'Ha Tinh'),
-    array(704, 'HD', 'Hai Duong'),
-    array(704, 'HP', 'Haiphong'),
-    array(704, 'HN', 'Ha Noi'),
-    array(704, 'HU', 'Hau Giang'),
-    array(704, 'HC', 'Ho Chi Minh'),
-    array(704, 'HO', 'Hoa Binh'),
-    array(704, 'HY', 'Hung Yen'),
-    array(704, 'KH', 'Khanh Hoa'),
-    array(704, 'KG', 'Kien Giang'),
-    array(704, 'KT', 'Kon Tum'),
-    array(704, 'LI', 'Lai Chau'),
-    array(704, 'LD', 'Lam Dong'),
-    array(704, 'LS', 'Lang Son'),
-    array(704, 'LO', 'Lao Cai'),
-    array(704, 'LA', 'Long An'),
-    array(704, 'ND', 'Nam Dinh'),
-    array(704, 'NA', 'Nghe An'),
-    array(704, 'NB', 'Ninh Binh'),
-    array(704, 'NT', 'Ninh Thuan'),
-    array(704, 'PT', 'Phu Tho'),
-    array(704, 'PY', 'Phu Yen'),
-    array(704, 'QB', 'Quang Binh'),
-    array(704, 'QM', 'Quang Nam'),
-    array(704, 'QG', 'Quang Ngai'),
-    array(704, 'QN', 'Quang Ninh'),
-    array(704, 'QT', 'Quang Tri'),
-    array(704, 'ST', 'Soc Trang'),
-    array(704, 'SL', 'Son La'),
-    array(704, 'TN', 'Tay Ninh'),
-    array(704, 'TB', 'Thai Binh'),
-    array(704, 'TY', 'Thai Nguyen'),
-    array(704, 'TH', 'Thanh Hoa'),
-    array(704, 'TT', 'Thua Thien-Hue'),
-    array(704, 'TG', 'Tien Giang'),
-    array(704, 'TV', 'Tra Vinh'),
-    array(704, 'TQ', 'Tuyen Quang'),
-    array(704, 'VL', 'Vinh Long'),
-    array(704, 'VC', 'Vinh Phuc'),
-    array(704, 'YB', 'Yen Bai'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    704,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
-
-function vietnam_update($version) {
-  switch ($version) {
-    case 2:
-      // Correct ISO-3166-1 country name
-      db_update('uc_countries')
-        ->fields(array('country_name' => 'Viet Nam'))
-        ->condition('country_id', 704)
-        ->execute();
-
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Dak Nong'))
-        ->condition('zone_country_id', 704)
-        ->condition('zone_name', 'Dac Nong')
-        ->execute();
-
-      db_update('uc_zones')
-        ->fields(array('zone_name' => 'Ha Noi'))
-        ->condition('zone_country_id', 704)
-        ->condition('zone_name', 'Hanoi')
-        ->execute();
-
-      break;
-  }
-}
diff --git a/uc_store/countries/virgin_islands_british_92_1.cif b/uc_store/countries/virgin_islands_british_92_1.cif
deleted file mode 100644
index 7685ac3..0000000
--- a/uc_store/countries/virgin_islands_british_92_1.cif
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function virgin_islands_british_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 92,
-      'country_name' => 'Virgin Islands, British',
-      'country_iso_code_2' => 'VG',
-      'country_iso_code_3' => 'VGB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    92,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/virgin_islands_us_850_1.cif b/uc_store/countries/virgin_islands_us_850_1.cif
deleted file mode 100644
index dcb5a44..0000000
--- a/uc_store/countries/virgin_islands_us_850_1.cif
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function virgin_islands_us_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 850,
-      'country_name' => 'Virgin Islands, U.S.',
-      'country_iso_code_2' => 'VI',
-      'country_iso_code_3' => 'VIR',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    850,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city !zone_code !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/wallis_futuna_876_1.cif b/uc_store/countries/wallis_futuna_876_1.cif
deleted file mode 100644
index 757b6c8..0000000
--- a/uc_store/countries/wallis_futuna_876_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function wallis_futuna_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 876,
-      'country_name' => 'Wallis and Futuna',
-      'country_iso_code_2' => 'WF',
-      'country_iso_code_3' => 'WLF',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    876,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/western_sahara_732_1.cif b/uc_store/countries/western_sahara_732_1.cif
deleted file mode 100644
index 3a020a2..0000000
--- a/uc_store/countries/western_sahara_732_1.cif
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function western_sahara_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 732,
-      'country_name' => 'Western Sahara',
-      'country_iso_code_2' => 'EH',
-      'country_iso_code_3' => 'ESH',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // No zones
-
-  // Set address format
-  uc_set_address_format(
-    732,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/yemen_887_1.cif b/uc_store/countries/yemen_887_1.cif
deleted file mode 100644
index c30ae9d..0000000
--- a/uc_store/countries/yemen_887_1.cif
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-function yemen_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 887,
-      'country_name' => 'Yemen',
-      'country_iso_code_2' => 'YE',
-      'country_iso_code_3' => 'YEM',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(887, 'YE-SA', "Şan‘ā' [city]"),
-    array(887, 'YE-AB', 'Abyān'),
-    array(887, 'YE-AD', "'Adan"),
-    array(887, 'YE-DA', "Aḑ Ḑāli'"),
-    array(887, 'YE-BA', "Al Bayḑā'"),
-    array(887, 'YE-HU', 'Al Ḩudaydah'),
-    array(887, 'YE-JA', 'Al Jawf'),
-    array(887, 'YE-MR', 'Al Mahrah'),
-    array(887, 'YE-MW', 'Al Maḩwīt'),
-    array(887, 'YE-AM', "'Amrān"),
-    array(887, 'YE-DH', 'Dhamār'),
-    array(887, 'YE-HD', 'Ḩaḑramawt'),
-    array(887, 'YE-HJ', 'Ḩajjah'),
-    array(887, 'YE-IB', 'Ibb'),
-    array(887, 'YE-LA', 'Laḩij'),
-    array(887, 'YE-MA', "Ma'rib"),
-    array(887, 'YE-RA', 'Raymah'),
-    array(887, 'YE-SD', 'Şā‘dah'),
-    array(887, 'YE-SN', "Şan‘ā'"),
-    array(887, 'YE-SH', 'Shabwah'),
-    array(887, 'YE-TA', 'Tā‘izz'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    887,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/zambia_894_1.cif b/uc_store/countries/zambia_894_1.cif
deleted file mode 100644
index 18cfb91..0000000
--- a/uc_store/countries/zambia_894_1.cif
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-function zambia_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 894,
-      'country_name' => 'Zambia',
-      'country_iso_code_2' => 'ZM',
-      'country_iso_code_3' => 'ZMB',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(894, 'ZM-02', 'Central'),
-    array(894, 'ZM-08', 'Copperbelt'),
-    array(894, 'ZM-03', 'Eastern'),
-    array(894, 'ZM-04', 'Luapula'),
-    array(894, 'ZM-09', 'Lusaka'),
-    array(894, 'ZM-05', 'Northern'),
-    array(894, 'ZM-06', 'NorthWestern'),
-    array(894, 'ZM-07', 'Southern'),
-    array(894, 'ZM-01', 'Western'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    894,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city, !zone_name  !postal_code\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/countries/zimbabwe_716_1.cif b/uc_store/countries/zimbabwe_716_1.cif
deleted file mode 100644
index b2b7811..0000000
--- a/uc_store/countries/zimbabwe_716_1.cif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Implements hook_install() using the name of the country as the base of
- * the function name.
- */
-function zimbabwe_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_insert('uc_countries')
-    ->fields(array(
-      'country_id' => 716,
-      'country_name' => 'Zimbabwe',
-      'country_iso_code_2' => 'ZW',
-      'country_iso_code_3' => 'ZWE',
-      'version' => 1,
-    ))
-    ->execute();
-
-  // Make the entries in the zones table.  Use %d for the zone_id and the
-  // function uc_get_zone_ids($num) as the second argument for db_query() where
-  // $num is the number of zones in the INSERT query.
-  // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  $zones = array(
-    array(716, 'BW', 'Bulawayo'),
-    array(716, 'HR', 'Harare'),
-    array(716, 'MC', 'Manicaland'),
-    array(716, 'MSC', 'Mashonaland Central'),
-    array(716, 'MSE', 'Mashonaland East'),
-    array(716, 'MSW', 'Mashonaland West'),
-    array(716, 'MV', 'Masvingo'),
-    array(716, 'MBN', 'Matabeleland North'),
-    array(716, 'MBS', 'Matabeleland South'),
-    array(716, 'ML', 'Midlands'),
-  );
-
-  $query = db_insert('uc_zones')->fields(array('zone_country_id', 'zone_code', 'zone_name'));
-  foreach ($zones as $zone) {
-    $query->values($zone);
-  }
-  $query->execute();
-
-  // Set address format
-  uc_set_address_format(
-    716,
-    "!company\r\n".
-    "!first_name !last_name\r\n".
-    "!street1\r\n".
-    "!street2\r\n".
-    "!city\r\n".
-    "!country_name_if"
-  );
-}
diff --git a/uc_store/lib/Drupal/uc_store/Address.php b/uc_store/lib/Drupal/uc_store/Address.php
index af1870a..e35de92 100644
--- a/uc_store/lib/Drupal/uc_store/Address.php
+++ b/uc_store/lib/Drupal/uc_store/Address.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\uc_store;
 
+use Drupal\Component\Utility\String;
 use Drupal\Component\Utility\Unicode;
 
 /**
@@ -33,10 +34,10 @@ class Address {
   public $city = '';
 
   /** State, provence, or region id. */
-  public $zone = 0;
+  public $zone = '';
 
-  /** ISO 3166-1 3-digit numeric country code. */
-  public $country = 0;
+  /** Country entity. */
+  public $country = 'US';
 
   /** Postal code. */
   public $postal_code = '';
@@ -49,18 +50,6 @@ class Address {
 
 
   /**
-   * Constructor.
-   *
-   * @param $country
-   *   ISO 3166-1 3-digit numeric country code. Defaults to the store country.
-   */
-  public function __construct($country = NULL) {
-    if (!$this->country) {
-      $this->country = isset($country) ? $country : \Drupal::config('uc_store.settings')->get('address.country');
-    }
-  }
-
-  /**
    * Compares two Address objects to determine if they represent the same
    * physical address.
    *
@@ -120,39 +109,42 @@ class Address {
    *   A formatted string containing the address.
    */
   public function __toString() {
-    $result = db_query('SELECT * FROM {uc_zones} WHERE zone_id = :id', array(':id' => $this->zone));
-    if (!($zone_data = $result->fetchAssoc())) {
-      $zone_data = array('zone_code' => t('N/A'), 'zone_name' => t('Unknown'));
+    $variables = array(
+      '!company' => $this->company,
+      '!first_name' => $this->first_name,
+      '!last_name' => $this->last_name,
+      '!street1' => $this->street1,
+      '!street2' => $this->street2,
+      '!city' => $this->city,
+      '!postal_code' => $this->postal_code,
+    );
+
+    $country = entity_load('uc_country', $this->country);
+    if ($country) {
+      $variables += array(
+        '!zone_code' => $this->zone ?: t('N/A'),
+        '!zone_name' => isset($country->zones[$this->zone]) ? $country->zones[$this->zone] : t('Unknown'),
+        '!country_name' => t($country->name),
+        '!country_code2' => $country->iso2,
+        '!country_code3' => $country->iso3,
+      );
+      $format = $country->format;
     }
-    $result = db_query('SELECT * FROM {uc_countries} WHERE country_id = :id', array(':id' => $this->country));
-    if (!($country_data = $result->fetchAssoc())) {
-      $country_data = array(
-        'country_name' => t('Unknown'),
-        'country_iso_code_2' => t('N/A'),
-        'country_iso_code_3' => t('N/A'),
+    else {
+      $variables += array(
+        '!zone_code' => t('N/A'),
+        '!zone_name' => t('Unknown'),
+        '!country_name' => t('Unknown'),
+        '!country_code2' => t('N/A'),
+        '!country_code3' => t('N/A'),
       );
+      $format = "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if";
     }
 
-    $variables = array(
-      "\r\n" => '<br />',
-      '!company' => check_plain($this->company),
-      '!first_name' => check_plain($this->first_name),
-      '!last_name' => check_plain($this->last_name),
-      '!street1' => check_plain($this->street1),
-      '!street2' => check_plain($this->street2),
-      '!city' => check_plain($this->city),
-      '!zone_code' => $zone_data['zone_code'],
-      '!zone_name' => $zone_data['zone_name'],
-      '!postal_code' => check_plain($this->postal_code),
-      '!country_name' => t($country_data['country_name']),
-      '!country_code2' => $country_data['country_iso_code_2'],
-      '!country_code3' => $country_data['country_iso_code_3'],
-    );
-
     if (uc_store_default_country() != $this->country) {
-      $variables['!country_name_if'] = t($country_data['country_name']);
-      $variables['!country_code2_if'] = $country_data['country_iso_code_2'];
-      $variables['!country_code3_if'] = $country_data['country_iso_code_3'];
+      $variables['!country_name_if'] = $variables['!country_name'];
+      $variables['!country_code2_if'] = $variables['!country_code2'];
+      $variables['!country_code3_if'] = $variables['!country_code3'];
     }
     else {
       $variables['!country_name_if']  = '';
@@ -160,40 +152,16 @@ class Address {
       $variables['!country_code3_if'] = '';
     }
 
-    $format = variable_get('uc_address_format_' . $this->country, '');
-    if (empty($format)) {
-      $format = "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if";
-    }
-    $address = strtr($format, $variables);
-    $address = strtr($address, array("\n" => '<br />'));
-
-    $match = array('`^<br( /)?>`', '`<br( /)?>$`', '`<br( /)?>(\s*|[\s*<br( /)?>\s*]+)<br( /)?>`', '`<br( /)?><br( /)?>`', '`<br( /)?>, N/A`');
-    $replace = array('', '', '<br />', '<br />', '', '');
-    $address = preg_replace($match, $replace, $address);
+    $address = String::checkPlain(strtr($format, $variables));
+    $address = trim(preg_replace(array("/\r/", "/\n+/"), array('', "\n"), $address), "\n");
 
     if (\Drupal::config('uc_store.settings')->get('capitalize_address')) {
       $address = Unicode::strtoupper($address);
     }
 
-    return $address;
-  }
-
-  /**
-   * PHP magic method to use in relation with var_export().
-   *
-   * Created for strongarm compatibility.
-   *
-   * @param array $data
-   *   Data to import
-   */
-  public static function __set_state($data) {
-    $obj = new self;
+    $address = nl2br($address);
 
-    foreach ($data as $key => $val) {
-      $obj->$key = $val;
-    }
-
-    return $obj;
+    return $address;
   }
 
 }
diff --git a/uc_store/lib/Drupal/uc_store/CountryController.php b/uc_store/lib/Drupal/uc_store/CountryController.php
new file mode 100644
index 0000000..dbbabf9
--- /dev/null
+++ b/uc_store/lib/Drupal/uc_store/CountryController.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\uc_store\CountryController.
+ */
+
+namespace Drupal\uc_store;
+
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\uc_store\Entity\Country;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+
+/**
+ * Route controller class for countries.
+ */
+class CountryController extends ControllerBase {
+
+  /**
+   * Enables a country.
+   *
+   * @param \Drupal\uc_store\Entity\Country $uc_country
+   *   The country object to enable.
+   *
+   * @return \Symfony\Component\HttpFoundation\RedirectResponse
+   *   A redirect response to the country listing page.
+   */
+  function enable(Country $uc_country) {
+    $uc_country->enable()->save();
+
+    drupal_set_message($this->t('The country %label has been enabled.', array('%label' => $uc_country->label())));
+
+    return new RedirectResponse(url('admin/store/settings/countries', array('absolute' => TRUE)));
+  }
+
+  /**
+   * Disables a country.
+   *
+   * @param \Drupal\uc_store\Entity\Country $uc_country
+   *   The country object to disable.
+   *
+   * @return \Symfony\Component\HttpFoundation\RedirectResponse
+   *   A redirect response to the country listing page.
+   */
+  function disable(Country $uc_country) {
+    $uc_country->disable()->save();
+
+    drupal_set_message($this->t('The country %label has been disabled.', array('%label' => $uc_country->label())));
+
+    return new RedirectResponse(url('admin/store/settings/countries', array('absolute' => TRUE)));
+  }
+
+}
diff --git a/uc_store/lib/Drupal/uc_store/CountryFormController.php b/uc_store/lib/Drupal/uc_store/CountryFormController.php
new file mode 100644
index 0000000..9562a25
--- /dev/null
+++ b/uc_store/lib/Drupal/uc_store/CountryFormController.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\uc_store\CountryFormController.
+ */
+
+namespace Drupal\uc_store;
+
+use Drupal\Core\Entity\EntityFormController;
+
+/**
+ * Form controller for country forms.
+ */
+class CountryFormController extends EntityFormController {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, array &$form_state) {
+    $form = parent::form($form, $form_state);
+
+    $country = $this->entity;
+
+    $form['#title'] = $this->t('Edit %country', array('%country' => $country->label()));
+
+    $form['name'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Name'),
+      '#default_value' => $country->name,
+    );
+
+    $form['format'] = array(
+      '#type' => 'textarea',
+      '#title' => t('Address format'),
+      '#default_value' => $country->format,
+      '#rows' => 7,
+    );
+
+    $form['help'] = array(
+      '#type' => 'details',
+      '#title' => t('Address format variables'),
+      '#collapsed' => TRUE,
+    );
+    $form['help']['text'] = array(
+      '#theme' => 'table',
+      '#header' => array(t('Variable'), t('Description')),
+      '#rows' => array(
+        array('!first_name', t("Customer's first name")),
+        array('!last_name', t("Customer's last name")),
+        array('!company', t('Company name')),
+        array('!street1', t('First street address field')),
+        array('!street2', t('Second street address field')),
+        array('!city', t('City name')),
+        array('!zone_name', t('Full name of the zone')),
+        array('!zone_code', t('Abbreviation of the zone')),
+        array('!postal_code', t('Postal code')),
+        array('!country_name', t('Name of the country')),
+        array('!country_code2', t('2 digit country abbreviation')),
+        array('!country_code3', t('3 digit country abbreviation')),
+      ),
+      '#prefix' => '<p>' . t('The following variables should be used in configuring addresses for the countries you ship to:') . '</p>',
+      '#suffix' => '<p>' . t('Adding _if to any country variable will make it display only for addresses whose country is different than the default store country.') . '</p>',
+    );
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function actions(array $form, array &$form_state) {
+    $actions = parent::actions($form, $form_state);
+    $actions['delete']['#access'] = FALSE;
+    return $actions;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, array &$form_state) {
+    $this->entity->save();
+    drupal_set_message(t('Country settings saved.'));
+    $form_state['redirect'] = 'admin/store/settings/countries';
+  }
+
+}
diff --git a/uc_store/lib/Drupal/uc_store/CountryListController.php b/uc_store/lib/Drupal/uc_store/CountryListController.php
new file mode 100644
index 0000000..12b2fb2
--- /dev/null
+++ b/uc_store/lib/Drupal/uc_store/CountryListController.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Contains \Drupal\uc_store\CountryListController.
+ */
+
+namespace Drupal\uc_store;
+
+use Drupal\Component\Utility\String;
+use Drupal\Core\Config\Entity\ConfigEntityListController;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Provides a listing of countries.
+ */
+class CountryListController extends ConfigEntityListController {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildHeader() {
+    $header['title'] = t('Name');
+    $header['code'] = t('Code');
+    return $header + parent::buildHeader();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildRow(EntityInterface $entity) {
+    $row['title'] = String::checkPlain($entity->label());
+    $row['code'] = String::checkPlain($entity->id());
+    return $row + parent::buildRow($entity);
+  }
+
+}
diff --git a/uc_store/lib/Drupal/uc_store/Entity/Country.php b/uc_store/lib/Drupal/uc_store/Entity/Country.php
new file mode 100644
index 0000000..3469700
--- /dev/null
+++ b/uc_store/lib/Drupal/uc_store/Entity/Country.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\uc_store\Entity\Country.
+ */
+
+namespace Drupal\uc_store\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBase;
+use Drupal\Core\Entity\EntityStorageControllerInterface;
+
+/**
+ * Defines the uc_store type configuration entity.
+ *
+ * @ConfigEntityType(
+ *   id = "uc_country",
+ *   label = @Translation("Country"),
+ *   module = "uc_store",
+ *   controllers = {
+ *     "list" = "Drupal\uc_store\CountryListController",
+ *     "access" = "Drupal\Core\Entity\EntityAccessController",
+ *     "form" = {
+ *       "edit" = "Drupal\uc_store\CountryFormController",
+ *     },
+ *   },
+ *   admin_permission = "administer store",
+ *   config_prefix = "country",
+ *   entity_keys = {
+ *     "id" = "iso2",
+ *     "label" = "name",
+ *     "uuid" = "uuid",
+ *     "status" = "status",
+ *   },
+ *   links = {
+ *     "edit-form" = "uc_store.country_edit",
+ *     "enable" = "uc_store.country_enable",
+ *     "disable" = "uc_store.country_disable",
+ *   }
+ * )
+ */
+class Country extends ConfigEntityBase {
+
+  /**
+   * The 2-character ISO code identifying the country.
+   */
+  public $iso2;
+
+  /**
+   * The 3-character ISO code identifying the country.
+   */
+  public $iso3;
+
+  /**
+   * The human-readable name of the country.
+   */
+  public $name;
+
+  /**
+   * The numeric ISO code of the country.
+   */
+  public $numeric;
+
+  /**
+   * The address format string for the country.
+   */
+  public $format;
+
+  /**
+   * An associative array of zone names, keyed by zone code.
+   */
+  public $zones = array();
+
+  /**
+   * The UUID of the country.
+   */
+  public $uuid;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function id() {
+    return $this->iso2;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function sort($a, $b) {
+    $a_status = (int) $a->status();
+    $b_status = (int) $b->status();
+    if ($a_status != $b_status) {
+      return ($a_status > $b_status) ? -1 : 1;
+    }
+    return parent::sort($a, $b);
+  }
+
+}
diff --git a/uc_store/lib/Drupal/uc_store/Form/uc_store.countries.inc b/uc_store/lib/Drupal/uc_store/Form/uc_store.countries.inc
deleted file mode 100644
index a3ade38..0000000
--- a/uc_store/lib/Drupal/uc_store/Form/uc_store.countries.inc
+++ /dev/null
@@ -1,420 +0,0 @@
-<?php
-
-/**
- * @file
- * Store administration forms for country and address handling.
- */
-
-/**
- * Imports settings from a country file.
- *
- * @see uc_country_import_form_submit()
- * @ingroup forms
- */
-function uc_country_import_form($form, &$form_state) {
-  $countries = array();
-  $result = db_query("SELECT * FROM {uc_countries}");
-  foreach ($result as $country) {
-    $countries[t($country->country_name)] = $country;
-  }
-  uksort($countries, 'strnatcasecmp');
-  $files = _uc_country_import_list();
-
-  $header = array(t('Country'), t('Code'), t('Version'), t('Operations'));
-  $rows = array();
-  if (is_array($countries)) {
-    foreach ($countries as $country) {
-      $row = array(
-        t($country->country_name),
-        $country->country_iso_code_3,
-        array('data' => abs($country->version), 'align' => 'center')
-      );
-
-      $ops = array();
-      if ($country->version < 0) {
-        $ops[] = l(t('enable'), 'admin/store/settings/countries/' . $country->country_id . '/enable');
-      }
-      else {
-        $ops[] = l(t('disable'), 'admin/store/settings/countries/' . $country->country_id . '/disable');
-      }
-      if ($country->version < $files[$country->country_id]['version'] && $country->version > 0) {
-        $ops[] = l(t('update'), 'admin/store/settings/countries/' . $country->country_id . '/update/' . $files[$country->country_id]['version']);
-      }
-      $ops[] = l(t('remove'), 'admin/store/settings/countries/' . $country->country_id . '/remove');
-      $row[] = implode(' ', $ops);
-
-      $rows[] = $row;
-      unset($files[$country->country_id]);
-    }
-  }
-
-  $import_list = array();
-  foreach ($files as $file) {
-    $import_list[$file['file']] = $file['file'];
-  }
-
-  if (!empty($import_list)) {
-    ksort($import_list);
-
-    $form['country_import'] = array(
-      '#title' => t('Import countries'),
-      '#type' => 'details',
-      '#collapsed' => TRUE,
-      '#collapsible' => TRUE,
-    );
-
-    $form['country_import']['text'] = array(
-      '#markup' => '<p>' . t('To import new country data, select it in the list and click the import button. If you are using a custom or contributed import file, it must be placed in the Ubercart folder uc_store/countries.') . '</p>',
-    );
-    $form['country_import']['import_file'] = array(
-      '#type' => 'select',
-      '#title' => t('Country'),
-      '#options' => $import_list,
-      '#multiple' => TRUE,
-      '#size' => min(10, count($import_list)),
-    );
-    $form['country_import']['actions'] = array('#type' => 'actions');
-    $form['country_import']['actions']['import_button'] = array(
-      '#type' => 'submit',
-      '#value' => t('Import'),
-    );
-  }
-
-  $form['country_table'] = array(
-    '#theme' => 'table',
-    '#header' => $header,
-    '#rows' => $rows,
-  );
-
-  return $form;
-}
-
-/**
- * Form submission handler for uc_country_import_form().
- *
- * @see uc_country_import_form()
- */
-function uc_country_import_form_submit($form, &$form_state) {
-  $files = $form_state['values']['import_file'];
-
-  foreach ($files as $file) {
-    if (uc_country_import($file)) {
-      drupal_set_message(t('Country file @file imported.', array('@file' => $file)));
-    }
-    else {
-      drupal_set_message(t('Country file @file could not import or had no install function.', array('@file' => $file)), 'error');
-    }
-  }
-}
-
-/**
- * Form builder to set country address formats.
- *
- * @see uc_country_formats_form_submit()
- * @ingroup forms
- */
-function uc_country_formats_form($form, &$form_state) {
-  $form['instructions'] = array(
-    '#type' => 'details',
-    '#title' => t('Address format variables'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-  );
-  $header = array(t('Variable'), t('Description'));
-  $rows = array(
-    array('!first_name', t("Customer's first name")),
-    array('!last_name', t("Customer's last name")),
-    array('!company', t('Company name')),
-    array('!street1', t('First street address field')),
-    array('!street2', t('Second street address field')),
-    array('!city', t('City name')),
-    array('!zone_name', t('Full name of the zone')),
-    array('!zone_code', t('Abbreviation of the zone')),
-    array('!postal_code', t('Postal code')),
-    array('!country_name', t('Name of the country')),
-    array('!country_code2', t('2 digit country abbreviation')),
-    array('!country_code3', t('3 digit country abbreviation')),
-  );
-  $form['instructions']['text'] = array(
-    '#theme' => 'table',
-    '#header' => $header,
-    '#rows' => $rows,
-    '#prefix' => '<div><p>' . t('The following variables should be used in configuring addresses for the countries you ship to:') . '</p>',
-    '#suffix' => '<p>' . t('Adding _if to any country variable will make it display only for addresses whose country is different than the default store country.') . '</p></div>',
-  );
-
-  $countries = array();
-  $result = db_query("SELECT * FROM {uc_countries}");
-  foreach ($result as $country) {
-    $countries[t($country->country_name)] = $country;
-  }
-  uksort($countries, 'strnatcasecmp');
-
-  if (is_array($countries)) {
-    $form['countries'] = array(
-      '#type' => 'vertical_tabs',
-      '#tree' => TRUE,
-    );
-    foreach ($countries as $country) {
-      $form['countries'][$country->country_id] = array(
-        '#type' => 'details',
-        '#title' => check_plain(t($country->country_name)),
-        '#group' => 'country',
-      );
-      $form['countries'][$country->country_id]['address_format'] = array(
-        '#type' => 'textarea',
-        '#title' => t('@country address format', array('@country' => t($country->country_name))),
-        '#default_value' => variable_get('uc_address_format_' . $country->country_id, ''),
-        '#description' => t('Use the variables mentioned in the instructions to format an address for this country.'),
-        '#rows' => 7,
-      );
-    }
-  }
-
-  $form['actions'] = array('#type' => 'actions');
-  $form['actions']['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Submit changes'),
-  );
-
-  return $form;
-}
-
-/**
- * Form submission handler for uc_country_formats_form().
- *
- * @see uc_country_formats_form()
- */
-function uc_country_formats_form_submit($form, &$form_state) {
-  foreach ($form_state['values']['countries'] as $country_id => $data) {
-    variable_set('uc_address_format_' . $country_id, $data['address_format']);
-  }
-  drupal_set_message(t('Country settings saved.'));
-}
-
-/**
- * Disables a country so it remains installed but is no longer selectable.
- *
- * @param $country_id
- *   The ISO 3166-1 numeric country code.
- */
-function uc_country_disable($country_id) {
-  $result = db_query("SELECT * FROM {uc_countries} WHERE country_id = :id", array(':id' => $country_id));
-  if ($country = $result->fetchObject()) {
-    if ($country->version > 0) {
-      db_update('uc_countries')
-        ->fields(array(
-          'version' => -$country->version,
-        ))
-        ->condition('country_id', $country_id)
-        ->execute();
-      drupal_set_message(t('@country disabled.', array('@country' => t($country->country_name))));
-    }
-    else {
-      drupal_set_message(t('@country is already disabled.', array('@country' => t($country->country_name))), 'error');
-    }
-  }
-  else {
-    drupal_set_message(t('Attempted to disable an invalid country.'), 'error');
-  }
-  drupal_goto('admin/store/settings/countries');
-}
-
-/**
- * Enables a disabled country.
- *
- * @param $country_id
- *   The ISO 3166-1 numeric country code.
- */
-function uc_country_enable($country_id) {
-  $result = db_query("SELECT * FROM {uc_countries} WHERE country_id = :id", array(':id' => $country_id));
-  if ($country = $result->fetchObject()) {
-    if ($country->version < 0) {
-      db_update('uc_countries')
-        ->fields(array(
-          'version' => abs($country->version),
-        ))
-        ->condition('country_id', $country_id)
-        ->execute();
-      drupal_set_message(t('@country enabled.', array('@country' => t($country->country_name))));
-    }
-    else {
-      drupal_set_message(t('@country is already enabled.', array('@country' => t($country->country_name))), 'error');
-    }
-  }
-  else {
-    drupal_set_message(t('Attempted to enable an invalid country.'), 'error');
-  }
-  drupal_goto('admin/store/settings/countries');
-}
-
-/**
- * Form to completely remove a country.
- *
- * @param $country_id
- *   The ISO 3166-1 numeric country code.
- *
- * @see uc_country_remove_form_submit()
- * @ingroup forms
- */
-function uc_country_remove_form($form, &$form_state, $country_id) {
-  // Fetch the country name from the database.
-  $country = t(db_query("SELECT country_name FROM {uc_countries} WHERE country_id = :id", array(':id' => $country_id))->fetchField());
-
-  // If orders exist for this country, show a warning message prior to removal.
-  if (isset($form_state['triggering_element']) && $form_state['triggering_element']['#value'] != t('Remove') && module_exists('uc_order')) {
-    $count = db_query("SELECT COUNT(order_id) FROM {uc_orders} WHERE delivery_country = :delivery_country OR billing_country = :billing_country", array(':delivery_country' => $country_id, ':billing_country' => $country_id))->fetchField();
-    if ($count > 0) {
-      drupal_set_message(t('Warning: @count orders were found with addresses in this country. Removing this country now will cause errors to show on those order pages. You might consider simply disabling this country instead.', array('@count' => $count)), 'error');
-    }
-  }
-
-  // Store the country ID in the form array for processing.
-  $form['country_id'] = array(
-    '#type' => 'value',
-    '#value' => $country_id,
-  );
-
-  return confirm_form($form, t('Are you sure you want to remove @country from the system?', array('@country' => $country)), 'admin/store/settings/countries', NULL, t('Remove'));
-}
-
-/**
- * Form submission handler for uc_country_remove_form().
- *
- * @see uc_country_remove_form()
- */
-function uc_country_remove_form_submit($form, &$form_state) {
-  $country_id = $form_state['values']['country_id'];
-
-  $result = db_query("SELECT * FROM {uc_countries} WHERE country_id = :id", array(':id' => $country_id));
-  if (!($country = $result->fetchObject())) {
-    drupal_set_message(t('Attempted to remove an invalid country.'), 'error');
-    drupal_goto('admin/store/settings/countries');
-  }
-
-  db_delete('uc_countries')
-    ->condition('country_id', $country_id)
-    ->execute();
-  db_delete('uc_zones')
-    ->condition('zone_country_id', $country_id)
-    ->execute();
-  variable_del('uc_address_format_' . $country_id);
-
-  $func_base = _uc_country_import_include($country_id, $country->version);
-  if ($func_base !== FALSE) {
-    $func = $func_base . '_uninstall';
-    if (function_exists($func)) {
-      $func();
-    }
-  }
-
-  drupal_set_message(t('@country removed.', array('@country' => t($country->country_name))));
-  drupal_goto('admin/store/settings/countries');
-}
-
-/**
- * Updates a country definition to a specific CIF file version.
- *
- * @param $country_id
- *   The ISO 3166-1 numeric country code.
- * @param $version
- *   Version number of CIF file.
- */
-function uc_country_update($country_id, $version) {
-  $result = db_query("SELECT * FROM {uc_countries} WHERE country_id = :id", array(':id' => $country_id));
-  if (!($country = $result->fetchObject())) {
-    drupal_set_message(t('Attempted to update an invalid country.'));
-    drupal_goto('admin/store/settings/countries');
-  }
-
-  if ($version < $country->version) {
-    drupal_set_message(t('You cannot update to a previous version.'));
-    drupal_goto('admin/store/settings/countries');
-  }
-
-  $func_base = _uc_country_import_include($country_id, $version);
-  if ($func_base !== FALSE) {
-    $func = $func_base . '_update';
-    if (function_exists($func)) {
-      for ($i = $country->version; $i <= $version; $i++) {
-        $func($i);
-      }
-    }
-
-    db_update('uc_countries')
-      ->fields(array(
-        'version' => $version,
-      ))
-      ->condition('country_id', $country_id)
-      ->execute();
-    drupal_set_message(t('Country update complete.'));
-  }
-  else {
-    drupal_set_message(t('Attempted to update an invalid country.'));
-  }
-
-  drupal_goto('admin/store/settings/countries');
-}
-
-/**
- * Imports an Ubercart country file by filename.
- *
- * @param $file
- *   The filename of the country to import.
- *
- * @return
- *   TRUE or FALSE indicating whether or not the country was imported.
- */
-function uc_country_import($file) {
-  require_once(drupal_get_path('module', 'uc_store') . '/countries/' . $file);
-
-  $pieces = explode('_', substr($file, 0, strlen($file) - 4));
-
-  $country_id = $pieces[count($pieces) - 2];
-  $version = $pieces[count($pieces) - 1];
-  $country = substr($file, 0, strlen($file) - strlen($country_id) - strlen($version) - 6);
-
-  $func = $country . '_install';
-
-  if (function_exists($func)) {
-    $func();
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
-/**
- * Includes the appropriate country file and return the base for hooks.
- *
- * @param $country_id
- *   ISO 3166-1 numeric country code for the CIF file to import.
- * @param $version
- *   Version number of the CIF to import.
- *
- * @return
- *   A string containing the portion of the filename holding the country name.
- */
-function _uc_country_import_include($country_id, $version) {
-  $dir = drupal_get_path('module', 'uc_store') . '/countries/';
-  $match = '_' . $country_id . '_' . $version . '.cif';
-  $matchlen = strlen($match);
-
-  if (is_dir($dir)) {
-    if ($dh = opendir($dir)) {
-      while (($file = readdir($dh)) !== FALSE) {
-        switch (filetype($dir . $file)) {
-          case 'file':
-            if (substr($file, -$matchlen) == $match) {
-              require_once($dir . $file);
-              return substr($file, 0, strlen($file) - $matchlen);
-            }
-            break;
-        }
-      }
-      closedir($dh);
-    }
-  }
-
-  return FALSE;
-}
diff --git a/uc_store/lib/Drupal/uc_store/Tests/AddressTest.php b/uc_store/lib/Drupal/uc_store/Tests/AddressTest.php
index 7ce557b..b208353 100644
--- a/uc_store/lib/Drupal/uc_store/Tests/AddressTest.php
+++ b/uc_store/lib/Drupal/uc_store/Tests/AddressTest.php
@@ -7,9 +7,17 @@
 
 namespace Drupal\uc_store\Tests;
 
+use Drupal\simpletest\DrupalUnitTestBase;
 use Drupal\uc_store\Address;
 
-class AddressTest extends UbercartTestBase {
+class AddressTest extends DrupalUnitTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('uc_store');
 
   /** Array of Address objects */
   protected $test_address = array();
@@ -28,6 +36,8 @@ class AddressTest extends UbercartTestBase {
   public function setUp() {
     parent::setUp();
 
+    $this->installConfig(array('uc_store'));
+
     // Create a random address object for use in tests.
     $this->test_address[] = $this->createAddress();
 
@@ -37,9 +47,10 @@ class AddressTest extends UbercartTestBase {
       'last_name'   => 'Monster',
       'company'     => 'CTW, Inc.',
       'street1'     => '123 Sesame Street',
+      'street2'     => '',
       'city'        => 'New York',
-      'zone'        => 43,
-      'country'     => 840,
+      'zone'        => 'NY',
+      'country'     => 'US',
       'postal_code' => '10010',
       'phone'       => '1234567890',
       'email'       => 'elmo@ctw.org',
@@ -47,10 +58,21 @@ class AddressTest extends UbercartTestBase {
     $this->test_address[] = $this->createAddress($settings);
   }
 
-  public function testAddressComparison() {
-    $this->pass((string) $this->test_address[0]);
-    $this->pass((string) $this->test_address[1]);
+  public function testAddressFormat() {
+    $address = $this->test_address[1];
 
+    $formatted = (string) $address;
+    $expected = "CTW, INC.<br />\nELMO MONSTER<br />\n123 SESAME STREET<br />\nNEW YORK, NY 10010";
+    $this->assertEqual($formatted, $expected, 'Formatted address matches expected value.');
+
+    $address->zone = 'BC';
+    $address->country = 'CA';
+    $formatted = (string) $address;
+    $expected = "CTW, INC.<br />\nELMO MONSTER<br />\n123 SESAME STREET<br />\nNEW YORK, 10010<br />\nBRITISH COLUMBIA, CANADA";
+    $this->assertEqual($formatted, $expected, 'Formatted address with non-default country matches expected value.');
+  }
+
+  public function testAddressComparison() {
     // Use randomly generated address first.
     $address = clone($this->test_address[0]);
 
@@ -61,12 +83,11 @@ class AddressTest extends UbercartTestBase {
       t('Physical address comparison ignores non-physical fields.')
     );
 
-    // Use specifc address.
+    // Use specific address.
     $address = clone($this->test_address[1]);
 
     // Modify city and test equality
     $address->city = 'nEw YoRk';
-    $this->pass((string) $address);
     $this->assertTrue(
       $this->test_address[1]->isSamePhysicalLocation($address),
       t('Case-insensitive address comparison works.')
@@ -74,12 +95,10 @@ class AddressTest extends UbercartTestBase {
 
     // Modify city and test equality
     $address->city = '		NewYork ';
-    $this->pass((string) $address);
     $this->assertTrue(
       $this->test_address[1]->isSamePhysicalLocation($address),
       t('Whitespace-insensitive address comparison works.')
     );
-
   }
 
   /**
@@ -113,8 +132,8 @@ class AddressTest extends UbercartTestBase {
                             array_rand($street);
     $address->street2     = 'Suite ' . mt_rand(100, 999);
     $address->city        = $this->randomName(10);
-    $address->zone        = 23;
-    $address->country     = 840;
+    $address->zone        = 'IL';
+    $address->country     = 'US';
     $address->postal_code = mt_rand(10000, 99999);
     $address->phone       = '(' . mt_rand(100, 999) . ') ' .
                             mt_rand(100, 999) . '-' . mt_rand(0, 9999);
diff --git a/uc_store/lib/Drupal/uc_store/Tests/CountryTest.php b/uc_store/lib/Drupal/uc_store/Tests/CountryTest.php
index 12fe015..867b139 100644
--- a/uc_store/lib/Drupal/uc_store/Tests/CountryTest.php
+++ b/uc_store/lib/Drupal/uc_store/Tests/CountryTest.php
@@ -7,90 +7,45 @@
 
 namespace Drupal\uc_store\Tests;
 
-class CountryTest extends UbercartTestBase {
+use Drupal\simpletest\WebTestBase;
+
+class CountryTest extends WebTestBase {
+
+  public static $modules = array('uc_store');
 
   public static function getInfo() {
     return array(
       'name' => 'Country functionality',
-      'description' => 'Import, edit, and remove countries and their settings.',
+      'description' => 'Enable and disable countries and edit their settings.',
       'group' => 'Ubercart',
     );
   }
 
   /**
-   * Test import/enable/disable/remove of Country information files.
+   * Test enable/disable of countries.
    */
-  /*
   public function testCountries() {
-    $import_file = 'belgium_56_3.cif';
-    $country_name = 'Belgium';
-    $country_code = 'BEL';
-
-    $this->drupalLogin($this->adminUser);
+    $this->drupalLogin($this->drupalCreateUser(array('administer store')));
 
     $this->drupalGet('admin/store/settings/countries');
-    $this->assertRaw(
-      '<option value="' . $import_file . '">' . $import_file . '</option>',
-      t('Ensure country file is not imported yet.')
-    );
+    $this->assertLinkByHref('admin/store/settings/countries/US/disable', 0, 'United States is enabled by default.');
+    $this->assertLinkByHref('admin/store/settings/countries/CA/disable', 0, 'Canada is enabled by default.');
+    $this->assertLinkByHref('admin/store/settings/countries/BE/enable', 0, 'Belgium is not enabled by default.');
 
-    $edit = array(
-      'import_file[]' => array($import_file => $import_file),
-    );
-    $this->drupalPostForm(
-      'admin/store/settings/countries',
-      $edit,
-      t('Import')
-    );
-    $this->assertText(
-      t('Country file @file imported.', array('@file' => $import_file)),
-      t('Country was imported successfully.')
-    );
-    $this->assertText(
-      $country_code,
-      t('Country appears in the imported countries table.')
-    );
-    $this->assertNoRaw(
-      '<option value="' . $import_file . '">' . $import_file . '</option>',
-      t('Country does not appear in list of files to be imported.')
-    );
+    $this->drupalGet('admin/store/settings/store');
+    $this->assertNoOption('edit-uc-store-country', 'BE', 'Belgium not listed as an selectable country.');
 
-    // Have to pick the right one here!
-    $this->clickLink(t('disable'));
-    $this->assertText(
-      t('@name disabled.', array('@name' => $country_name)),
-      t('Country was disabled.')
-    );
+    $this->drupalGet('admin/store/settings/countries/BE/enable');
+    $this->assertText('The country Belgium has been enabled.');
+    $this->assertLinkByHref('admin/store/settings/countries/BE/disable', 0, 'Belgium is now enabled.');
 
-    $this->clickLink(t('enable'));
-    $this->assertText(
-      t('@name enabled.', array('@name' => $country_name)),
-      t('Country was enabled.')
-    );
-
-    $this->clickLink(t('remove'));
-    $this->assertText(
-      t('Are you sure you want to remove @name from the system?', array('@name' => $country_name)),
-      t('Confirm form is displayed.')
-    );
+    $this->drupalGet('admin/store/settings/store');
+    $this->assertOption('edit-uc-store-country', 'BE', 'Belgium listed as a selectable country.');
 
-    $this->drupalPostForm(
-      'admin/store/settings/countries/56/remove',
-      array(),
-      t('Remove')
-    );
-    $this->assertText(
-      t('@name removed.', array('@name' => $country_name)),
-      t('Country removed.')
-    );
-    $this->assertRaw(
-      '<option value="' . $import_file . '">' . $import_file . '</option>',
-      t('Ensure country file is not imported yet.')
-    );
-    $this->assertNoText(
-      $country_code,
-      t('Country does not appear in imported countries table.')
-    );
+    $this->drupalGet('admin/store/settings/countries');
+    $this->clickLink('Disable');
+    $this->assertText('The country Belgium has been disabled.');
+    $this->assertLinkByHref('admin/store/settings/countries/BE/enable', 0, 'Belgium is now disabled.');
   }
-  */
+
 }
diff --git a/uc_store/lib/Drupal/uc_store/Tests/UbercartTestBase.php b/uc_store/lib/Drupal/uc_store/Tests/UbercartTestBase.php
index 7e071d3..ef99a7a 100644
--- a/uc_store/lib/Drupal/uc_store/Tests/UbercartTestBase.php
+++ b/uc_store/lib/Drupal/uc_store/Tests/UbercartTestBase.php
@@ -181,14 +181,13 @@ abstract class UbercartTestBase extends WebTestBase {
     foreach (array('billing', 'delivery') as $pane) {
       $prefix = 'panes[' . $pane . ']';
       $key =  $prefix . '[country]';
-      $country = empty($edit[$key]) ? \Drupal::config('uc_store.settings')->get('address.country') : $edit[$key];
-      $zone_id = db_query_range('SELECT zone_id FROM {uc_zones} WHERE zone_country_id = :country ORDER BY rand()', 0, 1, array('country' => $country))->fetchField();
+      $country = entity_load('uc_country', isset($edit[$key]) ? $edit[$key] : \Drupal::config('uc_store.settings')->get('address.country'));
       $edit += array(
         $prefix . '[first_name]' => $this->randomName(10),
         $prefix . '[last_name]' => $this->randomName(10),
         $prefix . '[street1]' => $this->randomName(10),
         $prefix . '[city]' => $this->randomName(10),
-        $prefix . '[zone]' => $zone_id,
+        $prefix . '[zone]' => array_rand($country->zones),
         $prefix . '[postal_code]' => mt_rand(10000, 99999),
       );
     }
diff --git a/uc_store/uc_store.admin.inc b/uc_store/uc_store.admin.inc
deleted file mode 100644
index 91aa9d2..0000000
--- a/uc_store/uc_store.admin.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * @file
- * Store administration menu items.
- */
-
-/**
- * Implements hook_uc_store_status().
- */
-function uc_store_uc_store_status() {
-  $messages = array();
-
-  // Check to see if there are any updated CIF files that need to be installed.
-  $countries = array();
-  $result = db_query("SELECT * FROM {uc_countries}");
-  foreach ($result as $country) {
-    $countries[t($country->country_name)] = $country;
-  }
-  uksort($countries, 'strnatcasecmp');
-  $files = _uc_country_import_list();
-
-  $updates = array();
-  if (is_array($countries)) {
-    foreach ($countries as $country) {
-      if ($country->version < $files[$country->country_id]['version'] && $country->version > 0) {
-        $updates[] = $country->country_name;
-      }
-      unset($files[$country->country_id]);
-    }
-  }
-
-  if (count($updates)) {
-    $messages[] = array(
-      'status' => 'warning',
-      'title'  => t('Countries'),
-      'desc'   => t('Updates are available for the following installed countries: %countries. You may update these countries on the <a href="@url">country settings</a> page.', array('%countries' => implode(', ', $updates), '@url' => url('admin/store/settings/countries'))),
-    );
-  }
-  else {
-    $messages[] = array(
-      'status' => 'ok',
-      'title'  => t('Countries'),
-      'desc'   => t('Country definitions are up-to-date.'),
-    );
-  }
-
-  // Check to see if the store e-mail address has been set.
-  if (!\Drupal::config('uc_store.settings')->get('mail')) {
-    $messages[] = array(
-      'status' => 'error',
-      'title'  => t('Store settings'),
-      'desc'   => t('Store e-mail address has not been set. Please enter it <a href="@url">here</a>.', array('@url' => url('admin/store/settings/store'))),
-    );
-  }
-  else {
-    $messages[] = array(
-      'status' => 'ok',
-      'title'  => t('Store settings'),
-      'desc'   => t('Store e-mail address is set.'),
-    );
-  }
-
-  return $messages;
-}
diff --git a/uc_store/uc_store.install b/uc_store/uc_store.install
index 9a87f5a..4f638d1 100644
--- a/uc_store/uc_store.install
+++ b/uc_store/uc_store.install
@@ -32,103 +32,6 @@ function uc_store_requirements($phase) {
 }
 
 /**
- * Implements hook_schema().
- */
-function uc_store_schema() {
-  $schema = array();
-
-  $schema['uc_countries'] = array(
-    'description' => 'Stores country information.',
-    'fields' => array(
-      'country_id' => array(
-        'description' => 'Primary key: numeric ISO country code.',
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'country_name' => array(
-        'description' => 'The country name.',
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'country_iso_code_2' => array(
-        'description' => 'The two-character ISO country code.',
-        'type' => 'char',
-        'length' => 2,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'country_iso_code_3' => array(
-        'description' => 'The three-character ISO country code.',
-        'type' => 'char',
-        'length' => 3,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'version' => array(
-        'description' => 'The version of the CIF that loaded the country information.',
-        'type' => 'int',
-        'size' => 'small',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-    ),
-    'indexes' => array(
-      'country_name' => array('country_name'),
-    ),
-    'primary key' => array('country_id'),
-  );
-
-  $schema['uc_zones'] = array(
-    'description' => 'Stores state/province information within a country.',
-    'fields' => array(
-      'zone_id' => array(
-        'description' => 'Primary key: the unique zone id.',
-        'type' => 'serial',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'zone_country_id' => array(
-        'description' => 'The {uc_countries}.country_id to which this zone belongs.',
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'zone_code' => array(
-        'description' => 'Standard abbreviation of the zone name.',
-        'type' => 'varchar',
-        'length' => 32,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'zone_name' => array(
-        'description' => 'The zone name.',
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-    ),
-    'indexes' => array(
-      'zone_code' => array('zone_code'),
-      'zone_country_id' => array('zone_country_id'),
-    ),
-    'primary key' => array('zone_id'),
-    'foreign keys' => array(
-      'uc_countries' => array(
-        'table' => 'uc_countries',
-        'columns' => array('zone_country_id' => 'country_id'),
-      ),
-    ),
-  );
-
-  return $schema;
-}
-
-/**
  * Implements hook_install().
  */
 function uc_store_install() {
@@ -141,13 +44,6 @@ function uc_store_install() {
     ->set('interface.uc_stock', 'ubercart_mail')
     ->set('interface.uc_store', 'ubercart_mail')
     ->save();
-
-  // Install United States and Canada by default.
-  $path = drupal_get_path('module', 'uc_store');
-  require_once($path . '/countries/united_states_840_1.cif');
-  require_once($path . '/countries/canada_124_2.cif');
-  united_states_install();
-  canada_install();
 }
 
 /**
diff --git a/uc_store/uc_store.module b/uc_store/uc_store.module
index a3304c3..a23abb7 100644
--- a/uc_store/uc_store.module
+++ b/uc_store/uc_store.module
@@ -120,20 +120,21 @@ function uc_store_menu() {
     'weight' => 6,
     'position' => 'right',
   );
+  $items['admin/store/settings/store'] = array(
+    'title' => 'Store',
+    'description' => 'Configure basic store settings.',
+    'route_name' => 'uc_store.settings_form',
+    'weight' => -1,
+  );
   $items['admin/store/settings/countries'] = array(
     'title' => 'Countries and addresses',
     'description' => 'Manage available countries and configure address formats.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('uc_country_import_form'),
-    'access arguments' => array('administer store'),
-    'file' => 'uc_store.countries.inc',
+    'route_name' => 'uc_store.countries',
   );
   $items['admin/store/settings/countries/import'] = array(
     'title' => 'Countries',
     'description' => 'Import and manage countries.',
-    'access arguments' => array('administer store'),
     'type' => MENU_DEFAULT_LOCAL_TASK,
-    'file' => 'uc_store.countries.inc',
   );
   $items['admin/store/settings/countries/fields'] = array(
     'title' => 'Address fields',
@@ -142,59 +143,6 @@ function uc_store_menu() {
     'type' => MENU_LOCAL_TASK,
     'weight' => 1,
   );
-  $items['admin/store/settings/countries/formats'] = array(
-    'title' => 'Address formats',
-    'description' => 'Edit country specific address format settings.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('uc_country_formats_form'),
-    'access arguments' => array('administer store'),
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 1,
-    'file' => 'uc_store.countries.inc',
-  );
-
-  $items['admin/store/settings/store'] = array(
-    'title' => 'Store',
-    'description' => 'Configure basic store settings.',
-    'route_name' => 'uc_store.settings_form',
-    'weight' => -1,
-  );
-
-  $items['admin/store/settings/countries/%/disable'] = array(
-    'title' => 'Disable a country',
-    'description' => 'Disable a country from use.',
-    'page callback' => 'uc_country_disable',
-    'page arguments' => array(4),
-    'access arguments' => array('administer store'),
-    'type' => MENU_CALLBACK,
-    'file' => 'uc_store.countries.inc',
-  );
-  $items['admin/store/settings/countries/%/enable'] = array(
-    'title' => 'Enable a country',
-    'description' => 'Enable a disabled country.',
-    'page callback' => 'uc_country_enable',
-    'page arguments' => array(4),
-    'access arguments' => array('administer store'),
-    'type' => MENU_CALLBACK,
-    'file' => 'uc_store.countries.inc',
-  );
-  $items['admin/store/settings/countries/%/remove'] = array(
-    'title' => 'Remove a country',
-    'description' => 'Remove an installed country.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('uc_country_remove_form', 4),
-    'access arguments' => array('administer store'),
-    'file' => 'uc_store.countries.inc',
-  );
-  $items['admin/store/settings/countries/%/update/%'] = array(
-    'title' => 'Update a country',
-    'description' => 'Update an installed country.',
-    'page callback' => 'uc_country_update',
-    'page arguments' => array(4, 6),
-    'access arguments' => array('administer store'),
-    'type' => MENU_CALLBACK,
-    'file' => 'uc_store.countries.inc',
-  );
 
   return $items;
 }
@@ -231,6 +179,12 @@ function uc_store_menu_link_defaults() {
     'parent' => 'uc_store.admin.store.settings',
     'weight' => -1,
   );
+  $items['uc_store.admin.store.settings.countries'] = array(
+    'link_title' => 'Countries and addresses',
+    'description' => 'Manage available countries and configure address formats.',
+    'route_name' => 'uc_store.countries',
+    'parent' => 'uc_store.admin.store.settings',
+  );
 
   return $links;
 }
@@ -330,21 +284,22 @@ function uc_store_process_address_field($element, $form_state) {
     $value = array();
   }
 
-  $countries = db_query("SELECT country_id, country_name FROM {uc_countries} WHERE version > :version", array(':version' => 0))->fetchAllKeyed();
-  foreach ($countries as $country_id => $country_name) {
-    $countries[$country_id] = t($country_name);
+  $countries = entity_load_multiple_by_properties('uc_country', array('status' => TRUE));
+  $country_names = array();
+  foreach ($countries as $id => $country) {
+    $country_names[$id] = t($country->name);
   }
-  natcasesort($countries);
-  $country_keys = array_keys($countries);
+  natcasesort($country_names);
+  $country_keys = array_keys($country_names);
 
   // Force the selected country to a valid one, so the zone dropdown matches.
   if (is_object($value)) {
-    if (isset($value->{$prefix . 'country'}) && !isset($countries[$value->{$prefix . 'country'}])) {
+    if (isset($value->{$prefix . 'country'}) && !isset($country_names[$value->{$prefix . 'country'}])) {
       $value->{$prefix . 'country'} = $country_keys[0];
     }
   }
   else {
-    if (isset($value[$prefix . 'country']) && !isset($countries[$value[$prefix . 'country']])) {
+    if (isset($value[$prefix . 'country']) && !isset($country_names[$value[$prefix . 'country']])) {
       $value[$prefix . 'country'] = $country_keys[0];
     }
   }
@@ -363,7 +318,7 @@ function uc_store_process_address_field($element, $form_state) {
       case 'country':
         $subelement = array(
           '#type' => 'select',
-          '#options' => $countries,
+          '#options' => $country_names,
           '#ajax' => array(
             'callback' => 'uc_store_update_address_field_zones',
             'wrapper' => 'uc-store-address-' . str_replace('_', '-', $prefix) . 'zone-wrapper',
@@ -383,13 +338,12 @@ function uc_store_process_address_field($element, $form_state) {
         );
 
         $country_id = is_object($value) ? $value->{$prefix . 'country'} : $value[$prefix . 'country'];
-        $zones = db_query("SELECT zone_id, zone_name FROM {uc_zones} WHERE zone_country_id = :country", array(':country' => $country_id))->fetchAllKeyed();
+        $zones = $countries[$country_id]->zones;
         if (!empty($zones)) {
           natcasesort($zones);
           $subelement += array(
             '#type' => 'select',
             '#options' => $zones,
-            '#empty_value' => 0,
           );
         }
         else {
@@ -825,125 +779,21 @@ function uc_date_format($month, $day, $year) {
 }
 
 /**
- * Saves the address format for a country.
- */
-function uc_set_address_format($country_id, $format) {
-  variable_set('uc_address_format_' . intval($country_id), $format);
-}
-
-/**
  * Formats an address for display based on a country's address format.
  */
 function uc_address_format($first_name, $last_name, $company, $street1, $street2, $city, $zone, $postal_code, $country) {
-  $result = db_query("SELECT * FROM {uc_zones} WHERE zone_id = :id", array(':id' => $zone));
-  if (!($zone_data = $result->fetchAssoc())) {
-    $zone_data = array('zone_code' => t('N/A'), 'zone_name' => t('Unknown'));
-  }
-  $result = db_query("SELECT * FROM {uc_countries} WHERE country_id = :id", array(':id' => $country));
-  if (!($country_data = $result->fetchAssoc())) {
-    $country_data = array(
-      'country_name' => t('Unknown'),
-      'country_iso_code_2' => t('N/A'),
-      'country_iso_code_3' => t('N/A'),
-    );
-  }
-
-  $variables = array(
-    "\r\n" => '<br />',
-    '!company' => check_plain($company),
-    '!first_name' => check_plain($first_name),
-    '!last_name' => check_plain($last_name),
-    '!street1' => check_plain($street1),
-    '!street2' => check_plain($street2),
-    '!city' => check_plain($city),
-    '!zone_code' => $zone_data['zone_code'],
-    '!zone_name' => $zone_data['zone_name'],
-    '!postal_code' => check_plain($postal_code),
-    '!country_name' => t($country_data['country_name']),
-    '!country_code2' => $country_data['country_iso_code_2'],
-    '!country_code3' => $country_data['country_iso_code_3'],
-  );
-
-  if (uc_store_default_country() != $country) {
-    $variables['!country_name_if'] = t($country_data['country_name']);
-    $variables['!country_code2_if'] = $country_data['country_iso_code_2'];
-    $variables['!country_code3_if'] = $country_data['country_iso_code_3'];
-  }
-  else {
-    $variables['!country_name_if'] = '';
-    $variables['!country_code2_if'] = '';
-    $variables['!country_code3_if'] = '';
-  }
-
-  $format = variable_get('uc_address_format_' . $country, '');
-  if (empty($format)) {
-    $format = "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if";
-  }
-  $address = strtr($format, $variables);
-  $address = strtr($address, array("\n" => '<br />'));
-
-  $match = array('`^<br( /)?>`', '`<br( /)?>$`', '`<br( /)?>(\s*|[\s*<br( /)?>\s*]+)<br( /)?>`', '`<br( /)?><br( /)?>`', '`<br( /)?>, N/A`');
-  $replace = array('', '', '<br />', '<br />', '', '');
-  $address = preg_replace($match, $replace, $address);
-
-  return $address;
-}
-
-/**
- * Returns the code abbreviation for a zone based on the zone ID or name.
- */
-function uc_get_zone_code($zone = NULL) {
-  if (empty($zone)) {
-    return FALSE;
-  }
-
-  if (is_numeric($zone)) {
-    $result = db_query("SELECT zone_code FROM {uc_zones} WHERE zone_id = :id", array(':id' => $zone));
-  }
-  else {
-    $result = db_query("SELECT zone_code FROM {uc_zones} WHERE zone_name = :name", array(':name' => $zone));
-  }
-
-  if ($row = $result->fetchObject()) {
-    return $row->zone_code;
-  }
-
-  return FALSE;
-}
-
-/**
- * Returns country data based on the supplied criteria.
- *
- * @param $match
- *   An associative array of fields to match.
- * @param $sort
- *   The field to sort by.
- */
-function uc_get_country_data($match = array(), $sort = 'country_name') {
-  $valid_fields = array('country_id', 'country_name', 'country_iso_code_2', 'country_iso_code_3', 'version');
-
-  if (!is_array($match)) {
-    $match = array();
-  }
-  if (!in_array($sort, $valid_fields)) {
-    $sort = 'country_name';
-  }
-
-  $query = db_select('uc_countries')
-    ->fields('uc_countries')
-    ->orderBy($sort);
-  if (count($match) > 0) {
-    foreach ($match as $key => $value) {
-      if (!in_array($key, $valid_fields)) {
-        continue;
-      }
-      $query->condition($key, $value);
-    }
-  }
-
-  $countries = $query->execute()->fetchAll(PDO::FETCH_ASSOC);
-
-  return empty($countries) ? FALSE : $countries;
+  $address = new Address();
+  $address->first_name = $first_name;
+  $address->last_name = $last_name;
+  $address->company = $company;
+  $address->street1 = $street1;
+  $address->street2 = $street2;
+  $address->city = $city;
+  $address->zone = $zone;
+  $address->postal_code = $postal_code;
+  $address->country = $country;
+
+  return (string) $address;
 }
 
 /**
@@ -954,76 +804,16 @@ function uc_address_field_enabled($field = NULL) {
 }
 
 /**
- * Retrieves a zone's name from the database, using its ID.
- *
- * @param $id
- *   The zone's ID.
- */
-function uc_zone_get_by_id($id) {
-  return db_query("SELECT zone_name FROM {uc_zones} WHERE zone_id = :id", array(':id' => $id))->fetchField();
-}
-
-/**
- * Creates a zone select box for a form.
- *
- * @param $title
- *   The label for the field.
- * @param $default
- *   The default zone ID.
- * @param $country_id
- *   The country ID
- * @param array $options
- *   An associative array of additional options, with the following elements:
- *   - 'description': The description for the field (defaults to none).
- *   - 'display': The values to display, either 'name' (default) or 'code'.
- *   - 'required': TRUE if the field is required (defaults to FALSE).
- *
- * @return
- *   A Form API select element.
- */
-function uc_zone_select($title = '', $default = NULL, $country_id = NULL, $options = array()) {
-  $options += array(
-    'description' => NULL,
-    'display' => 'name',
-    'required' => FALSE,
-  );
-
-  if (empty($country_id)) {
-    $country_id = uc_store_default_country();
-  }
-
-  $order_by = ($options['display'] == 'code') ? 'zone_code' : 'zone_name';
-  $result = db_query('SELECT * FROM {uc_zones} WHERE zone_country_id = :id ORDER BY :field', array(':id' => $country_id, ':field' => $order_by));
-
-  $zones = array('' => t('Please select'));
-  foreach ($result as $zone) {
-    $zones[$zone->zone_id] = $zone->$order_by;
-  }
-  if (count($zones) == 1) {
-    $zones = array(-1 => t('Not applicable'));
-  }
-
-  $select = array(
-    '#type' => 'select',
-    '#title' => $title,
-    '#description' => $options['description'],
-    '#options' => $zones,
-    '#default_value' => $default,
-    '#required' => $options['required'],
-    '#disabled' => isset($zones[-1]),
-  );
-
-  return $select;
-}
-
-/**
  * Helper function to return zone options, grouped by country.
  */
 function uc_zone_option_list() {
-  $result = db_query("SELECT z.*, c.country_name FROM {uc_zones} z LEFT JOIN {uc_countries} c ON z.zone_country_id = c.country_id ORDER BY c.country_name, z.zone_name");
+  $options = array();
 
-  foreach ($result as $zone) {
-    $options[t($zone->country_name)][$zone->zone_id] = $zone->zone_name;
+  $countries = entity_load_multiple_by_properties('uc_country', array('status' => TRUE));
+  foreach ($countries as $country) {
+    if (!empty($country->zones)) {
+      $options[t($country->name)] = $country->zones;
+    }
   }
   uksort($options, 'strnatcasecmp');
 
@@ -1031,31 +821,16 @@ function uc_zone_option_list() {
 }
 
 /**
- * Retrieves a country's name from the database, using its ID.
- *
- * @param $id
- *   The country's ISO 3166-1 numeric identifier.
- */
-function uc_country_get_by_id($id) {
-  return db_query("SELECT country_name FROM {uc_countries} WHERE country_id = :id", array(':id' => $id))->fetchField();
-}
-
-/**
  * Returns a list of available countries.
  */
 function uc_country_option_list() {
-  $result = db_query("SELECT * FROM {uc_countries} WHERE version > :version", array(':version' => 0));
-
-  $options = array();
-  while ($country = $result->fetchAssoc()) {
-    $options[$country['country_id']] = t($country['country_name']);
-  }
-  if (count($options) == 0) {
-    $options[] = t('No countries found.');
+  $countries = entity_load_multiple_by_properties('uc_country', array('status' => TRUE));
+  $country_names = array();
+  foreach ($countries as $id => $country) {
+    $country_names[$id] = t($country->name);
   }
-  natcasesort($options);
-
-  return $options;
+  natcasesort($country_names);
+  return $country_names;
 }
 
 /**
@@ -1237,44 +1012,6 @@ function uc_get_addresses($uid, $type = 'billing') {
 }
 
 /**
- * Returns an array of country files that can be installed or updated.
- */
-function _uc_country_import_list() {
-  $dir = drupal_get_path('module', 'uc_store') . '/countries/';
-
-  $countries = array();
-  if (is_dir($dir)) {
-    if ($dh = opendir($dir)) {
-      while (($file = readdir($dh)) !== FALSE) {
-        switch (filetype($dir . $file)) {
-          case 'file':
-            if (substr($file, -4, 4) == '.cif') {
-              $pieces = explode('_', substr($file, 0, strlen($file) - 4));
-              $country_id = intval($pieces[count($pieces) - 2]);
-              $version = $pieces[count($pieces) - 1];
-
-              if (!isset($countries[$country_id])) {
-                $countries[$country_id]['version'] = $version;
-                $countries[$country_id]['file'] = $file;
-              }
-              else {
-                if ($version > $countries[$country_id]['version']) {
-                  $countries[$country_id]['version'] = $version;
-                  $countries[$country_id]['file'] = $file;
-                }
-              }
-            }
-            break;
-        }
-      }
-      closedir($dh);
-    }
-  }
-
-  return $countries;
-}
-
-/**
  * Returns the store name.
  */
 function uc_store_name() {
@@ -1409,22 +1146,12 @@ function uc_store_encryption_errors(&$crypt, $module) {
 
 /**
  * Returns a default store country value.
+ *
+ * @return
+ *   The two character country code representing the store default.
  */
 function uc_store_default_country() {
-  static $default;
-
-  if (!empty($default)) {
-    return $default;
-  }
-
-  $default = \Drupal::config('uc_store.settings')->get('address.country');
-
-  $result = db_query("SELECT COUNT(*) FROM {uc_countries} WHERE country_id = :id AND version > :version", array(':id' => $default, ':version' => 0))->fetchField();
-  if ($result == 0) {
-    $default = db_query_range("SELECT country_id FROM {uc_countries} WHERE version > :version", 0, 1, array(':version' => 0))->fetchField();
-  }
-
-  return $default;
+  return \Drupal::config('uc_store.settings')->get('address.country');
 }
 
 /**
@@ -1477,6 +1204,28 @@ function uc_form_alter(&$form, &$form_state, $form_id) {
 }
 
 /**
+ * Implements hook_uc_store_status().
+ */
+function uc_store_uc_store_status() {
+  if (!\Drupal::config('uc_store.settings')->get('mail')) {
+    $messages[] = array(
+      'status' => 'error',
+      'title'  => t('Store settings'),
+      'desc'   => t('Store e-mail address has not been set. Please enter it <a href="@url">here</a>.', array('@url' => url('admin/store/settings/store'))),
+    );
+  }
+  else {
+    $messages[] = array(
+      'status' => 'ok',
+      'title'  => t('Store settings'),
+      'desc'   => t('Store e-mail address is set.'),
+    );
+  }
+
+  return $messages;
+}
+
+/**
  * Temporary shim for removed variable_get().
  */
 if (!function_exists('variable_get')) {
diff --git a/uc_store/uc_store.routing.yml b/uc_store/uc_store.routing.yml
index e99f1fa..d211ef3 100644
--- a/uc_store/uc_store.routing.yml
+++ b/uc_store/uc_store.routing.yml
@@ -30,6 +30,38 @@ uc_store.settings_form:
   requirements:
     _permission: 'administer store'
 
+uc_store.countries:
+  path: '/admin/store/settings/countries'
+  defaults:
+    _content: '\Drupal\Core\Entity\Controller\EntityListController::listing'
+    entity_type: 'uc_country'
+    _title: 'Countries'
+  requirements:
+    _permission: 'administer store'
+
+uc_store.country_edit:
+  path: '/admin/store/settings/countries/{uc_country}'
+  defaults:
+    _entity_form: 'uc_country.edit'
+  requirements:
+    _permission: 'administer store'
+
+uc_store.country_enable:
+  path: '/admin/store/settings/countries/{uc_country}/enable'
+  defaults:
+    _content: '\Drupal\uc_store\CountryController::enable'
+    entity_type: 'uc_country'
+  requirements:
+    _permission: 'administer store'
+
+uc_store.country_disable:
+  path: '/admin/store/settings/countries/{uc_country}/disable'
+  defaults:
+    _content: '\Drupal\uc_store\CountryController::disable'
+    entity_type: 'uc_country'
+  requirements:
+    _permission: 'administer store'
+
 uc_store.address_fields:
   path: '/admin/store/settings/countries/fields'
   defaults:
