diff --git a/fcpayone.php b/fcpayone.php
index 77509ea..c3efa49 100755
--- a/fcpayone.php
+++ b/fcpayone.php
@@ -25,7 +25,7 @@
     exit;
 }
 
-require_once _PS_MODULE_DIR_ . 'fcpayone/Core/autoload.php';
+require_once _PS_MODULE_DIR_ . 'fcpayone/vendor/autoload.php';
 
 class FcPayone extends \PaymentModule
 {
@@ -785,7 +785,8 @@ public function hookDisplayPDFInvoice($params)
             $this->context->smarty->assign('usage', $aOrderData['txid']);
             return $this->display(
                 $this->fcGetPayoneHelper()->getModulePath(),
-                'views/templates/hook/admin/displayPDFInvoice.tpl');
+                'views/templates/hook/admin/displayPDFInvoice.tpl'
+            );
         }
     }
 }
diff --git a/upgrade/upgrade-1.2.1.php b/upgrade/upgrade-1.2.1.php
index 4b56dd5..21a6cc3 100755
--- a/upgrade/upgrade-1.2.1.php
+++ b/upgrade/upgrade-1.2.1.php
@@ -21,7 +21,6 @@
  * @link      http://www.payone.de
  */
 
-
 if (!defined('_PS_VERSION_')) {
     exit;
 }
diff --git a/upgrade/upgrade-2.0.0.php b/upgrade/upgrade-2.0.0.php
index fb6c8d0..d824687 100755
--- a/upgrade/upgrade-2.0.0.php
+++ b/upgrade/upgrade-2.0.0.php
@@ -21,7 +21,6 @@
  * @link      http://www.payone.de
  */
 
-
 if (!defined('_PS_VERSION_')) {
     exit;
 }
