diff --git a/src/Commands/SendInvoiceCommand.php b/src/Commands/SendInvoiceCommand.php
index 3f30557..a225e61 100644
--- a/src/Commands/SendInvoiceCommand.php
+++ b/src/Commands/SendInvoiceCommand.php
@@ -3,7 +3,7 @@
 namespace Crm\InvoicesModule\Commands;
 
 use Crm\InvoicesModule\Models\Generator\InvoiceGenerator;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Events\NotificationEvent;
 use League\Event\Emitter;
 use Symfony\Component\Console\Command\Command;
diff --git a/src/Components/PaymentSuccessInvoiceWidget/PaymentSuccessInvoiceWidget.php b/src/Components/PaymentSuccessInvoiceWidget/PaymentSuccessInvoiceWidget.php
index bf06e2e..10b567d 100644
--- a/src/Components/PaymentSuccessInvoiceWidget/PaymentSuccessInvoiceWidget.php
+++ b/src/Components/PaymentSuccessInvoiceWidget/PaymentSuccessInvoiceWidget.php
@@ -6,9 +6,9 @@
 use Crm\ApplicationModule\Widget\LazyWidgetManager;
 use Crm\InvoicesModule\Forms\UserInvoiceFormFactory;
 use Crm\InvoicesModule\Repositories\InvoicesRepository;
-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\Application\UI\Form;
 use Nette\Database\Table\ActiveRow;
 
