diff --git a/src/Api/PaypalIpnHandler.php b/src/Api/PaypalIpnHandler.php
index 7b25c74..2bf1cd6 100644
--- a/src/Api/PaypalIpnHandler.php
+++ b/src/Api/PaypalIpnHandler.php
@@ -5,7 +5,7 @@
 use Crm\ApiModule\Models\Api\ApiHandler;
 use Crm\ApiModule\Models\Api\ApiParamsValidatorInterface;
 use Crm\ApiModule\Models\Response\EmptyResponse;
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Models\Gateways\GatewayAbstract;
 use Crm\PaymentsModule\Models\PaymentProcessor;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
diff --git a/src/Commands/CsobMailConfirmationCommand.php b/src/Commands/CsobMailConfirmationCommand.php
index a9e96b2..b65a3f5 100644
--- a/src/Commands/CsobMailConfirmationCommand.php
+++ b/src/Commands/CsobMailConfirmationCommand.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Commands;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Models\MailConfirmation\EmailInterface;
 use Crm\PaymentsModule\Models\MailConfirmation\MailDownloaderInterface;
 use Crm\PaymentsModule\Models\MailConfirmation\MailProcessor;
diff --git a/src/Commands/LastPaymentsCheckCommand.php b/src/Commands/LastPaymentsCheckCommand.php
index 711c420..0f16693 100644
--- a/src/Commands/LastPaymentsCheckCommand.php
+++ b/src/Commands/LastPaymentsCheckCommand.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Commands;
 
-use Crm\ApplicationModule\ActiveRow;
-use Crm\ApplicationModule\ActiveRowFactory;
+use Crm\ApplicationModule\Models\Database\ActiveRow;
+use Crm\ApplicationModule\Models\Database\ActiveRowFactory;
 use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Events\NotificationEvent;
diff --git a/src/Commands/RecurrentPaymentsChargeCommand.php b/src/Commands/RecurrentPaymentsChargeCommand.php
index df7ac98..abaa749 100644
--- a/src/Commands/RecurrentPaymentsChargeCommand.php
+++ b/src/Commands/RecurrentPaymentsChargeCommand.php
@@ -3,7 +3,7 @@
 namespace Crm\PaymentsModule\Commands;
 
 use Crm\ApplicationModule\Commands\DecoratedCommandTrait;
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Events\BeforeRecurrentPaymentChargeEvent;
 use Crm\PaymentsModule\Models\GatewayFactory;
 use Crm\PaymentsModule\Models\GatewayFail;
diff --git a/src/Commands/SkCsobMailConfirmationCommand.php b/src/Commands/SkCsobMailConfirmationCommand.php
index 52463c9..b3b7cf2 100644
--- a/src/Commands/SkCsobMailConfirmationCommand.php
+++ b/src/Commands/SkCsobMailConfirmationCommand.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Commands;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Models\MailConfirmation\EmailInterface;
 use Crm\PaymentsModule\Models\MailConfirmation\MailDownloaderInterface;
 use Crm\PaymentsModule\Models\MailConfirmation\MailProcessor;
diff --git a/src/Commands/TatraBankaMailConfirmationCommand.php b/src/Commands/TatraBankaMailConfirmationCommand.php
index 5df3b06..9f38cc6 100644
--- a/src/Commands/TatraBankaMailConfirmationCommand.php
+++ b/src/Commands/TatraBankaMailConfirmationCommand.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Commands;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Models\MailConfirmation\EmailInterface;
 use Crm\PaymentsModule\Models\MailConfirmation\MailDownloaderInterface;
 use Crm\PaymentsModule\Models\MailConfirmation\MailProcessor;
diff --git a/src/Commands/TatraBankaStatementMailConfirmationCommand.php b/src/Commands/TatraBankaStatementMailConfirmationCommand.php
index 0103774..79b0b37 100644
--- a/src/Commands/TatraBankaStatementMailConfirmationCommand.php
+++ b/src/Commands/TatraBankaStatementMailConfirmationCommand.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Commands;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Models\MailConfirmation\EmailInterface;
 use Crm\PaymentsModule\Models\MailConfirmation\MailDownloaderInterface;
 use Crm\PaymentsModule\Models\MailConfirmation\MailProcessor;
diff --git a/src/Components/AddressWidget/AddressWidget.php b/src/Components/AddressWidget/AddressWidget.php
index a30912f..09f924f 100644
--- a/src/Components/AddressWidget/AddressWidget.php
+++ b/src/Components/AddressWidget/AddressWidget.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Components\AddressWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
 use Nette\Database\Table\ActiveRow;
 
 class AddressWidget extends BaseLazyWidget
diff --git a/src/Components/AuthorizationPaymentItemListWidget/AuthorizationPaymentItemListWidget.php b/src/Components/AuthorizationPaymentItemListWidget/AuthorizationPaymentItemListWidget.php
index 1f366d1..b9844ad 100644
--- a/src/Components/AuthorizationPaymentItemListWidget/AuthorizationPaymentItemListWidget.php
+++ b/src/Components/AuthorizationPaymentItemListWidget/AuthorizationPaymentItemListWidget.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Components\AuthorizationPaymentItemListWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
 use Crm\PaymentsModule\Models\PaymentItem\AuthorizationPaymentItem;
 use Nette\Database\Table\ActiveRow;
 
diff --git a/src/Components/AvgMonthPaymentWidget/AvgMonthPaymentWidget.php b/src/Components/AvgMonthPaymentWidget/AvgMonthPaymentWidget.php
index 95caac6..9c90ba3 100644
--- a/src/Components/AvgMonthPaymentWidget/AvgMonthPaymentWidget.php
+++ b/src/Components/AvgMonthPaymentWidget/AvgMonthPaymentWidget.php
@@ -2,9 +2,9 @@
 
 namespace Crm\PaymentsModule\Components\AvgMonthPaymentWidget;
 
-use Crm\ApplicationModule\Cache\CacheRepository;
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Repositories\CacheRepository;
 use Crm\SegmentModule\Models\SegmentWidgetInterface;
 use Crm\UsersModule\Repositories\UserStatsRepository;
 use Nette\Database\Table\ActiveRow;
diff --git a/src/Components/AvgSubscriptionPaymentWidget/AvgSubscriptionPaymentWidget.php b/src/Components/AvgSubscriptionPaymentWidget/AvgSubscriptionPaymentWidget.php
index 9dba17e..c464a5e 100644
--- a/src/Components/AvgSubscriptionPaymentWidget/AvgSubscriptionPaymentWidget.php
+++ b/src/Components/AvgSubscriptionPaymentWidget/AvgSubscriptionPaymentWidget.php
@@ -2,9 +2,9 @@
 
 namespace Crm\PaymentsModule\Components\AvgSubscriptionPaymentWidget;
 
-use Crm\ApplicationModule\Cache\CacheRepository;
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Repositories\CacheRepository;
 use Crm\SegmentModule\Models\SegmentWidgetInterface;
 use Crm\UsersModule\Repositories\UserStatsRepository;
 use Nette\Database\Table\ActiveRow;
diff --git a/src/Components/ChangePaymentStatus/ChangePaymentStatus.php b/src/Components/ChangePaymentStatus/ChangePaymentStatus.php
index 4057fff..79e0189 100644
--- a/src/Components/ChangePaymentStatus/ChangePaymentStatus.php
+++ b/src/Components/ChangePaymentStatus/ChangePaymentStatus.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\ChangePaymentStatus;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Localization\Translator;
 
diff --git a/src/Components/ChangePaymentSubscriptionTypeWidget/ChangePaymentSubscriptionTypeWidget.php b/src/Components/ChangePaymentSubscriptionTypeWidget/ChangePaymentSubscriptionTypeWidget.php
index e434773..4ef759e 100644
--- a/src/Components/ChangePaymentSubscriptionTypeWidget/ChangePaymentSubscriptionTypeWidget.php
+++ b/src/Components/ChangePaymentSubscriptionTypeWidget/ChangePaymentSubscriptionTypeWidget.php
@@ -2,9 +2,9 @@
 
 namespace Crm\PaymentsModule\Components\ChangePaymentSubscriptionTypeWidget;
 
-use Crm\ApplicationModule\ActiveRow;
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Database\ActiveRow;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Forms\ChangePaymentSubscriptionTypeFormFactory;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Application\UI\Form;
diff --git a/src/Components/DeviceUserListingWidget/DeviceUserListingWidget.php b/src/Components/DeviceUserListingWidget/DeviceUserListingWidget.php
index df64f9d..605af9d 100644
--- a/src/Components/DeviceUserListingWidget/DeviceUserListingWidget.php
+++ b/src/Components/DeviceUserListingWidget/DeviceUserListingWidget.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Components\DeviceUserListingWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
 use DeviceDetector\DeviceDetector;
 use Nette\Database\Table\ActiveRow;
 
diff --git a/src/Components/DonationPaymentItemsListWidget/DonationPaymentItemsListWidget.php b/src/Components/DonationPaymentItemsListWidget/DonationPaymentItemsListWidget.php
index 3e8ee9e..92cc7a0 100644
--- a/src/Components/DonationPaymentItemsListWidget/DonationPaymentItemsListWidget.php
+++ b/src/Components/DonationPaymentItemsListWidget/DonationPaymentItemsListWidget.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Components\DonationPaymentItemsListWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
 use Crm\PaymentsModule\Models\PaymentItem\DonationPaymentItem;
 use Nette\Database\Table\ActiveRow;
 
