diff --git a/Bootstrapping/ShopConfigSetup.php b/Bootstrapping/ShopConfigSetup.php
index 01a74edf..b4f680c6 100644
--- a/Bootstrapping/ShopConfigSetup.php
+++ b/Bootstrapping/ShopConfigSetup.php
@@ -5,7 +5,7 @@
 use RpayRatePay\Component\Service\RatepayConfigWriter;
 use RpayRatePay\Models\ProfileConfig;
 use Shopware\Models\Shop\Shop;
-use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\ConfigService;
+use RpayRatePay\Services\ConfigService;
 
 class ShopConfigSetup extends Bootstrapper
 {
diff --git a/Component/Mapper/ModelFactory.php b/Component/Mapper/ModelFactory.php
index 9153c197..e67f2276 100755
--- a/Component/Mapper/ModelFactory.php
+++ b/Component/Mapper/ModelFactory.php
@@ -8,7 +8,7 @@
 use RpayRatePay\Component\Service\Logger;
 use RpayRatePay\Component\Service\ShopwareUtil;
 use RpayRatePay\Component\Service\ConfigLoader;
-use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\ProfileConfigService;
+use RpayRatePay\Services\ProfileConfigService;
 
 /**
  * This program is free software; you can redistribute it and/or modify it under the terms of
diff --git a/Component/Service/ConfigLoader.php b/Component/Service/ConfigLoader.php
index 238baf15..48187e3f 100644
--- a/Component/Service/ConfigLoader.php
+++ b/Component/Service/ConfigLoader.php
@@ -2,8 +2,8 @@
 
 namespace RpayRatePay\Component\Service;
 
-use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\ConfigService;
-use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\ProfileConfigService;
+use RpayRatePay\Services\ConfigService;
+use RpayRatePay\Services\ProfileConfigService;
 
 class ConfigLoader
 {
diff --git a/Component/Service/Logger.php b/Component/Service/Logger.php
index 7577746c..d7e6b4aa 100644
--- a/Component/Service/Logger.php
+++ b/Component/Service/Logger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace  RpayRatePay\Component\Service;
+namespace RpayRatePay\Component\Service;
 
 class Logger
 {
diff --git a/Component/Service/RatepayConfigWriter.php b/Component/Service/RatepayConfigWriter.php
index 5fc8869c..833b851c 100644
--- a/Component/Service/RatepayConfigWriter.php
+++ b/Component/Service/RatepayConfigWriter.php
@@ -4,7 +4,6 @@
 
 use RpayRatePay\Models\ProfileConfig;
 use Shopware\Components\Model\ModelManager;
-use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\ProfileConfigService;
 
 class RatepayConfigWriter
 {
diff --git a/Component/Service/SessionLoader.php b/Component/Service/SessionLoader.php
index 4cbb9b54..14583242 100644
--- a/Component/Service/SessionLoader.php
+++ b/Component/Service/SessionLoader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace  RpayRatePay\Component\Service;
+namespace RpayRatePay\Component\Service;
 
 use RpayRatePay\Component\Mapper\BankData;
 use RpayRatePay\Component\Mapper\PaymentRequestData;
diff --git a/Controller/backend/RpayRatepayBackendOrder.php b/Controller/backend/RpayRatepayBackendOrder.php
index 9b783764..9b961226 100755
--- a/Controller/backend/RpayRatepayBackendOrder.php
+++ b/Controller/backend/RpayRatepayBackendOrder.php
@@ -23,8 +23,8 @@
 use RpayRatePay\Component\Service\ConfigLoader;
 use RpayRatePay\Component\Service\Logger;
 use RpayRatePay\Models\ProfileConfig;
-use Shopware\Plugins\Community\Frontend\RpayRatePay\Models\ConfigRepository;
-use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\ConfigService;
+use RpayRatePay\Models\ConfigRepository;
+use RpayRatePay\Services\ConfigService;
 
 class Shopware_Controllers_Backend_RpayRatepayBackendOrder extends Shopware_Controllers_Backend_ExtJs
 {
diff --git a/Models/ConfigRepository.php b/Models/ConfigRepository.php
index 51d20d6c..d67a91bd 100644
--- a/Models/ConfigRepository.php
+++ b/Models/ConfigRepository.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Shopware\Plugins\Community\Frontend\RpayRatePay\Models;
+namespace RpayRatePay\Models;
 
 
 use RpayRatePay\Models\ProfileConfig;
diff --git a/Models/ProfileConfig.php b/Models/ProfileConfig.php
index 1795c2a8..e6c84459 100644
--- a/Models/ProfileConfig.php
+++ b/Models/ProfileConfig.php
@@ -6,7 +6,7 @@
 use Shopware\Components\Model\ModelEntity;
 
 /**
- * @ORM\Entity(repositoryClass="Shopware\Plugins\Community\Frontend\RpayRatePay\Models\ConfigRepository")
+ * @ORM\Entity(repositoryClass="RpayRatePay\Models\ConfigRepository")
  * @ORM\Table(name="rpay_ratepay_config")
  */
 class ProfileConfig extends ModelEntity
diff --git a/Services/ProfileConfigService.php b/Services/ProfileConfigService.php
index 82b126e9..e3832d95 100644
--- a/Services/ProfileConfigService.php
+++ b/Services/ProfileConfigService.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Shopware\Plugins\Community\Frontend\RpayRatePay\Services;
+namespace RpayRatePay\Services;
 
 
 use RpayRatePay\Models\ProfileConfig;
-use Shopware\Plugins\Community\Frontend\RpayRatePay\Models\ConfigRepository;
+use RpayRatePay\Models\ConfigRepository;
 
 class ProfileConfigService
 {
diff --git a/Views/responsive/frontend/installment/php/PiRatepayRateCalcData.php b/Views/responsive/frontend/installment/php/PiRatepayRateCalcData.php
index 64137430..4061f396 100755
--- a/Views/responsive/frontend/installment/php/PiRatepayRateCalcData.php
+++ b/Views/responsive/frontend/installment/php/PiRatepayRateCalcData.php
@@ -13,7 +13,7 @@
     //do i need a require here?
     use RpayRatePay\Component\Model\ShopwareCustomerWrapper;
 use RpayRatePay\Models\ProfileConfig;
-use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\ProfileConfigService;
+use RpayRatePay\Services\ProfileConfigService;
 
 /**
      * Developer needs to specify how the Calculator gets the Data