diff --git a/omnipay_Eway_Rapid.mgd.php b/Metadata/omnipay_Eway_Rapid.mgd.php
similarity index 95%
rename from omnipay_Eway_Rapid.mgd.php
rename to Metadata/omnipay_Eway_Rapid.mgd.php
index 18d253262..e5ab8edc0 100644
--- a/omnipay_Eway_Rapid.mgd.php
+++ b/Metadata/omnipay_Eway_Rapid.mgd.php
@@ -64,7 +64,12 @@
            ),
           'EWAY_CARDCVN' => array('core_field_name' => 'cvv2'),
         ),
-        'billing_fields' => array(),
+        'billing_fields' => array(
+          'billing_first_name',
+          'billing_middle_name',
+          'billing_last_name',
+          'billing_country_id' . '-' . CRM_Core_BAO_LocationType::getBilling(),
+        ),
       ),
     ),
     'params' => array(
diff --git a/omnipay_Eway_RapidDirect.mgd.php b/Metadata/omnipay_Eway_RapidDirect.mgd.php
similarity index 98%
rename from omnipay_Eway_RapidDirect.mgd.php
rename to Metadata/omnipay_Eway_RapidDirect.mgd.php
index 21d966939..ee55c140a 100644
--- a/omnipay_Eway_RapidDirect.mgd.php
+++ b/Metadata/omnipay_Eway_RapidDirect.mgd.php
@@ -44,6 +44,7 @@
     'entity' => 'payment_processor_type',
     'metadata' => array(
       'is_transparent_redirect' => FALSE,
+      'supports_preapproval' => TRUE,
     ),
     'params' => array(
       'version' => 3,
diff --git a/Metadata/omnipay_Eway_RapidShared.mgd.php b/Metadata/omnipay_Eway_RapidShared.mgd.php
new file mode 100644
index 000000000..1ef8f380b
--- /dev/null
+++ b/Metadata/omnipay_Eway_RapidShared.mgd.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: eileen
+ * Date: 17/06/2014
+ * Time: 10:14 PM
+ *
+ * To add a new processor you need to add an item to this array. It is sequentially numerically indexed and the important aspects are
+ *
+ * - name - omnipay_{Processor_Name}, Omnipay calls the gateway method create with the processor name as the parameter.
+ * To get the processor name take a look at the Readme for the gateway you are adding - you will generally see
+ * The following gateways are provided by this package: Mollie so the name should be ominpay_Mollie (note matching capitalisation)
+ *
+ * A more complex example is omnipay_SecurePay_DirectPayment.
+ * This breaks down as
+ *  - omnipay_ - our label within CiviCRM to denote Omnipay
+ *  - SecurePay - the namespace as declared within the composer.json within the securepay gateway
+ *  - DirectPost - the prefix on the Gateway file. It is called DirectPostGateway.php - this portion is excluded when the file is simply
+ *     named 'Gateway.php'
+ *
+ * - user_name_label, password_label, signature_label, subject_label - these are generally about telling the plugin what to call these when they pass them to
+ * Omnipay. They are also shown to users so some reformatting is done to turn it into lower-first-letter camel case. Take a look at the gateway file for your gateway. This is directly under src.
+ * Some provide more than one and the 'getName' function distinguishes them. The getDefaultParameters will tell you what to pass. eg if you see
+ * 'apiKey' you should enter 'user_name' => 'Api Key' (you might ? be able to get away with 'API Key' - need to check). You can provide as many or as
+ * few as you want of these and it's irrelevant which field you put them in but note that the signature field is the longest and that
+ * in future versions of CiviCRM hashing may be done on password and signature on the screen.
+ *
+ * - 'class_name' => 'Payment_OmnipayMultiProcessor', (always)
+ *
+ * - 'url_site_default' - this is ignored. But, by giving one you make it easier for people adding processors
+ *
+ * - 'billing_mode' - 1 = onsite, 4 = redirect offsite (including transparent redirects).
+ *
+ * - payment_mode - 1 = credit card, 2 = debit card, 3 = transparent redirect. In practice 3 means that billing details are gathered on-site so
+ * it may also be used with automatic redirects where address fields need to be mandatory for the signature.
+ *
+ * The record will be automatically inserted, updated, or deleted from the
+ * database as appropriate. For more details, see "hook_civicrm_managed" at:
+ * http://wiki.civicrm.org/confluence/display/CRMDOC/Hook+Reference
+ */
+return array(
+  array(
+    'name' => 'OmniPay - Eway_RapidShared',
+    'entity' => 'payment_processor_type',
+    'metadata' => array(
+      'fields' => array(
+        'billing_fields' => array(
+        'billing_first_name',
+        'billing_middle_name',
+        'billing_last_name',
+        'billing_country_id' . '-' . CRM_Core_BAO_LocationType::getBilling(),
+        ),
+      ),
+    ),
+    'params' => array(
+      'version' => 3,
+      'title' => 'OmniPay - Eway_RapidShared',
+      'name' => 'omnipay_Eway_RapidShared',
+      'description' => 'Omnipay Eway Rapid',
+      // DO NOT CHANGE: Labels are used as Omnipay gateway properties.
+      'user_name_label' => 'Api Key',
+      'password_label' => 'Password',
+      'class_name' => 'Payment_OmnipayMultiProcessor',
+      'url_site_default' => 'http://unused.com',
+      'url_api_default' => 'http://unused.com',
+      'url_recur_default' => 'http://unused.com',
+      'url_site_test_default' => 'http://unused.com',
+      'url_recur_test_default' => 'http://unused.com',
+      'url_api_test_default' => 'http://unused.com',
+      'billing_mode' => 4,
+      'payment_type' => 1,
+      'is_recur' => 1,
+    ),
+  ),
+);
diff --git a/omnipay_Mercanet_Offsite.mgd.php b/Metadata/omnipay_Mercanet_Offsite.mgd.php
similarity index 100%
rename from omnipay_Mercanet_Offsite.mgd.php
rename to Metadata/omnipay_Mercanet_Offsite.mgd.php
diff --git a/CRM/Core/Payment/optiongroup.mgd.php b/Metadata/optiongroup.mgd.php
similarity index 100%
rename from CRM/Core/Payment/optiongroup.mgd.php
rename to Metadata/optiongroup.mgd.php
diff --git a/CRM/Core/Payment/processors.mgd.php b/Metadata/processors.mgd.php
similarity index 94%
rename from CRM/Core/Payment/processors.mgd.php
rename to Metadata/processors.mgd.php
index 22910f982..de098714f 100644
--- a/CRM/Core/Payment/processors.mgd.php
+++ b/Metadata/processors.mgd.php
@@ -250,29 +250,6 @@
       'is_recur' => 0,
     ),
   ),
-  11 => array(
-    'name' => 'OmniPay - Eway_RapidShared',
-    'entity' => 'payment_processor_type',
-    'params' => array(
-      'version' => 3,
-      'title' => 'OmniPay - Eway_RapidShared',
-      'name' => 'omnipay_Eway_RapidShared',
-      'description' => 'Omnipay Eway Rapid',
-      // DO NOT CHANGE: Labels are used as Omnipay gateway properties.
-      'user_name_label' => 'Api Key',
-      'password_label' => 'Password',
-      'class_name' => 'Payment_OmnipayMultiProcessor',
-      'url_site_default' => 'http://unused.com',
-      'url_api_default' => 'http://unused.com',
-      'url_recur_default' => 'http://unused.com',
-      'url_site_test_default' => 'http://unused.com',
-      'url_recur_test_default' => 'http://unused.com',
-      'url_api_test_default' => 'http://unused.com',
-      'billing_mode' => 4,
-      'payment_type' => 1,
-      'is_recur' => 1,
-    ),
-  ),
   12 =>
     array(
       'name' => 'OmniPay - PayPal_Standard',