diff --git a/src/Components/DuplicateRecurrentPayments/DuplicateRecurrentPayments.php b/src/Components/DuplicateRecurrentPayments/DuplicateRecurrentPayments.php
index 7fcae85..889bb82 100644
--- a/src/Components/DuplicateRecurrentPayments/DuplicateRecurrentPayments.php
+++ b/src/Components/DuplicateRecurrentPayments/DuplicateRecurrentPayments.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\DuplicateRecurrentPayments;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 use Nette\Application\BadRequestException;
 use Nette\Localization\Translator;
diff --git a/src/Components/LastPayments/LastPayments.php b/src/Components/LastPayments/LastPayments.php
index 1fe32cf..40ff843 100644
--- a/src/Components/LastPayments/LastPayments.php
+++ b/src/Components/LastPayments/LastPayments.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\LastPayments;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 
 /**
diff --git a/src/Components/MonthAmountStatWidget/MonthAmountStatWidget.php b/src/Components/MonthAmountStatWidget/MonthAmountStatWidget.php
index 7e8327b..d067bc7 100644
--- a/src/Components/MonthAmountStatWidget/MonthAmountStatWidget.php
+++ b/src/Components/MonthAmountStatWidget/MonthAmountStatWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\MonthAmountStatWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Utils\DateTime;
 
diff --git a/src/Components/MonthDonationAmountStatWidget/MonthDonationAmountStatWidget.php b/src/Components/MonthDonationAmountStatWidget/MonthDonationAmountStatWidget.php
index 3f6cd08..8a07f5f 100644
--- a/src/Components/MonthDonationAmountStatWidget/MonthDonationAmountStatWidget.php
+++ b/src/Components/MonthDonationAmountStatWidget/MonthDonationAmountStatWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\MonthDonationAmountStatWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Models\PaymentItem\DonationPaymentItem;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Utils\DateTime;
diff --git a/src/Components/MonthToDateAmountStatWidget/MonthToDateAmountStatWidget.php b/src/Components/MonthToDateAmountStatWidget/MonthToDateAmountStatWidget.php
index cbe2e31..deb301c 100644
--- a/src/Components/MonthToDateAmountStatWidget/MonthToDateAmountStatWidget.php
+++ b/src/Components/MonthToDateAmountStatWidget/MonthToDateAmountStatWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\MonthToDateAmountStatWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Utils\DateTime;
 
diff --git a/src/Components/MonthToDateDonationAmountStatWidget/MonthToDateDonationAmountStatWidget.php b/src/Components/MonthToDateDonationAmountStatWidget/MonthToDateDonationAmountStatWidget.php
index 112886d..fcd35a1 100644
--- a/src/Components/MonthToDateDonationAmountStatWidget/MonthToDateDonationAmountStatWidget.php
+++ b/src/Components/MonthToDateDonationAmountStatWidget/MonthToDateDonationAmountStatWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\MonthToDateDonationAmountStatWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Models\PaymentItem\DonationPaymentItem;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Utils\DateTime;
diff --git a/src/Components/MyNextRecurrentPayment/MyNextRecurrentPayment.php b/src/Components/MyNextRecurrentPayment/MyNextRecurrentPayment.php
index b741a15..925e370 100644
--- a/src/Components/MyNextRecurrentPayment/MyNextRecurrentPayment.php
+++ b/src/Components/MyNextRecurrentPayment/MyNextRecurrentPayment.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\MyNextRecurrentPayment;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Models\RecurrentPaymentsResolver;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 
diff --git a/src/Components/PaidSubscriptionsWithoutExtensionEndingWithinPeriodWidget/PaidSubscriptionsWithoutExtensionEndingWithinPeriodWidget.php b/src/Components/PaidSubscriptionsWithoutExtensionEndingWithinPeriodWidget/PaidSubscriptionsWithoutExtensionEndingWithinPeriodWidget.php
index 4eb70f8..a2c7996 100644
--- a/src/Components/PaidSubscriptionsWithoutExtensionEndingWithinPeriodWidget/PaidSubscriptionsWithoutExtensionEndingWithinPeriodWidget.php
+++ b/src/Components/PaidSubscriptionsWithoutExtensionEndingWithinPeriodWidget/PaidSubscriptionsWithoutExtensionEndingWithinPeriodWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\PaidSubscriptionsWithoutExtensionEndingWithinPeriodWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SubscriptionsModule\Components\WidgetLegendInterface;
 use Nette\Localization\Translator;
diff --git a/src/Components/ParsedMailsFailedNotification/ParsedMailsFailedNotification.php b/src/Components/ParsedMailsFailedNotification/ParsedMailsFailedNotification.php
index 52aef0c..d8d61c0 100644
--- a/src/Components/ParsedMailsFailedNotification/ParsedMailsFailedNotification.php
+++ b/src/Components/ParsedMailsFailedNotification/ParsedMailsFailedNotification.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\ParsedMailsFailedNotification;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\ParsedMailLogsRepository;
 
 /**
diff --git a/src/Components/PaymentDonationLabelWidget/PaymentDonationLabelWidget.php b/src/Components/PaymentDonationLabelWidget/PaymentDonationLabelWidget.php
index f1dcf70..3d2c189 100644
--- a/src/Components/PaymentDonationLabelWidget/PaymentDonationLabelWidget.php
+++ b/src/Components/PaymentDonationLabelWidget/PaymentDonationLabelWidget.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Components\PaymentDonationLabelWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
 use Nette\Database\Table\ActiveRow;
 
 class PaymentDonationLabelWidget extends BaseLazyWidget
diff --git a/src/Components/PaymentItemsListWidget/PaymentItemsListWidget.php b/src/Components/PaymentItemsListWidget/PaymentItemsListWidget.php
index 497591d..6b05415 100644
--- a/src/Components/PaymentItemsListWidget/PaymentItemsListWidget.php
+++ b/src/Components/PaymentItemsListWidget/PaymentItemsListWidget.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Components\PaymentItemsListWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
 use Crm\SubscriptionsModule\Models\PaymentItem\SubscriptionTypePaymentItem;
 use Nette\Database\Table\ActiveRow;
 
diff --git a/src/Components/PaymentToSubscriptionMenu/PaymentToSubscriptionMenu.php b/src/Components/PaymentToSubscriptionMenu/PaymentToSubscriptionMenu.php
index 29009b5..d5ec265 100644
--- a/src/Components/PaymentToSubscriptionMenu/PaymentToSubscriptionMenu.php
+++ b/src/Components/PaymentToSubscriptionMenu/PaymentToSubscriptionMenu.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\PaymentToSubscriptionMenu;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 
 /**
diff --git a/src/Components/ReactivateFailedRecurrentPaymentWidget/ReactivateFailedRecurrentPaymentWidget.php b/src/Components/ReactivateFailedRecurrentPaymentWidget/ReactivateFailedRecurrentPaymentWidget.php
index 19e8259..bb9df96 100644
--- a/src/Components/ReactivateFailedRecurrentPaymentWidget/ReactivateFailedRecurrentPaymentWidget.php
+++ b/src/Components/ReactivateFailedRecurrentPaymentWidget/ReactivateFailedRecurrentPaymentWidget.php
@@ -2,9 +2,9 @@
 
 namespace Crm\PaymentsModule\Components\ReactivateFailedRecurrentPaymentWidget;
 
-use Crm\ApplicationModule\ActiveRow;
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Database\ActiveRow;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 
 class ReactivateFailedRecurrentPaymentWidget extends BaseLazyWidget
diff --git a/src/Components/RefundPaymentsListWidget/RefundPaymentsListWidget.php b/src/Components/RefundPaymentsListWidget/RefundPaymentsListWidget.php
index fcc04b9..bfbe545 100644
--- a/src/Components/RefundPaymentsListWidget/RefundPaymentsListWidget.php
+++ b/src/Components/RefundPaymentsListWidget/RefundPaymentsListWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\RefundPaymentsListWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 
 class RefundPaymentsListWidget extends BaseLazyWidget
diff --git a/src/Components/SubscribersWithPaymentWidget/SubscribersWithPaymentWidget.php b/src/Components/SubscribersWithPaymentWidget/SubscribersWithPaymentWidget.php
index 5d7ae59..d014175 100644
--- a/src/Components/SubscribersWithPaymentWidget/SubscribersWithPaymentWidget.php
+++ b/src/Components/SubscribersWithPaymentWidget/SubscribersWithPaymentWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\SubscribersWithPaymentWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\SegmentModule\Repositories\SegmentsRepository;
 use Crm\SegmentModule\Repositories\SegmentsValuesRepository;
 use DateTime;
diff --git a/src/Components/SubscribersWithPaymentWidget/SubscribersWithPaymentWidgetFactory.php b/src/Components/SubscribersWithPaymentWidget/SubscribersWithPaymentWidgetFactory.php
index 0a96f70..08abe71 100644
--- a/src/Components/SubscribersWithPaymentWidget/SubscribersWithPaymentWidgetFactory.php
+++ b/src/Components/SubscribersWithPaymentWidget/SubscribersWithPaymentWidgetFactory.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Components\SubscribersWithPaymentWidget;
 
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\SegmentModule\Repositories\SegmentsRepository;
 use Crm\SegmentModule\Repositories\SegmentsValuesRepository;
 
diff --git a/src/Components/SubscriptionDetailWidget/SubscriptionDetailWidget.php b/src/Components/SubscriptionDetailWidget/SubscriptionDetailWidget.php
index a1afc12..e5d7f5d 100644
--- a/src/Components/SubscriptionDetailWidget/SubscriptionDetailWidget.php
+++ b/src/Components/SubscriptionDetailWidget/SubscriptionDetailWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\SubscriptionDetailWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Database\Table\ActiveRow;
 
diff --git a/src/Components/SubscriptionTypeReports/SubscriptionTypeReports.php b/src/Components/SubscriptionTypeReports/SubscriptionTypeReports.php
index a3a0eb7..72cf982 100644
--- a/src/Components/SubscriptionTypeReports/SubscriptionTypeReports.php
+++ b/src/Components/SubscriptionTypeReports/SubscriptionTypeReports.php
@@ -3,8 +3,8 @@
 namespace Crm\PaymentsModule\Components\SubscriptionTypeReports;
 
 use Contributte\Translation\Translator;
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Models\Report\NoRecurrentChargeReport;
 use Crm\PaymentsModule\Models\Report\PaidNextSubscriptionReport;
 use Crm\PaymentsModule\Models\Report\StoppedOnFirstSubscriptionReport;
diff --git a/src/Components/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodWidget/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodWidget.php b/src/Components/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodWidget/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodWidget.php
index e7aab2a..cdce7e2 100644
--- a/src/Components/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodWidget/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodWidget.php
+++ b/src/Components/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodWidget/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SubscriptionsModule\Components\WidgetLegendInterface;
 use Nette\Localization\Translator;
diff --git a/src/Components/SubscriptionsWithoutExtensionEndingWithinPeriodWidget/SubscriptionsWithoutExtensionEndingWithinPeriodWidget.php b/src/Components/SubscriptionsWithoutExtensionEndingWithinPeriodWidget/SubscriptionsWithoutExtensionEndingWithinPeriodWidget.php
index e69f6c8..622263f 100644
--- a/src/Components/SubscriptionsWithoutExtensionEndingWithinPeriodWidget/SubscriptionsWithoutExtensionEndingWithinPeriodWidget.php
+++ b/src/Components/SubscriptionsWithoutExtensionEndingWithinPeriodWidget/SubscriptionsWithoutExtensionEndingWithinPeriodWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\SubscriptionsWithoutExtensionEndingWithinPeriodWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SubscriptionsModule\Components\WidgetLegendInterface;
 use Nette\Localization\Translator;
diff --git a/src/Components/TodayAmountStatWidget/TodayAmountStatWidget.php b/src/Components/TodayAmountStatWidget/TodayAmountStatWidget.php
index 4932ea1..99a5793 100644
--- a/src/Components/TodayAmountStatWidget/TodayAmountStatWidget.php
+++ b/src/Components/TodayAmountStatWidget/TodayAmountStatWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\TodayAmountStatWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Utils\DateTime;
 
diff --git a/src/Components/TotalAmountStatWidget/TotalAmountStatWidget.php b/src/Components/TotalAmountStatWidget/TotalAmountStatWidget.php
index e1b3922..9fa64f9 100644
--- a/src/Components/TotalAmountStatWidget/TotalAmountStatWidget.php
+++ b/src/Components/TotalAmountStatWidget/TotalAmountStatWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\TotalAmountStatWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 
 /**
diff --git a/src/Components/TotalUserPayments/TotalUserPayments.php b/src/Components/TotalUserPayments/TotalUserPayments.php
index 6dae4d6..bce174a 100644
--- a/src/Components/TotalUserPayments/TotalUserPayments.php
+++ b/src/Components/TotalUserPayments/TotalUserPayments.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Components\TotalUserPayments;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Models\AverageMonthPayment;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\Repositories\UserStatsRepository;
diff --git a/src/Components/UserPaymentsListing/UserPaymentsListing.php b/src/Components/UserPaymentsListing/UserPaymentsListing.php
index 5decd51..24bfab8 100644
--- a/src/Components/UserPaymentsListing/UserPaymentsListing.php
+++ b/src/Components/UserPaymentsListing/UserPaymentsListing.php
@@ -2,9 +2,9 @@
 
 namespace Crm\PaymentsModule\Components\UserPaymentsListing;
 
-use Crm\ApplicationModule\Components\SimpleWidgetFactoryInterface;
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Components\Widgets\SimpleWidget\SimpleWidgetFactoryInterface;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\PaymentsModule\Components\ChangePaymentStatus\ChangePaymentStatusFactoryInterface;
 use Crm\PaymentsModule\Repositories\ParsedMailLogsRepository;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
diff --git a/src/DataProviders/AdminFilterFormDataProviderInterface.php b/src/DataProviders/AdminFilterFormDataProviderInterface.php
index c1572e8..1f15703 100644
--- a/src/DataProviders/AdminFilterFormDataProviderInterface.php
+++ b/src/DataProviders/AdminFilterFormDataProviderInterface.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderInterface;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderInterface;
 use Nette\Application\UI\Form;
 use Nette\Database\Table\Selection;
 
diff --git a/src/DataProviders/CanDeleteAddressDataProvider.php b/src/DataProviders/CanDeleteAddressDataProvider.php
index 0fc5cc1..a75542a 100644
--- a/src/DataProviders/CanDeleteAddressDataProvider.php
+++ b/src/DataProviders/CanDeleteAddressDataProvider.php
@@ -3,7 +3,7 @@
 namespace Crm\PaymentsModule\DataProviders;
 
 use Contributte\Translation\Translator;
-use Crm\ApplicationModule\DataProvider\DataProviderException;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderException;
 use Crm\UsersModule\DataProviders\CanDeleteAddressDataProviderInterface;
 use Nette\Application\LinkGenerator;
 
diff --git a/src/DataProviders/CanUpdatePaymentItemDataProviderInterface.php b/src/DataProviders/CanUpdatePaymentItemDataProviderInterface.php
index e66af1e..3380d41 100644
--- a/src/DataProviders/CanUpdatePaymentItemDataProviderInterface.php
+++ b/src/DataProviders/CanUpdatePaymentItemDataProviderInterface.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderInterface;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderInterface;
 use Nette\Database\Table\ActiveRow;
 
 interface CanUpdatePaymentItemDataProviderInterface extends DataProviderInterface
diff --git a/src/DataProviders/PaymentFormDataProviderInterface.php b/src/DataProviders/PaymentFormDataProviderInterface.php
index 13bfe31..ab0f2f0 100644
--- a/src/DataProviders/PaymentFormDataProviderInterface.php
+++ b/src/DataProviders/PaymentFormDataProviderInterface.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderInterface;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderInterface;
 use Crm\PaymentsModule\Models\PaymentItem\PaymentItemInterface;
 use Nette\Application\UI\Form;
 use Nette\Database\Table\ActiveRow;
diff --git a/src/DataProviders/PaymentFromVariableSymbolDataProvider.php b/src/DataProviders/PaymentFromVariableSymbolDataProvider.php
index e20d83a..7ab20f0 100644
--- a/src/DataProviders/PaymentFromVariableSymbolDataProvider.php
+++ b/src/DataProviders/PaymentFromVariableSymbolDataProvider.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderException;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderException;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SubscriptionsModule\DataProviders\PaymentFromVariableSymbolDataProviderInterface;
 use Nette\Database\Table\ActiveRow;
diff --git a/src/DataProviders/PaymentItemTypesFilterDataProvider.php b/src/DataProviders/PaymentItemTypesFilterDataProvider.php
index 383043b..e989bf8 100644
--- a/src/DataProviders/PaymentItemTypesFilterDataProvider.php
+++ b/src/DataProviders/PaymentItemTypesFilterDataProvider.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderException;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderException;
 use Crm\SubscriptionsModule\Models\PaymentItem\SubscriptionTypePaymentItem;
 use Nette\Localization\Translator;
 
diff --git a/src/DataProviders/PaymentItemTypesFilterDataProviderInterface.php b/src/DataProviders/PaymentItemTypesFilterDataProviderInterface.php
index af7072b..ee952de 100644
--- a/src/DataProviders/PaymentItemTypesFilterDataProviderInterface.php
+++ b/src/DataProviders/PaymentItemTypesFilterDataProviderInterface.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderInterface;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderInterface;
 
 interface PaymentItemTypesFilterDataProviderInterface extends DataProviderInterface
 {
diff --git a/src/DataProviders/PaymentReturnGatewayDataProviderInterface.php b/src/DataProviders/PaymentReturnGatewayDataProviderInterface.php
index a25367b..7cfbe42 100644
--- a/src/DataProviders/PaymentReturnGatewayDataProviderInterface.php
+++ b/src/DataProviders/PaymentReturnGatewayDataProviderInterface.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderInterface;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderInterface;
 
 interface PaymentReturnGatewayDataProviderInterface extends DataProviderInterface
 {
diff --git a/src/DataProviders/PaymentsClaimUserDataProvider.php b/src/DataProviders/PaymentsClaimUserDataProvider.php
index 351fcb5..3b11444 100644
--- a/src/DataProviders/PaymentsClaimUserDataProvider.php
+++ b/src/DataProviders/PaymentsClaimUserDataProvider.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderException;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderException;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\UsersModule\DataProviders\ClaimUserDataProviderInterface;
 
diff --git a/src/DataProviders/PaymentsUserDataProvider.php b/src/DataProviders/PaymentsUserDataProvider.php
index 0ed5e6a..0e053df 100644
--- a/src/DataProviders/PaymentsUserDataProvider.php
+++ b/src/DataProviders/PaymentsUserDataProvider.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\User\UserDataProviderInterface;
+use Crm\ApplicationModule\Models\User\UserDataProviderInterface;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 
 class PaymentsUserDataProvider implements UserDataProviderInterface
diff --git a/src/DataProviders/RecurrentPaymentsClaimUserDataProvider.php b/src/DataProviders/RecurrentPaymentsClaimUserDataProvider.php
index a2acf03..fde57f0 100644
--- a/src/DataProviders/RecurrentPaymentsClaimUserDataProvider.php
+++ b/src/DataProviders/RecurrentPaymentsClaimUserDataProvider.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderException;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderException;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 use Crm\UsersModule\DataProviders\ClaimUserDataProviderInterface;
 
diff --git a/src/DataProviders/RecurrentPaymentsUserDataProvider.php b/src/DataProviders/RecurrentPaymentsUserDataProvider.php
index 598acdf..3a8db1e 100644
--- a/src/DataProviders/RecurrentPaymentsUserDataProvider.php
+++ b/src/DataProviders/RecurrentPaymentsUserDataProvider.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\User\UserDataProviderInterface;
+use Crm\ApplicationModule\Models\User\UserDataProviderInterface;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 
 class RecurrentPaymentsUserDataProvider implements UserDataProviderInterface
diff --git a/src/DataProviders/RetentionAnalysisDataProviderInterface.php b/src/DataProviders/RetentionAnalysisDataProviderInterface.php
index 230306e..e7d3d60 100644
--- a/src/DataProviders/RetentionAnalysisDataProviderInterface.php
+++ b/src/DataProviders/RetentionAnalysisDataProviderInterface.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderInterface;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderInterface;
 use Nette\Application\UI\Form;
 
 interface RetentionAnalysisDataProviderInterface extends DataProviderInterface
diff --git a/src/DataProviders/SubscriptionFormDataProvider.php b/src/DataProviders/SubscriptionFormDataProvider.php
index 9bd26a4..a1c6cf7 100644
--- a/src/DataProviders/SubscriptionFormDataProvider.php
+++ b/src/DataProviders/SubscriptionFormDataProvider.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderException;
 use Crm\ApplicationModule\Helpers\UserDateHelper;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderException;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SubscriptionsModule\DataProviders\SubscriptionFormDataProviderInterface;
 use Crm\SubscriptionsModule\Repositories\SubscriptionsRepository;
diff --git a/src/DataProviders/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodDataProvider.php b/src/DataProviders/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodDataProvider.php
index 4269afd..ee1eff8 100644
--- a/src/DataProviders/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodDataProvider.php
+++ b/src/DataProviders/SubscriptionsWithActiveUnchargedRecurrentEndingWithinPeriodDataProvider.php
@@ -2,9 +2,9 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderException;
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\GraphDataItem;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderException;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\GraphDataItem;
 use Crm\SubscriptionsModule\DataProviders\EndingSubscriptionsDataProviderInterface;
 use Nette\Localization\Translator;
 
diff --git a/src/DataProviders/SubscriptionsWithoutExtensionEndingWithinPeriodDataProvider.php b/src/DataProviders/SubscriptionsWithoutExtensionEndingWithinPeriodDataProvider.php
index 3550181..967e7c6 100644
--- a/src/DataProviders/SubscriptionsWithoutExtensionEndingWithinPeriodDataProvider.php
+++ b/src/DataProviders/SubscriptionsWithoutExtensionEndingWithinPeriodDataProvider.php
@@ -2,9 +2,9 @@
 
 namespace Crm\PaymentsModule\DataProviders;
 
-use Crm\ApplicationModule\DataProvider\DataProviderException;
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\GraphDataItem;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderException;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\GraphDataItem;
 use Crm\SubscriptionsModule\DataProviders\EndingSubscriptionsDataProviderInterface;
 use Nette\Localization\Translator;
 
diff --git a/src/Events/BeforePaymentBeginEvent.php b/src/Events/BeforePaymentBeginEvent.php
index 9deaf47..8025614 100644
--- a/src/Events/BeforePaymentBeginEvent.php
+++ b/src/Events/BeforePaymentBeginEvent.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Events;
 
-use Crm\ApplicationModule\ActiveRow;
+use Crm\ApplicationModule\Models\Database\ActiveRow;
 use League\Event\AbstractEvent;
 
 class BeforePaymentBeginEvent extends AbstractEvent implements PaymentEventInterface
diff --git a/src/Events/RecurrentPaymentCardExpiredEventHandler.php b/src/Events/RecurrentPaymentCardExpiredEventHandler.php
index a1c79be..a85a2bc 100644
--- a/src/Events/RecurrentPaymentCardExpiredEventHandler.php
+++ b/src/Events/RecurrentPaymentCardExpiredEventHandler.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Events;
 
-use Crm\ApplicationModule\ActiveRowFactory;
+use Crm\ApplicationModule\Models\Database\ActiveRowFactory;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 use Crm\UsersModule\Events\NotificationEvent;
 use League\Event\AbstractListener;
diff --git a/src/Forms/ChangePaymentSubscriptionTypeFormFactory.php b/src/Forms/ChangePaymentSubscriptionTypeFormFactory.php
index 3f4be4d..96078e8 100644
--- a/src/Forms/ChangePaymentSubscriptionTypeFormFactory.php
+++ b/src/Forms/ChangePaymentSubscriptionTypeFormFactory.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Forms;
 
-use Crm\ApplicationModule\ActiveRow;
+use Crm\ApplicationModule\Models\Database\ActiveRow;
 use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
 use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
diff --git a/src/Forms/PaymentFormFactory.php b/src/Forms/PaymentFormFactory.php
index c0232c7..a1d613e 100644
--- a/src/Forms/PaymentFormFactory.php
+++ b/src/Forms/PaymentFormFactory.php
@@ -2,9 +2,9 @@
 
 namespace Crm\PaymentsModule\Forms;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
-use Crm\ApplicationModule\DataProvider\DataProviderException;
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderException;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderManager;
 use Crm\PaymentsModule\DataProviders\PaymentFormDataProviderInterface;
 use Crm\PaymentsModule\Models\PaymentItem\DonationPaymentItem;
 use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
diff --git a/src/Forms/RetentionAnalysisFilterFormFactory.php b/src/Forms/RetentionAnalysisFilterFormFactory.php
index c9dd504..842db75 100644
--- a/src/Forms/RetentionAnalysisFilterFormFactory.php
+++ b/src/Forms/RetentionAnalysisFilterFormFactory.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Forms;
 
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderManager;
 use Crm\PaymentsModule\DataProviders\RetentionAnalysisDataProviderInterface;
 use Crm\PaymentsModule\Models\Retention\RetentionAnalysis;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
diff --git a/src/Hermes/ExportPaymentsHandler.php b/src/Hermes/ExportPaymentsHandler.php
index f94bd97..1db1668 100644
--- a/src/Hermes/ExportPaymentsHandler.php
+++ b/src/Hermes/ExportPaymentsHandler.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Hermes;
 
-use Crm\ApplicationModule\Models\ApplicationMountManager;
+use Crm\ApplicationModule\Application\Managers\ApplicationMountManager;
 use Crm\PaymentsModule\Models\AdminFilterFormData;
 use Crm\PaymentsModule\Models\FileSystem;
 use League\Csv\ByteSequence;
diff --git a/src/Models/AdminFilterFormData.php b/src/Models/AdminFilterFormData.php
index 958040d..3429e2f 100644
--- a/src/Models/AdminFilterFormData.php
+++ b/src/Models/AdminFilterFormData.php
@@ -3,7 +3,7 @@
 
 namespace Crm\PaymentsModule\Models;
 
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderManager;
 use Crm\PaymentsModule\DataProviders\AdminFilterFormDataProviderInterface;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Utils\DateTime;
diff --git a/src/Models/AverageMonthPayment.php b/src/Models/AverageMonthPayment.php
index 2a4fb16..61ed9b0 100644
--- a/src/Models/AverageMonthPayment.php
+++ b/src/Models/AverageMonthPayment.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Models;
 
-use Crm\ApplicationModule\Cache\CacheRepository;
+use Crm\ApplicationModule\Repositories\CacheRepository;
 use Crm\UsersModule\Repositories\UserStatsRepository;
 use Nette\Utils\DateTime;
 
diff --git a/src/Models/Gateways/CardPayAuthorization.php b/src/Models/Gateways/CardPayAuthorization.php
index 0adef5c..8e54813 100644
--- a/src/Models/Gateways/CardPayAuthorization.php
+++ b/src/Models/Gateways/CardPayAuthorization.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Models\Gateways;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
 use Nette\Application\LinkGenerator;
 use Nette\Database\Table\ActiveRow;
diff --git a/src/Models/Gateways/Csob.php b/src/Models/Gateways/Csob.php
index 75988c3..e4be856 100644
--- a/src/Models/Gateways/Csob.php
+++ b/src/Models/Gateways/Csob.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Models\Gateways;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
 use Crm\UsersModule\Models\Auth\UserManager;
 use Nette\Application\LinkGenerator;
diff --git a/src/Models/Gateways/CsobOneClick.php b/src/Models/Gateways/CsobOneClick.php
index e843faa..306a6d1 100644
--- a/src/Models/Gateways/CsobOneClick.php
+++ b/src/Models/Gateways/CsobOneClick.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Models\Gateways;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
-use Crm\ApplicationModule\Request;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Request;
 use Crm\PaymentsModule\Models\GatewayFail;
 use Crm\PaymentsModule\Models\RecurrentPaymentFailStop;
 use Crm\PaymentsModule\Models\RecurrentPaymentFailTry;
diff --git a/src/Models/Gateways/GatewayAbstract.php b/src/Models/Gateways/GatewayAbstract.php
index 313a418..0cb6284 100644
--- a/src/Models/Gateways/GatewayAbstract.php
+++ b/src/Models/Gateways/GatewayAbstract.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Models\Gateways;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Models\CannotProcessPayment;
 use Crm\PaymentsModule\Models\RecurrentPaymentFailStop;
 use Crm\PaymentsModule\Models\RecurrentPaymentFailTry;
diff --git a/src/Models/Gateways/Paypal.php b/src/Models/Gateways/Paypal.php
index 32a13b2..2fbf2f9 100644
--- a/src/Models/Gateways/Paypal.php
+++ b/src/Models/Gateways/Paypal.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Models\Gateways;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
 use Nette\Application\LinkGenerator;
 use Nette\Http\Response;
diff --git a/src/Models/Gateways/PaypalReference.php b/src/Models/Gateways/PaypalReference.php
index 26a683d..c84a93a 100644
--- a/src/Models/Gateways/PaypalReference.php
+++ b/src/Models/Gateways/PaypalReference.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Models\Gateways;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Models\GatewayFail;
 use Crm\PaymentsModule\Repositories\PaymentMetaRepository;
 use Nette\Application\LinkGenerator;
diff --git a/src/Models/MailConfirmation/CidGetterDownloader.php b/src/Models/MailConfirmation/CidGetterDownloader.php
index 6ea3704..5a5eec9 100644
--- a/src/Models/MailConfirmation/CidGetterDownloader.php
+++ b/src/Models/MailConfirmation/CidGetterDownloader.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Models\MailConfirmation;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Tomaj\BankMailsParser\Parser\TatraBanka\TatraBankaSimpleMailParser;
 use Tomaj\ImapMailDownloader\Downloader;
 use Tomaj\ImapMailDownloader\Email;
diff --git a/src/Models/PaymentsHistogramFactory.php b/src/Models/PaymentsHistogramFactory.php
index 33bb573..3de2346 100644
--- a/src/Models/PaymentsHistogramFactory.php
+++ b/src/Models/PaymentsHistogramFactory.php
@@ -1,10 +1,10 @@
 <?php
 namespace Crm\PaymentsModule\Models;
 
-use Crm\ApplicationModule\Cache\CacheRepository;
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\GraphData;
-use Crm\ApplicationModule\Graphs\GraphDataItem;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\GraphData;
+use Crm\ApplicationModule\Models\Graphs\GraphDataItem;
+use Crm\ApplicationModule\Repositories\CacheRepository;
 use Nette\Utils\DateTime;
 use Nette\Utils\Json;
 use Nette\Utils\JsonException;
diff --git a/src/Models/RecurrentPaymentsProcessor.php b/src/Models/RecurrentPaymentsProcessor.php
index 08dd8dc..da1bbce 100644
--- a/src/Models/RecurrentPaymentsProcessor.php
+++ b/src/Models/RecurrentPaymentsProcessor.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Models;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Crm\PaymentsModule\Events\BeforeRecurrentPaymentChargeEvent;
 use Crm\PaymentsModule\Events\RecurrentPaymentFailEvent;
 use Crm\PaymentsModule\Events\RecurrentPaymentFailTryEvent;
diff --git a/src/Models/Retention/RetentionAnalysis.php b/src/Models/Retention/RetentionAnalysis.php
index eef5191..e0a840d 100644
--- a/src/Models/Retention/RetentionAnalysis.php
+++ b/src/Models/Retention/RetentionAnalysis.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Models\Retention;
 
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderManager;
 use Crm\PaymentsModule\DataProviders\RetentionAnalysisDataProviderInterface;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\PaymentsModule\Repositories\RetentionAnalysisJobsRepository;
diff --git a/src/Models/Wallet/CardPayDirectService.php b/src/Models/Wallet/CardPayDirectService.php
index aafbe7b..d07d197 100644
--- a/src/Models/Wallet/CardPayDirectService.php
+++ b/src/Models/Wallet/CardPayDirectService.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Models\Wallet;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Psr\Log\LoggerInterface;
 
 class CardPayDirectService
diff --git a/src/PaymentsModule.php b/src/PaymentsModule.php
index 7670af2..a5948dd 100644
--- a/src/PaymentsModule.php
+++ b/src/PaymentsModule.php
@@ -8,19 +8,19 @@
 use Crm\ApiModule\Models\Authorization\NoAuthorization;
 use Crm\ApiModule\Models\Router\ApiIdentifier;
 use Crm\ApiModule\Models\Router\ApiRoute;
-use Crm\ApplicationModule\CallbackManagerInterface;
-use Crm\ApplicationModule\Commands\CommandsContainerInterface;
-use Crm\ApplicationModule\Criteria\CriteriaStorage;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaStorage;
+use Crm\ApplicationModule\Application\CommandsContainerInterface;
+use Crm\ApplicationModule\Application\Managers\CallbackManagerInterface;
+use Crm\ApplicationModule\Application\Managers\SeederManager;
 use Crm\ApplicationModule\CrmModule;
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
-use Crm\ApplicationModule\Event\EventsStorage;
-use Crm\ApplicationModule\Event\LazyEventEmitter;
-use Crm\ApplicationModule\Menu\MenuContainerInterface;
-use Crm\ApplicationModule\Menu\MenuItem;
-use Crm\ApplicationModule\SeederManager;
-use Crm\ApplicationModule\User\UserDataRegistrator;
-use Crm\ApplicationModule\Widget\LazyWidgetManagerInterface;
+use Crm\ApplicationModule\Models\Criteria\CriteriaStorage;
+use Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaStorage;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderManager;
+use Crm\ApplicationModule\Models\Event\EventsStorage;
+use Crm\ApplicationModule\Models\Event\LazyEventEmitter;
+use Crm\ApplicationModule\Models\Menu\MenuContainerInterface;
+use Crm\ApplicationModule\Models\Menu\MenuItem;
+use Crm\ApplicationModule\Models\User\UserDataRegistrator;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManagerInterface;
 use Crm\PaymentsModule\Api\ListRecurrentPaymentsApiHandler;
 use Crm\PaymentsModule\Api\PaypalIpnHandler;
 use Crm\PaymentsModule\Api\ReactivateRecurrentPaymentApiHandler;
diff --git a/src/Populator/ParsedEmailsPopulator.php b/src/Populator/ParsedEmailsPopulator.php
index 8cb8fde..ad758ef 100644
--- a/src/Populator/ParsedEmailsPopulator.php
+++ b/src/Populator/ParsedEmailsPopulator.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Populator;
 
-use Crm\ApplicationModule\Populator\AbstractPopulator;
+use Crm\ApplicationModule\Populators\AbstractPopulator;
 use Crm\PaymentsModule\Repositories\ParsedMailLogsRepository;
 use Symfony\Component\Console\Helper\ProgressBar;
 
diff --git a/src/Populator/PaymentsPopulator.php b/src/Populator/PaymentsPopulator.php
index 16eede6..b58d5e9 100644
--- a/src/Populator/PaymentsPopulator.php
+++ b/src/Populator/PaymentsPopulator.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Populator;
 
-use Crm\ApplicationModule\Populator\AbstractPopulator;
+use Crm\ApplicationModule\Populators\AbstractPopulator;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 use Symfony\Component\Console\Helper\ProgressBar;
diff --git a/src/Presenters/DashboardPresenter.php b/src/Presenters/DashboardPresenter.php
index 015a56b..bc99969 100644
--- a/src/Presenters/DashboardPresenter.php
+++ b/src/Presenters/DashboardPresenter.php
@@ -4,11 +4,11 @@
 
 use Crm\AdminModule\Components\DateFilterFormFactory;
 use Crm\AdminModule\Presenters\AdminPresenter;
-use Crm\ApplicationModule\Components\Graphs\GoogleBarGraphGroupControlFactoryInterface;
-use Crm\ApplicationModule\Components\Graphs\GoogleLineGraphGroupControlFactoryInterface;
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\GraphDataItem;
+use Crm\ApplicationModule\Components\Graphs\GoogleBarGraphGroup\GoogleBarGraphGroupControlFactoryInterface;
+use Crm\ApplicationModule\Components\Graphs\GoogleLineGraphGroup\GoogleLineGraphGroupControlFactoryInterface;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderManager;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\GraphDataItem;
 use Crm\PaymentsModule\DataProviders\PaymentItemTypesFilterDataProviderInterface;
 use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
diff --git a/src/Presenters/ExportsAdminPresenter.php b/src/Presenters/ExportsAdminPresenter.php
index bbe46c9..84e07a9 100644
--- a/src/Presenters/ExportsAdminPresenter.php
+++ b/src/Presenters/ExportsAdminPresenter.php
@@ -3,9 +3,9 @@
 namespace Crm\PaymentsModule\Presenters;
 
 use Crm\AdminModule\Presenters\AdminPresenter;
-use Crm\ApplicationModule\Components\PreviousNextPaginator;
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
-use Crm\ApplicationModule\Models\ApplicationMountManager;
+use Crm\ApplicationModule\Application\Managers\ApplicationMountManager;
+use Crm\ApplicationModule\Components\PreviousNextPaginator\PreviousNextPaginator;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderManager;
 use League\Flysystem\UnableToDeleteFile;
 use Nette\Application\Attributes\Persistent;
 use Nette\Application\Responses\CallbackResponse;
diff --git a/src/Presenters/ParsedMailsPresenter.php b/src/Presenters/ParsedMailsPresenter.php
index 1fd402c..a078046 100644
--- a/src/Presenters/ParsedMailsPresenter.php
+++ b/src/Presenters/ParsedMailsPresenter.php
@@ -3,7 +3,7 @@
 namespace Crm\PaymentsModule\Presenters;
 
 use Crm\AdminModule\Presenters\AdminPresenter;
-use Crm\ApplicationModule\Components\PreviousNextPaginator;
+use Crm\ApplicationModule\Components\PreviousNextPaginator\PreviousNextPaginator;
 use Crm\PaymentsModule\Repositories\ParsedMailLogsRepository;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Application\Attributes\Persistent;
diff --git a/src/Presenters/PaymentGatewaysAdminPresenter.php b/src/Presenters/PaymentGatewaysAdminPresenter.php
index 8567b7e..54c67d5 100644
--- a/src/Presenters/PaymentGatewaysAdminPresenter.php
+++ b/src/Presenters/PaymentGatewaysAdminPresenter.php
@@ -3,9 +3,9 @@
 namespace Crm\PaymentsModule\Presenters;
 
 use Crm\AdminModule\Presenters\AdminPresenter;
-use Crm\ApplicationModule\Components\Graphs\GoogleLineGraphGroupControlFactoryInterface;
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\GraphDataItem;
+use Crm\ApplicationModule\Components\Graphs\GoogleLineGraphGroup\GoogleLineGraphGroupControlFactoryInterface;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\GraphDataItem;
 use Crm\PaymentsModule\Components\LastPayments\LastPaymentsControlFactoryInterface;
 use Crm\PaymentsModule\Forms\PaymentGatewayFormFactory;
 use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
diff --git a/src/Presenters/PaymentsAdminPresenter.php b/src/Presenters/PaymentsAdminPresenter.php
index f54330a..893a32e 100644
--- a/src/Presenters/PaymentsAdminPresenter.php
+++ b/src/Presenters/PaymentsAdminPresenter.php
@@ -3,10 +3,10 @@
 namespace Crm\PaymentsModule\Presenters;
 
 use Crm\AdminModule\Presenters\AdminPresenter;
-use Crm\ApplicationModule\Components\Graphs\SmallBarGraphControlFactoryInterface;
-use Crm\ApplicationModule\Components\PreviousNextPaginator;
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
+use Crm\ApplicationModule\Components\Graphs\SmallBarGraph\SmallBarGraphControlFactoryInterface;
+use Crm\ApplicationModule\Components\PreviousNextPaginator\PreviousNextPaginator;
 use Crm\ApplicationModule\Hermes\HermesMessage;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderManager;
 use Crm\PaymentsModule\Components\ChangePaymentStatus\ChangePaymentStatusFactoryInterface;
 use Crm\PaymentsModule\DataProviders\AdminFilterFormDataProviderInterface;
 use Crm\PaymentsModule\Forms\PaymentFormFactory;
diff --git a/src/Presenters/PaymentsRecurrentAdminPresenter.php b/src/Presenters/PaymentsRecurrentAdminPresenter.php
index 83b3b9b..3ca4995 100644
--- a/src/Presenters/PaymentsRecurrentAdminPresenter.php
+++ b/src/Presenters/PaymentsRecurrentAdminPresenter.php
@@ -3,12 +3,12 @@
 namespace Crm\PaymentsModule\Presenters;
 
 use Crm\AdminModule\Presenters\AdminPresenter;
-use Crm\ApplicationModule\Components\Graphs\SmallBarGraphControlFactoryInterface;
-use Crm\ApplicationModule\Components\PreviousNextPaginator;
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\GraphData;
-use Crm\ApplicationModule\Graphs\GraphDataItem;
+use Crm\ApplicationModule\Components\Graphs\SmallBarGraph\SmallBarGraphControlFactoryInterface;
+use Crm\ApplicationModule\Components\PreviousNextPaginator\PreviousNextPaginator;
 use Crm\ApplicationModule\Helpers\UserDateHelper;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\GraphData;
+use Crm\ApplicationModule\Models\Graphs\GraphDataItem;
 use Crm\PaymentsModule\Components\DuplicateRecurrentPayments\DuplicateRecurrentPaymentsControlFactoryInterface;
 use Crm\PaymentsModule\Forms\RecurrentPaymentFormFactory;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
diff --git a/src/Presenters/RetentionAnalysisAdminPresenter.php b/src/Presenters/RetentionAnalysisAdminPresenter.php
index dc359b3..30c9613 100644
--- a/src/Presenters/RetentionAnalysisAdminPresenter.php
+++ b/src/Presenters/RetentionAnalysisAdminPresenter.php
@@ -3,7 +3,7 @@
 namespace Crm\PaymentsModule\Presenters;
 
 use Crm\AdminModule\Presenters\AdminPresenter;
-use Crm\ApplicationModule\Components\PreviousNextPaginator;
+use Crm\ApplicationModule\Components\PreviousNextPaginator\PreviousNextPaginator;
 use Crm\ApplicationModule\Hermes\HermesMessage;
 use Crm\PaymentsModule\Forms\RetentionAnalysisFilterFormFactory;
 use Crm\PaymentsModule\Models\Retention\RetentionAnalysis;
diff --git a/src/Presenters/ReturnPresenter.php b/src/Presenters/ReturnPresenter.php
index 8bfaf4b..c91bb30 100644
--- a/src/Presenters/ReturnPresenter.php
+++ b/src/Presenters/ReturnPresenter.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Presenters;
 
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderManager;
 use Crm\ApplicationModule\Presenters\FrontendPresenter;
 use Crm\PaymentsModule\DataProviders\PaymentReturnGatewayDataProviderInterface;
 use Crm\PaymentsModule\Models\Gateways\GatewayAbstract;
diff --git a/src/Repositories/ParsedMailLogsRepository.php b/src/Repositories/ParsedMailLogsRepository.php
index d3e3a97..004a8e5 100644
--- a/src/Repositories/ParsedMailLogsRepository.php
+++ b/src/Repositories/ParsedMailLogsRepository.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
+use Crm\ApplicationModule\Models\Database\Repository;
 use Crm\PaymentsModule\Models\VariableSymbolVariant;
 use Nette\Caching\Storage;
 use Nette\Database\Explorer;
diff --git a/src/Repositories/PaymentGatewayMetaRepository.php b/src/Repositories/PaymentGatewayMetaRepository.php
index d970382..9bc0cf3 100644
--- a/src/Repositories/PaymentGatewayMetaRepository.php
+++ b/src/Repositories/PaymentGatewayMetaRepository.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
+use Crm\ApplicationModule\Models\Database\Repository;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
 
diff --git a/src/Repositories/PaymentGatewaysRepository.php b/src/Repositories/PaymentGatewaysRepository.php
index 8aa3a8f..08b463a 100644
--- a/src/Repositories/PaymentGatewaysRepository.php
+++ b/src/Repositories/PaymentGatewaysRepository.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
+use Crm\ApplicationModule\Models\Database\Repository;
 use Crm\PaymentsModule\Models\GatewayFactory;
 use DateTime;
 use Nette\Caching\Storage;
@@ -32,9 +32,9 @@ final public function all()
             ->order('sorting');
     }
 
-    final public function find($id): ?\Crm\ApplicationModule\ActiveRow
+    final public function find($id): ?\Crm\ApplicationModule\Models\Database\ActiveRow
     {
-        /** @var \Crm\ApplicationModule\ActiveRow $result */
+        /** @var \Crm\ApplicationModule\Models\Database\ActiveRow $result */
         $result = $this->getTable()
             ->where(['id' => $id])
             ->where('code IN (?)', $this->gatewayFactory->getRegisteredCodes())
