diff --git a/src/Block/Adminhtml/Render/Heading.php b/Block/Adminhtml/Render/Heading.php
similarity index 100%
rename from src/Block/Adminhtml/Render/Heading.php
rename to Block/Adminhtml/Render/Heading.php
diff --git a/src/Block/Adminhtml/Render/Version.php b/Block/Adminhtml/Render/Version.php
similarity index 100%
rename from src/Block/Adminhtml/Render/Version.php
rename to Block/Adminhtml/Render/Version.php
diff --git a/src/Block/Adminhtml/System/Config/Form/Compatibility/Checker.php b/Block/Adminhtml/System/Config/Form/Compatibility/Checker.php
similarity index 100%
rename from src/Block/Adminhtml/System/Config/Form/Compatibility/Checker.php
rename to Block/Adminhtml/System/Config/Form/Compatibility/Checker.php
diff --git a/src/Block/Adminhtml/System/Config/Form/Compatibility/Result.php b/Block/Adminhtml/System/Config/Form/Compatibility/Result.php
similarity index 100%
rename from src/Block/Adminhtml/System/Config/Form/Compatibility/Result.php
rename to Block/Adminhtml/System/Config/Form/Compatibility/Result.php
diff --git a/src/COPYING.txt b/COPYING.txt
similarity index 100%
rename from src/COPYING.txt
rename to COPYING.txt
diff --git a/src/Controller/Adminhtml/Action/Compatibility.php b/Controller/Adminhtml/Action/Compatibility.php
similarity index 100%
rename from src/Controller/Adminhtml/Action/Compatibility.php
rename to Controller/Adminhtml/Action/Compatibility.php
diff --git a/src/Controller/Checkout/Redirect.php b/Controller/Checkout/Redirect.php
similarity index 100%
rename from src/Controller/Checkout/Redirect.php
rename to Controller/Checkout/Redirect.php
diff --git a/src/Controller/Checkout/Success.php b/Controller/Checkout/Success.php
similarity index 100%
rename from src/Controller/Checkout/Success.php
rename to Controller/Checkout/Success.php
diff --git a/src/Controller/Checkout/Webhook.php b/Controller/Checkout/Webhook.php
similarity index 100%
rename from src/Controller/Checkout/Webhook.php
rename to Controller/Checkout/Webhook.php
diff --git a/src/Helper/General.php b/Helper/General.php
similarity index 100%
rename from src/Helper/General.php
rename to Helper/General.php
diff --git a/src/Logger/MollieHandler.php b/Logger/MollieHandler.php
similarity index 100%
rename from src/Logger/MollieHandler.php
rename to Logger/MollieHandler.php
diff --git a/src/Logger/MollieLogger.php b/Logger/MollieLogger.php
similarity index 100%
rename from src/Logger/MollieLogger.php
rename to Logger/MollieLogger.php
diff --git a/src/Model/Adminhtml/Source/ApiKey.php b/Model/Adminhtml/Source/ApiKey.php
similarity index 100%
rename from src/Model/Adminhtml/Source/ApiKey.php
rename to Model/Adminhtml/Source/ApiKey.php
diff --git a/src/Model/Adminhtml/Source/Pending.php b/Model/Adminhtml/Source/Pending.php
similarity index 100%
rename from src/Model/Adminhtml/Source/Pending.php
rename to Model/Adminhtml/Source/Pending.php
diff --git a/src/Model/Methods/Bancontact.php b/Model/Methods/Bancontact.php
similarity index 100%
rename from src/Model/Methods/Bancontact.php
rename to Model/Methods/Bancontact.php
diff --git a/src/Model/Methods/Banktransfer.php b/Model/Methods/Banktransfer.php
similarity index 100%
rename from src/Model/Methods/Banktransfer.php
rename to Model/Methods/Banktransfer.php
diff --git a/src/Model/Methods/Belfius.php b/Model/Methods/Belfius.php
similarity index 100%
rename from src/Model/Methods/Belfius.php
rename to Model/Methods/Belfius.php
diff --git a/src/Model/Methods/Bitcoin.php b/Model/Methods/Bitcoin.php
similarity index 100%
rename from src/Model/Methods/Bitcoin.php
rename to Model/Methods/Bitcoin.php
diff --git a/src/Model/Methods/Creditcard.php b/Model/Methods/Creditcard.php
similarity index 100%
rename from src/Model/Methods/Creditcard.php
rename to Model/Methods/Creditcard.php
diff --git a/src/Model/Methods/General.php b/Model/Methods/General.php
similarity index 100%
rename from src/Model/Methods/General.php
rename to Model/Methods/General.php
diff --git a/src/Model/Methods/Ideal.php b/Model/Methods/Ideal.php
similarity index 100%
rename from src/Model/Methods/Ideal.php
rename to Model/Methods/Ideal.php
diff --git a/src/Model/Methods/Kbc.php b/Model/Methods/Kbc.php
similarity index 100%
rename from src/Model/Methods/Kbc.php
rename to Model/Methods/Kbc.php
diff --git a/src/Model/Methods/Paypal.php b/Model/Methods/Paypal.php
similarity index 100%
rename from src/Model/Methods/Paypal.php
rename to Model/Methods/Paypal.php
diff --git a/src/Model/Methods/Paysafecard.php b/Model/Methods/Paysafecard.php
similarity index 100%
rename from src/Model/Methods/Paysafecard.php
rename to Model/Methods/Paysafecard.php
diff --git a/src/Model/Methods/Sofort.php b/Model/Methods/Sofort.php
similarity index 100%
rename from src/Model/Methods/Sofort.php
rename to Model/Methods/Sofort.php
diff --git a/src/Model/Mollie.php b/Model/Mollie.php
similarity index 100%
rename from src/Model/Mollie.php
rename to Model/Mollie.php
diff --git a/src/Model/MollieConfigProvider.php b/Model/MollieConfigProvider.php
similarity index 100%
rename from src/Model/MollieConfigProvider.php
rename to Model/MollieConfigProvider.php
diff --git a/src/Observer/ConfigObserver.php b/Observer/ConfigObserver.php
similarity index 100%
rename from src/Observer/ConfigObserver.php
rename to Observer/ConfigObserver.php
diff --git a/README.md b/README.md
index 482d908d0397..87ce811a94ea 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,43 @@
-# Mollie Magento 2 - BETA
+# Mollie Magento® 2 - BETA
 
