diff --git a/src/Commands/ActivatePurchasedGiftCouponsCommand.php b/src/Commands/ActivatePurchasedGiftCouponsCommand.php
index 804ca0d..15471e6 100644
--- a/src/Commands/ActivatePurchasedGiftCouponsCommand.php
+++ b/src/Commands/ActivatePurchasedGiftCouponsCommand.php
@@ -6,7 +6,7 @@
 use Crm\GiftsModule\GiftsModule;
 use Crm\GiftsModule\Repositories\PaymentGiftCouponsRepository;
 use Crm\GiftsModule\Seeders\AddressTypesSeeder;
-use Crm\PaymentsModule\Repository\PaymentMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
 use Crm\ProductsModule\Repositories\OrdersRepository;
 use Crm\ProductsModule\Repositories\ProductPropertiesRepository;
 use Crm\SubscriptionsModule\Models\Extension\ExtensionInterface;
diff --git a/src/Components/PaymentSuccessGiftSubscriptionAddressWidget/PaymentSuccessGiftSubscriptionAddressWidget.php b/src/Components/PaymentSuccessGiftSubscriptionAddressWidget/PaymentSuccessGiftSubscriptionAddressWidget.php
index 3b3c010..4680d9c 100644
--- a/src/Components/PaymentSuccessGiftSubscriptionAddressWidget/PaymentSuccessGiftSubscriptionAddressWidget.php
+++ b/src/Components/PaymentSuccessGiftSubscriptionAddressWidget/PaymentSuccessGiftSubscriptionAddressWidget.php
@@ -5,9 +5,9 @@
 use Crm\ApplicationModule\Widget\BaseLazyWidget;
 use Crm\GiftsModule\Forms\GiftSubscriptionAddressFormFactory;
 use Crm\GiftsModule\Models\PaymentItem\GiftPaymentItem;
-use Crm\PaymentsModule\Gateways\BankTransfer;
-use Crm\PaymentsModule\PaymentAwareInterface;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Models\Gateways\BankTransfer;
+use Crm\PaymentsModule\Models\PaymentAwareInterface;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Database\Table\ActiveRow;
 
 class PaymentSuccessGiftSubscriptionAddressWidget extends BaseLazyWidget
diff --git a/src/DataProviders/CanDeleteAddressDataProvider.php b/src/DataProviders/CanDeleteAddressDataProvider.php
index 642ebbd..373bb97 100644
--- a/src/DataProviders/CanDeleteAddressDataProvider.php
+++ b/src/DataProviders/CanDeleteAddressDataProvider.php
@@ -4,7 +4,7 @@
 
 use Crm\ApplicationModule\DataProvider\DataProviderException;
 use Crm\GiftsModule\Forms\GiftSubscriptionAddressFormFactory;
-use Crm\PaymentsModule\Repository\PaymentMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
 use Crm\UsersModule\DataProviders\CanDeleteAddressDataProviderInterface;
 use Nette\Database\Table\ActiveRow;
 use Nette\Localization\Translator;
diff --git a/src/DataProviders/PaymentItemTypesFilterDataProvider.php b/src/DataProviders/PaymentItemTypesFilterDataProvider.php
index 4b11b70..7dc325d 100644
--- a/src/DataProviders/PaymentItemTypesFilterDataProvider.php
+++ b/src/DataProviders/PaymentItemTypesFilterDataProvider.php
@@ -4,7 +4,7 @@
 
 use Crm\ApplicationModule\DataProvider\DataProviderException;
 use Crm\GiftsModule\Models\PaymentItem\GiftPaymentItem;
-use Crm\PaymentsModule\DataProvider\PaymentItemTypesFilterDataProviderInterface;
+use Crm\PaymentsModule\DataProviders\PaymentItemTypesFilterDataProviderInterface;
 use Nette\Localization\Translator;
 
 class PaymentItemTypesFilterDataProvider implements PaymentItemTypesFilterDataProviderInterface
diff --git a/src/Events/CreateGiftCouponNewPaymentEventHandler.php b/src/Events/CreateGiftCouponNewPaymentEventHandler.php
index 79db31e..b676914 100644
--- a/src/Events/CreateGiftCouponNewPaymentEventHandler.php
+++ b/src/Events/CreateGiftCouponNewPaymentEventHandler.php
@@ -4,8 +4,8 @@
 
 use Crm\GiftsModule\Repositories\PaymentGiftCouponsRepository;
 use Crm\PaymentsModule\Events\NewPaymentEvent;