diff --git a/src/Repositories/PaymentItemMetaRepository.php b/src/Repositories/PaymentItemMetaRepository.php
index 2100ee5..18a5242 100644
--- a/src/Repositories/PaymentItemMetaRepository.php
+++ b/src/Repositories/PaymentItemMetaRepository.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
+use Crm\ApplicationModule\Models\Database\Repository;
 use Nette\Database\Table\ActiveRow;
 use Nette\Utils\DateTime;
 
diff --git a/src/Repositories/PaymentItemsRepository.php b/src/Repositories/PaymentItemsRepository.php
index 9160940..ff33c34 100644
--- a/src/Repositories/PaymentItemsRepository.php
+++ b/src/Repositories/PaymentItemsRepository.php
@@ -2,10 +2,10 @@
 
 namespace Crm\PaymentsModule\Repositories;
 
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
-use Crm\ApplicationModule\Repository;
-use Crm\ApplicationModule\Repository\AuditLogRepository;
-use Crm\ApplicationModule\Selection;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderManager;
+use Crm\ApplicationModule\Models\Database\Repository;
+use Crm\ApplicationModule\Models\Database\Selection;
+use Crm\ApplicationModule\Repositories\AuditLogRepository;
 use Crm\PaymentsModule\DataProviders\CanUpdatePaymentItemDataProviderInterface;
 use Crm\PaymentsModule\Events\BeforeRemovePaymentItemEvent;
 use Crm\PaymentsModule\Events\NewPaymentItemEvent;
