diff --git a/data/ep-blueprint-data/importexport/payment_gateways.xml b/data/ep-blueprint-data/importexport/payment_gateways.xml
deleted file mode 100644
index e00427e22..000000000
--- a/data/ep-blueprint-data/importexport/payment_gateways.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<payment_gateways>
-<payment_gateway>
-    <name>CyberSource</name>
-    <type>paymentGatewayCybersource</type>
-    <properties>
-        <property key="logMaximumSize">10</property>
-        <property key="logDirectory">WEB-INF/log</property>
-        <property key="merchantID">YOUR_MERCHANTID</property>
-        <property key="targetAPIVersion">1.24</property>
-        <property key="enableLog">false</property>
-        <property key="sendToProduction">false</property>
-        <property key="keysDirectory">conf//resources//payment//cybersource</property>
-    </properties>
-</payment_gateway>
-
-<payment_gateway>
-    <name>DemoPaymentProcessor</name>
-    <type>paymentGatewayNull</type>
-    <properties/>
-</payment_gateway>
-
-<payment_gateway>
-    <name>DemoTokenPaymentProcessor</name>
-    <type>paymentGatewayPluginTestDouble</type>
-    <properties/>
-</payment_gateway>
-
-<payment_gateway>
-    <name>Exchange</name>
-    <type>paymentGatewayExchange</type>
-    <properties/>
-</payment_gateway>
-
-<payment_gateway>
-    <name>GiftCertificate</name>
-    <type>paymentGatewayGiftCertificate</type>
-    <properties/>
-</payment_gateway>
-
-<payment_gateway>
-    <name>PayPal Do Direct</name>
-    <type>paymentGatewayPaypalDoDirect</type>
-    <properties>
-        <property key="environment">sandbox</property>
-        <property key="privateKeyPassword">YOUR_PRIVATE_KEY_PASSWORD</property>
-        <property key="APIPassword">YOUR_API_PASSWORD</property>
-        <property key="certificateFile">conf//resources//payment//paypal//YOUR_CERT.p12</property>
-        <property key="APIUsername">YOUR_API_USERNAME</property>
-    </properties>
-</payment_gateway>
-
-<payment_gateway>
-    <name>PayPal Express</name>
-    <type>paymentGatewayPaypalExpress</type>
-    <properties>
-        <property key="environment">sandbox</property>
-        <property key="privateKeyPassword">YOUR_PRIVATE_KEY_PASSWORD</property>
-        <property key="APIPassword">YOUR_API_PASSWORD</property>
-        <property key="certificateFile">conf//resources//payment//paypal//YOUR_CERT.p12</property>
-        <property key="APIUsername">YOUR_API_USERNAME</property>
-        <property key="paypalExpressCheckoutURL">https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout&amp;token=</property>
-    </properties>
-</payment_gateway>
-
-<payment_gateway>
-    <name>PayflowPro</name>
-    <type>paymentGatewayPayflowPro</type>
-    <properties>
-        <property key="logFileMaxSize">5</property>
-        <property key="proxyPassword"></property>
-        <property key="proxyPort"></property>
-        <property key="password">YOUR_PASSWORD</property>
-        <property key="proxyLogon"></property>
-        <property key="partner">Verisign</property>
-        <property key="vendor">YOUR_VENDOR</property>
-        <property key="logFileName">log/payflow-pro.log</property>
-        <property key="hostPort">443</property>
-        <property key="hostAddress">pilot-payflowpro.paypal.com</property>
-        <property key="proxyAddress"></property>
-        <property key="user">YOUR_USERNAME</property>
-        <property key="loggingLevel">1</property>
-    </properties>
-</payment_gateway>
-</payment_gateways>
\ No newline at end of file
diff --git a/data/ep-blueprint-data/importexport/stores.xml b/data/ep-blueprint-data/importexport/stores.xml
deleted file mode 100644
index df0b78085..000000000
--- a/data/ep-blueprint-data/importexport/stores.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<stores>
-<store code="VESTRI" enabled="true">
-    <globalization timeZone="Europe/London" country="US" sub_country="CA" content_encoding="UTF-8" default_locale="en_US" default_currency="USD"/>
-    <url>http://vestri.epdemos.com</url>
-    <name>Vestri US Web Store</name>
-    <state>200</state>
-    <type>B2B</type>
-    <description>Vestri Web Store</description>
-    <catalog>VESTRI_VIRTUAL</catalog>
-    <display_out_of_stock>true</display_out_of_stock>
-    <email_sender_name>admin@shop.vestri.com</email_sender_name>
-    <email_sender_address>admin@shop.vestri.com</email_sender_address>
-    <store_admin_email>admin@shop.vestri.com</store_admin_email>
-    <credit_card_cvv2_enabled>false</credit_card_cvv2_enabled>
-    <store_full_credit_cards>false</store_full_credit_cards>
-    <locales>
-        <locale>en_US</locale>
-    </locales>
-    <currencies>
-        <currency>USD</currency>
-    </currencies>
-    <warehouses>
-        <warehouse>VESTRI_MOTORS</warehouse>
-    </warehouses>
-    <tax_codes>
-        <guid>500</guid>
-        <guid>501</guid>
-        <guid>502</guid>
-        <guid>504</guid>
-    </tax_codes>
-    <tax_jurisdictions>
-        <jurisdiction>USTaxJurisdiction</jurisdiction>
-    </tax_jurisdictions>
-    <payment_gateways>
-        <gateway>DemoTokenPaymentProcessor</gateway>
-    </payment_gateways>
-    <credit_card_types>
-        <type>American Express</type>
-        <type>MasterCard</type>
-        <type>Visa</type>
-    </credit_card_types>
-    <cart_types>
-        <cart_type>
-            <name>default</name>
-            <guid>5364a6ef-5f8e-4ea0-ac40-54e6fff10ec1</guid>
-            <modifiergroups>
-                <code>multicart</code>
-            </modifiergroups>
-        </cart_type>
-    </cart_types>
-</store>
-
-<store code="vestri_au" enabled="true">
-    <globalization timeZone="Europe/London" country="AU" sub_country="" content_encoding="UTF-8" default_locale="en_US" default_currency="AUD"/>
-    <url>http://au.epdemo.com</url>
-    <name>AU Web</name>
-    <state>200</state>
-    <type>B2B</type>
-    <description></description>
-    <catalog>VESTRI_AU_VIRTUAL</catalog>
-    <display_out_of_stock>true</display_out_of_stock>
-    <email_sender_name>admin@ep.com</email_sender_name>
-    <email_sender_address>admin@ep.com</email_sender_address>
-    <store_admin_email>admin@ep.com</store_admin_email>
-    <credit_card_cvv2_enabled>false</credit_card_cvv2_enabled>
-    <store_full_credit_cards>false</store_full_credit_cards>
-    <locales>
-        <locale>en_US</locale>
-    </locales>
-    <currencies>
-        <currency>AUD</currency>
-    </currencies>
-    <warehouses>
-        <warehouse>VESTRI_MOTORS</warehouse>
-    </warehouses>
-    <tax_codes>
-        <guid>500</guid>
-        <guid>501</guid>
-        <guid>502</guid>
-    </tax_codes>
-    <tax_jurisdictions/>
-    <payment_gateways>
-        <gateway>DemoTokenPaymentProcessor</gateway>
-    </payment_gateways>
-    <credit_card_types>
-        <type>American Express</type>
-        <type>MasterCard</type>
-        <type>Visa</type>
-    </credit_card_types>
-    <cart_types>
-        <cart_type>
-            <name>default</name>
-            <guid>5364a6ef-5f8e-4ea0-ac40-54e6fff10ec2</guid>
-            <modifiergroups>
-                <code>multicart</code>
-            </modifiergroups>
-        </cart_type>
-    </cart_types>
-</store>
-
-<store code="VESTRICA" enabled="true">
-    <globalization timeZone="Europe/London" country="CA" sub_country="BC" content_encoding="UTF-8" default_locale="en" default_currency="CAD"/>
-    <url>http://vestrica.epdemos.com</url>
-    <name>Vestri Canada Web Store</name>
-    <state>200</state>
-    <type>B2B</type>
-    <description></description>
-    <catalog>Vestri_Shop_CA</catalog>
-    <display_out_of_stock>true</display_out_of_stock>
-    <email_sender_name>Store Admin</email_sender_name>
-    <email_sender_address>store@epdemos.com</email_sender_address>
-    <store_admin_email>store@epdemos.com</store_admin_email>
-    <credit_card_cvv2_enabled>false</credit_card_cvv2_enabled>
-    <store_full_credit_cards>false</store_full_credit_cards>
-    <locales>
-        <locale>en</locale>
-    </locales>
-    <currencies>
-        <currency>CAD</currency>
-    </currencies>
-    <warehouses>
-        <warehouse>VESTRI_MOTORS</warehouse>
-    </warehouses>
-    <tax_codes/>
-    <tax_jurisdictions>
-        <jurisdiction>CATaxJurisdiction</jurisdiction>
-    </tax_jurisdictions>
-    <payment_gateways>
-        <gateway>DemoTokenPaymentProcessor</gateway>
-    </payment_gateways>
-    <credit_card_types>
-        <type>American Express</type>
-        <type>MasterCard</type>
-        <type>Visa</type>
-    </credit_card_types>
-    <cart_types>
-        <cart_type>
-            <name>default</name>
-            <guid>5364a6ef-5f8e-4ea0-ac40-54e6fff10ec3</guid>
-            <modifiergroups>
-                <code>multicart</code>
-            </modifiergroups>
-        </cart_type>
-    </cart_types>
-</store>
-</stores>
\ No newline at end of file
diff --git a/data/ep-blueprint-data.zip b/data/ep-blueprint-data_7.6.0.zip
similarity index 100%
rename from data/ep-blueprint-data.zip
rename to data/ep-blueprint-data_7.6.0.zip
diff --git a/data/ep-blueprint-data_8.0.0.zip b/data/ep-blueprint-data_8.0.0.zip
new file mode 100644
index 000000000..260a8843c
Binary files /dev/null and b/data/ep-blueprint-data_8.0.0.zip differ
diff --git a/data/ep-blueprint-data/importexport/amounts.xml b/data/ep-blueprint-data_8.0.0/importexport/amounts.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/amounts.xml
rename to data/ep-blueprint-data_8.0.0/importexport/amounts.xml
diff --git a/data/ep-blueprint-data/importexport/bundles.xml b/data/ep-blueprint-data_8.0.0/importexport/bundles.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/bundles.xml
rename to data/ep-blueprint-data_8.0.0/importexport/bundles.xml
diff --git a/data/ep-blueprint-data/importexport/catalogs.xml b/data/ep-blueprint-data_8.0.0/importexport/catalogs.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/catalogs.xml
rename to data/ep-blueprint-data_8.0.0/importexport/catalogs.xml
diff --git a/data/ep-blueprint-data/importexport/categories.xml b/data/ep-blueprint-data_8.0.0/importexport/categories.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/categories.xml
rename to data/ep-blueprint-data_8.0.0/importexport/categories.xml
diff --git a/data/ep-blueprint-data/importexport/cmimportjobs.xml b/data/ep-blueprint-data_8.0.0/importexport/cmimportjobs.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/cmimportjobs.xml
rename to data/ep-blueprint-data_8.0.0/importexport/cmimportjobs.xml
diff --git a/data/ep-blueprint-data/importexport/condition_rules.xml b/data/ep-blueprint-data_8.0.0/importexport/condition_rules.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/condition_rules.xml
rename to data/ep-blueprint-data_8.0.0/importexport/condition_rules.xml
diff --git a/data/ep-blueprint-data/importexport/configuration/exportconfiguration.xml b/data/ep-blueprint-data_8.0.0/importexport/configuration/exportconfiguration.xml
similarity index 97%
rename from data/ep-blueprint-data/importexport/configuration/exportconfiguration.xml
rename to data/ep-blueprint-data_8.0.0/importexport/configuration/exportconfiguration.xml
index d06a2ad04..a7b4157c0 100755
--- a/data/ep-blueprint-data/importexport/configuration/exportconfiguration.xml
+++ b/data/ep-blueprint-data_8.0.0/importexport/configuration/exportconfiguration.xml
@@ -21,7 +21,6 @@
         </exporter>
         <exporter type="PRICELISTASSIGNMENT"/>
         <exporter type="TAXJURISDICTION"/>
