diff --git a/composer.json b/composer.json
index fbbc558..174a03e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "mage2pro/postfinance"
-	,"version": "1.0.9"
+	,"version": "1.0.10"
 	,"description": "PostFinance integration with Magento 2"
 	,"type": "magento2-module"
 	,"homepage": "https://mage2.pro/c/extensions/postfinance"
diff --git a/etc/di.xml b/etc/di.xml
deleted file mode 100644
index 0f0f097..0000000
--- a/etc/di.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<config
-	xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-	xsi:noNamespaceSchemaLocation='urn:magento:framework:ObjectManager/etc/config.xsd'
->
-	<virtualType name='Dfe\PostFinance\Controller\CustomerReturn\Index' type='Df\Payment\CustomerReturn'/>
-	<virtualType name='Dfe\PostFinance\Controller\Index\Index' type='Df\Payment\W\Action'/>
-</config>
\ No newline at end of file
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 8119368..11a1c24 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -13,4 +13,6 @@
 	<virtualType name='Dfe\PostFinance\ConfigProvider' type='Df\Payment\ConfigProvider'>
 		<arguments><argument name='module' xsi:type='string'>Dfe_PostFinance</argument></arguments>
 	</virtualType>
+	<virtualType name='Dfe\PostFinance\Controller\CustomerReturn\Index' type='Df\Payment\CustomerReturn'/>
+	<virtualType name='Dfe\PostFinance\Controller\Index\Index' type='Df\Payment\W\Action'/>
 </config>
\ No newline at end of file