diff --git a/src/DataProviders/InvoicesUserDataProvider.php b/src/DataProviders/InvoicesUserDataProvider.php
index ad5b6c8..5abf5a4 100644
--- a/src/DataProviders/InvoicesUserDataProvider.php
+++ b/src/DataProviders/InvoicesUserDataProvider.php
@@ -4,7 +4,7 @@
 
 use Crm\ApplicationModule\User\UserDataProviderInterface;
 use Crm\InvoicesModule\Models\Generator\InvoiceGenerator;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 
 class InvoicesUserDataProvider implements UserDataProviderInterface
 {
diff --git a/src/DataProviders/PaymentInvoiceProvider.php b/src/DataProviders/PaymentInvoiceProvider.php
index fc44577..ab20496 100644
--- a/src/DataProviders/PaymentInvoiceProvider.php
+++ b/src/DataProviders/PaymentInvoiceProvider.php
@@ -3,7 +3,7 @@
 namespace Crm\InvoicesModule\DataProviders;
 
 use Crm\InvoicesModule\Models\Generator\InvoiceGenerator;
-use Crm\PaymentsModule\DataProvider\PaymentInvoiceProviderInterface;
+use Crm\PaymentsModule\DataProviders\PaymentInvoiceProviderInterface;
 use Nette\Database\Table\ActiveRow;
 
 class PaymentInvoiceProvider implements PaymentInvoiceProviderInterface
diff --git a/src/DataProviders/UserFormDataProvider.php b/src/DataProviders/UserFormDataProvider.php
index df84044..6ef57cd 100644
--- a/src/DataProviders/UserFormDataProvider.php
+++ b/src/DataProviders/UserFormDataProvider.php
@@ -4,7 +4,7 @@
 
 use Crm\ApplicationModule\DataProvider\DataProviderException;
 use Crm\ApplicationModule\Hermes\HermesMessage;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\DataProviders\UserFormDataProviderInterface;
 use Crm\UsersModule\Repositories\UsersRepository;
 use Nette\Application\UI\Form;
diff --git a/src/Events/AddressChangedHandler.php b/src/Events/AddressChangedHandler.php
index f3cd131..9744306 100644
--- a/src/Events/AddressChangedHandler.php
+++ b/src/Events/AddressChangedHandler.php
@@ -3,7 +3,7 @@
 namespace Crm\InvoicesModule\Events;
 
 use Crm\ApplicationModule\Hermes\HermesMessage;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Events\AddressChangedEvent;
 use Crm\UsersModule\Repositories\UsersRepository;
 use League\Event\AbstractListener;
diff --git a/src/Events/NewAddressHandler.php b/src/Events/NewAddressHandler.php
index 5a65a82..7062a38 100644
--- a/src/Events/NewAddressHandler.php
+++ b/src/Events/NewAddressHandler.php
@@ -3,7 +3,7 @@
 namespace Crm\InvoicesModule\Events;
 
 use Crm\ApplicationModule\Hermes\HermesMessage;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Events\NewAddressEvent;
 use Crm\UsersModule\Repositories\UsersRepository;
 use League\Event\AbstractListener;
diff --git a/src/Events/PaymentStatusChangeHandler.php b/src/Events/PaymentStatusChangeHandler.php
index 4679516..c8a7f8c 100644
--- a/src/Events/PaymentStatusChangeHandler.php
+++ b/src/Events/PaymentStatusChangeHandler.php
@@ -5,7 +5,7 @@
 use Crm\ApplicationModule\Config\ApplicationConfig;
 use Crm\ApplicationModule\Hermes\HermesMessage;
 use Crm\PaymentsModule\Events\PaymentChangeStatusEvent;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use League\Event\AbstractListener;
 use League\Event\EventInterface;
 use Tomaj\Hermes\Emitter as HermesEmitter;
diff --git a/src/Events/PreNotificationEventHandler.php b/src/Events/PreNotificationEventHandler.php
index d1e17da..04eec10 100644
--- a/src/Events/PreNotificationEventHandler.php
+++ b/src/Events/PreNotificationEventHandler.php
@@ -6,7 +6,7 @@
 use Crm\InvoicesModule\Models\Generator\InvoiceGenerationException;
 use Crm\InvoicesModule\Models\Generator\InvoiceGenerator;
 use Crm\InvoicesModule\Models\Generator\PaymentNotInvoiceableException;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Events\NotificationContext;
 use Crm\UsersModule\Events\PreNotificationEvent;
 use League\Event\AbstractListener;
diff --git a/src/Forms/ChangeInvoiceDetailsFormFactory.php b/src/Forms/ChangeInvoiceDetailsFormFactory.php
index 9f1f45e..ddf9459 100644
--- a/src/Forms/ChangeInvoiceDetailsFormFactory.php
+++ b/src/Forms/ChangeInvoiceDetailsFormFactory.php
@@ -5,7 +5,7 @@
 use Crm\ApplicationModule\Config\ApplicationConfig;
 use Crm\ApplicationModule\DataProvider\DataProviderManager;
 use Crm\ApplicationModule\Hermes\HermesMessage;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\DataProviders\AddressFormDataProviderInterface;
 use Crm\UsersModule\Repositories\AddressChangeRequestsRepository;
 use Crm\UsersModule\Repositories\AddressesRepository;
diff --git a/src/Gateways/ProformaInvoice.php b/src/Gateways/ProformaInvoice.php
index 68e2dd8..10b1cbc 100644
--- a/src/Gateways/ProformaInvoice.php
+++ b/src/Gateways/ProformaInvoice.php
@@ -1,7 +1,7 @@
 <?php
 namespace Crm\InvoicesModule\Gateways;
 
-use Crm\PaymentsModule\Gateways\GatewayAbstract;
+use Crm\PaymentsModule\Models\Gateways\GatewayAbstract;
 
 class ProformaInvoice extends GatewayAbstract
 {
diff --git a/src/Hermes/GenerateInvoiceHandler.php b/src/Hermes/GenerateInvoiceHandler.php
index c59e952..625851b 100644
--- a/src/Hermes/GenerateInvoiceHandler.php
+++ b/src/Hermes/GenerateInvoiceHandler.php
@@ -4,7 +4,7 @@
 
 use Crm\InvoicesModule\Models\Generator\InvoiceGenerator;
 use Crm\InvoicesModule\Models\Generator\PaymentNotInvoiceableException;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Tomaj\Hermes\Handler\HandlerInterface;
 use Tomaj\Hermes\MessageInterface;
 use Tracy\Debugger;
diff --git a/src/Hermes/ZipInvoicesHandler.php b/src/Hermes/ZipInvoicesHandler.php
index 0e308ac..69629b9 100644
--- a/src/Hermes/ZipInvoicesHandler.php
+++ b/src/Hermes/ZipInvoicesHandler.php
@@ -6,7 +6,7 @@
 use Crm\InvoicesModule\Models\Sandbox\InvoiceZipGenerator;
 use Crm\InvoicesModule\Repositories\InvoiceNumbersRepository;
 use Crm\InvoicesModule\Repositories\InvoicesRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Utils\DateTime;
 use Psr\Log\LoggerAwareTrait;
 use Tomaj\Hermes\Handler\HandlerInterface;
diff --git a/src/Models/Generator/InvoiceGenerator.php b/src/Models/Generator/InvoiceGenerator.php
index 40ade75..278fbcf 100644
--- a/src/Models/Generator/InvoiceGenerator.php
+++ b/src/Models/Generator/InvoiceGenerator.php
@@ -11,7 +11,7 @@
 use Crm\ApplicationModule\RedisClientTraitException;
 use Crm\InvoicesModule\Models\InvoiceNumber\InvoiceNumberInterface;
 use Crm\InvoicesModule\Repositories\InvoicesRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Repositories\AddressesRepository;
 use Latte\Engine;
 use Latte\Essential\TranslatorExtension;
diff --git a/src/Presenters/InvoicesAdminPresenter.php b/src/Presenters/InvoicesAdminPresenter.php
index 3a61438..3cde498 100644
--- a/src/Presenters/InvoicesAdminPresenter.php
+++ b/src/Presenters/InvoicesAdminPresenter.php
@@ -12,7 +12,7 @@
 use Crm\InvoicesModule\Models\Sandbox\InvoiceZipGenerator;
 use Crm\InvoicesModule\Repositories\InvoiceNumbersRepository;
 use Crm\InvoicesModule\Repositories\InvoicesRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Repositories\AddressesRepository;
 use Nette\Application\BadRequestException;
 use Nette\Application\Responses\FileResponse;
diff --git a/src/Presenters/InvoicesPresenter.php b/src/Presenters/InvoicesPresenter.php
index 0239ab5..facdb35 100644
--- a/src/Presenters/InvoicesPresenter.php
+++ b/src/Presenters/InvoicesPresenter.php
@@ -7,7 +7,7 @@
 use Crm\InvoicesModule\Forms\ChangeInvoiceDetailsFormFactory;
 use Crm\InvoicesModule\Models\Generator\InvoiceGenerator;
 use Crm\InvoicesModule\Repositories\InvoicesRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Application\BadRequestException;
 use Nette\DI\Attributes\Inject;
 
diff --git a/src/Presenters/ReceiptsAdminPresenter.php b/src/Presenters/ReceiptsAdminPresenter.php
index 40020d0..64d844c 100644
--- a/src/Presenters/ReceiptsAdminPresenter.php
+++ b/src/Presenters/ReceiptsAdminPresenter.php
@@ -4,7 +4,7 @@
 
 use Crm\AdminModule\Presenters\AdminPresenter;
 use Crm\InvoicesModule\Models\Generator\ReceiptGenerator;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Application\BadRequestException;
 use Nette\DI\Attributes\Inject;
 
diff --git a/src/Presenters/ReceiptsPresenter.php b/src/Presenters/ReceiptsPresenter.php
index 9297597..0f872e2 100644
--- a/src/Presenters/ReceiptsPresenter.php
+++ b/src/Presenters/ReceiptsPresenter.php
@@ -5,7 +5,7 @@
 use Contributte\PdfResponse\PdfResponse;
 use Crm\ApplicationModule\Presenters\FrontendPresenter;
 use Crm\InvoicesModule\Models\Generator\ReceiptGenerator;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Application\BadRequestException;
 use Nette\Application\ForbiddenRequestException;
 use Nette\DI\Attributes\Inject;
diff --git a/src/Presenters/SalesFunnelPresenter.php b/src/Presenters/SalesFunnelPresenter.php
index 1208dbc..0f889d3 100644
--- a/src/Presenters/SalesFunnelPresenter.php
+++ b/src/Presenters/SalesFunnelPresenter.php
@@ -5,8 +5,8 @@
 use Crm\ApplicationModule\Presenters\FrontendPresenter;
 use Crm\InvoicesModule\Events\ProformaInvoiceCreatedEvent;
 use Crm\InvoicesModule\Forms\UserInvoiceFormFactory;
-use Crm\PaymentsModule\Repository\PaymentLogsRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentLogsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Application\Attributes\Persistent;
 use Nette\Application\UI\Form;
 use Nette\DI\Attributes\Inject;
diff --git a/src/Repositories/InvoicesRepository.php b/src/Repositories/InvoicesRepository.php
index 469147d..b45cf8e 100644
--- a/src/Repositories/InvoicesRepository.php
+++ b/src/Repositories/InvoicesRepository.php
@@ -8,7 +8,7 @@
 use Crm\ApplicationModule\Repository;
 use Crm\ApplicationModule\Repository\AuditLogRepository;
 use Crm\InvoicesModule\Events\NewInvoiceEvent;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SubscriptionsModule\Models\PaymentItem\SubscriptionTypePaymentItem;
 use Crm\UsersModule\Repositories\AddressesRepository;
 use IntlDateFormatter;
diff --git a/src/Seeders/PaymentGatewaysSeeder.php b/src/Seeders/PaymentGatewaysSeeder.php
index a6659f3..75592ea 100644
--- a/src/Seeders/PaymentGatewaysSeeder.php
+++ b/src/Seeders/PaymentGatewaysSeeder.php
@@ -4,7 +4,7 @@
 
 use Crm\ApplicationModule\Seeders\ISeeder;
 use Crm\InvoicesModule\Gateways\ProformaInvoice;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class PaymentGatewaysSeeder implements ISeeder
diff --git a/src/Tests/BaseTestCase.php b/src/Tests/BaseTestCase.php
index da7427b..e9f9cfe 100644
--- a/src/Tests/BaseTestCase.php
+++ b/src/Tests/BaseTestCase.php
@@ -9,10 +9,10 @@
 use Crm\InvoicesModule\Repositories\InvoicesRepository;
 use Crm\InvoicesModule\Seeders\AddressTypesSeeder;
 use Crm\InvoicesModule\Seeders\ConfigsSeeder;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentItemsRepository;
-use Crm\PaymentsModule\Repository\PaymentMetaRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
+use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SubscriptionsModule\Repositories\SubscriptionExtensionMethodsRepository;
 use Crm\SubscriptionsModule\Repositories\SubscriptionLengthMethodsRepository;
 use Crm\SubscriptionsModule\Repositories\SubscriptionTypesRepository;
diff --git a/src/Tests/Events/AddressChangedHandlerTest.php b/src/Tests/Events/AddressChangedHandlerTest.php
index 30d2400..a01f45e 100644
--- a/src/Tests/Events/AddressChangedHandlerTest.php
+++ b/src/Tests/Events/AddressChangedHandlerTest.php
@@ -6,10 +6,10 @@
 use Crm\InvoicesModule\Events\AddressChangedHandler;
 use Crm\InvoicesModule\Hermes\GenerateInvoiceHandler;
 use Crm\InvoicesModule\Seeders\AddressTypesSeeder;
-use Crm\PaymentsModule\PaymentItem\PaymentItemContainer;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentItemsRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Events\AddressChangedEvent;
 use Crm\UsersModule\Events\UserMetaEvent;
 use Crm\UsersModule\Models\Auth\UserManager;
diff --git a/src/Tests/Events/NewAddressHandlerTest.php b/src/Tests/Events/NewAddressHandlerTest.php
index bdd50dc..9180445 100644
--- a/src/Tests/Events/NewAddressHandlerTest.php
+++ b/src/Tests/Events/NewAddressHandlerTest.php
@@ -6,10 +6,10 @@
 use Crm\InvoicesModule\Events\NewAddressHandler;
 use Crm\InvoicesModule\Hermes\GenerateInvoiceHandler;
 use Crm\InvoicesModule\Seeders\AddressTypesSeeder;
-use Crm\PaymentsModule\PaymentItem\PaymentItemContainer;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentItemsRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Events\AddressChangedEvent;
 use Crm\UsersModule\Events\NewAddressEvent;
 use Crm\UsersModule\Models\Auth\UserManager;
diff --git a/src/Tests/Events/PaymentStatusChangeHandlerTest.php b/src/Tests/Events/PaymentStatusChangeHandlerTest.php
index f61ce22..7e50d73 100644
--- a/src/Tests/Events/PaymentStatusChangeHandlerTest.php
+++ b/src/Tests/Events/PaymentStatusChangeHandlerTest.php
@@ -11,10 +11,10 @@
 use Crm\InvoicesModule\Seeders\ConfigsSeeder;
 use Crm\PaymentsModule\Events\NewPaymentEvent;
 use Crm\PaymentsModule\Events\PaymentChangeStatusEvent;
-use Crm\PaymentsModule\PaymentItem\PaymentItemContainer;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentItemsRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Models\Auth\UserManager;
 use Crm\UsersModule\Repositories\UsersRepository;
 use Nette\Database\Table\ActiveRow;
diff --git a/src/Tests/Generator/InvoicesGeneratorGenerateTest.php b/src/Tests/Generator/InvoicesGeneratorGenerateTest.php
index 11c01f1..dffe2e2 100644
--- a/src/Tests/Generator/InvoicesGeneratorGenerateTest.php
+++ b/src/Tests/Generator/InvoicesGeneratorGenerateTest.php
@@ -13,10 +13,10 @@
 use Crm\InvoicesModule\Repositories\InvoicesRepository;
 use Crm\InvoicesModule\Seeders\AddressTypesSeeder;
 use Crm\InvoicesModule\Seeders\ConfigsSeeder;
-use Crm\PaymentsModule\PaymentItem\PaymentItemContainer;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentItemsRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Models\Auth\UserManager;
 use Crm\UsersModule\Repositories\AddressTypesRepository;
 use Crm\UsersModule\Repositories\AddressesRepository;
diff --git a/src/Tests/HasInvoiceCriteriaTest.php b/src/Tests/HasInvoiceCriteriaTest.php
index 340fc51..cc439d2 100644
--- a/src/Tests/HasInvoiceCriteriaTest.php
+++ b/src/Tests/HasInvoiceCriteriaTest.php
@@ -7,8 +7,8 @@
 use Crm\InvoicesModule\Repositories\InvoicesRepository;
 use Crm\InvoicesModule\Scenarios\HasInvoiceCriteria;
 use Crm\InvoicesModule\Seeders\AddressTypesSeeder;
-use Crm\PaymentsModule\PaymentItem\PaymentItemContainer;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\PaymentsModule\Tests\PaymentsTestCase;
 use Crm\SubscriptionsModule\Models\Builder\SubscriptionTypeBuilder;
 use Crm\UsersModule\Models\Auth\UserManager;
diff --git a/src/Tests/Hermes/GenerateInvoiceHandlerTest.php b/src/Tests/Hermes/GenerateInvoiceHandlerTest.php
index 92e3a6a..f4bc94e 100644
--- a/src/Tests/Hermes/GenerateInvoiceHandlerTest.php
+++ b/src/Tests/Hermes/GenerateInvoiceHandlerTest.php
@@ -13,12 +13,12 @@
 use Crm\InvoicesModule\Repositories\InvoiceNumbersRepository;
 use Crm\InvoicesModule\Repositories\InvoicesRepository;
 use Crm\InvoicesModule\Seeders\AddressTypesSeeder;
-use Crm\PaymentsModule\PaymentItem\PaymentItemContainer;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentItemMetaRepository;
-use Crm\PaymentsModule\Repository\PaymentItemsRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
-use Crm\PaymentsModule\Repository\VariableSymbol;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
+use Crm\PaymentsModule\Repositories\VariableSymbolRepository;
 use Crm\SubscriptionsModule\Models\Builder\SubscriptionTypeBuilder;
 use Crm\SubscriptionsModule\Models\PaymentItem\SubscriptionTypePaymentItem;
 use Crm\SubscriptionsModule\Repositories\SubscriptionExtensionMethodsRepository;
@@ -69,7 +69,7 @@ protected function requiredRepositories(): array
             SubscriptionTypesRepository::class,
             SubscriptionTypeItemsRepository::class,
             UsersRepository::class,
-            VariableSymbol::class,
+            VariableSymbolRepository::class,
         ];
     }
 
