diff --git a/Models/raiseTaxRate.php b/Models/raiseTaxRate.php
index 2f08980..67d344d 100644
--- a/Models/raiseTaxRate.php
+++ b/Models/raiseTaxRate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace D3\TaxRatesAdjustment\Model;
+namespace D3\TaxRatesAdjustment\Models;
 
 class raiseTaxRate
 {
diff --git a/bin/raiseTaxRate b/bin/raiseTaxRate
index a8d38da..81b8fbd 100644
--- a/bin/raiseTaxRate
+++ b/bin/raiseTaxRate
@@ -1,13 +1,13 @@
 #!/usr/bin/env php
 <?php
 
-$filePath = '../d3/taxratesadjustment/bootstrap.php';
+$filePath = '../bootstrap.php';
 $currentDirectory = __DIR__ . '/';
 $filePath = $currentDirectory . $filePath;
 
 require($filePath);
 
-$change = new raiseTaxRate();
+$change = new \D3\TaxRatesAdjustment\Models\raiseTaxRate();
 try {
     $change->run();
 } catch ( \Exception $e) {
diff --git a/bootstrap.php b/bootstrap.php
index f666961..753f9fa 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -1,13 +1,11 @@
 <?php 
 
-use OxidEsales\ComposerPlugin\Installer\Package\ShopPackageInstaller;
-
 $bootstrapFileName = getenv('ESHOP_BOOTSTRAP_PATH');
 if (!empty($bootstrapFileName)) {
     $bootstrapFileName = realpath(trim(getenv('ESHOP_BOOTSTRAP_PATH')));
 } else {
     $count = 0;
-    $bootstrapFileName = '../../'. ShopPackageInstaller::SHOP_SOURCE_DIRECTORY .'/bootstrap.php';
+    $bootstrapFileName = '../../source/bootstrap.php';
     $currentDirectory = __DIR__ . '/';
     while ($count < 5) {
         $count++;
diff --git a/composer.json b/composer.json
index a337a14..b9c659d 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,11 @@
             "homepage": "http://www.d3data.de"
         }
     ],
+    "autoload": {
+        "psr-4": {
+            "D3\\TaxRatesAdjustment\\": ""
+        }
+    },
     "bin": [
         "bin/reduceTaxRate",
         "bin/raiseTaxRate"