diff --git a/src/Gateways/AbstractStripe.php b/src/Gateways/AbstractStripe.php
index 5e6ea24..e19e0bc 100644
--- a/src/Gateways/AbstractStripe.php
+++ b/src/Gateways/AbstractStripe.php
@@ -3,9 +3,9 @@
 namespace Crm\StripeModule\Gateways;
 
 use Crm\ApplicationModule\Config\ApplicationConfig;
-use Crm\PaymentsModule\GatewayFail;
-use Crm\PaymentsModule\Gateways\GatewayAbstract;
-use Crm\PaymentsModule\Repository\PaymentMetaRepository;
+use Crm\PaymentsModule\Models\GatewayFail;
+use Crm\PaymentsModule\Models\Gateways\GatewayAbstract;
+use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
 use Crm\UsersModule\Repositories\UserMetaRepository;
 use Money\Currencies\ISOCurrencies;
 use Money\Currency;
diff --git a/src/Gateways/StripeRecurrent.php b/src/Gateways/StripeRecurrent.php
index 5486ba9..821606a 100644
--- a/src/Gateways/StripeRecurrent.php
+++ b/src/Gateways/StripeRecurrent.php
@@ -2,9 +2,9 @@
 
 namespace Crm\StripeModule\Gateways;
 
-use Crm\PaymentsModule\Gateways\RecurrentPaymentInterface;
-use Crm\PaymentsModule\RecurrentPaymentFailStop;
-use Crm\PaymentsModule\RecurrentPaymentFailTry;
+use Crm\PaymentsModule\Models\Gateways\RecurrentPaymentInterface;
+use Crm\PaymentsModule\Models\RecurrentPaymentFailStop;
+use Crm\PaymentsModule\Models\RecurrentPaymentFailTry;
 use Money\Currency;
 use Omnipay\Common\Exception\InvalidRequestException;
 use Stripe\ErrorObject;
diff --git a/src/Gateways/StripeWallet.php b/src/Gateways/StripeWallet.php
index 0381a1e..4174b9e 100644
--- a/src/Gateways/StripeWallet.php
+++ b/src/Gateways/StripeWallet.php
@@ -2,7 +2,7 @@
 
 namespace Crm\StripeModule\Gateways;
 
-use Crm\PaymentsModule\Gateways\GatewayAbstract;
+use Crm\PaymentsModule\Models\Gateways\GatewayAbstract;
 
 class StripeWallet extends GatewayAbstract
 {
diff --git a/src/Models/RedirectResolver.php b/src/Models/RedirectResolver.php
index f6833cd..616bf81 100644
--- a/src/Models/RedirectResolver.php
+++ b/src/Models/RedirectResolver.php
@@ -2,7 +2,7 @@
 
 namespace Crm\StripeModule\Models;
 
-use Crm\PaymentsModule\Model\PaymentCompleteRedirectResolver;
+use Crm\PaymentsModule\Models\SuccessPageResolver\PaymentCompleteRedirectResolver;
 use Crm\StripeModule\Gateways\StripeWallet;
 use Nette\Database\Table\ActiveRow;
 
diff --git a/src/Models/StripeWalletClient.php b/src/Models/StripeWalletClient.php
index 5fb326e..e0ba270 100644
--- a/src/Models/StripeWalletClient.php
+++ b/src/Models/StripeWalletClient.php
@@ -3,7 +3,7 @@
 namespace Crm\StripeModule\Models;
 
 use Crm\ApplicationModule\Config\ApplicationConfig;
-use Crm\PaymentsModule\Repository\PaymentMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
 use Exception;
 use Nette\Database\Table\ActiveRow;
 use Stripe\Exception\ApiErrorException;
diff --git a/src/Presenters/StripeWalletPresenter.php b/src/Presenters/StripeWalletPresenter.php
index c122021..5bdc290 100644
--- a/src/Presenters/StripeWalletPresenter.php
+++ b/src/Presenters/StripeWalletPresenter.php
@@ -4,7 +4,7 @@
 
 use Crm\ApplicationModule\ActiveRow;
 use Crm\ApplicationModule\Presenters\FrontendPresenter;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\StripeModule\Gateways\StripeWallet;
 use Crm\StripeModule\Models\StripeWalletClient;
 use Crm\UsersModule\Repositories\CountriesRepository;
diff --git a/src/Seeders/PaymentGatewaysSeeder.php b/src/Seeders/PaymentGatewaysSeeder.php
index 5bee14d..70359a2 100644
--- a/src/Seeders/PaymentGatewaysSeeder.php
+++ b/src/Seeders/PaymentGatewaysSeeder.php
@@ -3,7 +3,7 @@
 namespace Crm\StripeModule\Seeders;
 
 use Crm\ApplicationModule\Seeders\ISeeder;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
 use Crm\StripeModule\Gateways\Stripe;
 use Crm\StripeModule\Gateways\StripeRecurrent;
 use Crm\StripeModule\Gateways\StripeWallet;
diff --git a/src/Seeders/SalesFunnelsSeeder.php b/src/Seeders/SalesFunnelsSeeder.php
index 3ff1356..5cc4f4c 100644
--- a/src/Seeders/SalesFunnelsSeeder.php
+++ b/src/Seeders/SalesFunnelsSeeder.php
@@ -3,7 +3,7 @@
 namespace Crm\StripeModule\Seeders;
 
 use Crm\ApplicationModule\Seeders\ISeeder;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
 use Crm\SalesFunnelModule\Repositories\SalesFunnelsPaymentGatewaysRepository;
 use Crm\SalesFunnelModule\Repositories\SalesFunnelsRepository;
 use Crm\StripeModule\Gateways\Stripe;