-        <exporter type="PAYMENTGATEWAY"/>
         <exporter type="WAREHOUSE"/>
         <exporter type="CUSTOMER">
             <option key="CARD_NUMBER_FILTER" value="EMPTY"/>
diff --git a/data/ep-blueprint-data/importexport/configuration/importconfiguration.xml b/data/ep-blueprint-data_8.0.0/importexport/configuration/importconfiguration.xml
similarity index 85%
rename from data/ep-blueprint-data/importexport/configuration/importconfiguration.xml
rename to data/ep-blueprint-data_8.0.0/importexport/configuration/importconfiguration.xml
index 200354119..8b47b5025 100644
--- a/data/ep-blueprint-data/importexport/configuration/importconfiguration.xml
+++ b/data/ep-blueprint-data_8.0.0/importexport/configuration/importconfiguration.xml
@@ -3,31 +3,6 @@
   <!--TODO: Change validation back to true when we figure out how to make customers schema pass -->
   <xmlvalidation>false</xmlvalidation>
   <importstrategy>
-   <importer type="PAYMENTGATEWAY">
-      <importstrategy>INSERT_OR_UPDATE</importstrategy>
-      <dependentelements>
-        <dependentelement type="PAYMENT_GATEWAY_PROPERTIES">CLEAR_COLLECTION</dependentelement>
-      </dependentelements>
-    </importer>
-    <importer type="DYNAMICCONTENT">
-      <importstrategy>INSERT_OR_UPDATE</importstrategy>
-    </importer>
-    <importer type="DYNAMICCONTENTDELIVERY">
-      <importstrategy>INSERT_OR_UPDATE</importstrategy>
-    </importer>
-     <importer type="CONTENTSPACE">
-      <importstrategy>INSERT_OR_UPDATE</importstrategy>
-    </importer>
-    <importer type="DYNAMICCONTENT">
-      <importstrategy>INSERT_OR_UPDATE</importstrategy>
-    </importer>
-    <importer type="DYNAMICCONTENTDELIVERY">
-      <importstrategy>INSERT_OR_UPDATE</importstrategy>
-    </importer>
-	<importer type="CATALOG">
-      <importstrategy>INSERT_OR_UPDATE</importstrategy>
-    </importer>
-
     <importer type="PRICELISTASSIGNMENT">
       <importstrategy>INSERT_OR_UPDATE</importstrategy>
     </importer>