diff --git a/src/Tests/InvoiceNumbersTest.php b/src/Tests/InvoiceNumbersTest.php
index 761d4aa..4a05aea 100644
--- a/src/Tests/InvoiceNumbersTest.php
+++ b/src/Tests/InvoiceNumbersTest.php
@@ -5,11 +5,11 @@
 use Crm\ApplicationModule\Tests\DatabaseTestCase;
 use Crm\InvoicesModule\Models\InvoiceNumber\InvoiceNumber;
 use Crm\InvoicesModule\Repositories\InvoiceNumbersRepository;
-use Crm\PaymentsModule\Gateways\BankTransfer;
-use Crm\PaymentsModule\PaymentItem\DonationPaymentItem;
-use Crm\PaymentsModule\PaymentItem\PaymentItemContainer;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Models\Gateways\BankTransfer;
+use Crm\PaymentsModule\Models\PaymentItem\DonationPaymentItem;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\PaymentsModule\Seeders\PaymentGatewaysSeeder;
 use Crm\UsersModule\Repositories\UsersRepository;
 use DateTime;
diff --git a/src/Tests/PreNotificationHandlerTest.php b/src/Tests/PreNotificationHandlerTest.php
index 3b0274f..0a426e6 100644
--- a/src/Tests/PreNotificationHandlerTest.php
+++ b/src/Tests/PreNotificationHandlerTest.php
@@ -7,10 +7,10 @@
 use Crm\InvoicesModule\Events\PreNotificationEventHandler;
 use Crm\PaymentsModule\Events\PaymentChangeStatusEvent;
 use Crm\PaymentsModule\Events\PaymentStatusChangeHandler;