-Beta version Mollie for Magento 2, not for production environments. 
+As this is a Beta of the Mollie extension for Magento® 2, don't use this in production environments. 
 
-## Getting Started
+## Installation
 
-Download the extension as a ZIP file from this repository or install our module with [Composer](https://getcomposer.org/) using the following command:
+### Magento® Marketplace
 
-```
-composer require mollie/magento2
-```
+This extension will be available on the Magento® Marketplace once it is out of beta. 
 
-If you're installing the extension manually, unzip the archive and upload the contents of the /src directory to `/app/code/Mollie/Payment`. 
+### Manually
 
-After uploading, run the following commands:
+1. Go to Magento® 2 root folder
 
-```
-bin/magento module:enable Mollie_Payment
-bin/magento setup:upgrade
-bin/magento setup:di:compile
-```
+2. Enter following commands to install module:
+
+   ```
+   composer require mollie/magento2
+   ```
 
+   Wait while dependencies are updated.
+
+3. Enter following commands to enable module:
+
+   ```
+   php bin/magento module:enable Mollie_Payment
+   php bin/magento setup:upgrade
+   php bin/magento cache:clean
+   ```
+
+4. Enable and configure the Mollie extension in Magento® Admin under *Stores* >
+   *Configuration* > *Sales* > *Payment Methods* > *Mollie*.
+   
 ## Requirements
 
-This extension requires the [Mollie API client for PHP](https://github.com/mollie/mollie-api-php) 
+This extension requires the [Mollie API client for PHP.](https://github.com/mollie/mollie-api-php)
+
+When using composer this will be installed automaticly.
 
-Run the following command in your Magento 2 store root:
+To install manually, enter the following command in your Magento® 2 root folder:
 ```
 composer require mollie/mollie-api-php
 ```
diff --git a/src/Setup/InstallData.php b/Setup/InstallData.php
similarity index 100%
rename from src/Setup/InstallData.php
rename to Setup/InstallData.php
diff --git a/composer.json b/composer.json
index 91fb41d91381..00d3cc4b2aa6 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "mollie/magento2",
+  "name": "mollie/Magento2",
   "description": "Mollie Payment Module for Magento 2",
   "require": {
     "php": "~5.5.0|~5.6.0|~7.0.0",
@@ -17,10 +17,10 @@
   ],
   "autoload": {
     "files": [
-      "src/registration.php"
+      "registration.php"
     ],
     "psr-4": {
-      "Mollie\\Payment\\": "src"
+      "Mollie\\Payment\\": ""
     }
   }
 }
diff --git a/src/etc/acl.xml b/etc/acl.xml
similarity index 100%
rename from src/etc/acl.xml
rename to etc/acl.xml
diff --git a/src/etc/adminhtml/methods.xml b/etc/adminhtml/methods.xml
similarity index 100%
rename from src/etc/adminhtml/methods.xml
rename to etc/adminhtml/methods.xml
diff --git a/src/etc/adminhtml/methods/bancontact.xml b/etc/adminhtml/methods/bancontact.xml
similarity index 100%
rename from src/etc/adminhtml/methods/bancontact.xml
rename to etc/adminhtml/methods/bancontact.xml
diff --git a/src/etc/adminhtml/methods/banktransfer.xml b/etc/adminhtml/methods/banktransfer.xml
similarity index 100%
rename from src/etc/adminhtml/methods/banktransfer.xml
rename to etc/adminhtml/methods/banktransfer.xml
diff --git a/src/etc/adminhtml/methods/belfius.xml b/etc/adminhtml/methods/belfius.xml
similarity index 100%
rename from src/etc/adminhtml/methods/belfius.xml
rename to etc/adminhtml/methods/belfius.xml
diff --git a/src/etc/adminhtml/methods/bitcoin.xml b/etc/adminhtml/methods/bitcoin.xml
similarity index 100%
rename from src/etc/adminhtml/methods/bitcoin.xml
rename to etc/adminhtml/methods/bitcoin.xml
diff --git a/src/etc/adminhtml/methods/creditcard.xml b/etc/adminhtml/methods/creditcard.xml
similarity index 100%
rename from src/etc/adminhtml/methods/creditcard.xml
rename to etc/adminhtml/methods/creditcard.xml
diff --git a/src/etc/adminhtml/methods/ideal.xml b/etc/adminhtml/methods/ideal.xml
similarity index 100%
rename from src/etc/adminhtml/methods/ideal.xml
rename to etc/adminhtml/methods/ideal.xml
diff --git a/src/etc/adminhtml/methods/kbc.xml b/etc/adminhtml/methods/kbc.xml
similarity index 100%
rename from src/etc/adminhtml/methods/kbc.xml
rename to etc/adminhtml/methods/kbc.xml
diff --git a/src/etc/adminhtml/methods/paypal.xml b/etc/adminhtml/methods/paypal.xml
similarity index 100%
rename from src/etc/adminhtml/methods/paypal.xml
rename to etc/adminhtml/methods/paypal.xml
diff --git a/src/etc/adminhtml/methods/paysafecard.xml b/etc/adminhtml/methods/paysafecard.xml
similarity index 100%
rename from src/etc/adminhtml/methods/paysafecard.xml
rename to etc/adminhtml/methods/paysafecard.xml
diff --git a/src/etc/adminhtml/methods/sofort.xml b/etc/adminhtml/methods/sofort.xml
similarity index 100%
rename from src/etc/adminhtml/methods/sofort.xml
rename to etc/adminhtml/methods/sofort.xml
diff --git a/src/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml
similarity index 100%
rename from src/etc/adminhtml/routes.xml
rename to etc/adminhtml/routes.xml
diff --git a/src/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
similarity index 100%
rename from src/etc/adminhtml/system.xml
rename to etc/adminhtml/system.xml
diff --git a/src/etc/config.xml b/etc/config.xml
similarity index 100%
rename from src/etc/config.xml
rename to etc/config.xml
diff --git a/src/etc/di.xml b/etc/di.xml
similarity index 100%
rename from src/etc/di.xml
rename to etc/di.xml
diff --git a/src/etc/events.xml b/etc/events.xml
similarity index 100%
rename from src/etc/events.xml
rename to etc/events.xml
diff --git a/src/etc/frontend/di.xml b/etc/frontend/di.xml
similarity index 100%
rename from src/etc/frontend/di.xml
rename to etc/frontend/di.xml
diff --git a/src/etc/frontend/routes.xml b/etc/frontend/routes.xml
similarity index 100%
rename from src/etc/frontend/routes.xml
rename to etc/frontend/routes.xml
diff --git a/src/etc/module.xml b/etc/module.xml
similarity index 76%
rename from src/etc/module.xml
rename to etc/module.xml
index 7159703b1662..7af2f361f05b 100644
--- a/src/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Mollie_Payment" setup_version="0.9.5">
+    <module name="Mollie_Payment" setup_version="0.9.6">
 
     </module>
 </config>
diff --git a/src/etc/payment.xml b/etc/payment.xml
similarity index 100%
rename from src/etc/payment.xml
rename to etc/payment.xml
diff --git a/src/i18n/en_US.csv b/i18n/en_US.csv
similarity index 100%
rename from src/i18n/en_US.csv
rename to i18n/en_US.csv
diff --git a/src/i18n/nl_NL.csv b/i18n/nl_NL.csv
similarity index 100%
rename from src/i18n/nl_NL.csv
rename to i18n/nl_NL.csv
diff --git a/modman b/modman
deleted file mode 100644
index 505e7ac9613f..000000000000
--- a/modman
+++ /dev/null
@@ -1 +0,0 @@
-src/ app/code/Mollie/Payment
\ No newline at end of file
diff --git a/src/registration.php b/registration.php
similarity index 100%
rename from src/registration.php
rename to registration.php
diff --git a/src/Changelog.txt b/src/Changelog.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/src/composer.json b/src/composer.json
deleted file mode 100644
index aaae77e35cb8..000000000000
--- a/src/composer.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name": "mollie/Magento2",
-  "description": "Mollie Payment Module for Magento 2",
-  "require": {
-    "php": "~5.5.0|~5.6.0|~7.0.0",
-    "magento/module-sales": ">=100.1.0",
-    "magento/module-checkout": ">=100.1.0",
-    "magento/module-payment": ">=100.1.0",
-    "magento/framework": ">=100.1.0",
-    "magento/magento-composer-installer": "*",
-    "mollie/mollie-api-php": "1.9.*"
-  },
-  "type": "magento2-module",
-  "version": "0.9.5",
-  "license": [
-    "OSL-3.0",
-    "AFL-3.0"
-  ],
-  "autoload": {
-    "files": [
-      "registration.php"
-    ],
-    "psr-4": {
-      "Mollie\\Payment\\": ""
-    }
-  }
-}
diff --git a/src/view/adminhtml/layout/default.xml b/view/adminhtml/layout/default.xml
similarity index 100%
rename from src/view/adminhtml/layout/default.xml
rename to view/adminhtml/layout/default.xml
diff --git a/src/view/adminhtml/templates/system/config/button/button.phtml b/view/adminhtml/templates/system/config/button/button.phtml
similarity index 100%
rename from src/view/adminhtml/templates/system/config/button/button.phtml
rename to view/adminhtml/templates/system/config/button/button.phtml
diff --git a/src/view/adminhtml/templates/system/config/fieldset/result.phtml b/view/adminhtml/templates/system/config/fieldset/result.phtml
similarity index 100%
rename from src/view/adminhtml/templates/system/config/fieldset/result.phtml
rename to view/adminhtml/templates/system/config/fieldset/result.phtml
diff --git a/src/view/adminhtml/web/css/styles.css b/view/adminhtml/web/css/styles.css
similarity index 100%
rename from src/view/adminhtml/web/css/styles.css
rename to view/adminhtml/web/css/styles.css
diff --git a/src/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from src/view/frontend/layout/checkout_index_index.xml
rename to view/frontend/layout/checkout_index_index.xml
diff --git a/src/view/frontend/web/images/bancontact.png b/view/frontend/web/images/bancontact.png
similarity index 100%
rename from src/view/frontend/web/images/bancontact.png
rename to view/frontend/web/images/bancontact.png
diff --git a/src/view/frontend/web/images/bancontact@2x.png b/view/frontend/web/images/bancontact@2x.png
similarity index 100%
rename from src/view/frontend/web/images/bancontact@2x.png
rename to view/frontend/web/images/bancontact@2x.png
diff --git a/src/view/frontend/web/images/banktransfer.png b/view/frontend/web/images/banktransfer.png
similarity index 100%
rename from src/view/frontend/web/images/banktransfer.png
rename to view/frontend/web/images/banktransfer.png
diff --git a/src/view/frontend/web/images/banktransfer@2x.png b/view/frontend/web/images/banktransfer@2x.png
similarity index 100%
rename from src/view/frontend/web/images/banktransfer@2x.png
rename to view/frontend/web/images/banktransfer@2x.png
diff --git a/src/view/frontend/web/images/belfius.png b/view/frontend/web/images/belfius.png
similarity index 100%
rename from src/view/frontend/web/images/belfius.png
rename to view/frontend/web/images/belfius.png
diff --git a/src/view/frontend/web/images/belfius@2x.png b/view/frontend/web/images/belfius@2x.png
similarity index 100%
rename from src/view/frontend/web/images/belfius@2x.png
rename to view/frontend/web/images/belfius@2x.png
diff --git a/src/view/frontend/web/images/bitcoin.png b/view/frontend/web/images/bitcoin.png
similarity index 100%
rename from src/view/frontend/web/images/bitcoin.png
rename to view/frontend/web/images/bitcoin.png
diff --git a/src/view/frontend/web/images/bitcoin@2x.png b/view/frontend/web/images/bitcoin@2x.png
similarity index 100%
rename from src/view/frontend/web/images/bitcoin@2x.png
rename to view/frontend/web/images/bitcoin@2x.png
diff --git a/src/view/frontend/web/images/creditcard.png b/view/frontend/web/images/creditcard.png
similarity index 100%
rename from src/view/frontend/web/images/creditcard.png
rename to view/frontend/web/images/creditcard.png
diff --git a/src/view/frontend/web/images/creditcard@2x.png b/view/frontend/web/images/creditcard@2x.png
similarity index 100%
rename from src/view/frontend/web/images/creditcard@2x.png
rename to view/frontend/web/images/creditcard@2x.png
diff --git a/src/view/frontend/web/images/ideal.png b/view/frontend/web/images/ideal.png
similarity index 100%
rename from src/view/frontend/web/images/ideal.png
rename to view/frontend/web/images/ideal.png
diff --git a/src/view/frontend/web/images/ideal@2x.png b/view/frontend/web/images/ideal@2x.png
similarity index 100%
rename from src/view/frontend/web/images/ideal@2x.png
rename to view/frontend/web/images/ideal@2x.png
diff --git a/src/view/frontend/web/images/kbc.png b/view/frontend/web/images/kbc.png
similarity index 100%
rename from src/view/frontend/web/images/kbc.png
rename to view/frontend/web/images/kbc.png
diff --git a/src/view/frontend/web/images/kbc@2x.png b/view/frontend/web/images/kbc@2x.png
similarity index 100%
rename from src/view/frontend/web/images/kbc@2x.png
rename to view/frontend/web/images/kbc@2x.png
diff --git a/src/view/frontend/web/images/paypal.png b/view/frontend/web/images/paypal.png
similarity index 100%
rename from src/view/frontend/web/images/paypal.png
rename to view/frontend/web/images/paypal.png
diff --git a/src/view/frontend/web/images/paypal@2x.png b/view/frontend/web/images/paypal@2x.png
similarity index 100%
rename from src/view/frontend/web/images/paypal@2x.png
rename to view/frontend/web/images/paypal@2x.png
diff --git a/src/view/frontend/web/images/paysafecard.png b/view/frontend/web/images/paysafecard.png
similarity index 100%
rename from src/view/frontend/web/images/paysafecard.png
rename to view/frontend/web/images/paysafecard.png
diff --git a/src/view/frontend/web/images/paysafecard@2x.png b/view/frontend/web/images/paysafecard@2x.png
similarity index 100%
rename from src/view/frontend/web/images/paysafecard@2x.png
rename to view/frontend/web/images/paysafecard@2x.png
diff --git a/src/view/frontend/web/images/sofort.png b/view/frontend/web/images/sofort.png
similarity index 100%
rename from src/view/frontend/web/images/sofort.png
rename to view/frontend/web/images/sofort.png
diff --git a/src/view/frontend/web/images/sofort@2x.png b/view/frontend/web/images/sofort@2x.png
similarity index 100%
rename from src/view/frontend/web/images/sofort@2x.png
rename to view/frontend/web/images/sofort@2x.png
diff --git a/src/view/frontend/web/js/view/payment/method-renderer.js b/view/frontend/web/js/view/payment/method-renderer.js
similarity index 100%
rename from src/view/frontend/web/js/view/payment/method-renderer.js
rename to view/frontend/web/js/view/payment/method-renderer.js
diff --git a/src/view/frontend/web/js/view/payment/method-renderer/default.js b/view/frontend/web/js/view/payment/method-renderer/default.js
similarity index 100%
rename from src/view/frontend/web/js/view/payment/method-renderer/default.js
rename to view/frontend/web/js/view/payment/method-renderer/default.js
diff --git a/src/view/frontend/web/template/payment/default.html b/view/frontend/web/template/payment/default.html
similarity index 100%
rename from src/view/frontend/web/template/payment/default.html
rename to view/frontend/web/template/payment/default.html