@@ -143,7 +118,7 @@
   <packager type="NONE"/>
   <retrieval>
     <method>FILE</method>
-    <source>${data.population.data.directory}/ep-blueprint-data/importexport</source>
+    <source>${data.population.data.directory}/ep-blueprint-data/ep-blueprint-data/importexport/</source>
   </retrieval>
   <transformerschain/>
 </importconfiguration>
diff --git a/data/ep-blueprint-data/importexport/configuration/searchconfiguration.xml b/data/ep-blueprint-data_8.0.0/importexport/configuration/searchconfiguration.xml
similarity index 95%
rename from data/ep-blueprint-data/importexport/configuration/searchconfiguration.xml
rename to data/ep-blueprint-data_8.0.0/importexport/configuration/searchconfiguration.xml
index 3b6d25e6a..387ca8a3c 100755
--- a/data/ep-blueprint-data/importexport/configuration/searchconfiguration.xml
+++ b/data/ep-blueprint-data_8.0.0/importexport/configuration/searchconfiguration.xml
@@ -12,7 +12,6 @@
     <query for="DynamicContentDelivery">FIND DynamicContentDelivery</query>
     <query for="TaxJurisdiction">FIND TaxJurisdiction</query>
     <query for="TaxCode">FIND TaxCode</query>