-use Crm\PaymentsModule\PaymentItem\PaymentItemContainer;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentMetaRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SubscriptionsModule\Models\Builder\SubscriptionTypeBuilder;
 use Crm\UsersModule\Events\NotificationContext;
 use Crm\UsersModule\Events\NotificationEvent;
diff --git a/src/Tests/Repository/InvoicesRepositoryTest.php b/src/Tests/Repository/InvoicesRepositoryTest.php
index c429b40..4579a57 100644
--- a/src/Tests/Repository/InvoicesRepositoryTest.php
+++ b/src/Tests/Repository/InvoicesRepositoryTest.php
@@ -13,12 +13,12 @@
 use Crm\InvoicesModule\Repositories\InvoicesRepository;
 use Crm\InvoicesModule\Seeders\AddressTypesSeeder;
 use Crm\InvoicesModule\Seeders\ConfigsSeeder as InvoicesConfigsSeeder;
-use Crm\PaymentsModule\PaymentItem\PaymentItemContainer;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentItemMetaRepository;
-use Crm\PaymentsModule\Repository\PaymentItemsRepository;
-use Crm\PaymentsModule\Repository\PaymentMetaRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
+use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SubscriptionsModule\Models\Builder\SubscriptionTypeBuilder;
 use Crm\SubscriptionsModule\Models\PaymentItem\SubscriptionTypePaymentItem;
 use Crm\SubscriptionsModule\Repositories\SubscriptionTypesRepository;
diff --git a/src/Tests/Repository/IsPaymentInvoiceableTest.php b/src/Tests/Repository/IsPaymentInvoiceableTest.php
index f3eda88..cd81ecd 100644
--- a/src/Tests/Repository/IsPaymentInvoiceableTest.php
+++ b/src/Tests/Repository/IsPaymentInvoiceableTest.php
@@ -5,12 +5,12 @@
 use Crm\ApplicationModule\Tests\DatabaseTestCase;
 use Crm\InvoicesModule\Repositories\InvoicesRepository;
 use Crm\InvoicesModule\Seeders\AddressTypesSeeder;
-use Crm\PaymentsModule\PaymentItem\PaymentItemContainer;
-use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
-use Crm\PaymentsModule\Repository\PaymentItemMetaRepository;
-use Crm\PaymentsModule\Repository\PaymentItemsRepository;
-use Crm\PaymentsModule\Repository\PaymentMetaRepository;
-use Crm\PaymentsModule\Repository\PaymentsRepository;
+use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
+use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
+use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
+use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Models\Auth\UserManager;
 use Crm\UsersModule\Repositories\AddressTypesRepository;
 use Crm\UsersModule\Repositories\AddressesRepository;