diff --git a/src/Application/Controller/d3dev.php b/src/Application/Controller/d3dev.php
index 573428a..9f9634b 100644
--- a/src/Application/Controller/d3dev.php
+++ b/src/Application/Controller/d3dev.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace D3\Devhelper\Application\Controller;
+
+use OxidEsales\Eshop\Application\Controller\FrontendController;
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\Eshop\Core\Request;
 
@@ -18,7 +21,7 @@ use OxidEsales\Eshop\Core\Request;
  * @link      http://www.oxidmodule.com
  */
 
-class d3dev extends \OxidEsales\EshopProfessional\Application\Controller\FrontendController
+class d3dev extends FrontendController
 {
     public function init()
     {
diff --git a/src/modules/controllers/d3_dev_thankyou.php b/src/Modules/Application/Controller/d3_dev_thankyou.php
similarity index 98%
rename from src/modules/controllers/d3_dev_thankyou.php
rename to src/Modules/Application/Controller/d3_dev_thankyou.php
index 198155a..15994dd 100644
--- a/src/modules/controllers/d3_dev_thankyou.php
+++ b/src/Modules/Application/Controller/d3_dev_thankyou.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace D3\Devhelper\Modules\Application\Controller;
+
 // .../?cl=thankyou[&d3orderid=23]
 use OxidEsales\Eshop\Core\Registry;
 
diff --git a/src/modules/models/d3_dev_d3inquiry.php b/src/Modules/Application/Model/d3_dev_d3inquiry.php
similarity index 99%
rename from src/modules/models/d3_dev_d3inquiry.php
rename to src/Modules/Application/Model/d3_dev_d3inquiry.php
index 5dd6d5b..fd95cc3 100644
--- a/src/modules/models/d3_dev_d3inquiry.php
+++ b/src/Modules/Application/Model/d3_dev_d3inquiry.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace D3\Devhelper\Modules\Application\Model;
+
 use OxidEsales\Eshop\Core\DatabaseProvider;
 use OxidEsales\Eshop\Core\Registry;
 
diff --git a/src/modules/models/d3_dev_d3inquiryarticle.php b/src/Modules/Application/Model/d3_dev_d3inquiryarticle.php
similarity index 95%
rename from src/modules/models/d3_dev_d3inquiryarticle.php
rename to src/Modules/Application/Model/d3_dev_d3inquiryarticle.php
index 7254bcd..2c72002 100644
--- a/src/modules/models/d3_dev_d3inquiryarticle.php
+++ b/src/Modules/Application/Model/d3_dev_d3inquiryarticle.php
@@ -14,6 +14,8 @@
  * @link      http://www.oxidmodule.com
  */
 
+namespace D3\Devhelper\Modules\Application\Model;
+
 class d3_dev_d3inquiryarticle extends d3_dev_d3inquiryarticle_parent
 {
     /**
diff --git a/src/modules/models/d3_dev_oxbasket.php b/src/Modules/Application/Model/d3_dev_oxbasket.php
similarity index 97%
rename from src/modules/models/d3_dev_oxbasket.php
rename to src/Modules/Application/Model/d3_dev_oxbasket.php
index c0adcb2..48a6e3e 100644
--- a/src/modules/models/d3_dev_oxbasket.php
+++ b/src/Modules/Application/Model/d3_dev_oxbasket.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace D3\Devhelper\Modules\Application\Model;
+
 use OxidEsales\Eshop\Core\Registry;
 
 /**
diff --git a/src/modules/models/d3_dev_oxbasketitem.php b/src/Modules/Application/Model/d3_dev_oxbasketitem.php
similarity index 95%
rename from src/modules/models/d3_dev_oxbasketitem.php
rename to src/Modules/Application/Model/d3_dev_oxbasketitem.php
index f81f1b5..a7deff1 100644
--- a/src/modules/models/d3_dev_oxbasketitem.php
+++ b/src/Modules/Application/Model/d3_dev_oxbasketitem.php
@@ -14,6 +14,8 @@
  * @link      http://www.oxidmodule.com
  */
 
+namespace D3\Devhelper\Modules\Application\Model;
+
 class d3_dev_oxbasketitem extends d3_dev_oxbasketitem_parent
 {
     public function d3ClearArticle()
diff --git a/src/modules/models/d3_dev_oxorder.php b/src/Modules/Application/Model/d3_dev_oxorder.php
similarity index 98%
rename from src/modules/models/d3_dev_oxorder.php
rename to src/Modules/Application/Model/d3_dev_oxorder.php
index e774614..4285497 100644
--- a/src/modules/models/d3_dev_oxorder.php
+++ b/src/Modules/Application/Model/d3_dev_oxorder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace D3\Devhelper\Modules\Application\Model;
+
 use OxidEsales\Eshop\Core\DatabaseProvider;
 use OxidEsales\Eshop\Core\Registry;
 
diff --git a/src/modules/models/d3_dev_oxorderarticle.php b/src/Modules/Application/Model/d3_dev_oxorderarticle.php
similarity index 94%
rename from src/modules/models/d3_dev_oxorderarticle.php
rename to src/Modules/Application/Model/d3_dev_oxorderarticle.php
index 81f2fdc..9fd5bbc 100644
--- a/src/modules/models/d3_dev_oxorderarticle.php
+++ b/src/Modules/Application/Model/d3_dev_oxorderarticle.php
@@ -14,6 +14,8 @@
  * @link      http://www.oxidmodule.com
  */
 
+namespace D3\Devhelper\Modules\Application\Model;
+
 class d3_dev_oxorderarticle extends d3_dev_oxorderarticle_parent
 {
     /**
diff --git a/src/modules/models/d3_dev_oxemail.php b/src/Modules/Core/d3_dev_oxemail.php
similarity index 99%
rename from src/modules/models/d3_dev_oxemail.php
rename to src/Modules/Core/d3_dev_oxemail.php
index 1b39138..c22964f 100644
--- a/src/modules/models/d3_dev_oxemail.php
+++ b/src/Modules/Core/d3_dev_oxemail.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace D3\Devhelper\Modules\Core;
+
 use OxidEsales\Eshop\Core\Registry;
 
 /**
diff --git a/src/metadata.php b/src/metadata.php
index 3cb5592..67de35c 100644
--- a/src/metadata.php
+++ b/src/metadata.php
@@ -1,4 +1,11 @@
 <?php
+
+use D3\Devhelper\Modules\Core as ModuleCore;
+use D3\Devhelper\Modules\Application\Controller as ModuleController;
+use D3\Devhelper\Modules\Application\Model as ModuleModel;
+use OxidEsales\Eshop\Application\Controller as OxidController;
+use OxidEsales\Eshop\Application\Model as OxidModel;
+use OxidEsales\Eshop\Core as OxidCore;
 use OxidEsales\Eshop\Core\Registry;
 
 /**
@@ -47,20 +54,20 @@ $aModule = array(
             '* Ordernummer an URL erg&auml;nzen, wenn bestimmte Bestellungen angezeigt werden sollen',
         'en'    => ''),
     // 'thumbnail'    => 'picture.png',
-    'version'      => '1.2.0.0',
+    'version'      => '2.0.0.0',
     'author'       => 'D&sup3; Data Development (Inh.: Thomas Dartsch)',
     'email'        => 'support@shopmodule.com',
     'url'          => 'http://www.oxidmodule.com/',
     'extend'      => array(
-        'thankyou'  => 'd3/d3dev/modules/controllers/d3_dev_thankyou',
-        'oxorder'   => 'd3/d3dev/modules/models/d3_dev_oxorder',
-        'oxorderarticle'   => 'd3/d3dev/modules/models/d3_dev_oxorderarticle',
-        'oxemail'   => 'd3/d3dev/modules/models/d3_dev_oxemail',
-        'oxbasket'  => 'd3/d3dev/modules/models/d3_dev_oxbasket',
-        'oxbasketitem'  => 'd3/d3dev/modules/models/d3_dev_oxbasketitem',
+        OxidController\ThankYouController::class    => ModuleController\d3_dev_thankyou::class,
+        OxidModel\Order::class                      => ModuleModel\d3_dev_oxorder::class,
+        OxidModel\OrderArticle::class               => ModuleModel\d3_dev_oxorderarticle::class,
+        OxidCore\Email::class                       => ModuleCore\d3_dev_oxemail::class,
+        OxidModel\Basket::class                     => ModuleModel\d3_dev_oxbasket::class,
+        OxidModel\BasketItem::class                 => ModuleModel\d3_dev_oxbasketitem::class,
     ),
     'controllers'       => array(
-        'd3dev'     => \D3\Devhelper\Application\Controller\d3dev,
+        'd3dev'     => \D3\Devhelper\Application\Controller\d3dev::class,
     ),
     'templates'   => array(
     ),
@@ -104,6 +111,6 @@ $aModule = array(
 
 
 if (class_exists('d3inquiry')) {
-    $aModule['extend']['d3inquiry']  = 'd3/d3dev/modules/models/d3_dev_d3inquiry';
-    $aModule['extend']['d3inquiryarticle']  = 'd3/d3dev/modules/models/d3_dev_d3inquiryarticle';
+    $aModule['extend']['d3inquiry']  = ModuleModel\d3_dev_d3inquiry::class;
+    $aModule['extend']['d3inquiryarticle']  = ModuleModel\d3_dev_d3inquiryarticle::class;
 }