-    <query for="PaymentGateway">FIND PaymentGateway</query>
     <query for="Warehouse">FIND Warehouse</query>
     <query for="Store">FIND Store</query>
     <query for="Customer">FIND Customer</query>
diff --git a/data/ep-blueprint-data/importexport/coupon_sets.xml b/data/ep-blueprint-data_8.0.0/importexport/coupon_sets.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/coupon_sets.xml
rename to data/ep-blueprint-data_8.0.0/importexport/coupon_sets.xml
diff --git a/data/ep-blueprint-data/importexport/customerprofile_attributes.xml b/data/ep-blueprint-data_8.0.0/importexport/customerprofile_attributes.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/customerprofile_attributes.xml
rename to data/ep-blueprint-data_8.0.0/importexport/customerprofile_attributes.xml
diff --git a/data/ep-blueprint-data/importexport/customers.xml b/data/ep-blueprint-data_8.0.0/importexport/customers.xml
similarity index 78%
rename from data/ep-blueprint-data/importexport/customers.xml
rename to data/ep-blueprint-data_8.0.0/importexport/customers.xml
index f11d0cefe..bab019f82 100644
--- a/data/ep-blueprint-data/importexport/customers.xml
+++ b/data/ep-blueprint-data_8.0.0/importexport/customers.xml
@@ -22,18 +22,6 @@
             <organization>Brian &amp; co</organization>
         </address>
     </addresses>
-    <payment_methods>
-        <payment_token>
-            <payment_token_display_value>tok</payment_token_display_value>
-            <payment_token_value>tok</payment_token_value>
-        </payment_token>
-    </payment_methods>
-    <default_payment_method>
-        <payment_token>
-            <payment_token_display_value>tok</payment_token_display_value>
-            <payment_token_value>tok</payment_token_value>
-        </payment_token>
-    </default_payment_method>
     <groups>
         <group>400</group>
     </groups>
@@ -69,18 +57,6 @@
             <organization></organization>
         </address>
     </addresses>
-    <payment_methods>
-        <payment_token>
-            <payment_token_display_value>VISA</payment_token_display_value>
-            <payment_token_value>1232</payment_token_value>
-        </payment_token>
-    </payment_methods>
-    <default_payment_method>
-        <payment_token>
-            <payment_token_display_value>VISA</payment_token_display_value>
-            <payment_token_value>1232</payment_token_value>
-        </payment_token>
-    </default_payment_method>
     <groups>
         <group>400</group>
     </groups>
@@ -116,18 +92,6 @@
             <organization></organization>
         </address>
     </addresses>
-    <payment_methods>
-        <payment_token>
-            <payment_token_display_value>VISA</payment_token_display_value>
-            <payment_token_value>12324</payment_token_value>
-        </payment_token>
-    </payment_methods>
-    <default_payment_method>
-        <payment_token>
-            <payment_token_display_value>VISA</payment_token_display_value>
-            <payment_token_value>12324</payment_token_value>
-        </payment_token>
-    </default_payment_method>
     <groups>
         <group>400</group>
     </groups>
@@ -163,18 +127,6 @@
             <organization></organization>
         </address>
     </addresses>