diff --git a/Core/Base/ErrorHandler.php b/vendor/Base/ErrorHandler.php
similarity index 100%
rename from Core/Base/ErrorHandler.php
rename to vendor/Base/ErrorHandler.php
diff --git a/Core/Base/Log.php b/vendor/Base/Log.php
similarity index 100%
rename from Core/Base/Log.php
rename to vendor/Base/Log.php
diff --git a/Core/Base/Mandate.php b/vendor/Base/Mandate.php
similarity index 100%
rename from Core/Base/Mandate.php
rename to vendor/Base/Mandate.php
diff --git a/Core/Base/Order.php b/vendor/Base/Order.php
similarity index 100%
rename from Core/Base/Order.php
rename to vendor/Base/Order.php
diff --git a/Core/Base/Reference.php b/vendor/Base/Reference.php
similarity index 100%
rename from Core/Base/Reference.php
rename to vendor/Base/Reference.php
diff --git a/Core/Base/Registry.php b/vendor/Base/Registry.php
similarity index 100%
rename from Core/Base/Registry.php
rename to vendor/Base/Registry.php
diff --git a/Core/Base/Transaction.php b/vendor/Base/Transaction.php
similarity index 100%
rename from Core/Base/Transaction.php
rename to vendor/Base/Transaction.php
diff --git a/Core/Base/User.php b/vendor/Base/User.php
similarity index 100%
rename from Core/Base/User.php
rename to vendor/Base/User.php
diff --git a/Core/Base/index.php b/vendor/Base/index.php
similarity index 100%
rename from Core/Base/index.php
rename to vendor/Base/index.php
diff --git a/Core/Forms/Backend/Backend.php b/vendor/Forms/Backend/Backend.php
similarity index 100%
rename from Core/Forms/Backend/Backend.php
rename to vendor/Forms/Backend/Backend.php
diff --git a/Core/Forms/Backend/Base.php b/vendor/Forms/Backend/Base.php
similarity index 100%
rename from Core/Forms/Backend/Base.php
rename to vendor/Forms/Backend/Base.php
diff --git a/Core/Forms/Backend/General/Connection.php b/vendor/Forms/Backend/General/Connection.php
similarity index 100%
rename from Core/Forms/Backend/General/Connection.php
rename to vendor/Forms/Backend/General/Connection.php
diff --git a/Core/Forms/Backend/General/Misc.php b/vendor/Forms/Backend/General/Misc.php
similarity index 100%
rename from Core/Forms/Backend/General/Misc.php
rename to vendor/Forms/Backend/General/Misc.php
diff --git a/Core/Forms/Backend/General/TransactionForwarding.php b/vendor/Forms/Backend/General/TransactionForwarding.php
similarity index 100%
rename from Core/Forms/Backend/General/TransactionForwarding.php
rename to vendor/Forms/Backend/General/TransactionForwarding.php
diff --git a/Core/Forms/Backend/General/TransactionStateMapping.php b/vendor/Forms/Backend/General/TransactionStateMapping.php
similarity index 100%
rename from Core/Forms/Backend/General/TransactionStateMapping.php
rename to vendor/Forms/Backend/General/TransactionStateMapping.php
diff --git a/Core/Forms/Backend/General/index.php b/vendor/Forms/Backend/General/index.php
similarity index 100%
rename from Core/Forms/Backend/General/index.php
rename to vendor/Forms/Backend/General/index.php
diff --git a/Core/Forms/Backend/Order.php b/vendor/Forms/Backend/Order.php
similarity index 100%
rename from Core/Forms/Backend/Order.php
rename to vendor/Forms/Backend/Order.php
diff --git a/Core/Forms/Backend/Payment/AdvancePayment.php b/vendor/Forms/Backend/Payment/AdvancePayment.php
similarity index 100%
rename from Core/Forms/Backend/Payment/AdvancePayment.php
rename to vendor/Forms/Backend/Payment/AdvancePayment.php
diff --git a/Core/Forms/Backend/Payment/BSInvoice.php b/vendor/Forms/Backend/Payment/BSInvoice.php
similarity index 100%
rename from Core/Forms/Backend/Payment/BSInvoice.php
rename to vendor/Forms/Backend/Payment/BSInvoice.php
diff --git a/Core/Forms/Backend/Payment/Base.php b/vendor/Forms/Backend/Payment/Base.php
similarity index 100%
rename from Core/Forms/Backend/Payment/Base.php
rename to vendor/Forms/Backend/Payment/Base.php
diff --git a/Core/Forms/Backend/Payment/CashOnDelivery.php b/vendor/Forms/Backend/Payment/CashOnDelivery.php
similarity index 100%
rename from Core/Forms/Backend/Payment/CashOnDelivery.php
rename to vendor/Forms/Backend/Payment/CashOnDelivery.php
diff --git a/Core/Forms/Backend/Payment/CreditCard.php b/vendor/Forms/Backend/Payment/CreditCard.php
similarity index 100%
rename from Core/Forms/Backend/Payment/CreditCard.php
rename to vendor/Forms/Backend/Payment/CreditCard.php
diff --git a/Core/Forms/Backend/Payment/CreditCardGeneral.php b/vendor/Forms/Backend/Payment/CreditCardGeneral.php
similarity index 100%
rename from Core/Forms/Backend/Payment/CreditCardGeneral.php
rename to vendor/Forms/Backend/Payment/CreditCardGeneral.php
diff --git a/Core/Forms/Backend/Payment/Debit.php b/vendor/Forms/Backend/Payment/Debit.php
similarity index 100%
rename from Core/Forms/Backend/Payment/Debit.php
rename to vendor/Forms/Backend/Payment/Debit.php
diff --git a/Core/Forms/Backend/Payment/Invoice.php b/vendor/Forms/Backend/Payment/Invoice.php
similarity index 100%
rename from Core/Forms/Backend/Payment/Invoice.php
rename to vendor/Forms/Backend/Payment/Invoice.php
diff --git a/Core/Forms/Backend/Payment/OnlineTransfer.php b/vendor/Forms/Backend/Payment/OnlineTransfer.php
similarity index 100%
rename from Core/Forms/Backend/Payment/OnlineTransfer.php
rename to vendor/Forms/Backend/Payment/OnlineTransfer.php
diff --git a/Core/Forms/Backend/Payment/PayPal.php b/vendor/Forms/Backend/Payment/PayPal.php
similarity index 100%
rename from Core/Forms/Backend/Payment/PayPal.php
rename to vendor/Forms/Backend/Payment/PayPal.php
diff --git a/Core/Forms/Backend/Payment/PayPalExpress.php b/vendor/Forms/Backend/Payment/PayPalExpress.php
similarity index 100%
rename from Core/Forms/Backend/Payment/PayPalExpress.php
rename to vendor/Forms/Backend/Payment/PayPalExpress.php
diff --git a/Core/Forms/Backend/Payment/Paydirekt.php b/vendor/Forms/Backend/Payment/Paydirekt.php
similarity index 100%
rename from Core/Forms/Backend/Payment/Paydirekt.php
rename to vendor/Forms/Backend/Payment/Paydirekt.php
diff --git a/Core/Forms/Backend/Payment/Sofortbanking.php b/vendor/Forms/Backend/Payment/Sofortbanking.php
similarity index 100%
rename from Core/Forms/Backend/Payment/Sofortbanking.php
rename to vendor/Forms/Backend/Payment/Sofortbanking.php
diff --git a/Core/Forms/Backend/Payment/index.php b/vendor/Forms/Backend/Payment/index.php
similarity index 100%
rename from Core/Forms/Backend/Payment/index.php
rename to vendor/Forms/Backend/Payment/index.php
diff --git a/Core/Forms/Backend/index.php b/vendor/Forms/Backend/index.php
similarity index 100%
rename from Core/Forms/Backend/index.php
rename to vendor/Forms/Backend/index.php
diff --git a/Core/Forms/Frontend/Base.php b/vendor/Forms/Frontend/Base.php
similarity index 100%
rename from Core/Forms/Frontend/Base.php
rename to vendor/Forms/Frontend/Base.php
diff --git a/Core/Forms/Frontend/Frontend.php b/vendor/Forms/Frontend/Frontend.php
similarity index 100%
rename from Core/Forms/Frontend/Frontend.php
rename to vendor/Forms/Frontend/Frontend.php
diff --git a/Core/Forms/Frontend/Payment/Base.php b/vendor/Forms/Frontend/Payment/Base.php
similarity index 100%
rename from Core/Forms/Frontend/Payment/Base.php
rename to vendor/Forms/Frontend/Payment/Base.php
diff --git a/Core/Forms/Frontend/Payment/CreditCard.php b/vendor/Forms/Frontend/Payment/CreditCard.php
similarity index 100%
rename from Core/Forms/Frontend/Payment/CreditCard.php
rename to vendor/Forms/Frontend/Payment/CreditCard.php
diff --git a/Core/Forms/Frontend/Payment/Debit.php b/vendor/Forms/Frontend/Payment/Debit.php
similarity index 100%
rename from Core/Forms/Frontend/Payment/Debit.php
rename to vendor/Forms/Frontend/Payment/Debit.php
diff --git a/Core/Forms/Frontend/Payment/Default.php b/vendor/Forms/Frontend/Payment/Default.php
similarity index 100%
rename from Core/Forms/Frontend/Payment/Default.php
rename to vendor/Forms/Frontend/Payment/Default.php
diff --git a/Core/Forms/Frontend/Payment/OnlineTransfer.php b/vendor/Forms/Frontend/Payment/OnlineTransfer.php
similarity index 100%
rename from Core/Forms/Frontend/Payment/OnlineTransfer.php
rename to vendor/Forms/Frontend/Payment/OnlineTransfer.php
diff --git a/Core/Forms/Frontend/Payment/index.php b/vendor/Forms/Frontend/Payment/index.php
similarity index 100%
rename from Core/Forms/Frontend/Payment/index.php
rename to vendor/Forms/Frontend/Payment/index.php
diff --git a/Core/Forms/Frontend/index.php b/vendor/Forms/Frontend/index.php
similarity index 100%
rename from Core/Forms/Frontend/index.php
rename to vendor/Forms/Frontend/index.php
diff --git a/Core/Forms/index.php b/vendor/Forms/index.php
similarity index 100%
rename from Core/Forms/index.php
rename to vendor/Forms/index.php
diff --git a/Core/Helper/Helper.php b/vendor/Helper/Helper.php
similarity index 100%
rename from Core/Helper/Helper.php
rename to vendor/Helper/Helper.php
diff --git a/Core/Helper/HelperPrestashop.php b/vendor/Helper/HelperPrestashop.php
similarity index 100%
rename from Core/Helper/HelperPrestashop.php
rename to vendor/Helper/HelperPrestashop.php
diff --git a/Core/Helper/index.php b/vendor/Helper/index.php
similarity index 100%
rename from Core/Helper/index.php
rename to vendor/Helper/index.php
diff --git a/Core/Payment/Methods/AdvancePayment.php b/vendor/Payment/Methods/AdvancePayment.php
similarity index 100%
rename from Core/Payment/Methods/AdvancePayment.php
rename to vendor/Payment/Methods/AdvancePayment.php
diff --git a/Core/Payment/Methods/BSInvoice.php b/vendor/Payment/Methods/BSInvoice.php
similarity index 100%
rename from Core/Payment/Methods/BSInvoice.php
rename to vendor/Payment/Methods/BSInvoice.php
diff --git a/Core/Payment/Methods/Base.php b/vendor/Payment/Methods/Base.php
similarity index 100%
rename from Core/Payment/Methods/Base.php
rename to vendor/Payment/Methods/Base.php
diff --git a/Core/Payment/Methods/CashOnDelivery.php b/vendor/Payment/Methods/CashOnDelivery.php
similarity index 100%
rename from Core/Payment/Methods/CashOnDelivery.php
rename to vendor/Payment/Methods/CashOnDelivery.php
diff --git a/Core/Payment/Methods/CreditCard/Amex.php b/vendor/Payment/Methods/CreditCard/Amex.php
similarity index 100%
rename from Core/Payment/Methods/CreditCard/Amex.php
rename to vendor/Payment/Methods/CreditCard/Amex.php
diff --git a/Core/Payment/Methods/CreditCard/CarteBleue.php b/vendor/Payment/Methods/CreditCard/CarteBleue.php
similarity index 100%
rename from Core/Payment/Methods/CreditCard/CarteBleue.php
rename to vendor/Payment/Methods/CreditCard/CarteBleue.php
diff --git a/Core/Payment/Methods/CreditCard/CreditCard.php b/vendor/Payment/Methods/CreditCard/CreditCard.php
similarity index 100%
rename from Core/Payment/Methods/CreditCard/CreditCard.php
rename to vendor/Payment/Methods/CreditCard/CreditCard.php
diff --git a/Core/Payment/Methods/CreditCard/Diners.php b/vendor/Payment/Methods/CreditCard/Diners.php
similarity index 100%
rename from Core/Payment/Methods/CreditCard/Diners.php
rename to vendor/Payment/Methods/CreditCard/Diners.php
diff --git a/Core/Payment/Methods/CreditCard/Discover.php b/vendor/Payment/Methods/CreditCard/Discover.php
similarity index 100%
rename from Core/Payment/Methods/CreditCard/Discover.php
rename to vendor/Payment/Methods/CreditCard/Discover.php
diff --git a/Core/Payment/Methods/CreditCard/Jcb.php b/vendor/Payment/Methods/CreditCard/Jcb.php
similarity index 100%
rename from Core/Payment/Methods/CreditCard/Jcb.php
rename to vendor/Payment/Methods/CreditCard/Jcb.php
diff --git a/Core/Payment/Methods/CreditCard/MaestroInternational.php b/vendor/Payment/Methods/CreditCard/MaestroInternational.php
similarity index 100%
rename from Core/Payment/Methods/CreditCard/MaestroInternational.php
rename to vendor/Payment/Methods/CreditCard/MaestroInternational.php
diff --git a/Core/Payment/Methods/CreditCard/MaestroUk.php b/vendor/Payment/Methods/CreditCard/MaestroUk.php
similarity index 100%
rename from Core/Payment/Methods/CreditCard/MaestroUk.php
rename to vendor/Payment/Methods/CreditCard/MaestroUk.php
diff --git a/Core/Payment/Methods/CreditCard/MasterCard.php b/vendor/Payment/Methods/CreditCard/MasterCard.php
similarity index 100%
rename from Core/Payment/Methods/CreditCard/MasterCard.php
rename to vendor/Payment/Methods/CreditCard/MasterCard.php
diff --git a/Core/Payment/Methods/CreditCard/Visa.php b/vendor/Payment/Methods/CreditCard/Visa.php
similarity index 100%
rename from Core/Payment/Methods/CreditCard/Visa.php
rename to vendor/Payment/Methods/CreditCard/Visa.php
diff --git a/Core/Payment/Methods/CreditCard/index.php b/vendor/Payment/Methods/CreditCard/index.php
similarity index 100%
rename from Core/Payment/Methods/CreditCard/index.php
rename to vendor/Payment/Methods/CreditCard/index.php
diff --git a/Core/Payment/Methods/Debit.php b/vendor/Payment/Methods/Debit.php
similarity index 100%
rename from Core/Payment/Methods/Debit.php
rename to vendor/Payment/Methods/Debit.php
diff --git a/Core/Payment/Methods/Invoice.php b/vendor/Payment/Methods/Invoice.php
similarity index 100%
rename from Core/Payment/Methods/Invoice.php
rename to vendor/Payment/Methods/Invoice.php
diff --git a/Core/Payment/Methods/OnlineTransfer/Eps.php b/vendor/Payment/Methods/OnlineTransfer/Eps.php
similarity index 100%
rename from Core/Payment/Methods/OnlineTransfer/Eps.php
rename to vendor/Payment/Methods/OnlineTransfer/Eps.php
diff --git a/Core/Payment/Methods/OnlineTransfer/Giropay.php b/vendor/Payment/Methods/OnlineTransfer/Giropay.php
similarity index 100%
rename from Core/Payment/Methods/OnlineTransfer/Giropay.php
rename to vendor/Payment/Methods/OnlineTransfer/Giropay.php
diff --git a/Core/Payment/Methods/OnlineTransfer/IDeal.php b/vendor/Payment/Methods/OnlineTransfer/IDeal.php
similarity index 100%
rename from Core/Payment/Methods/OnlineTransfer/IDeal.php
rename to vendor/Payment/Methods/OnlineTransfer/IDeal.php
diff --git a/Core/Payment/Methods/OnlineTransfer/OnlineTransfer.php b/vendor/Payment/Methods/OnlineTransfer/OnlineTransfer.php
similarity index 100%
rename from Core/Payment/Methods/OnlineTransfer/OnlineTransfer.php
rename to vendor/Payment/Methods/OnlineTransfer/OnlineTransfer.php
diff --git a/Core/Payment/Methods/OnlineTransfer/PostFinanceCard.php b/vendor/Payment/Methods/OnlineTransfer/PostFinanceCard.php
similarity index 100%
rename from Core/Payment/Methods/OnlineTransfer/PostFinanceCard.php
rename to vendor/Payment/Methods/OnlineTransfer/PostFinanceCard.php
diff --git a/Core/Payment/Methods/OnlineTransfer/PostFinanceEFinance.php b/vendor/Payment/Methods/OnlineTransfer/PostFinanceEFinance.php
similarity index 100%
rename from Core/Payment/Methods/OnlineTransfer/PostFinanceEFinance.php
rename to vendor/Payment/Methods/OnlineTransfer/PostFinanceEFinance.php
diff --git a/Core/Payment/Methods/OnlineTransfer/Przelewy24.php b/vendor/Payment/Methods/OnlineTransfer/Przelewy24.php
similarity index 100%
rename from Core/Payment/Methods/OnlineTransfer/Przelewy24.php
rename to vendor/Payment/Methods/OnlineTransfer/Przelewy24.php
diff --git a/Core/Payment/Methods/OnlineTransfer/Sofortbanking.php b/vendor/Payment/Methods/OnlineTransfer/Sofortbanking.php
similarity index 100%
rename from Core/Payment/Methods/OnlineTransfer/Sofortbanking.php
rename to vendor/Payment/Methods/OnlineTransfer/Sofortbanking.php
diff --git a/Core/Payment/Methods/OnlineTransfer/index.php b/vendor/Payment/Methods/OnlineTransfer/index.php
similarity index 100%
rename from Core/Payment/Methods/OnlineTransfer/index.php
rename to vendor/Payment/Methods/OnlineTransfer/index.php
diff --git a/Core/Payment/Methods/Wallet/PayPal.php b/vendor/Payment/Methods/Wallet/PayPal.php
similarity index 100%
rename from Core/Payment/Methods/Wallet/PayPal.php
rename to vendor/Payment/Methods/Wallet/PayPal.php
diff --git a/Core/Payment/Methods/Wallet/PayPalExpress.php b/vendor/Payment/Methods/Wallet/PayPalExpress.php
similarity index 100%
rename from Core/Payment/Methods/Wallet/PayPalExpress.php
rename to vendor/Payment/Methods/Wallet/PayPalExpress.php
diff --git a/Core/Payment/Methods/Wallet/Paydirekt.php b/vendor/Payment/Methods/Wallet/Paydirekt.php
similarity index 100%
rename from Core/Payment/Methods/Wallet/Paydirekt.php
rename to vendor/Payment/Methods/Wallet/Paydirekt.php
diff --git a/Core/Payment/Methods/Wallet/Wallet.php b/vendor/Payment/Methods/Wallet/Wallet.php
similarity index 100%
rename from Core/Payment/Methods/Wallet/Wallet.php
rename to vendor/Payment/Methods/Wallet/Wallet.php
diff --git a/Core/Payment/Methods/Wallet/index.php b/vendor/Payment/Methods/Wallet/index.php
similarity index 100%
rename from Core/Payment/Methods/Wallet/index.php
rename to vendor/Payment/Methods/Wallet/index.php
diff --git a/Core/Payment/Methods/index.php b/vendor/Payment/Methods/index.php
similarity index 100%
rename from Core/Payment/Methods/index.php
rename to vendor/Payment/Methods/index.php
diff --git a/Core/Payment/Payment.php b/vendor/Payment/Payment.php
similarity index 100%
rename from Core/Payment/Payment.php
rename to vendor/Payment/Payment.php
diff --git a/Core/Payment/index.php b/vendor/Payment/index.php
similarity index 100%
rename from Core/Payment/index.php
rename to vendor/Payment/index.php
diff --git a/Core/Request/Builder/Auth.php b/vendor/Request/Builder/Auth.php
similarity index 100%
rename from Core/Request/Builder/Auth.php
rename to vendor/Request/Builder/Auth.php
diff --git a/Core/Request/Builder/Base.php b/vendor/Request/Builder/Base.php
similarity index 100%
rename from Core/Request/Builder/Base.php
rename to vendor/Request/Builder/Base.php
diff --git a/Core/Request/Builder/Items.php b/vendor/Request/Builder/Items.php
similarity index 100%
rename from Core/Request/Builder/Items.php
rename to vendor/Request/Builder/Items.php
diff --git a/Core/Request/Builder/Mandate.php b/vendor/Request/Builder/Mandate.php
similarity index 100%
rename from Core/Request/Builder/Mandate.php
rename to vendor/Request/Builder/Mandate.php
diff --git a/Core/Request/Builder/Order/Base.php b/vendor/Request/Builder/Order/Base.php
similarity index 100%
rename from Core/Request/Builder/Order/Base.php
rename to vendor/Request/Builder/Order/Base.php
diff --git a/Core/Request/Builder/Order/Capture.php b/vendor/Request/Builder/Order/Capture.php
similarity index 100%
rename from Core/Request/Builder/Order/Capture.php
rename to vendor/Request/Builder/Order/Capture.php
diff --git a/Core/Request/Builder/Order/Debit.php b/vendor/Request/Builder/Order/Debit.php
similarity index 100%
rename from Core/Request/Builder/Order/Debit.php
rename to vendor/Request/Builder/Order/Debit.php
diff --git a/Core/Request/Builder/Order/index.php b/vendor/Request/Builder/Order/index.php
similarity index 100%
rename from Core/Request/Builder/Order/index.php
rename to vendor/Request/Builder/Order/index.php
diff --git a/Core/Request/Builder/Payment/AdvancePayment.php b/vendor/Request/Builder/Payment/AdvancePayment.php
similarity index 100%
rename from Core/Request/Builder/Payment/AdvancePayment.php
rename to vendor/Request/Builder/Payment/AdvancePayment.php
diff --git a/Core/Request/Builder/Payment/BSInvoice.php b/vendor/Request/Builder/Payment/BSInvoice.php
similarity index 100%
rename from Core/Request/Builder/Payment/BSInvoice.php
rename to vendor/Request/Builder/Payment/BSInvoice.php
diff --git a/Core/Request/Builder/Payment/Base.php b/vendor/Request/Builder/Payment/Base.php
similarity index 100%
rename from Core/Request/Builder/Payment/Base.php
rename to vendor/Request/Builder/Payment/Base.php
diff --git a/Core/Request/Builder/Payment/CashOnDelivery.php b/vendor/Request/Builder/Payment/CashOnDelivery.php
similarity index 100%
rename from Core/Request/Builder/Payment/CashOnDelivery.php
rename to vendor/Request/Builder/Payment/CashOnDelivery.php
diff --git a/Core/Request/Builder/Payment/CreditCard.php b/vendor/Request/Builder/Payment/CreditCard.php
similarity index 100%
rename from Core/Request/Builder/Payment/CreditCard.php
rename to vendor/Request/Builder/Payment/CreditCard.php
diff --git a/Core/Request/Builder/Payment/Debit.php b/vendor/Request/Builder/Payment/Debit.php
similarity index 100%
rename from Core/Request/Builder/Payment/Debit.php
rename to vendor/Request/Builder/Payment/Debit.php
diff --git a/Core/Request/Builder/Payment/Invoice.php b/vendor/Request/Builder/Payment/Invoice.php
similarity index 100%
rename from Core/Request/Builder/Payment/Invoice.php
rename to vendor/Request/Builder/Payment/Invoice.php
diff --git a/Core/Request/Builder/Payment/OnlineTransfer.php b/vendor/Request/Builder/Payment/OnlineTransfer.php
similarity index 100%
rename from Core/Request/Builder/Payment/OnlineTransfer.php
rename to vendor/Request/Builder/Payment/OnlineTransfer.php
diff --git a/Core/Request/Builder/Payment/PayPal.php b/vendor/Request/Builder/Payment/PayPal.php
similarity index 100%
rename from Core/Request/Builder/Payment/PayPal.php
rename to vendor/Request/Builder/Payment/PayPal.php
diff --git a/Core/Request/Builder/Payment/PayPalExpress.php b/vendor/Request/Builder/Payment/PayPalExpress.php
similarity index 100%
rename from Core/Request/Builder/Payment/PayPalExpress.php
rename to vendor/Request/Builder/Payment/PayPalExpress.php
diff --git a/Core/Request/Builder/Payment/Paydirekt.php b/vendor/Request/Builder/Payment/Paydirekt.php
similarity index 100%
rename from Core/Request/Builder/Payment/Paydirekt.php
rename to vendor/Request/Builder/Payment/Paydirekt.php
diff --git a/Core/Request/Builder/Payment/index.php b/vendor/Request/Builder/Payment/index.php
similarity index 100%
rename from Core/Request/Builder/Payment/index.php
rename to vendor/Request/Builder/Payment/index.php
diff --git a/Core/Request/Builder/User.php b/vendor/Request/Builder/User.php
similarity index 100%
rename from Core/Request/Builder/User.php
rename to vendor/Request/Builder/User.php
diff --git a/Core/Request/Builder/index.php b/vendor/Request/Builder/index.php
similarity index 100%
rename from Core/Request/Builder/index.php
rename to vendor/Request/Builder/index.php
diff --git a/Core/Request/Dispatcher.php b/vendor/Request/Dispatcher.php
similarity index 100%
rename from Core/Request/Dispatcher.php
rename to vendor/Request/Dispatcher.php
diff --git a/Core/Request/Request.php b/vendor/Request/Request.php
similarity index 100%
rename from Core/Request/Request.php
rename to vendor/Request/Request.php
diff --git a/Core/Request/index.php b/vendor/Request/index.php
similarity index 100%
rename from Core/Request/index.php
rename to vendor/Request/index.php
diff --git a/Core/Response/Response.php b/vendor/Response/Response.php
similarity index 100%
rename from Core/Response/Response.php
rename to vendor/Response/Response.php
diff --git a/Core/Response/index.php b/vendor/Response/index.php
similarity index 100%
rename from Core/Response/index.php
rename to vendor/Response/index.php
diff --git a/Core/Translation/Translations.php b/vendor/Translation/Translations.php
similarity index 100%
rename from Core/Translation/Translations.php
rename to vendor/Translation/Translations.php
diff --git a/Core/Translation/Translator.php b/vendor/Translation/Translator.php
similarity index 100%
rename from Core/Translation/Translator.php
rename to vendor/Translation/Translator.php
diff --git a/Core/Translation/index.php b/vendor/Translation/index.php
similarity index 100%
rename from Core/Translation/index.php
rename to vendor/Translation/index.php
diff --git a/Core/Validation/Ajax.php b/vendor/Validation/Ajax.php
similarity index 100%
rename from Core/Validation/Ajax.php
rename to vendor/Validation/Ajax.php
diff --git a/Core/Validation/Base.php b/vendor/Validation/Base.php
similarity index 100%
rename from Core/Validation/Base.php
rename to vendor/Validation/Base.php
diff --git a/Core/Validation/Payment/Base.php b/vendor/Validation/Payment/Base.php
similarity index 100%
rename from Core/Validation/Payment/Base.php
rename to vendor/Validation/Payment/Base.php
diff --git a/Core/Validation/Payment/CreditCard.php b/vendor/Validation/Payment/CreditCard.php
similarity index 100%
rename from Core/Validation/Payment/CreditCard.php
rename to vendor/Validation/Payment/CreditCard.php
diff --git a/Core/Validation/Payment/Debit.php b/vendor/Validation/Payment/Debit.php
similarity index 100%
rename from Core/Validation/Payment/Debit.php
rename to vendor/Validation/Payment/Debit.php
diff --git a/Core/Validation/Payment/Default.php b/vendor/Validation/Payment/Default.php
similarity index 100%
rename from Core/Validation/Payment/Default.php
rename to vendor/Validation/Payment/Default.php
diff --git a/Core/Validation/Payment/OnlineTransfer.php b/vendor/Validation/Payment/OnlineTransfer.php
similarity index 100%
rename from Core/Validation/Payment/OnlineTransfer.php
rename to vendor/Validation/Payment/OnlineTransfer.php
diff --git a/Core/Validation/Payment/Wallet.php b/vendor/Validation/Payment/Wallet.php
similarity index 100%
rename from Core/Validation/Payment/Wallet.php
rename to vendor/Validation/Payment/Wallet.php
diff --git a/Core/Validation/Payment/index.php b/vendor/Validation/Payment/index.php
similarity index 100%
rename from Core/Validation/Payment/index.php
rename to vendor/Validation/Payment/index.php
diff --git a/Core/Validation/Request/Request.php b/vendor/Validation/Request/Request.php
similarity index 100%
rename from Core/Validation/Request/Request.php
rename to vendor/Validation/Request/Request.php
diff --git a/Core/Validation/Request/index.php b/vendor/Validation/Request/index.php
similarity index 100%
rename from Core/Validation/Request/index.php
rename to vendor/Validation/Request/index.php
diff --git a/Core/Validation/Response/Response.php b/vendor/Validation/Response/Response.php
similarity index 100%
rename from Core/Validation/Response/Response.php
rename to vendor/Validation/Response/Response.php
diff --git a/Core/Validation/Response/index.php b/vendor/Validation/Response/index.php
similarity index 100%
rename from Core/Validation/Response/index.php
rename to vendor/Validation/Response/index.php
diff --git a/Core/Validation/Validation.php b/vendor/Validation/Validation.php
similarity index 100%
rename from Core/Validation/Validation.php
rename to vendor/Validation/Validation.php
diff --git a/Core/Validation/index.php b/vendor/Validation/index.php
similarity index 100%
rename from Core/Validation/index.php
rename to vendor/Validation/index.php
diff --git a/Core/autoload.php b/vendor/autoload.php
similarity index 99%
rename from Core/autoload.php
rename to vendor/autoload.php
index ac264d7..3aa0019 100755
--- a/Core/autoload.php
+++ b/vendor/autoload.php
@@ -40,7 +40,7 @@
  */
 $aFcPayonePayments = array();
 $aFcPayoneSubPaymentBaseNames = array();
-$sFcPayoneAutoloadBaseDir = _PS_MODULE_DIR_ . 'fcpayone/Core/';
+$sFcPayoneAutoloadBaseDir = _PS_MODULE_DIR_ . 'fcpayone/vendor/';
 if (file_exists($sFcPayoneAutoloadBaseDir . 'Payment/Payment.php')) {
     require_once $sFcPayoneAutoloadBaseDir . 'Payment/Payment.php';
     if (class_exists('Payone\Payment\Payment')) {
diff --git a/Core/index.php b/vendor/index.php
similarity index 100%
rename from Core/index.php
rename to vendor/index.php