diff --git a/src/Repositories/PaymentLogsRepository.php b/src/Repositories/PaymentLogsRepository.php
index a11e38d..093d9a0 100644
--- a/src/Repositories/PaymentLogsRepository.php
+++ b/src/Repositories/PaymentLogsRepository.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
-use Crm\ApplicationModule\Repository\RetentionData;
+use Crm\ApplicationModule\Models\Database\Repository;
+use Crm\ApplicationModule\Models\Database\RetentionData;
 
 class PaymentLogsRepository extends Repository
 {
diff --git a/src/Repositories/PaymentMetaRepository.php b/src/Repositories/PaymentMetaRepository.php
index df6611f..60ef05c 100644
--- a/src/Repositories/PaymentMetaRepository.php
+++ b/src/Repositories/PaymentMetaRepository.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
+use Crm\ApplicationModule\Models\Database\Repository;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
 
diff --git a/src/Repositories/PaymentsRepository.php b/src/Repositories/PaymentsRepository.php
index 2fccea3..28b9cd6 100644
--- a/src/Repositories/PaymentsRepository.php
+++ b/src/Repositories/PaymentsRepository.php
@@ -2,13 +2,13 @@
 
 namespace Crm\PaymentsModule\Repositories;
 
-use Crm\ApplicationModule\Cache\CacheRepository;
 use Crm\ApplicationModule\Hermes\HermesMessage;
-use Crm\ApplicationModule\RedisClientFactory;
-use Crm\ApplicationModule\RedisClientTrait;
-use Crm\ApplicationModule\Repository;
-use Crm\ApplicationModule\Repository\AuditLogRepository;
-use Crm\ApplicationModule\Request;
+use Crm\ApplicationModule\Models\Database\Repository;
+use Crm\ApplicationModule\Models\Redis\RedisClientFactory;
+use Crm\ApplicationModule\Models\Redis\RedisClientTrait;
+use Crm\ApplicationModule\Models\Request;
+use Crm\ApplicationModule\Repositories\AuditLogRepository;
+use Crm\ApplicationModule\Repositories\CacheRepository;
 use Crm\PaymentsModule\Events\NewPaymentEvent;
 use Crm\PaymentsModule\Events\PaymentChangeStatusEvent;
 use Crm\PaymentsModule\Models\PaymentItem\PaymentItemContainer;
@@ -500,7 +500,7 @@ final public function paidSubscribers()
      * @param DateTime $from
      * @param DateTime $to
      *
-     * @return \Crm\ApplicationModule\Selection
+     * @return \Crm\ApplicationModule\Models\Database\Selection
      */
     final public function paidBetween(DateTime $from, DateTime $to)
     {
@@ -691,7 +691,7 @@ final public function unconfirmedPayments(DateTime $from)
 
     /**
      * @param string $urlKey
-     * @return \Crm\ApplicationModule\Selection
+     * @return \Crm\ApplicationModule\Models\Database\Selection
      */
     final public function findBySalesFunnelUrlKey(string $urlKey)
     {
diff --git a/src/Repositories/RecurrentPaymentsRepository.php b/src/Repositories/RecurrentPaymentsRepository.php
index 75a00f1..c4bb2ef 100644
--- a/src/Repositories/RecurrentPaymentsRepository.php
+++ b/src/Repositories/RecurrentPaymentsRepository.php
@@ -2,13 +2,13 @@
 
 namespace Crm\PaymentsModule\Repositories;
 
-use Crm\ApplicationModule\Cache\CacheRepository;
-use Crm\ApplicationModule\Config\ApplicationConfig;
 use Crm\ApplicationModule\Hermes\HermesMessage;
-use Crm\ApplicationModule\NowTrait;
-use Crm\ApplicationModule\Repository;
-use Crm\ApplicationModule\Repository\AuditLogRepository;
-use Crm\ApplicationModule\Selection;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Database\Repository;
+use Crm\ApplicationModule\Models\Database\Selection;
+use Crm\ApplicationModule\Models\NowTrait;
+use Crm\ApplicationModule\Repositories\AuditLogRepository;
+use Crm\ApplicationModule\Repositories\CacheRepository;
 use Crm\PaymentsModule\Events\RecurrentPaymentCreatedEvent;
 use Crm\PaymentsModule\Events\RecurrentPaymentRenewedEvent;
 use Crm\PaymentsModule\Events\RecurrentPaymentStateChangedEvent;
diff --git a/src/Repositories/RetentionAnalysisJobsRepository.php b/src/Repositories/RetentionAnalysisJobsRepository.php
index ee1fff6..a84d857 100644
--- a/src/Repositories/RetentionAnalysisJobsRepository.php
+++ b/src/Repositories/RetentionAnalysisJobsRepository.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
-use Crm\ApplicationModule\Selection;
+use Crm\ApplicationModule\Models\Database\Repository;
+use Crm\ApplicationModule\Models\Database\Selection;
 use Nette\Database\Table\ActiveRow;
 use Nette\Utils\Json;
 
diff --git a/src/Repositories/VariableSymbolRepository.php b/src/Repositories/VariableSymbolRepository.php
index 1aed5fa..0453680 100644
--- a/src/Repositories/VariableSymbolRepository.php
+++ b/src/Repositories/VariableSymbolRepository.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
+use Crm\ApplicationModule\Models\Database\Repository;
 use Crm\PaymentsModule\Models\VariableSymbolInterface;
 use Nette\Database\Table\ActiveRow;
 
diff --git a/src/Scenarios/DonationAmountCriteria.php b/src/Scenarios/DonationAmountCriteria.php
index 2444acf..f2990b1 100644
--- a/src/Scenarios/DonationAmountCriteria.php
+++ b/src/Scenarios/DonationAmountCriteria.php
@@ -3,9 +3,9 @@
 namespace Crm\PaymentsModule\Scenarios;
 
 use Contributte\Translation\Translator;
-use Crm\ApplicationModule\Config\ApplicationConfig;
-use Crm\ApplicationModule\Criteria\ScenarioParams\NumberParam;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Criteria\ScenarioParams\NumberParam;
+use Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaInterface;
 use Crm\PaymentsModule\Models\PaymentItem\DonationPaymentItem;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
diff --git a/src/Scenarios/IsActiveRecurrentSubscriptionCriteria.php b/src/Scenarios/IsActiveRecurrentSubscriptionCriteria.php
index 7682a75..7645fd0 100644
--- a/src/Scenarios/IsActiveRecurrentSubscriptionCriteria.php
+++ b/src/Scenarios/IsActiveRecurrentSubscriptionCriteria.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Scenarios;
 
-use Crm\ApplicationModule\Criteria\ScenarioParams\BooleanParam;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioParams\BooleanParam;
+use Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaInterface;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
diff --git a/src/Scenarios/PaymentGatewayCriteria.php b/src/Scenarios/PaymentGatewayCriteria.php
index 988efec..5ec0a82 100644
--- a/src/Scenarios/PaymentGatewayCriteria.php
+++ b/src/Scenarios/PaymentGatewayCriteria.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Scenarios;
 
-use Crm\ApplicationModule\Criteria\ScenarioParams\StringLabeledArrayParam;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioParams\StringLabeledArrayParam;
+use Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaInterface;
 use Crm\PaymentsModule\Repositories\PaymentGatewaysRepository;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Database\Table\ActiveRow;
diff --git a/src/Scenarios/PaymentHasItemTypeCriteria.php b/src/Scenarios/PaymentHasItemTypeCriteria.php
index b89f01b..0f98a34 100644
--- a/src/Scenarios/PaymentHasItemTypeCriteria.php
+++ b/src/Scenarios/PaymentHasItemTypeCriteria.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Scenarios;
 
-use Crm\ApplicationModule\Criteria\ScenarioParams\StringLabeledArrayParam;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioParams\StringLabeledArrayParam;
+use Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaInterface;
 use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
diff --git a/src/Scenarios/PaymentHasSubscriptionCriteria.php b/src/Scenarios/PaymentHasSubscriptionCriteria.php
index a91fbd0..10de01c 100644
--- a/src/Scenarios/PaymentHasSubscriptionCriteria.php
+++ b/src/Scenarios/PaymentHasSubscriptionCriteria.php
@@ -3,8 +3,8 @@
 namespace Crm\PaymentsModule\Scenarios;
 
 use Contributte\Translation\Translator;
-use Crm\ApplicationModule\Criteria\ScenarioParams\BooleanParam;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioParams\BooleanParam;
+use Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaInterface;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
 
diff --git a/src/Scenarios/PaymentIsRecurrentChargeCriteria.php b/src/Scenarios/PaymentIsRecurrentChargeCriteria.php
index 0dcfcd3..6d3f46e 100644
--- a/src/Scenarios/PaymentIsRecurrentChargeCriteria.php
+++ b/src/Scenarios/PaymentIsRecurrentChargeCriteria.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Scenarios;
 
-use Crm\ApplicationModule\Criteria\ScenarioParams\BooleanParam;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioParams\BooleanParam;
+use Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaInterface;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
 
diff --git a/src/Scenarios/PaymentStatusCriteria.php b/src/Scenarios/PaymentStatusCriteria.php
index c3e709d..8eb237a 100644
--- a/src/Scenarios/PaymentStatusCriteria.php
+++ b/src/Scenarios/PaymentStatusCriteria.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Scenarios;
 
-use Crm\ApplicationModule\Criteria\ScenarioParams\StringLabeledArrayParam;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioParams\StringLabeledArrayParam;
+use Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaInterface;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
diff --git a/src/Scenarios/RecurrentPaymentStateCriteria.php b/src/Scenarios/RecurrentPaymentStateCriteria.php
index 8b37a05..0863519 100644
--- a/src/Scenarios/RecurrentPaymentStateCriteria.php
+++ b/src/Scenarios/RecurrentPaymentStateCriteria.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Scenarios;
 
-use Crm\ApplicationModule\Criteria\ScenarioParams\StringLabeledArrayParam;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioParams\StringLabeledArrayParam;
+use Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaInterface;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
diff --git a/src/Scenarios/RecurrentPaymentStatusCriteria.php b/src/Scenarios/RecurrentPaymentStatusCriteria.php
index c599028..0226583 100644
--- a/src/Scenarios/RecurrentPaymentStatusCriteria.php
+++ b/src/Scenarios/RecurrentPaymentStatusCriteria.php
@@ -2,8 +2,8 @@
 
 namespace Crm\PaymentsModule\Scenarios;
 
-use Crm\ApplicationModule\Criteria\ScenarioParams\StringLabeledArrayParam;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioParams\StringLabeledArrayParam;
+use Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaInterface;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
diff --git a/src/Scenarios/RecurrentPaymentSubscriptionTypeContentAccessCriteria.php b/src/Scenarios/RecurrentPaymentSubscriptionTypeContentAccessCriteria.php
index 24b33ea..5fb4458 100644
--- a/src/Scenarios/RecurrentPaymentSubscriptionTypeContentAccessCriteria.php
+++ b/src/Scenarios/RecurrentPaymentSubscriptionTypeContentAccessCriteria.php
@@ -3,8 +3,8 @@
 namespace Crm\PaymentsModule\Scenarios;
 
 use Contributte\Translation\Translator;
-use Crm\ApplicationModule\Criteria\ScenarioParams\StringLabeledArrayParam;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioParams\StringLabeledArrayParam;
+use Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaInterface;
 use Crm\PaymentsModule\Models\RecurrentPaymentsResolver;
 use Crm\SubscriptionsModule\Repositories\ContentAccessRepository;
 use Nette\Database\Table\ActiveRow;
diff --git a/src/Seeders/ConfigsSeeder.php b/src/Seeders/ConfigsSeeder.php
index ee9cdba..065da66 100644
--- a/src/Seeders/ConfigsSeeder.php
+++ b/src/Seeders/ConfigsSeeder.php
@@ -3,9 +3,9 @@
 namespace Crm\PaymentsModule\Seeders;
 
 use Crm\ApplicationModule\Builder\ConfigBuilder;
-use Crm\ApplicationModule\Config\ApplicationConfig;
-use Crm\ApplicationModule\Config\Repository\ConfigCategoriesRepository;
-use Crm\ApplicationModule\Config\Repository\ConfigsRepository;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
+use Crm\ApplicationModule\Repositories\ConfigCategoriesRepository;
+use Crm\ApplicationModule\Repositories\ConfigsRepository;
 use Crm\ApplicationModule\Seeders\ConfigsTrait;
 use Crm\ApplicationModule\Seeders\ISeeder;
 use Crm\PaymentsModule\Api\PaypalIpnHandler;
diff --git a/src/Segment/AmountCriteria.php b/src/Segment/AmountCriteria.php
index 3674f79..030a811 100644
--- a/src/Segment/AmountCriteria.php
+++ b/src/Segment/AmountCriteria.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Segment;
 
-use Crm\ApplicationModule\Criteria\CriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\CriteriaInterface;
 use Crm\SegmentModule\Models\Params\DecimalParam;
 use Crm\SegmentModule\Models\Params\ParamsBag;
 
diff --git a/src/Segment/PaymentCountsCriteria.php b/src/Segment/PaymentCountsCriteria.php
index 7769ccc..d05ffb0 100644
--- a/src/Segment/PaymentCountsCriteria.php
+++ b/src/Segment/PaymentCountsCriteria.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Segment;
 
-use Crm\ApplicationModule\Criteria\CriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\CriteriaInterface;
 use Crm\SegmentModule\Models\Criteria\Fields;
 use Crm\SegmentModule\Models\Params\NumberParam;
 use Crm\SegmentModule\Models\Params\ParamsBag;
diff --git a/src/Segment/PaymentCriteria.php b/src/Segment/PaymentCriteria.php
index 16e612a..e785429 100644
--- a/src/Segment/PaymentCriteria.php
+++ b/src/Segment/PaymentCriteria.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Segment;
 
-use Crm\ApplicationModule\Criteria\CriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\CriteriaInterface;
 use Crm\PaymentsModule\Repositories\PaymentItemsRepository;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SegmentModule\Models\Criteria\Fields;
diff --git a/src/Segment/RecurrentPaymentCriteria.php b/src/Segment/RecurrentPaymentCriteria.php
index a573871..da5ca8d 100644
--- a/src/Segment/RecurrentPaymentCriteria.php
+++ b/src/Segment/RecurrentPaymentCriteria.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Segment;
 
-use Crm\ApplicationModule\Criteria\CriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\CriteriaInterface;
 use Crm\PaymentsModule\Repositories\RecurrentPaymentsRepository;
 use Crm\SegmentModule\Models\Criteria\Fields;
 use Crm\SegmentModule\Models\Params\BooleanParam;
diff --git a/src/Segment/ReferenceCriteria.php b/src/Segment/ReferenceCriteria.php
index 33e0de7..2d31650 100644
--- a/src/Segment/ReferenceCriteria.php
+++ b/src/Segment/ReferenceCriteria.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Segment;
 
-use Crm\ApplicationModule\Criteria\CriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\CriteriaInterface;
 use Crm\SegmentModule\Models\Params\ParamsBag;
 use Crm\SegmentModule\Models\Params\StringParam;
 
diff --git a/src/Segment/StatusCriteria.php b/src/Segment/StatusCriteria.php
index 7b715e4..e9fc6d4 100644
--- a/src/Segment/StatusCriteria.php
+++ b/src/Segment/StatusCriteria.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Segment;
 
-use Crm\ApplicationModule\Criteria\CriteriaInterface;
+use Crm\ApplicationModule\Models\Criteria\CriteriaInterface;
 use Crm\PaymentsModule\Repositories\PaymentsRepository;
 use Crm\SegmentModule\Models\Params\ParamsBag;
 use Crm\SegmentModule\Models\Params\StringArrayParam;
diff --git a/src/Tests/PaymentsClaimUserDataProviderTest.php b/src/Tests/PaymentsClaimUserDataProviderTest.php
index fa7da9b..bdc5b53 100644
--- a/src/Tests/PaymentsClaimUserDataProviderTest.php
+++ b/src/Tests/PaymentsClaimUserDataProviderTest.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Tests;
 
-use Crm\ApplicationModule\DataProvider\DataProviderException;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderException;
 use Crm\ApplicationModule\Tests\DatabaseTestCase;
 use Crm\PaymentsModule\DataProviders\PaymentsClaimUserDataProvider;
 use Crm\PaymentsModule\Models\GatewayFactory;
diff --git a/src/Tests/RecurrentPaymentsClaimUserDataProviderTest.php b/src/Tests/RecurrentPaymentsClaimUserDataProviderTest.php
index 2de674e..559619f 100644
--- a/src/Tests/RecurrentPaymentsClaimUserDataProviderTest.php
+++ b/src/Tests/RecurrentPaymentsClaimUserDataProviderTest.php
@@ -2,7 +2,7 @@
 
 namespace Crm\PaymentsModule\Tests;
 
-use Crm\ApplicationModule\DataProvider\DataProviderException;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderException;
 use Crm\ApplicationModule\Tests\DatabaseTestCase;
 use Crm\PaymentsModule\DataProviders\RecurrentPaymentsClaimUserDataProvider;
 use Crm\PaymentsModule\Models\GatewayFactory;
diff --git a/src/templates/ExportsAdmin/default.latte b/src/templates/ExportsAdmin/default.latte
index e9844bd..e543369 100644
--- a/src/templates/ExportsAdmin/default.latte
+++ b/src/templates/ExportsAdmin/default.latte
@@ -31,8 +31,8 @@
           {foreach $exports as $export}
             <tr>
               <td>{date_timestamp_set(new Datetime(), $export['lastModified'])|userDate}</td>
-              <td><a href="{link downloadExport! $export['path']}">{\Crm\ApplicationModule\Models\ApplicationMountManager::getFileName($export['path'])}</a> <span class="label label-default">{$export['fileSize']|bytes}</span></td>
-              <td>{\Crm\ApplicationModule\Models\ApplicationMountManager::getFileName($export['path'])}</td>
+              <td><a href="{link downloadExport! $export['path']}">{\Crm\ApplicationModule\Application\Managers\ApplicationMountManager::getFileName($export['path'])}</a> <span class="label label-default">{$export['fileSize']|bytes}</span></td>
+              <td>{\Crm\ApplicationModule\Application\Managers\ApplicationMountManager::getFileName($export['path'])}</td>
               <td>
                 <a href="{link downloadExport! $export['path']}" class="btn btn-sm btn-info" title="{_payments.admin.exports.download}"><i class="fa fa-download"></i></a>
                 <a href="{link deleteExport! $export['path']}" class="btn btn-sm btn-danger" title="{_payments.admin.exports.delete}"><i class="fa fa-trash"></i></a>