-    <payment_methods>
-        <payment_token>
-            <payment_token_display_value>VISA</payment_token_display_value>
-            <payment_token_value>1224</payment_token_value>
-        </payment_token>
-    </payment_methods>
-    <default_payment_method>
-        <payment_token>
-            <payment_token_display_value>VISA</payment_token_display_value>
-            <payment_token_value>1224</payment_token_value>
-        </payment_token>
-    </default_payment_method>
     <groups>
         <group>400</group>
     </groups>
diff --git a/data/ep-blueprint-data/importexport/gift_certificates.xml b/data/ep-blueprint-data_8.0.0/importexport/gift_certificates.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/gift_certificates.xml
rename to data/ep-blueprint-data_8.0.0/importexport/gift_certificates.xml
diff --git a/data/ep-blueprint-data/importexport/inventory.xml b/data/ep-blueprint-data_8.0.0/importexport/inventory.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/inventory.xml
rename to data/ep-blueprint-data_8.0.0/importexport/inventory.xml
diff --git a/data/ep-blueprint-data/importexport/manifest.xml b/data/ep-blueprint-data_8.0.0/importexport/manifest.xml
similarity index 96%
rename from data/ep-blueprint-data/importexport/manifest.xml
rename to data/ep-blueprint-data_8.0.0/importexport/manifest.xml
index 38d7376ca..7a3daf534 100644
--- a/data/ep-blueprint-data/importexport/manifest.xml
+++ b/data/ep-blueprint-data_8.0.0/importexport/manifest.xml
@@ -4,7 +4,6 @@
     <resource>tax_codes.xml</resource>
     <resource>tax_jurisdictions.xml</resource>
     <resource>warehouses.xml</resource>
-    <resource>payment_gateways.xml</resource>
     <resource>modifiergroups.xml</resource>
     <resource>catalogs.xml</resource>
     <resource>modifiergroupfilters.xml</resource>