-use Crm\PaymentsModule\Repository\PaymentMetaRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use League\Event\AbstractListener;
 use League\Event\EventInterface;
 use Nette\Utils\DateTime;
diff --git a/src/Events/GiftPaymentStatusChangeHandler.php b/src/Events/GiftPaymentStatusChangeHandler.php
index 26beb4b..f035cf1 100644
--- a/src/Events/GiftPaymentStatusChangeHandler.php
+++ b/src/Events/GiftPaymentStatusChangeHandler.php
@@ -5,7 +5,7 @@
 use Crm\ApplicationModule\Config\ApplicationConfig;
 use Crm\GiftsModule\Repositories\PaymentGiftCouponsRepository;
 use Crm\PaymentsModule\Events\PaymentChangeStatusEvent;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Events\NotificationEvent;
 use League\Event\AbstractListener;
 use League\Event\Emitter;
diff --git a/src/Forms/GiftSubscriptionAddressFormFactory.php b/src/Forms/GiftSubscriptionAddressFormFactory.php
index 114d533..f9f77ab 100644
--- a/src/Forms/GiftSubscriptionAddressFormFactory.php
+++ b/src/Forms/GiftSubscriptionAddressFormFactory.php
@@ -4,7 +4,7 @@
 
 use Contributte\Translation\Translator;
 use Crm\GiftsModule\Seeders\AddressTypesSeeder;
-use Crm\PaymentsModule\Repository\PaymentMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
 use Crm\UsersModule\Repositories\AddressChangeRequestsRepository;
 use Crm\UsersModule\Repositories\AddressesRepository;
 use Crm\UsersModule\Repositories\CountriesRepository;
diff --git a/src/Models/PaymentItem/GiftPaymentItem.php b/src/Models/PaymentItem/GiftPaymentItem.php
index 21a2842..8f958d6 100644
--- a/src/Models/PaymentItem/GiftPaymentItem.php
+++ b/src/Models/PaymentItem/GiftPaymentItem.php
@@ -2,8 +2,8 @@
 
 namespace Crm\GiftsModule\Models\PaymentItem;
 
-use Crm\PaymentsModule\PaymentItem\PaymentItemInterface;
-use Crm\PaymentsModule\PaymentItem\PaymentItemTrait;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemInterface;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemTrait;
 use Nette\Database\Table\ActiveRow;
 
 class GiftPaymentItem implements PaymentItemInterface
diff --git a/src/Repositories/PaymentGiftCouponsRepository.php b/src/Repositories/PaymentGiftCouponsRepository.php
index fb332ba..6ed852d 100644
--- a/src/Repositories/PaymentGiftCouponsRepository.php
+++ b/src/Repositories/PaymentGiftCouponsRepository.php
@@ -4,7 +4,7 @@
 
 use Crm\ApplicationModule\Repository;
 use Crm\ApplicationModule\Repository\AuditLogRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Caching\Storage;
 use Nette\Database\Explorer;
 use Nette\Database\Table\Selection;
diff --git a/src/Tests/BaseTestCase.php b/src/Tests/BaseTestCase.php
index 85bbc3c..39156f1 100644
--- a/src/Tests/BaseTestCase.php
+++ b/src/Tests/BaseTestCase.php
@@ -5,10 +5,10 @@
 use Contributte\Translation\Translator;
 use Crm\ApplicationModule\Tests\DatabaseTestCase;
 use Crm\GiftsModule\GiftsModule;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentItemsRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
-use Crm\PaymentsModule\Repository\RecurrentPaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 use Crm\SubscriptionsModule\Repositories\ContentAccessRepository;
 use Crm\SubscriptionsModule\Repositories\SubscriptionExtensionMethodsRepository;
 use Crm\SubscriptionsModule\Repositories\SubscriptionLengthMethodsRepository;
diff --git a/src/Tests/GiftPaymentTest.php b/src/Tests/GiftPaymentTest.php
index 212e1d1..28f0dd4 100644
--- a/src/Tests/GiftPaymentTest.php
+++ b/src/Tests/GiftPaymentTest.php
@@ -4,9 +4,9 @@
 
 use Crm\GiftsModule\Events\GiftPaymentStatusChangeHandler;
 use Crm\PaymentsModule\Events\PaymentChangeStatusEvent;
-use Crm\PaymentsModule\PaymentItem\PaymentItemContainer;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SubscriptionsModule\Models\Builder\SubscriptionTypeBuilder;
 use Crm\UsersModule\Models\Auth\UserManager;
 use Nette\Utils\DateTime;