diff --git a/data/ep-blueprint-data/importexport/modifiergroupfilters.xml b/data/ep-blueprint-data_8.0.0/importexport/modifiergroupfilters.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/modifiergroupfilters.xml
rename to data/ep-blueprint-data_8.0.0/importexport/modifiergroupfilters.xml
diff --git a/data/ep-blueprint-data/importexport/modifiergroups.xml b/data/ep-blueprint-data_8.0.0/importexport/modifiergroups.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/modifiergroups.xml
rename to data/ep-blueprint-data_8.0.0/importexport/modifiergroups.xml
diff --git a/data/ep-blueprint-data_8.0.0/importexport/payment_providers.xml b/data/ep-blueprint-data_8.0.0/importexport/payment_providers.xml
new file mode 100644
index 000000000..118f4a6e5
--- /dev/null
+++ b/data/ep-blueprint-data_8.0.0/importexport/payment_providers.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) Elastic Path Software Inc., 2019
+  -->
+
+<payment_providers>
+	<payment_provider_configuration guid="happy-path-payment-provider-config" status="ACTIVE">
+		<name>Happy Path Config</name>
+		<payment_provider_id>happyPathPaymentProviderPlugin</payment_provider_id>
+		<properties>
+			<property key="Config B">Value of Config B</property>
+			<property key="Config A">Value of Config A</property>
+		</properties>
+		<default_display_name>default happy path display name</default_display_name>
+		<localized_names>
+			<value language="fr_CA">happy path display name - fr_CA</value>
+			<value language="fr">happy path display name - fr</value>
+		</localized_names>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="happy-path-payment-provider-another-config" status="ACTIVE">
+		<name>Happy Path Another Config</name>
+		<payment_provider_id>happyPathPaymentProviderPlugin</payment_provider_id>
+		<properties>
+			<property key="Config B">Another value of Config B</property>
+			<property key="Config A">Another value of Config A</property>
+		</properties>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="address-required-happy-path-payment-provider-config" status="ACTIVE">
+		<name>Address Required Happy Path Config</name>
+		<payment_provider_id>addressRequiredHappyPathPaymentProviderPlugin</payment_provider_id>
+		<properties>
+			<property key="Config B">Value of Config B</property>
+			<property key="Config A">Value of Config A</property>
+		</properties>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="big-amount-fields-happy-path-payment-provider-config" status="ACTIVE">
+		<name>Big Amount Fields Happy Path Config</name>
+		<payment_provider_id>bigAmountFieldsHappyPathPaymentProviderPlugin</payment_provider_id>
+		<properties>
+			<property key="Config B">Value of Config B for big amount fields happy path payment provider config with big value</property>
+			<property key="Config A">Value of Config A for big amount fields happy path payment provider config with big value</property>
+		</properties>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="angry-path-payment-provider-config" status="ACTIVE">
+		<name>Angry Path Config</name>
+		<payment_provider_id>angryPathPaymentProviderPlugin</payment_provider_id>
+		<properties/>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="no-capabilities-payment-provider-config" status="ACTIVE">
+		<name>No Capabilities Config</name>
+		<payment_provider_id>noCapabilitiesPaymentProviderPlugin</payment_provider_id>
+		<properties/>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="smart-path-payment-provider-config" status="ACTIVE">
+		<name>Smart Path Config</name>
+		<payment_provider_id>smartPathPaymentProviderPlugin</payment_provider_id>
+		<properties/>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="cancel-unsupported-config" status="ACTIVE">
+		<name>Cancel Unsupported Config</name>
+		<payment_provider_id>smartPathCancelUnsupportedPaymentProviderPlugin</payment_provider_id>
+		<properties/>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="credit-unsupported-config" status="ACTIVE">
+		<name>Credit Unsupported Config</name>
+		<payment_provider_id>smartPathCreditUnsupportedPaymentProviderPlugin</payment_provider_id>
+		<properties/>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="reverse-unsupported-config" status="ACTIVE">
+		<name>Reverse Unsupported Config</name>
+		<payment_provider_id>smartPathReverseUnsupportedPaymentProviderPlugin</payment_provider_id>
+		<properties/>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="modify-unsupported-config" status="ACTIVE">
+		<name>Modify Unsupported Config</name>
+		<payment_provider_id>smartPathModifyUnsupportedPaymentProviderPlugin</payment_provider_id>
+		<properties/>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="reserve-unsupported-config" status="ACTIVE">
+		<name>Reserve Unsupported Config</name>
+		<payment_provider_id>smartPathReserveUnsupportedPaymentProviderPlugin</payment_provider_id>
+		<properties/>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="modify-and-cancel-unsupported-config" status="ACTIVE">
+		<name>Modify And Cancel Unsupported Config</name>
+		<payment_provider_id>smartPathModifyAndCancelUnsupportedPaymentProviderPlugin</payment_provider_id>
+		<properties/>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="cancel-reserve-fail-config" status="ACTIVE">
+		<name>Cancel Fails Config</name>
+		<payment_provider_id>smartPathPaymentProviderPlugin</payment_provider_id>
+		<properties>
+			<property key="CANCEL_RESERVE">FAILS</property>
+		</properties>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="email-required-payment-provider-config" status="ACTIVE">
+		<name>Email Required Config</name>
+		<payment_provider_id>emailRequiredPaymentProviderPlugin</payment_provider_id>
+		<properties/>
+	</payment_provider_configuration>
+
+	<payment_provider_configuration guid="single-use-happy-path-payment-provider-config" status="ACTIVE">
+		<name>Single Use Happy Path Config</name>
+		<payment_provider_id>singleUseHappyPathPaymentProviderPlugin</payment_provider_id>
+		<properties>
+			<property key="Config A">Value of Config A</property>
+			<property key="Config B">Value of Config B</property>
+		</properties>
+	</payment_provider_configuration>
+
+</payment_providers>
diff --git a/data/ep-blueprint-data/importexport/price_list_assignments.xml b/data/ep-blueprint-data_8.0.0/importexport/price_list_assignments.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/price_list_assignments.xml
rename to data/ep-blueprint-data_8.0.0/importexport/price_list_assignments.xml
diff --git a/data/ep-blueprint-data/importexport/price_lists.xml b/data/ep-blueprint-data_8.0.0/importexport/price_lists.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/price_lists.xml
rename to data/ep-blueprint-data_8.0.0/importexport/price_lists.xml
diff --git a/data/ep-blueprint-data/importexport/pricing.xml b/data/ep-blueprint-data_8.0.0/importexport/pricing.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/pricing.xml
rename to data/ep-blueprint-data_8.0.0/importexport/pricing.xml
diff --git a/data/ep-blueprint-data/importexport/productassociations.xml b/data/ep-blueprint-data_8.0.0/importexport/productassociations.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/productassociations.xml
rename to data/ep-blueprint-data_8.0.0/importexport/productassociations.xml
diff --git a/data/ep-blueprint-data/importexport/productcategoryassociations.xml b/data/ep-blueprint-data_8.0.0/importexport/productcategoryassociations.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/productcategoryassociations.xml
rename to data/ep-blueprint-data_8.0.0/importexport/productcategoryassociations.xml
diff --git a/data/ep-blueprint-data/importexport/products.xml b/data/ep-blueprint-data_8.0.0/importexport/products.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/products.xml
rename to data/ep-blueprint-data_8.0.0/importexport/products.xml
diff --git a/data/ep-blueprint-data/importexport/promotions.xml b/data/ep-blueprint-data_8.0.0/importexport/promotions.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/promotions.xml
rename to data/ep-blueprint-data_8.0.0/importexport/promotions.xml
diff --git a/data/ep-blueprint-data/importexport/saved_conditions.xml b/data/ep-blueprint-data_8.0.0/importexport/saved_conditions.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/saved_conditions.xml
rename to data/ep-blueprint-data_8.0.0/importexport/saved_conditions.xml
diff --git a/data/ep-blueprint-data/importexport/shipping_regions.xml b/data/ep-blueprint-data_8.0.0/importexport/shipping_regions.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/shipping_regions.xml
rename to data/ep-blueprint-data_8.0.0/importexport/shipping_regions.xml
diff --git a/data/ep-blueprint-data/importexport/shipping_service_levels.xml b/data/ep-blueprint-data_8.0.0/importexport/shipping_service_levels.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/shipping_service_levels.xml
rename to data/ep-blueprint-data_8.0.0/importexport/shipping_service_levels.xml
diff --git a/data/ep-blueprint-data/importexport/store_associations.xml b/data/ep-blueprint-data_8.0.0/importexport/store_associations.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/store_associations.xml
rename to data/ep-blueprint-data_8.0.0/importexport/store_associations.xml
diff --git a/data/ep-blueprint-data_8.0.0/importexport/stores.xml b/data/ep-blueprint-data_8.0.0/importexport/stores.xml
new file mode 100644
index 000000000..37650fb80
--- /dev/null
+++ b/data/ep-blueprint-data_8.0.0/importexport/stores.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<stores>
+<store code="VESTRI" enabled="true">
+    <globalization timeZone="Europe/London" country="US" sub_country="CA" content_encoding="UTF-8" default_locale="en_US" default_currency="USD"/>
+    <url>http://vestri.epdemos.com</url>
+    <name>Vestri US Web Store</name>
+    <state>200</state>
+    <type>B2B</type>
+    <description>Vestri Web Store</description>
+    <catalog>VESTRI_VIRTUAL</catalog>
+    <display_out_of_stock>true</display_out_of_stock>
+    <email_sender_name>admin@shop.vestri.com</email_sender_name>
+    <email_sender_address>admin@shop.vestri.com</email_sender_address>
+    <store_admin_email>admin@shop.vestri.com</store_admin_email>
+    <credit_card_cvv2_enabled>false</credit_card_cvv2_enabled>
+    <store_full_credit_cards>false</store_full_credit_cards>
+    <locales>
+        <locale>en_US</locale>
+    </locales>
+    <currencies>
+        <currency>USD</currency>
+    </currencies>
+    <warehouses>
+        <warehouse>VESTRI_MOTORS</warehouse>
+    </warehouses>
+    <tax_codes>
+        <guid>500</guid>
+        <guid>501</guid>
+        <guid>502</guid>
+        <guid>504</guid>
+    </tax_codes>
+    <tax_jurisdictions>
+        <jurisdiction>USTaxJurisdiction</jurisdiction>
+    </tax_jurisdictions>
+    <credit_card_types>
+        <type>American Express</type>
+        <type>MasterCard</type>
+        <type>Visa</type>
+    </credit_card_types>
+    <cart_types>
+        <cart_type>
+            <name>default</name>
+            <guid>5364a6ef-5f8e-4ea0-ac40-54e6fff10ec1</guid>
+            <modifiergroups>
+                <code>multicart</code>
+            </modifiergroups>
+        </cart_type>
+    </cart_types>
+    <payment_provider_configurations>
+        <payment_provider_configuration_guid>no-capabilities-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>smart-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>angry-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>happy-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>big-amount-fields-happy-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>address-required-happy-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>cancel-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>credit-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>reverse-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>modify-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>modify-and-cancel-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>reserve-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>cancel-reserve-fail-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>email-required-payment-provider-config</payment_provider_configuration_guid>
+    </payment_provider_configurations>
+</store>
+
+<store code="vestri_au" enabled="true">
+    <globalization timeZone="Europe/London" country="AU" sub_country="" content_encoding="UTF-8" default_locale="en_US" default_currency="AUD"/>
+    <url>http://au.epdemo.com</url>
+    <name>AU Web</name>
+    <state>200</state>
+    <type>B2B</type>
+    <description></description>
+    <catalog>VESTRI_AU_VIRTUAL</catalog>
+    <display_out_of_stock>true</display_out_of_stock>
+    <email_sender_name>admin@ep.com</email_sender_name>
+    <email_sender_address>admin@ep.com</email_sender_address>
+    <store_admin_email>admin@ep.com</store_admin_email>
+    <credit_card_cvv2_enabled>false</credit_card_cvv2_enabled>
+    <store_full_credit_cards>false</store_full_credit_cards>
+    <locales>
+        <locale>en_US</locale>
+    </locales>
+    <currencies>
+        <currency>AUD</currency>
+    </currencies>
+    <warehouses>
+        <warehouse>VESTRI_MOTORS</warehouse>
+    </warehouses>
+    <tax_codes>
+        <guid>500</guid>
+        <guid>501</guid>
+        <guid>502</guid>
+    </tax_codes>
+    <tax_jurisdictions/>
+    <credit_card_types>
+        <type>American Express</type>
+        <type>MasterCard</type>
+        <type>Visa</type>
+    </credit_card_types>
+    <cart_types>
+        <cart_type>
+            <name>default</name>
+            <guid>5364a6ef-5f8e-4ea0-ac40-54e6fff10ec2</guid>
+            <modifiergroups>
+                <code>multicart</code>
+            </modifiergroups>
+        </cart_type>
+    </cart_types>
+    <payment_provider_configurations>
+        <payment_provider_configuration_guid>no-capabilities-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>smart-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>angry-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>happy-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>big-amount-fields-happy-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>address-required-happy-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>cancel-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>credit-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>reverse-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>modify-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>modify-and-cancel-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>reserve-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>cancel-reserve-fail-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>email-required-payment-provider-config</payment_provider_configuration_guid>
+    </payment_provider_configurations>
+</store>
+
+<store code="VESTRICA" enabled="true">
+    <globalization timeZone="Europe/London" country="CA" sub_country="BC" content_encoding="UTF-8" default_locale="en" default_currency="CAD"/>
+    <url>http://vestrica.epdemos.com</url>
+    <name>Vestri Canada Web Store</name>
+    <state>200</state>
+    <type>B2B</type>
+    <description></description>
+    <catalog>Vestri_Shop_CA</catalog>
+    <display_out_of_stock>true</display_out_of_stock>
+    <email_sender_name>Store Admin</email_sender_name>
+    <email_sender_address>store@epdemos.com</email_sender_address>
+    <store_admin_email>store@epdemos.com</store_admin_email>
+    <credit_card_cvv2_enabled>false</credit_card_cvv2_enabled>
+    <store_full_credit_cards>false</store_full_credit_cards>
+    <locales>
+        <locale>en</locale>
+    </locales>
+    <currencies>
+        <currency>CAD</currency>
+    </currencies>
+    <warehouses>
+        <warehouse>VESTRI_MOTORS</warehouse>
+    </warehouses>
+    <tax_codes/>
+    <tax_jurisdictions>
+        <jurisdiction>CATaxJurisdiction</jurisdiction>
+    </tax_jurisdictions>
+    <credit_card_types>
+        <type>American Express</type>
+        <type>MasterCard</type>
+        <type>Visa</type>
+    </credit_card_types>
+    <cart_types>
+        <cart_type>
+            <name>default</name>
+            <guid>5364a6ef-5f8e-4ea0-ac40-54e6fff10ec3</guid>
+            <modifiergroups>
+                <code>multicart</code>
+            </modifiergroups>
+        </cart_type>
+    </cart_types>
+    <payment_provider_configurations>
+        <payment_provider_configuration_guid>no-capabilities-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>smart-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>angry-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>happy-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>big-amount-fields-happy-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>address-required-happy-path-payment-provider-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>cancel-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>credit-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>reverse-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>modify-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>modify-and-cancel-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>reserve-unsupported-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>cancel-reserve-fail-config</payment_provider_configuration_guid>
+        <payment_provider_configuration_guid>email-required-payment-provider-config</payment_provider_configuration_guid>
+    </payment_provider_configurations>
+</store>
+</stores>
diff --git a/data/ep-blueprint-data/importexport/tax_codes.xml b/data/ep-blueprint-data_8.0.0/importexport/tax_codes.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/tax_codes.xml
rename to data/ep-blueprint-data_8.0.0/importexport/tax_codes.xml
diff --git a/data/ep-blueprint-data/importexport/tax_jurisdictions.xml b/data/ep-blueprint-data_8.0.0/importexport/tax_jurisdictions.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/tax_jurisdictions.xml
rename to data/ep-blueprint-data_8.0.0/importexport/tax_jurisdictions.xml
diff --git a/data/ep-blueprint-data/importexport/warehouses.xml b/data/ep-blueprint-data_8.0.0/importexport/warehouses.xml
similarity index 100%
rename from data/ep-blueprint-data/importexport/warehouses.xml
rename to data/ep-blueprint-data_8.0.0/importexport/warehouses.xml
diff --git a/data/ep-blueprint-data/liquibase-changelog.xml b/data/ep-blueprint-data_8.0.0/liquibase-changelog.xml
similarity index 90%
rename from data/ep-blueprint-data/liquibase-changelog.xml
rename to data/ep-blueprint-data_8.0.0/liquibase-changelog.xml
index 4fb201f75..6fc422555 100644
--- a/data/ep-blueprint-data/liquibase-changelog.xml
+++ b/data/ep-blueprint-data_8.0.0/liquibase-changelog.xml
@@ -8,7 +8,7 @@
 		<comment>Initial import of ep vestri blueprint data.</comment>
 
 		<customChange class="com.elasticpath.datapopulation.importexport.ImportExportChange">
-			<param name="dataSet" value="ep-blueprint-data" />
+			<param name="dataSet" value="ep-blueprint-data/ep-blueprint-data" />
 		</customChange>
 	</changeSet>
 </databaseChangeLog>