From f388d7ffffbf5b957756b8c9f0437fcb7636d315 Mon Sep 17 00:00:00 2001
From: Dominik Skerhak <dominik.skerhak@gmail.com>
Date: Fri, 19 Jan 2024 11:06:36 +0100
Subject: [PATCH] [PSR4] ApplicationModule - (Rector) Fix uses of changed
 classes

remp/crm#2228
---
 src/Api/EventGeneratorsListApiHandler.php     |   2 +-
 src/Api/EventsListApiHandler.php              |   2 +-
 .../ApplicationModuleInterface.php            |  24 ++--
 src/Application/Core.php                      |   2 +
 .../Managers/ApplicationManager.php           |  25 ++--
 src/Application/Managers/LayoutManager.php    |   2 -
 src/Application/Managers/ModuleManager.php    |   1 +
 src/Application/PhinxRegistrator.php          |   2 +-
 src/ApplicationModule.php                     |   5 +-
 src/Commands/AuditLogsCleanupCommand.php      |   2 +-
 src/Commands/CacheCommand.php                 |   2 +-
 src/Commands/CalculateMeasurementsCommand.php |   6 +-
 src/Commands/CleanupCommand.php               |   2 +-
 src/Commands/DatabaseSeedCommand.php          |   2 +-
 src/Commands/DecoratedCommandTrait.php        |   2 +-
 src/Commands/GenerateKeyCommand.php           |   2 +-
 src/Commands/InstallAssetsCommand.php         |   2 +-
 src/Commands/MigrateAuditLogsCommand.php      |   8 +-
 src/Commands/PopulatorCommand.php             |   2 +-
 src/Components/FrontendMenu/FrontendMenu.php  |   8 +-
 .../GoogleBarGraphGroup.php                   |   3 +-
 .../google_bar_graph_group.latte              |   8 +-
 .../GoogleLineGraphGroup.php                  |   5 +-
 .../google_line_graph_group.latte             |   8 +-
 .../Widgets/SimpleWidget/SimpleWidget.php     |   2 +-
 .../SingleStatWidget/SingleStatWidget.php     |   4 +-
 src/CrmModule.php                             |  29 +++--
 src/Helpers/PriceHelper.php                   |   2 +-
 src/Hermes/HeartbeatMysql.php                 |   2 +-
 src/Hermes/RedisDriver.php                    |   2 +-
 src/Hermes/RedisTasksQueue.php                |   4 +-
 .../Authenticator/AuthenticatorManager.php    |   2 +-
 src/Models/Config/ApplicationConfig.php       |   2 +-
 src/Models/Config/ConfigsCache.php            |   4 +-
 .../ScenarioConditionModelInterface.php       |   2 +-
 .../Criteria/ScenarioParams/BooleanParam.php  |   2 +-
 .../Criteria/ScenarioParams/NumberParam.php   |   2 +-
 .../StringLabeledArrayParam.php               |   2 +-
 .../ScenarioParams/TimeframeParam.php         |   2 +-
 .../Criteria/ScenariosCriteriaInterface.php   |   1 -
 .../FrontendMenuDataProviderInterface.php     |   2 +-
 .../Database/NewTableDataMigrationTrait.php   |   5 +-
 src/Models/Database/Repository.php            |   4 +-
 src/Models/Database/Selection.php             |   2 -
 src/Models/Database/SlugColumnTrait.php       |   1 -
 src/Models/Event/RedisEventManager.php        |   4 +-
 src/Models/Exports/ExcelFactory.php           |   2 +-
 src/Models/Graphs/GraphData.php               |   2 +-
 src/Models/Graphs/GraphDataItem.php           |   2 +-
 .../Graphs/Scale/Measurements/DayScale.php    |   8 +-
 .../Graphs/Scale/Measurements/MonthScale.php  |   8 +-
 .../Scale/Measurements/RangeScaleFactory.php  |   2 +-
 .../Graphs/Scale/Measurements/WeekScale.php   |   8 +-
 .../Graphs/Scale/Measurements/YearScale.php   |   8 +-
 src/Models/Graphs/Scale/Mysql/DayScale.php    |   4 +-
 src/Models/Graphs/Scale/Mysql/MonthScale.php  |   6 +-
 .../Graphs/Scale/Mysql/RangeScaleFactory.php  |   2 +-
 src/Models/Graphs/Scale/Mysql/WeekScale.php   |   6 +-
 src/Models/Graphs/Scale/Mysql/YearScale.php   |   6 +-
 src/Models/Graphs/Scale/ScaleInterface.php    |   2 +-
 src/Models/Graphs/ScaleFactory.php            |   9 +-
 src/Models/Measurements/Criteria.php          |   2 +-
 src/Models/Snippet/Control/Snippet.php        |   2 +-
 src/Models/Snippet/SnippetRenderer.php        |   2 +-
 src/Models/User/RedisUserDataStorage.php      |   4 +-
 src/Models/Widget/BaseLazyWidget.php          |   4 +-
 src/Models/Widget/BaseWidget.php              |   4 +-
 src/Presenters/BasePresenter.php              |  16 +--
 src/Presenters/ErrorPresenter.php             |   2 +-
 src/Presenters/FrontendPresenter.php          |   2 +-
 src/Presenters/HealthCheckPresenter.php       |   4 +-
 src/Repositories/AuditLogRepository.php       |   6 +-
 src/Repositories/CacheRepository.php          |   2 +-
 .../ConfigCategoriesRepository.php            |   2 +-
 src/Repositories/ConfigsRepository.php        |   3 +-
 src/Repositories/HermesTasksRepository.php    |   2 +-
 .../MeasurementGroupValuesRepository.php      |   2 +-
 .../MeasurementGroupsRepository.php           |   4 +-
 .../MeasurementValuesRepository.php           |   4 +-
 src/Repositories/MeasurementsRepository.php   |   4 +-
 src/Repositories/SnippetsRepository.php       |   2 +-
 src/Router/RouterFactory.php                  |   6 +-
 src/Seeders/ConfigsSeeder.php                 |   8 +-
 src/Seeders/ConfigsTrait.php                  |   4 +-
 src/Seeders/MeasurementsTrait.php             |   2 +-
 src/Seeders/SnippetsSeeder.php                |   2 +-
 src/Tests/CrmTestCase.php                     |   2 +-
 src/Tests/DateFieldsProcessorTraitTest.php    |   2 +-
 src/Tests/LazyEventEmitterTest.php            |   2 +-
 src/Tests/LazyWidgetManagerTest.php           |   2 +-
 .../Models/Config/ApplicationConfigTest.php   |   8 +-
 src/Tests/ReplicaManagerTest.php              |   4 +-
 src/Tests/RepositoryTest.php                  |   4 +-
 src/Tests/RequestTest.php                     |   2 +-
 src/Tests/SeederManagerTest.php               |   2 +-
 src/Tests/WidgetManagerTest.php               |   4 +-
 src/Tests/Widgets/TestingAWidget.php          |   2 +-
 src/Tests/Widgets/TestingBWidget.php          |   2 +-
 src/config/config.neon                        | 114 +++++++++---------
 99 files changed, 267 insertions(+), 262 deletions(-)

diff --git a/src/Api/EventGeneratorsListApiHandler.php b/src/Api/EventGeneratorsListApiHandler.php
index 5a66282..5aa3266 100644
--- a/src/Api/EventGeneratorsListApiHandler.php
+++ b/src/Api/EventGeneratorsListApiHandler.php
@@ -3,7 +3,7 @@
 namespace Crm\ApplicationModule\Api;
 
 use Crm\ApiModule\Models\Api\ApiHandler;
-use Crm\ApplicationModule\Event\EventsStorage;
+use Crm\ApplicationModule\Models\Event\EventsStorage;
 use Nette\Http\IResponse;
 use Tomaj\NetteApi\Response\JsonApiResponse;
 use Tomaj\NetteApi\Response\ResponseInterface;
diff --git a/src/Api/EventsListApiHandler.php b/src/Api/EventsListApiHandler.php
index 99eab46..9fef6a1 100644
--- a/src/Api/EventsListApiHandler.php
+++ b/src/Api/EventsListApiHandler.php
@@ -3,7 +3,7 @@
 namespace Crm\ApplicationModule\Api;
 
 use Crm\ApiModule\Models\Api\ApiHandler;
-use Crm\ApplicationModule\Event\EventsStorage;
+use Crm\ApplicationModule\Models\Event\EventsStorage;
 use Nette\Http\IResponse;
 use Tomaj\NetteApi\Response\JsonApiResponse;
 use Tomaj\NetteApi\Response\ResponseInterface;
diff --git a/src/Application/ApplicationModuleInterface.php b/src/Application/ApplicationModuleInterface.php
index 19a01d7..d3e5a87 100644
--- a/src/Application/ApplicationModuleInterface.php
+++ b/src/Application/ApplicationModuleInterface.php
@@ -3,22 +3,22 @@
 namespace Crm\ApplicationModule\Application;
 
 use Crm\ApiModule\Models\Api\ApiRoutersContainerInterface;
-use Crm\ApplicationModule\Access\AccessManager;
+use Crm\ApplicationModule\Application\CommandsContainerInterface;
 use Crm\ApplicationModule\Application\Managers\AssetsManager;
 use Crm\ApplicationModule\Application\Managers\CallbackManagerInterface;
 use Crm\ApplicationModule\Application\Managers\LayoutManager;
 use Crm\ApplicationModule\Application\Managers\SeederManager;
-use Crm\ApplicationModule\Authenticator\AuthenticatorManagerInterface;
-use Crm\ApplicationModule\Commands\CommandsContainerInterface;
-use Crm\ApplicationModule\Criteria\CriteriaStorage;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaStorage;
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
-use Crm\ApplicationModule\Event\EventsStorage;
-use Crm\ApplicationModule\Event\LazyEventEmitter;
-use Crm\ApplicationModule\Menu\MenuContainerInterface;
-use Crm\ApplicationModule\User\UserDataRegistrator;
-use Crm\ApplicationModule\Widget\LazyWidgetManagerInterface;
-use Crm\ApplicationModule\Widget\WidgetManagerInterface;
+use Crm\ApplicationModule\Models\Access\AccessManager;
+use Crm\ApplicationModule\Models\Authenticator\AuthenticatorManagerInterface;
+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\User\UserDataRegistrator;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManagerInterface;
+use Crm\ApplicationModule\Models\Widget\WidgetManagerInterface;
 use League\Event\Emitter;
 use Nette\Application\Routers\RouteList;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/src/Application/Core.php b/src/Application/Core.php
index f6cdd90..6dcab94 100644
--- a/src/Application/Core.php
+++ b/src/Application/Core.php
@@ -2,6 +2,8 @@
 
 namespace Crm\ApplicationModule\Application;
 
+use Crm\ApplicationModule\Application\Managers\ApplicationManager;
+use Crm\ApplicationModule\Application\Managers\ModuleManager;
 use Dotenv\Dotenv;
 use Nette\Bootstrap\Configurator;
 use Nette\DI\Container;
diff --git a/src/Application/Managers/ApplicationManager.php b/src/Application/Managers/ApplicationManager.php
index 33d1b1c..dee6041 100644
--- a/src/Application/Managers/ApplicationManager.php
+++ b/src/Application/Managers/ApplicationManager.php
@@ -3,17 +3,20 @@
 namespace Crm\ApplicationModule\Application\Managers;
 
 use Crm\ApiModule\Models\Router\ApiRoutesContainer;
-use Crm\ApplicationModule\Access\AccessManager;
-use Crm\ApplicationModule\Authenticator\AuthenticatorManager;
-use Crm\ApplicationModule\Commands\CommandsContainer;
-use Crm\ApplicationModule\Criteria\CriteriaStorage;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaStorage;
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
-use Crm\ApplicationModule\Event\EventsStorage;
-use Crm\ApplicationModule\Menu\MenuContainer;
-use Crm\ApplicationModule\User\UserDataRegistrator;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
-use Crm\ApplicationModule\Widget\WidgetManager;
+use Crm\ApplicationModule\Application\ApplicationModuleInterface;
+use Crm\ApplicationModule\Application\CommandsContainer;
+use Crm\ApplicationModule\Application\Core;
+use Crm\ApplicationModule\Models\Access\AccessManager;
+use Crm\ApplicationModule\Models\Authenticator\AuthenticatorManager;
+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\Menu\MenuContainer;
+use Crm\ApplicationModule\Models\Request;
+use Crm\ApplicationModule\Models\User\UserDataRegistrator;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\WidgetManager;
 use League\Event\Emitter;
 use Tomaj\Hermes\Dispatcher;
 
diff --git a/src/Application/Managers/LayoutManager.php b/src/Application/Managers/LayoutManager.php
index 450271a..3557dbc 100644
--- a/src/Application/Managers/LayoutManager.php
+++ b/src/Application/Managers/LayoutManager.php
@@ -2,8 +2,6 @@
 
 namespace Crm\ApplicationModule\Application\Managers;
 
-use Crm\ApplicationModule\model\MissingLayoutException;
-
 class LayoutManager
 {
     private $layouts = [];
diff --git a/src/Application/Managers/ModuleManager.php b/src/Application/Managers/ModuleManager.php
index f34b54d..ad7d3e9 100644
--- a/src/Application/Managers/ModuleManager.php
+++ b/src/Application/Managers/ModuleManager.php
@@ -2,6 +2,7 @@
 
 namespace Crm\ApplicationModule\Application\Managers;
 
+use Crm\ApplicationModule\Application\ApplicationModuleInterface;
 use Nette\Application\ApplicationException;
 use Nette\Utils\Strings;
 
diff --git a/src/Application/PhinxRegistrator.php b/src/Application/PhinxRegistrator.php
index 5e49fd2..f46703d 100644
--- a/src/Application/PhinxRegistrator.php
+++ b/src/Application/PhinxRegistrator.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Application;
 
+use Crm\ApplicationModule\Application\Managers\ModuleManager;
 use Crm\ApplicationModule\Commands\DumpSchemaForTests;
-use Crm\ApplicationModule\ModuleManager;
 use Phinx\Config\Config;
 use Phinx\Console\Command\Create;
 use Phinx\Console\Command\Init;
diff --git a/src/ApplicationModule.php b/src/ApplicationModule.php
index 088bb31..3e3da2a 100644
--- a/src/ApplicationModule.php
+++ b/src/ApplicationModule.php
@@ -8,12 +8,15 @@
 use Crm\ApiModule\Models\Router\ApiRoute;
 use Crm\ApplicationModule\Api\EventGeneratorsListApiHandler;
 use Crm\ApplicationModule\Api\EventsListApiHandler;
+use Crm\ApplicationModule\Application\CommandsContainerInterface;
+use Crm\ApplicationModule\Application\Managers\AssetsManager;
+use Crm\ApplicationModule\Application\Managers\LayoutManager;
+use Crm\ApplicationModule\Application\Managers\SeederManager;
 use Crm\ApplicationModule\Commands\AuditLogsCleanupCommand;
 use Crm\ApplicationModule\Commands\BigintMigrationCleanupCommand;
 use Crm\ApplicationModule\Commands\CacheCommand;
 use Crm\ApplicationModule\Commands\CalculateMeasurementsCommand;
 use Crm\ApplicationModule\Commands\CleanupCommand;
-use Crm\ApplicationModule\Commands\CommandsContainerInterface;
 use Crm\ApplicationModule\Commands\DatabaseSeedCommand;
 use Crm\ApplicationModule\Commands\GenerateKeyCommand;
 use Crm\ApplicationModule\Commands\HeartbeatCommand;
diff --git a/src/Commands/AuditLogsCleanupCommand.php b/src/Commands/AuditLogsCleanupCommand.php
index 5895286..9a11427 100644
--- a/src/Commands/AuditLogsCleanupCommand.php
+++ b/src/Commands/AuditLogsCleanupCommand.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Commands;
 
-use Crm\ApplicationModule\Repository\AuditLogRepository;
+use Crm\ApplicationModule\Repositories\AuditLogRepository;
 use Nette\Utils\DateTime;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Commands/CacheCommand.php b/src/Commands/CacheCommand.php
index b2f23db..da3e683 100644
--- a/src/Commands/CacheCommand.php
+++ b/src/Commands/CacheCommand.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Commands;
 
-use Crm\ApplicationModule\ModuleManager;
+use Crm\ApplicationModule\Application\Managers\ModuleManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/src/Commands/CalculateMeasurementsCommand.php b/src/Commands/CalculateMeasurementsCommand.php
index 788959d..4a59f89 100644
--- a/src/Commands/CalculateMeasurementsCommand.php
+++ b/src/Commands/CalculateMeasurementsCommand.php
@@ -2,7 +2,6 @@
 
 namespace Crm\ApplicationModule\Commands;
 
-use Crm\ApplicationModule\Config\Repository\ConfigsRepository;
 use Crm\ApplicationModule\Helpers\UserDateHelper;
 use Crm\ApplicationModule\Models\Measurements\Aggregation\Day;
 use Crm\ApplicationModule\Models\Measurements\Aggregation\Month;
@@ -10,8 +9,9 @@
 use Crm\ApplicationModule\Models\Measurements\Aggregation\Year;
 use Crm\ApplicationModule\Models\Measurements\Criteria;
 use Crm\ApplicationModule\Models\Measurements\MeasurementManager;
-use Crm\ApplicationModule\Models\Measurements\Repository\MeasurementValuesRepository;
-use Crm\ApplicationModule\Models\Measurements\Repository\MeasurementsRepository;
+use Crm\ApplicationModule\Repositories\ConfigsRepository;
+use Crm\ApplicationModule\Repositories\MeasurementValuesRepository;
+use Crm\ApplicationModule\Repositories\MeasurementsRepository;
 use Nette\Utils\DateTime;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Commands/CleanupCommand.php b/src/Commands/CleanupCommand.php
index e0262f1..44ada12 100644
--- a/src/Commands/CleanupCommand.php
+++ b/src/Commands/CleanupCommand.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Commands;
 
-use Crm\ApplicationModule\CallbackManagerInterface;
+use Crm\ApplicationModule\Application\Managers\CallbackManagerInterface;
 use Nette\DI\Container;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Commands/DatabaseSeedCommand.php b/src/Commands/DatabaseSeedCommand.php
index 2bc4b04..62613c9 100644
--- a/src/Commands/DatabaseSeedCommand.php
+++ b/src/Commands/DatabaseSeedCommand.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Commands;
 
-use Crm\ApplicationModule\SeederManager;
+use Crm\ApplicationModule\Application\Managers\SeederManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/src/Commands/DecoratedCommandTrait.php b/src/Commands/DecoratedCommandTrait.php
index 081b2ad..9da2583 100644
--- a/src/Commands/DecoratedCommandTrait.php
+++ b/src/Commands/DecoratedCommandTrait.php
@@ -3,7 +3,7 @@
 namespace Crm\ApplicationModule\Commands;
 
 use Closure;
-use Crm\ApplicationModule\Core;
+use Crm\ApplicationModule\Application\Core;
 use Nette\Utils\DateTime;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Commands/GenerateKeyCommand.php b/src/Commands/GenerateKeyCommand.php
index c2353cf..425b29d 100644
--- a/src/Commands/GenerateKeyCommand.php
+++ b/src/Commands/GenerateKeyCommand.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Commands;
 
-use Crm\ApplicationModule\Core;
+use Crm\ApplicationModule\Application\Core;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/src/Commands/InstallAssetsCommand.php b/src/Commands/InstallAssetsCommand.php
index c066246..23bdc4f 100644
--- a/src/Commands/InstallAssetsCommand.php
+++ b/src/Commands/InstallAssetsCommand.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Commands;
 
-use Crm\ApplicationModule\AssetsManager;
+use Crm\ApplicationModule\Application\Managers\AssetsManager;
 use Nette\Utils\FileSystem;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Commands/MigrateAuditLogsCommand.php b/src/Commands/MigrateAuditLogsCommand.php
index c32ebac..7c8a191 100644
--- a/src/Commands/MigrateAuditLogsCommand.php
+++ b/src/Commands/MigrateAuditLogsCommand.php
@@ -2,10 +2,10 @@
 
 namespace Crm\ApplicationModule\Commands;
 
-use Crm\ApplicationModule\EnvironmentConfig;
-use Crm\ApplicationModule\RedisClientFactory;
-use Crm\ApplicationModule\RedisClientTrait;
-use Crm\ApplicationModule\Repository\AuditLogRepository;
+use Crm\ApplicationModule\Application\EnvironmentConfig;
+use Crm\ApplicationModule\Models\Redis\RedisClientFactory;
+use Crm\ApplicationModule\Models\Redis\RedisClientTrait;
+use Crm\ApplicationModule\Repositories\AuditLogRepository;
 use Nette\Database\Explorer;
 use Nette\Utils\DateTime;
 use Symfony\Component\Console\Command\Command;
diff --git a/src/Commands/PopulatorCommand.php b/src/Commands/PopulatorCommand.php
index f009168..9a0540c 100644
--- a/src/Commands/PopulatorCommand.php
+++ b/src/Commands/PopulatorCommand.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Commands;
 
-use Crm\ApplicationModule\Populator\AbstractPopulator;
+use Crm\ApplicationModule\Populators\AbstractPopulator;
 use Faker\Factory;
 use Faker\Generator;
 use Nette\Database\Explorer;
diff --git a/src/Components/FrontendMenu/FrontendMenu.php b/src/Components/FrontendMenu/FrontendMenu.php
index 7b18b46..9bc8418 100644
--- a/src/Components/FrontendMenu/FrontendMenu.php
+++ b/src/Components/FrontendMenu/FrontendMenu.php
@@ -2,10 +2,10 @@
 
 namespace Crm\ApplicationModule\Components\FrontendMenu;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
-use Crm\ApplicationModule\DataProvider\FrontendMenuDataProviderInterface;
-use Crm\ApplicationModule\Menu\MenuContainerInterface;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\DataProvider\DataProviderManager;
+use Crm\ApplicationModule\Models\DataProvider\FrontendMenuDataProviderInterface;
+use Crm\ApplicationModule\Models\Menu\MenuContainerInterface;
 use Nette\Application\UI\Control;
 
 /**
diff --git a/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroup.php b/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroup.php
index a394b12..cb7cbe4 100644
--- a/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroup.php
+++ b/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroup.php
@@ -3,7 +3,8 @@
 namespace Crm\ApplicationModule\Components\Graphs\GoogleBarGraphGroup;
 
 use Crm\ApplicationModule\Components\Graphs\BaseGraphControl;
-use Crm\ApplicationModule\Graphs\GraphData;
+use Crm\ApplicationModule\Components\Graphs\GoogleBarGraph\GoogleBarGraphControlFactoryInterface;
+use Crm\ApplicationModule\Models\Graphs\GraphData;
 use Nette\Application\UI\Multiplier;
 use Nette\Utils\DateTime;
 
diff --git a/src/Components/Graphs/GoogleBarGraphGroup/google_bar_graph_group.latte b/src/Components/Graphs/GoogleBarGraphGroup/google_bar_graph_group.latte
index fbf4a44..12a6bf8 100644
--- a/src/Components/Graphs/GoogleBarGraphGroup/google_bar_graph_group.latte
+++ b/src/Components/Graphs/GoogleBarGraphGroup/google_bar_graph_group.latte
@@ -6,10 +6,10 @@
       <button type="button" class="btn btn-xs btn-default" data-toggle="tooltip" data-placement="top" title="{$graphHelp}"><i class="fa fa-question-circle"></i></button>
       <div class="btn-toolbar pull-right" role="toolbar">
         <div class="btn-group btn-group-xs" role="group" aria-label="...">
-          <a n:href="change! $range, \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_DAY, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_DAY ? btn-primary : btn-default, btn, ajax">{_system.date.days}</a>
-          <a n:href="change! $range, \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_WEEK, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_WEEK ? btn-primary : btn-default, btn, ajax">{_system.date.weeks}</a>
-          <a n:href="change! $range, \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_MONTH, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_MONTH ? btn-primary : btn-default, btn, ajax">{_system.date.months}</a>
-          <a n:href="change! $range, \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_YEAR, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_YEAR ? btn-primary : btn-default, btn, ajax">{_system.date.years}</a>
+          <a n:href="change! $range, \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_DAY, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_DAY ? btn-primary : btn-default, btn, ajax">{_system.date.days}</a>
+          <a n:href="change! $range, \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_WEEK, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_WEEK ? btn-primary : btn-default, btn, ajax">{_system.date.weeks}</a>
+          <a n:href="change! $range, \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_MONTH, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_MONTH ? btn-primary : btn-default, btn, ajax">{_system.date.months}</a>
+          <a n:href="change! $range, \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_YEAR, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_YEAR ? btn-primary : btn-default, btn, ajax">{_system.date.years}</a>
         </div>
 
         <div class="btn-group btn-group-xs" role="group" aria-label="...">
diff --git a/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroup.php b/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroup.php
index e0b52ac..648fb6d 100644
--- a/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroup.php
+++ b/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroup.php
@@ -3,8 +3,9 @@
 namespace Crm\ApplicationModule\Components\Graphs\GoogleLineGraphGroup;
 
 use Crm\ApplicationModule\Components\Graphs\BaseGraphControl;
-use Crm\ApplicationModule\Graphs\GraphData;
-use Crm\ApplicationModule\Graphs\ScaleFactory;
+use Crm\ApplicationModule\Components\Graphs\GoogleLineGraph\GoogleLineGraphControlFactoryInterface;
+use Crm\ApplicationModule\Models\Graphs\GraphData;
+use Crm\ApplicationModule\Models\Graphs\ScaleFactory;
 use Nette\Application\UI\Multiplier;
 use Nette\Utils\DateTime;
 
diff --git a/src/Components/Graphs/GoogleLineGraphGroup/google_line_graph_group.latte b/src/Components/Graphs/GoogleLineGraphGroup/google_line_graph_group.latte
index 77aace9..82b8ec6 100644
--- a/src/Components/Graphs/GoogleLineGraphGroup/google_line_graph_group.latte
+++ b/src/Components/Graphs/GoogleLineGraphGroup/google_line_graph_group.latte
@@ -6,10 +6,10 @@
       <button type="button" class="btn btn-xs btn-default" data-toggle="tooltip" data-placement="top" title="{$graphHelp}"><i class="fa fa-question-circle"></i></button>
       <div class="btn-toolbar pull-right" role="toolbar">
         <div class="btn-group btn-group-xs" role="group" aria-label="...">
-          <a n:href="change! $range, \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_DAY, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_DAY ? btn-primary : btn-default, btn, ajax">{_system.date.days}</a>
-          <a n:href="change! $range, \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_WEEK, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_WEEK ? btn-primary : btn-default, btn, ajax">{_system.date.weeks}</a>
-          <a n:href="change! $range, \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_MONTH, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_MONTH ? btn-primary : btn-default, btn, ajax">{_system.date.months}</a>
-          <a n:href="change! $range, \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_YEAR, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Graphs\ScaleFactory::RANGE_YEAR ? btn-primary : btn-default, btn, ajax">{_system.date.years}</a>
+          <a n:href="change! $range, \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_DAY, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_DAY ? btn-primary : btn-default, btn, ajax">{_system.date.days}</a>
+          <a n:href="change! $range, \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_WEEK, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_WEEK ? btn-primary : btn-default, btn, ajax">{_system.date.weeks}</a>
+          <a n:href="change! $range, \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_MONTH, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_MONTH ? btn-primary : btn-default, btn, ajax">{_system.date.months}</a>
+          <a n:href="change! $range, \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_YEAR, $from, $to" role="tab" type="button" n:class="$groupBy == \Crm\ApplicationModule\Models\Graphs\ScaleFactory::RANGE_YEAR ? btn-primary : btn-default, btn, ajax">{_system.date.years}</a>
         </div>
 
         <div class="btn-group btn-group-xs" role="group" aria-label="...">
diff --git a/src/Components/Widgets/SimpleWidget/SimpleWidget.php b/src/Components/Widgets/SimpleWidget/SimpleWidget.php
index 0e4649d..c32544a 100644
--- a/src/Components/Widgets/SimpleWidget/SimpleWidget.php
+++ b/src/Components/Widgets/SimpleWidget/SimpleWidget.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Components\Widgets\SimpleWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
 
 /**
  * Widget used for rendering other widgets in groups.
diff --git a/src/Components/Widgets/SingleStatWidget/SingleStatWidget.php b/src/Components/Widgets/SingleStatWidget/SingleStatWidget.php
index 031b9f9..035baba 100644
--- a/src/Components/Widgets/SingleStatWidget/SingleStatWidget.php
+++ b/src/Components/Widgets/SingleStatWidget/SingleStatWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Components\Widgets\SingleStatWidget;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Nette\Localization\Translator;
 
 /**
diff --git a/src/CrmModule.php b/src/CrmModule.php
index 20d0dc5..e00314e 100644
--- a/src/CrmModule.php
+++ b/src/CrmModule.php
@@ -4,18 +4,23 @@
 
 use Contributte\Translation\Translator;
 use Crm\ApiModule\Models\Api\ApiRoutersContainerInterface;
-use Crm\ApplicationModule\Access\AccessManager;
-use Crm\ApplicationModule\Authenticator\AuthenticatorManagerInterface;
-use Crm\ApplicationModule\Commands\CommandsContainerInterface;
-use Crm\ApplicationModule\Criteria\CriteriaStorage;
-use Crm\ApplicationModule\Criteria\ScenariosCriteriaStorage;
-use Crm\ApplicationModule\DataProvider\DataProviderManager;
-use Crm\ApplicationModule\Event\EventsStorage;
-use Crm\ApplicationModule\Event\LazyEventEmitter;
-use Crm\ApplicationModule\Menu\MenuContainerInterface;
-use Crm\ApplicationModule\User\UserDataRegistrator;
-use Crm\ApplicationModule\Widget\LazyWidgetManagerInterface;
-use Crm\ApplicationModule\Widget\WidgetManagerInterface;
+use Crm\ApplicationModule\Application\ApplicationModuleInterface;
+use Crm\ApplicationModule\Application\CommandsContainerInterface;
+use Crm\ApplicationModule\Application\Managers\AssetsManager;
+use Crm\ApplicationModule\Application\Managers\CallbackManagerInterface;
+use Crm\ApplicationModule\Application\Managers\LayoutManager;
+use Crm\ApplicationModule\Application\Managers\SeederManager;
+use Crm\ApplicationModule\Models\Access\AccessManager;
+use Crm\ApplicationModule\Models\Authenticator\AuthenticatorManagerInterface;
+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\User\UserDataRegistrator;
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManagerInterface;
+use Crm\ApplicationModule\Models\Widget\WidgetManagerInterface;
 use League\Event\Emitter;
 use Nette\Application\Routers\RouteList;
 use Nette\DI\Container;
diff --git a/src/Helpers/PriceHelper.php b/src/Helpers/PriceHelper.php
index c0497a0..e6d07b1 100644
--- a/src/Helpers/PriceHelper.php
+++ b/src/Helpers/PriceHelper.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Helpers;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use Nette\Utils\Html;
 
 class PriceHelper
diff --git a/src/Hermes/HeartbeatMysql.php b/src/Hermes/HeartbeatMysql.php
index 9c55a2e..f83cfb1 100644
--- a/src/Hermes/HeartbeatMysql.php
+++ b/src/Hermes/HeartbeatMysql.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Hermes;
 
-use Crm\ApplicationModule\Config\Repository\ConfigsRepository;
+use Crm\ApplicationModule\Repositories\ConfigsRepository;
 use Nette\Database\Explorer;
 use Tomaj\Hermes\Handler\HandlerInterface;
 use Tomaj\Hermes\MessageInterface;
diff --git a/src/Hermes/RedisDriver.php b/src/Hermes/RedisDriver.php
index d72ec84..4e5e571 100644
--- a/src/Hermes/RedisDriver.php
+++ b/src/Hermes/RedisDriver.php
@@ -3,7 +3,7 @@
 namespace Crm\ApplicationModule\Hermes;
 
 use Closure;
-use Crm\ApplicationModule\Repository\HermesTasksRepository;
+use Crm\ApplicationModule\Repositories\HermesTasksRepository;
 use Tomaj\Hermes\Dispatcher;
 use Tomaj\Hermes\Driver\DriverInterface;
 use Tomaj\Hermes\Driver\ShutdownTrait;
diff --git a/src/Hermes/RedisTasksQueue.php b/src/Hermes/RedisTasksQueue.php
index 72233e9..b9f8cae 100644
--- a/src/Hermes/RedisTasksQueue.php
+++ b/src/Hermes/RedisTasksQueue.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Hermes;
 
-use Crm\ApplicationModule\RedisClientFactory;
-use Crm\ApplicationModule\RedisClientTrait;
+use Crm\ApplicationModule\Models\Redis\RedisClientFactory;
+use Crm\ApplicationModule\Models\Redis\RedisClientTrait;
 use Nette\Utils\DateTime;
 use Nette\Utils\Json;
 use Tomaj\Hermes\Driver\UnknownPriorityException;
diff --git a/src/Models/Authenticator/AuthenticatorManager.php b/src/Models/Authenticator/AuthenticatorManager.php
index 383f1eb..e0eacda 100644
--- a/src/Models/Authenticator/AuthenticatorManager.php
+++ b/src/Models/Authenticator/AuthenticatorManager.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Authenticator;
 
-use Crm\ApplicationModule\ResettableInterface;
+use Crm\ApplicationModule\Models\ResettableInterface;
 
 class AuthenticatorManager implements AuthenticatorManagerInterface, ResettableInterface
 {
diff --git a/src/Models/Config/ApplicationConfig.php b/src/Models/Config/ApplicationConfig.php
index 5d89355..8afa33f 100644
--- a/src/Models/Config/ApplicationConfig.php
+++ b/src/Models/Config/ApplicationConfig.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Config;
 
-use Crm\ApplicationModule\Config\Repository\ConfigsRepository;
+use Crm\ApplicationModule\Repositories\ConfigsRepository;
 use Nette\Caching\Cache;
 use Nette\Caching\Storage;
 use Tracy\Debugger;
diff --git a/src/Models/Config/ConfigsCache.php b/src/Models/Config/ConfigsCache.php
index 93bae29..600f90d 100644
--- a/src/Models/Config/ConfigsCache.php
+++ b/src/Models/Config/ConfigsCache.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Models\Config;
 
-use Crm\ApplicationModule\RedisClientFactory;
-use Crm\ApplicationModule\RedisClientTrait;
+use Crm\ApplicationModule\Models\Redis\RedisClientFactory;
+use Crm\ApplicationModule\Models\Redis\RedisClientTrait;
 
 class ConfigsCache
 {
diff --git a/src/Models/Criteria/ScenarioConditionModelInterface.php b/src/Models/Criteria/ScenarioConditionModelInterface.php
index 17eecec..4f351b5 100644
--- a/src/Models/Criteria/ScenarioConditionModelInterface.php
+++ b/src/Models/Criteria/ScenarioConditionModelInterface.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Criteria;
 
-use Crm\ApplicationModule\Selection;
+use Crm\ApplicationModule\Models\Database\Selection;
 
 interface ScenarioConditionModelInterface
 {
diff --git a/src/Models/Criteria/ScenarioParams/BooleanParam.php b/src/Models/Criteria/ScenarioParams/BooleanParam.php
index 6b3e489..02177e8 100644
--- a/src/Models/Criteria/ScenarioParams/BooleanParam.php
+++ b/src/Models/Criteria/ScenarioParams/BooleanParam.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Criteria\ScenarioParams;
 
-use Crm\ApplicationModule\Scenarios\ScenarioCriteriaParamInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioCriteriaParamInterface;
 
 class BooleanParam implements ScenarioCriteriaParamInterface
 {
diff --git a/src/Models/Criteria/ScenarioParams/NumberParam.php b/src/Models/Criteria/ScenarioParams/NumberParam.php
index 2455ff0..76a075e 100644
--- a/src/Models/Criteria/ScenarioParams/NumberParam.php
+++ b/src/Models/Criteria/ScenarioParams/NumberParam.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Criteria\ScenarioParams;
 
-use Crm\ApplicationModule\Scenarios\ScenarioCriteriaParamInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioCriteriaParamInterface;
 
 class NumberParam implements ScenarioCriteriaParamInterface
 {
diff --git a/src/Models/Criteria/ScenarioParams/StringLabeledArrayParam.php b/src/Models/Criteria/ScenarioParams/StringLabeledArrayParam.php
index 7781c8e..52ac422 100644
--- a/src/Models/Criteria/ScenarioParams/StringLabeledArrayParam.php
+++ b/src/Models/Criteria/ScenarioParams/StringLabeledArrayParam.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Criteria\ScenarioParams;
 
-use Crm\ApplicationModule\Scenarios\ScenarioCriteriaParamInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioCriteriaParamInterface;
 
 class StringLabeledArrayParam implements ScenarioCriteriaParamInterface
 {
diff --git a/src/Models/Criteria/ScenarioParams/TimeframeParam.php b/src/Models/Criteria/ScenarioParams/TimeframeParam.php
index 494c040..b68358f 100644
--- a/src/Models/Criteria/ScenarioParams/TimeframeParam.php
+++ b/src/Models/Criteria/ScenarioParams/TimeframeParam.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Criteria\ScenarioParams;
 
-use Crm\ApplicationModule\Scenarios\ScenarioCriteriaParamInterface;
+use Crm\ApplicationModule\Models\Criteria\ScenarioCriteriaParamInterface;
 
 class TimeframeParam implements ScenarioCriteriaParamInterface
 {
diff --git a/src/Models/Criteria/ScenariosCriteriaInterface.php b/src/Models/Criteria/ScenariosCriteriaInterface.php
index 87a5f40..9f2fae2 100644
--- a/src/Models/Criteria/ScenariosCriteriaInterface.php
+++ b/src/Models/Criteria/ScenariosCriteriaInterface.php
@@ -2,7 +2,6 @@
 
 namespace Crm\ApplicationModule\Models\Criteria;
 
-use Crm\ApplicationModule\Scenarios\ScenarioCriteriaParamInterface;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
 
diff --git a/src/Models/DataProvider/FrontendMenuDataProviderInterface.php b/src/Models/DataProvider/FrontendMenuDataProviderInterface.php
index 8a353c8..0545bc9 100644
--- a/src/Models/DataProvider/FrontendMenuDataProviderInterface.php
+++ b/src/Models/DataProvider/FrontendMenuDataProviderInterface.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\DataProvider;
 
-use Crm\ApplicationModule\Menu\MenuContainerInterface;
+use Crm\ApplicationModule\Models\Menu\MenuContainerInterface;
 
 interface FrontendMenuDataProviderInterface extends DataProviderInterface
 {
diff --git a/src/Models/Database/NewTableDataMigrationTrait.php b/src/Models/Database/NewTableDataMigrationTrait.php
index a226df3..28460bc 100644
--- a/src/Models/Database/NewTableDataMigrationTrait.php
+++ b/src/Models/Database/NewTableDataMigrationTrait.php
@@ -2,9 +2,8 @@
 
 namespace Crm\ApplicationModule\Models\Database;
 
-use Crm\ApplicationModule\RedisClientFactory;
-use Crm\ApplicationModule\RedisClientTrait;
-use Crm\ApplicationModule\Selection;
+use Crm\ApplicationModule\Models\Redis\RedisClientFactory;
+use Crm\ApplicationModule\Models\Redis\RedisClientTrait;
 use Nette\Database\Table\ActiveRow;
 
 /**
diff --git a/src/Models/Database/Repository.php b/src/Models/Database/Repository.php
index ed9893f..7b8b724 100644
--- a/src/Models/Database/Repository.php
+++ b/src/Models/Database/Repository.php
@@ -3,9 +3,7 @@
 namespace Crm\ApplicationModule\Models\Database;
 
 use Closure;
-use Crm\ApplicationModule\Models\Repository\SlugColumnTrait;
-use Crm\ApplicationModule\Repository\AuditLogRepository;
-use Crm\ApplicationModule\Repository\ReplicaTrait;
+use Crm\ApplicationModule\Repositories\AuditLogRepository;
 use Nette\Caching\Storage;
 use Nette\Database\Explorer;
 use Nette\Utils\DateTime;
diff --git a/src/Models/Database/Selection.php b/src/Models/Database/Selection.php
index 5082927..a2140d3 100644
--- a/src/Models/Database/Selection.php
+++ b/src/Models/Database/Selection.php
@@ -2,8 +2,6 @@
 
 namespace Crm\ApplicationModule\Models\Database;
 
-use Crm\ApplicationModule\Repository\ReplicaManager;
-
 class Selection extends \Nette\Database\Table\Selection
 {
     use DateFieldsProcessorTrait;
diff --git a/src/Models/Database/SlugColumnTrait.php b/src/Models/Database/SlugColumnTrait.php
index d09a651..2f4ef69 100644
--- a/src/Models/Database/SlugColumnTrait.php
+++ b/src/Models/Database/SlugColumnTrait.php
@@ -2,7 +2,6 @@
 
 namespace Crm\ApplicationModule\Models\Database;
 
-use Crm\ApplicationModule\Models\Traits\SlugColumnException;
 use Nette\Utils\Strings;
 
 trait SlugColumnTrait
diff --git a/src/Models/Event/RedisEventManager.php b/src/Models/Event/RedisEventManager.php
index 2b9413c..b8996af 100644
--- a/src/Models/Event/RedisEventManager.php
+++ b/src/Models/Event/RedisEventManager.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Models\Event;
 
-use Crm\ApplicationModule\RedisClientFactory;
-use Crm\ApplicationModule\RedisClientTrait;
+use Crm\ApplicationModule\Models\Redis\RedisClientFactory;
+use Crm\ApplicationModule\Models\Redis\RedisClientTrait;
 use Nette\Utils\Json;
 
 class RedisEventManager implements EventManagerInterface
diff --git a/src/Models/Exports/ExcelFactory.php b/src/Models/Exports/ExcelFactory.php
index 1523156..4ad8d7d 100644
--- a/src/Models/Exports/ExcelFactory.php
+++ b/src/Models/Exports/ExcelFactory.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Exports;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 class ExcelFactory
diff --git a/src/Models/Graphs/GraphData.php b/src/Models/Graphs/GraphData.php
index 2840ebd..c140b14 100644
--- a/src/Models/Graphs/GraphData.php
+++ b/src/Models/Graphs/GraphData.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Graphs;
 
-use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
+use Crm\ApplicationModule\Models\Graphs\Scale\ScaleInterface;
 use Nette\Database\Explorer;
 
 class GraphData
diff --git a/src/Models/Graphs/GraphDataItem.php b/src/Models/Graphs/GraphDataItem.php
index 3cad8f8..b55721b 100644
--- a/src/Models/Graphs/GraphDataItem.php
+++ b/src/Models/Graphs/GraphDataItem.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Graphs;
 
-use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
+use Crm\ApplicationModule\Models\Graphs\Scale\ScaleInterface;
 
 class GraphDataItem
 {
diff --git a/src/Models/Graphs/Scale/Measurements/DayScale.php b/src/Models/Graphs/Scale/Measurements/DayScale.php
index 6940c8f..1402a71 100644
--- a/src/Models/Graphs/Scale/Measurements/DayScale.php
+++ b/src/Models/Graphs/Scale/Measurements/DayScale.php
@@ -2,11 +2,11 @@
 
 namespace Crm\ApplicationModule\Models\Graphs\Scale\Measurements;
 
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\Scale\ScaleInterface;
 use Crm\ApplicationModule\Models\Measurements\Aggregation\Day;
-use Crm\ApplicationModule\Models\Measurements\Repository\MeasurementGroupValuesRepository;
-use Crm\ApplicationModule\Models\Measurements\Repository\MeasurementValuesRepository;
+use Crm\ApplicationModule\Repositories\MeasurementGroupValuesRepository;
+use Crm\ApplicationModule\Repositories\MeasurementValuesRepository;
 use Nette\Localization\Translator;
 use Nette\Utils\DateTime;
 
diff --git a/src/Models/Graphs/Scale/Measurements/MonthScale.php b/src/Models/Graphs/Scale/Measurements/MonthScale.php
index 9a07290..a969c0b 100644
--- a/src/Models/Graphs/Scale/Measurements/MonthScale.php
+++ b/src/Models/Graphs/Scale/Measurements/MonthScale.php
@@ -2,11 +2,11 @@
 
 namespace Crm\ApplicationModule\Models\Graphs\Scale\Measurements;
 
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\Scale\ScaleInterface;
 use Crm\ApplicationModule\Models\Measurements\Aggregation\Month;
-use Crm\ApplicationModule\Models\Measurements\Repository\MeasurementGroupValuesRepository;
-use Crm\ApplicationModule\Models\Measurements\Repository\MeasurementValuesRepository;
+use Crm\ApplicationModule\Repositories\MeasurementGroupValuesRepository;
+use Crm\ApplicationModule\Repositories\MeasurementValuesRepository;
 use Nette\Localization\Translator;
 use Nette\Utils\DateTime;
 
diff --git a/src/Models/Graphs/Scale/Measurements/RangeScaleFactory.php b/src/Models/Graphs/Scale/Measurements/RangeScaleFactory.php
index aad72e8..652d91f 100644
--- a/src/Models/Graphs/Scale/Measurements/RangeScaleFactory.php
+++ b/src/Models/Graphs/Scale/Measurements/RangeScaleFactory.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Graphs\Scale\Measurements;
 
-use Crm\ApplicationModule\Graphs\ScaleFactory;
+use Crm\ApplicationModule\Models\Graphs\ScaleFactory;
 
 class RangeScaleFactory
 {
diff --git a/src/Models/Graphs/Scale/Measurements/WeekScale.php b/src/Models/Graphs/Scale/Measurements/WeekScale.php
index c02210b..6f418e5 100644
--- a/src/Models/Graphs/Scale/Measurements/WeekScale.php
+++ b/src/Models/Graphs/Scale/Measurements/WeekScale.php
@@ -2,11 +2,11 @@
 
 namespace Crm\ApplicationModule\Models\Graphs\Scale\Measurements;
 
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\Scale\ScaleInterface;
 use Crm\ApplicationModule\Models\Measurements\Aggregation\Week;
-use Crm\ApplicationModule\Models\Measurements\Repository\MeasurementGroupValuesRepository;
-use Crm\ApplicationModule\Models\Measurements\Repository\MeasurementValuesRepository;
+use Crm\ApplicationModule\Repositories\MeasurementGroupValuesRepository;
+use Crm\ApplicationModule\Repositories\MeasurementValuesRepository;
 use Nette\Localization\Translator;
 use Nette\Utils\DateTime;
 
diff --git a/src/Models/Graphs/Scale/Measurements/YearScale.php b/src/Models/Graphs/Scale/Measurements/YearScale.php
index d615c91..cae823d 100644
--- a/src/Models/Graphs/Scale/Measurements/YearScale.php
+++ b/src/Models/Graphs/Scale/Measurements/YearScale.php
@@ -2,11 +2,11 @@
 
 namespace Crm\ApplicationModule\Models\Graphs\Scale\Measurements;
 
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\Scale\ScaleInterface;
 use Crm\ApplicationModule\Models\Measurements\Aggregation\Year;
-use Crm\ApplicationModule\Models\Measurements\Repository\MeasurementGroupValuesRepository;
-use Crm\ApplicationModule\Models\Measurements\Repository\MeasurementValuesRepository;
+use Crm\ApplicationModule\Repositories\MeasurementGroupValuesRepository;
+use Crm\ApplicationModule\Repositories\MeasurementValuesRepository;
 use Nette\Localization\Translator;
 use Nette\Utils\DateTime;
 
diff --git a/src/Models/Graphs/Scale/Mysql/DayScale.php b/src/Models/Graphs/Scale/Mysql/DayScale.php
index c0f5df6..2f73ce9 100644
--- a/src/Models/Graphs/Scale/Mysql/DayScale.php
+++ b/src/Models/Graphs/Scale/Mysql/DayScale.php
@@ -2,10 +2,10 @@
 
 namespace Crm\ApplicationModule\Models\Graphs\Scale\Mysql;
 
-use Crm\ApplicationModule\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
 use Nette\Database\Explorer;
 
-class DayScale extends \Crm\ApplicationModule\Graphs\Scale\DayScale
+class DayScale extends \Crm\ApplicationModule\Models\Graphs\Scale\DayScale
 {
     public function __construct(private Explorer $database)
     {
diff --git a/src/Models/Graphs/Scale/Mysql/MonthScale.php b/src/Models/Graphs/Scale/Mysql/MonthScale.php
index 877d146..e2fe028 100644
--- a/src/Models/Graphs/Scale/Mysql/MonthScale.php
+++ b/src/Models/Graphs/Scale/Mysql/MonthScale.php
@@ -2,11 +2,11 @@
 
 namespace Crm\ApplicationModule\Models\Graphs\Scale\Mysql;
 
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\Scale\ScaleInterface;
 use Nette\Database\Explorer;
 
-class MonthScale extends \Crm\ApplicationModule\Graphs\Scale\MonthScale implements ScaleInterface
+class MonthScale extends \Crm\ApplicationModule\Models\Graphs\Scale\MonthScale implements ScaleInterface
 {
     public function __construct(private Explorer $database)
     {
diff --git a/src/Models/Graphs/Scale/Mysql/RangeScaleFactory.php b/src/Models/Graphs/Scale/Mysql/RangeScaleFactory.php
index 273297c..91a46f7 100644
--- a/src/Models/Graphs/Scale/Mysql/RangeScaleFactory.php
+++ b/src/Models/Graphs/Scale/Mysql/RangeScaleFactory.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Graphs\Scale\Mysql;
 
-use Crm\ApplicationModule\Graphs\ScaleFactory;
+use Crm\ApplicationModule\Models\Graphs\ScaleFactory;
 use Nette\Database\Explorer;
 
 class RangeScaleFactory
diff --git a/src/Models/Graphs/Scale/Mysql/WeekScale.php b/src/Models/Graphs/Scale/Mysql/WeekScale.php
index c028735..fec9b1d 100644
--- a/src/Models/Graphs/Scale/Mysql/WeekScale.php
+++ b/src/Models/Graphs/Scale/Mysql/WeekScale.php
@@ -2,11 +2,11 @@
 
 namespace Crm\ApplicationModule\Models\Graphs\Scale\Mysql;
 
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\Scale\ScaleInterface;
 use Nette\Database\Explorer;
 
-class WeekScale extends \Crm\ApplicationModule\Graphs\Scale\WeekScale implements ScaleInterface
+class WeekScale extends \Crm\ApplicationModule\Models\Graphs\Scale\WeekScale implements ScaleInterface
 {
     private $database;
 
diff --git a/src/Models/Graphs/Scale/Mysql/YearScale.php b/src/Models/Graphs/Scale/Mysql/YearScale.php
index 4a788cd..9fe2cbc 100644
--- a/src/Models/Graphs/Scale/Mysql/YearScale.php
+++ b/src/Models/Graphs/Scale/Mysql/YearScale.php
@@ -2,9 +2,9 @@
 
 namespace Crm\ApplicationModule\Models\Graphs\Scale\Mysql;
 
-use Crm\ApplicationModule\Graphs\Criteria;
-use Crm\ApplicationModule\Graphs\Scale\ScaleBase;
-use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\Scale\ScaleBase;
+use Crm\ApplicationModule\Models\Graphs\Scale\ScaleInterface;
 use DateTime;
 use Nette\Database\Explorer;
 
diff --git a/src/Models/Graphs/Scale/ScaleInterface.php b/src/Models/Graphs/Scale/ScaleInterface.php
index f12c7a4..6d4cc69 100644
--- a/src/Models/Graphs/Scale/ScaleInterface.php
+++ b/src/Models/Graphs/Scale/ScaleInterface.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Graphs\Scale;
 
-use Crm\ApplicationModule\Graphs\Criteria;
+use Crm\ApplicationModule\Models\Graphs\Criteria;
 
 interface ScaleInterface
 {
diff --git a/src/Models/Graphs/ScaleFactory.php b/src/Models/Graphs/ScaleFactory.php
index 5593cb5..1ceaac6 100644
--- a/src/Models/Graphs/ScaleFactory.php
+++ b/src/Models/Graphs/ScaleFactory.php
@@ -2,9 +2,8 @@
 
 namespace Crm\ApplicationModule\Models\Graphs;
 
-use Crm\ApplicationModule\Graphs\Scale\Mysql\RangeScaleFactory as MysqlScaleFactory;
-use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
 use Crm\ApplicationModule\Models\Graphs\Scale\Measurements\RangeScaleFactory as MeasurementsScaleFactory;
+use Crm\ApplicationModule\Models\Graphs\Scale\ScaleInterface;
 
 class ScaleFactory
 {
@@ -13,11 +12,11 @@ class ScaleFactory
     public const RANGE_MONTH = 'month';
     public const RANGE_YEAR = 'year';
 
-    private MysqlScaleFactory $mysqlScaleFactory;
+    private \Crm\ApplicationModule\Models\Graphs\Scale\Mysql\RangeScaleFactory $mysqlScaleFactory;
     private MeasurementsScaleFactory $measurementsScaleFactory;
 
     public function __construct(
-        MysqlScaleFactory $mysqlScaleFactory,
+        \Crm\ApplicationModule\Models\Graphs\Scale\Mysql\RangeScaleFactory $mysqlScaleFactory,
         MeasurementsScaleFactory $measurementsScaleFactory
     ) {
         $this->mysqlScaleFactory = $mysqlScaleFactory;
@@ -27,7 +26,7 @@ public function __construct(
     public function create($provider, $range): ScaleInterface
     {
         switch ($provider) {
-            case MysqlScaleFactory::PROVIDER_MYSQL:
+            case \Crm\ApplicationModule\Models\Graphs\Scale\Mysql\RangeScaleFactory::PROVIDER_MYSQL:
                 $factory = $this->mysqlScaleFactory;
                 break;
             case MeasurementsScaleFactory::PROVIDER_MEASUREMENT:
diff --git a/src/Models/Measurements/Criteria.php b/src/Models/Measurements/Criteria.php
index 8592def..0d29185 100644
--- a/src/Models/Measurements/Criteria.php
+++ b/src/Models/Measurements/Criteria.php
@@ -3,7 +3,7 @@
 namespace Crm\ApplicationModule\Models\Measurements;
 
 use Crm\ApplicationModule\Models\Measurements\Aggregation\Aggregation;
-use Crm\ApplicationModule\NowTrait;
+use Crm\ApplicationModule\Models\NowTrait;
 use DateTime;
 
 class Criteria
diff --git a/src/Models/Snippet/Control/Snippet.php b/src/Models/Snippet/Control/Snippet.php
index b1e3d35..540a023 100644
--- a/src/Models/Snippet/Control/Snippet.php
+++ b/src/Models/Snippet/Control/Snippet.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Models\Snippet\Control;
 
-use Crm\ApplicationModule\Snippet\SnippetRenderer;
+use Crm\ApplicationModule\Models\Snippet\SnippetRenderer;
 use Nette\Application\UI\Control;
 
 class Snippet extends Control
diff --git a/src/Models/Snippet/SnippetRenderer.php b/src/Models/Snippet/SnippetRenderer.php
index fb9bf1f..29046b7 100644
--- a/src/Models/Snippet/SnippetRenderer.php
+++ b/src/Models/Snippet/SnippetRenderer.php
@@ -3,7 +3,7 @@
 namespace Crm\ApplicationModule\Models\Snippet;
 
 use Contributte\Translation\Translator;
-use Crm\ApplicationModule\Snippet\Repository\SnippetsRepository;
+use Crm\ApplicationModule\Repositories\SnippetsRepository;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader;
 
diff --git a/src/Models/User/RedisUserDataStorage.php b/src/Models/User/RedisUserDataStorage.php
index 4dbe438..a33e229 100644
--- a/src/Models/User/RedisUserDataStorage.php
+++ b/src/Models/User/RedisUserDataStorage.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Models\User;
 
-use Crm\ApplicationModule\RedisClientFactory;
-use Crm\ApplicationModule\RedisClientTrait;
+use Crm\ApplicationModule\Models\Redis\RedisClientFactory;
+use Crm\ApplicationModule\Models\Redis\RedisClientTrait;
 
 class RedisUserDataStorage implements UserDataStorageInterface
 {
diff --git a/src/Models/Widget/BaseLazyWidget.php b/src/Models/Widget/BaseLazyWidget.php
index 3d87e81..62bd66b 100644
--- a/src/Models/Widget/BaseLazyWidget.php
+++ b/src/Models/Widget/BaseLazyWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Models\Widget;
 
-use Crm\ApplicationModule\Components\SimpleWidgetFactoryInterface;
-use Crm\ApplicationModule\Snippet\Control\SnippetFactory;
+use Crm\ApplicationModule\Components\Widgets\SimpleWidget\SimpleWidgetFactoryInterface;
+use Crm\ApplicationModule\Models\Snippet\Control\SnippetFactory;
 use Kdyby\Autowired\AutowireComponentFactories;
 use Nette\Application\UI\Control;
 use Nette\ComponentModel\IComponent;
diff --git a/src/Models/Widget/BaseWidget.php b/src/Models/Widget/BaseWidget.php
index 4abca01..5f0e0f6 100644
--- a/src/Models/Widget/BaseWidget.php
+++ b/src/Models/Widget/BaseWidget.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Models\Widget;
 
-use Crm\ApplicationModule\Components\SimpleWidgetFactoryInterface;
-use Crm\ApplicationModule\Snippet\Control\SnippetFactory;
+use Crm\ApplicationModule\Components\Widgets\SimpleWidget\SimpleWidgetFactoryInterface;
+use Crm\ApplicationModule\Models\Snippet\Control\SnippetFactory;
 use Kdyby\Autowired\AutowireComponentFactories;
 use Nette\Application\UI\Control;
 use Nette\ComponentModel\IComponent;
diff --git a/src/Presenters/BasePresenter.php b/src/Presenters/BasePresenter.php
index cbf6971..eb084c8 100644
--- a/src/Presenters/BasePresenter.php
+++ b/src/Presenters/BasePresenter.php
@@ -3,15 +3,15 @@
 namespace Crm\ApplicationModule\Presenters;
 
 use Contributte\Translation\Translator;
-use Crm\ApplicationModule\ApplicationManager;
-use Crm\ApplicationModule\Components\SimpleWidgetFactoryInterface;
-use Crm\ApplicationModule\Components\SingleStatWidgetFactoryInterface;
-use Crm\ApplicationModule\Config\ApplicationConfig;
-use Crm\ApplicationModule\Core;
+use Crm\ApplicationModule\Application\Core;
+use Crm\ApplicationModule\Application\Managers\ApplicationManager;
+use Crm\ApplicationModule\Application\Managers\LayoutManager;
+use Crm\ApplicationModule\Components\Widgets\SimpleWidget\SimpleWidgetFactoryInterface;
+use Crm\ApplicationModule\Components\Widgets\SingleStatWidget\SingleStatWidgetFactoryInterface;
 use Crm\ApplicationModule\Events\AuthenticatedAccessRequiredEvent;
 use Crm\ApplicationModule\Events\AuthenticationEvent;
-use Crm\ApplicationModule\LayoutManager;
-use Crm\ApplicationModule\Snippet\Control\SnippetFactory;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Snippet\Control\SnippetFactory;
 use Crm\UsersModule\Models\Auth\UserAuthenticator;
 use Crm\UsersModule\Repositories\UsersRepository;
 use Kdyby\Autowired\AutowireComponentFactories;
@@ -98,7 +98,7 @@ protected function beforeRender()
 
     protected function getIp()
     {
-        return \Crm\ApplicationModule\Request::getIp();
+        return \Crm\ApplicationModule\Models\Request::getIp();
     }
 
     public function onlyLoggedIn()
diff --git a/src/Presenters/ErrorPresenter.php b/src/Presenters/ErrorPresenter.php
index 40ddc89..fa2a20e 100644
--- a/src/Presenters/ErrorPresenter.php
+++ b/src/Presenters/ErrorPresenter.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Presenters;
 
-use Crm\ApplicationModule\Snippet\Control\SnippetFactory;
+use Crm\ApplicationModule\Models\Snippet\Control\SnippetFactory;
 use Kdyby\Autowired\AutowireComponentFactories;
 use Nette\Application\AbortException;
 use Nette\Application\BadRequestException;
diff --git a/src/Presenters/FrontendPresenter.php b/src/Presenters/FrontendPresenter.php
index 1c8d42a..0f38388 100644
--- a/src/Presenters/FrontendPresenter.php
+++ b/src/Presenters/FrontendPresenter.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Presenters;
 
-use Crm\ApplicationModule\Components\FrontendMenu;
+use Crm\ApplicationModule\Components\FrontendMenu\FrontendMenu;
 use Crm\ApplicationModule\Events\FrontendRequestEvent;
 use Crm\SubscriptionsModule\Repositories\SubscriptionsRepository;
 use Crm\UsersModule\Models\Auth\AutoLogin\AutoLogin;
diff --git a/src/Presenters/HealthCheckPresenter.php b/src/Presenters/HealthCheckPresenter.php
index 3a25b69..f2de807 100644
--- a/src/Presenters/HealthCheckPresenter.php
+++ b/src/Presenters/HealthCheckPresenter.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Presenters;
 
-use Crm\ApplicationModule\Config\Repository\ConfigsRepository;
-use Crm\ApplicationModule\User\UserDataStorageInterface;
+use Crm\ApplicationModule\Models\User\UserDataStorageInterface;
+use Crm\ApplicationModule\Repositories\ConfigsRepository;
 use Nette\Application\BadRequestException;
 use Nette\Application\Responses\TextResponse;
 
diff --git a/src/Repositories/AuditLogRepository.php b/src/Repositories/AuditLogRepository.php
index 00b60b0..e7487cc 100644
--- a/src/Repositories/AuditLogRepository.php
+++ b/src/Repositories/AuditLogRepository.php
@@ -2,11 +2,11 @@
 
 namespace Crm\ApplicationModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
-use Crm\ApplicationModule\Selection;
+use Crm\ApplicationModule\Models\Database\NewTableDataMigrationTrait;
+use Crm\ApplicationModule\Models\Database\Repository;
+use Crm\ApplicationModule\Models\Database\Selection;
 use Nette\Database\Explorer;
 use Nette\Security\UserStorage;
-use Remp\MailerModule\Repositories\NewTableDataMigrationTrait;
 
 class AuditLogRepository extends Repository
 {
diff --git a/src/Repositories/CacheRepository.php b/src/Repositories/CacheRepository.php
index 40155f5..e4451ad 100644
--- a/src/Repositories/CacheRepository.php
+++ b/src/Repositories/CacheRepository.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
+use Crm\ApplicationModule\Models\Database\Repository;
 use Nette\Database\Explorer;
 use Nette\Database\Table\ActiveRow;
 use Nette\Utils\DateTime;
diff --git a/src/Repositories/ConfigCategoriesRepository.php b/src/Repositories/ConfigCategoriesRepository.php
index 3bc0489..74996b6 100644
--- a/src/Repositories/ConfigCategoriesRepository.php
+++ b/src/Repositories/ConfigCategoriesRepository.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
+use Crm\ApplicationModule\Models\Database\Repository;
 use DateTime;
 
 class ConfigCategoriesRepository extends Repository
diff --git a/src/Repositories/ConfigsRepository.php b/src/Repositories/ConfigsRepository.php
index de76895..41409db 100644
--- a/src/Repositories/ConfigsRepository.php
+++ b/src/Repositories/ConfigsRepository.php
@@ -3,8 +3,7 @@
 namespace Crm\ApplicationModule\Repositories;
 
 use Crm\ApplicationModule\Events\ConfigUpdatedEvent;
-use Crm\ApplicationModule\Repository;
-use Crm\ApplicationModule\Repository\AuditLogRepository;
+use Crm\ApplicationModule\Models\Database\Repository;
 use DateTime;
 use League\Event\Emitter;
 use Nette\Database\Explorer;
diff --git a/src/Repositories/HermesTasksRepository.php b/src/Repositories/HermesTasksRepository.php
index 199d17e..4ab6935 100644
--- a/src/Repositories/HermesTasksRepository.php
+++ b/src/Repositories/HermesTasksRepository.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
+use Crm\ApplicationModule\Models\Database\Repository;
 use Nette\Utils\DateTime;
 use Nette\Utils\Json;
 use Tomaj\Hermes\MessageInterface;
diff --git a/src/Repositories/MeasurementGroupValuesRepository.php b/src/Repositories/MeasurementGroupValuesRepository.php
index 7229a89..2156987 100644
--- a/src/Repositories/MeasurementGroupValuesRepository.php
+++ b/src/Repositories/MeasurementGroupValuesRepository.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Repositories;
 
+use Crm\ApplicationModule\Models\Database\Repository;
 use Crm\ApplicationModule\Models\Measurements\PointAggregate;
-use Crm\ApplicationModule\Repository;
 use Nette\Caching\Storage;
 use Nette\Database\Explorer;
 use Nette\Database\Table\ActiveRow;
diff --git a/src/Repositories/MeasurementGroupsRepository.php b/src/Repositories/MeasurementGroupsRepository.php
index 4972ee7..baa8a1a 100644
--- a/src/Repositories/MeasurementGroupsRepository.php
+++ b/src/Repositories/MeasurementGroupsRepository.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\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\DateTime;
 
diff --git a/src/Repositories/MeasurementValuesRepository.php b/src/Repositories/MeasurementValuesRepository.php
index c896cf8..f1da775 100644
--- a/src/Repositories/MeasurementValuesRepository.php
+++ b/src/Repositories/MeasurementValuesRepository.php
@@ -2,9 +2,9 @@
 
 namespace Crm\ApplicationModule\Repositories;
 
-use Crm\ApplicationModule\ActiveRow;
+use Crm\ApplicationModule\Models\Database\ActiveRow;
+use Crm\ApplicationModule\Models\Database\Repository;
 use Crm\ApplicationModule\Models\Measurements\PointAggregate;
-use Crm\ApplicationModule\Repository;
 use Nette\Caching\Storage;
 use Nette\Database\Explorer;
 use Nette\Database\Table\Selection;
diff --git a/src/Repositories/MeasurementsRepository.php b/src/Repositories/MeasurementsRepository.php
index d910983..6fa63f2 100644
--- a/src/Repositories/MeasurementsRepository.php
+++ b/src/Repositories/MeasurementsRepository.php
@@ -2,9 +2,9 @@
 
 namespace Crm\ApplicationModule\Repositories;
 
+use Crm\ApplicationModule\Models\Database\Repository;
+use Crm\ApplicationModule\Models\Database\Selection;
 use Crm\ApplicationModule\Models\Measurements\BaseMeasurement;
-use Crm\ApplicationModule\Repository;
-use Crm\ApplicationModule\Selection;
 use Nette\Database\Table\ActiveRow;
 use Nette\Utils\DateTime;
 
diff --git a/src/Repositories/SnippetsRepository.php b/src/Repositories/SnippetsRepository.php
index 0cde22b..ea6835e 100644
--- a/src/Repositories/SnippetsRepository.php
+++ b/src/Repositories/SnippetsRepository.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Repositories;
 
-use Crm\ApplicationModule\Repository;
+use Crm\ApplicationModule\Models\Database\Repository;
 use Nette\Database\Table\ActiveRow;
 use Nette\Utils\DateTime;
 
diff --git a/src/Router/RouterFactory.php b/src/Router/RouterFactory.php
index 2e7b578..5a0122d 100644
--- a/src/Router/RouterFactory.php
+++ b/src/Router/RouterFactory.php
@@ -2,9 +2,9 @@
 
 namespace Crm\ApplicationModule\Router;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
-use Crm\ApplicationModule\Config\ConfigsCache;
-use Crm\ApplicationModule\ModuleManager;
+use Crm\ApplicationModule\Application\Managers\ModuleManager;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\ConfigsCache;
 use Nette\Application\Routers\RouteList;
 
 /**
diff --git a/src/Seeders/ConfigsSeeder.php b/src/Seeders/ConfigsSeeder.php
index 5617122..0f475b0 100644
--- a/src/Seeders/ConfigsSeeder.php
+++ b/src/Seeders/ConfigsSeeder.php
@@ -2,11 +2,11 @@
 
 namespace Crm\ApplicationModule\Seeders;
 
+use Crm\ApplicationModule\Application\Core;
 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\Core;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
+use Crm\ApplicationModule\Repositories\ConfigCategoriesRepository;
+use Crm\ApplicationModule\Repositories\ConfigsRepository;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ConfigsSeeder implements ISeeder
diff --git a/src/Seeders/ConfigsTrait.php b/src/Seeders/ConfigsTrait.php
index c24ab63..f23d84f 100644
--- a/src/Seeders/ConfigsTrait.php
+++ b/src/Seeders/ConfigsTrait.php
@@ -3,8 +3,8 @@
 namespace Crm\ApplicationModule\Seeders;
 
 use Crm\ApplicationModule\Builder\ConfigBuilder;
-use Crm\ApplicationModule\Config\Repository\ConfigCategoriesRepository;
-use Crm\ApplicationModule\Config\Repository\ConfigsRepository;
+use Crm\ApplicationModule\Repositories\ConfigCategoriesRepository;
+use Crm\ApplicationModule\Repositories\ConfigsRepository;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
diff --git a/src/Seeders/MeasurementsTrait.php b/src/Seeders/MeasurementsTrait.php
index 5282cb8..957ba6b 100644
--- a/src/Seeders/MeasurementsTrait.php
+++ b/src/Seeders/MeasurementsTrait.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Seeders;
 
-use Crm\ApplicationModule\Models\Measurements\Repository\MeasurementsRepository;
+use Crm\ApplicationModule\Repositories\MeasurementsRepository;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
diff --git a/src/Seeders/SnippetsSeeder.php b/src/Seeders/SnippetsSeeder.php
index 1131ec0..ef45860 100644
--- a/src/Seeders/SnippetsSeeder.php
+++ b/src/Seeders/SnippetsSeeder.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Seeders;
 
-use Crm\ApplicationModule\Snippet\Repository\SnippetsRepository;
+use Crm\ApplicationModule\Repositories\SnippetsRepository;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SnippetsSeeder implements ISeeder
diff --git a/src/Tests/CrmTestCase.php b/src/Tests/CrmTestCase.php
index 918c4e4..33fed25 100644
--- a/src/Tests/CrmTestCase.php
+++ b/src/Tests/CrmTestCase.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Tests;
 
-use Crm\ApplicationModule\ResettableInterface;
+use Crm\ApplicationModule\Models\ResettableInterface;
 use Nette\DI\Container;
 use Nette\Http\Session;
 use PHPUnit\Framework\TestCase;
diff --git a/src/Tests/DateFieldsProcessorTraitTest.php b/src/Tests/DateFieldsProcessorTraitTest.php
index d0e8ef4..7a8518a 100644
--- a/src/Tests/DateFieldsProcessorTraitTest.php
+++ b/src/Tests/DateFieldsProcessorTraitTest.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Tests;
 
-use Crm\ApplicationModule\DateFieldsProcessorTrait;
+use Crm\ApplicationModule\Models\Database\DateFieldsProcessorTrait;
 use Nette\Utils\DateTime;
 use PHPUnit\Framework\TestCase;
 
diff --git a/src/Tests/LazyEventEmitterTest.php b/src/Tests/LazyEventEmitterTest.php
index 9596d0b..9c45355 100644
--- a/src/Tests/LazyEventEmitterTest.php
+++ b/src/Tests/LazyEventEmitterTest.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Tests;
 
-use Crm\ApplicationModule\Event\LazyEventEmitter;
+use Crm\ApplicationModule\Models\Event\LazyEventEmitter;
 use Crm\ApplicationModule\Tests\Events\TestEvent;
 use Crm\ApplicationModule\Tests\Events\TestListenerA;
 use Crm\ApplicationModule\Tests\Events\TestListenerB;
diff --git a/src/Tests/LazyWidgetManagerTest.php b/src/Tests/LazyWidgetManagerTest.php
index 623dc76..c717d4f 100644
--- a/src/Tests/LazyWidgetManagerTest.php
+++ b/src/Tests/LazyWidgetManagerTest.php
@@ -2,9 +2,9 @@
 
 namespace Crm\ApplicationModule\Tests;
 
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
 use Crm\ApplicationModule\Tests\Widgets\TestingAWidget;
 use Crm\ApplicationModule\Tests\Widgets\TestingBWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
 
 class LazyWidgetManagerTest extends CrmTestCase
 {
diff --git a/src/Tests/Models/Config/ApplicationConfigTest.php b/src/Tests/Models/Config/ApplicationConfigTest.php
index 6a84b5a..c82e690 100644
--- a/src/Tests/Models/Config/ApplicationConfigTest.php
+++ b/src/Tests/Models/Config/ApplicationConfigTest.php
@@ -2,10 +2,10 @@
 
 namespace Crm\ApplicationModule\Tests\Models\Config;
 
-use Crm\ApplicationModule\Config\ApplicationConfig;
-use Crm\ApplicationModule\Config\LocalConfig;
-use Crm\ApplicationModule\Config\Repository\ConfigsRepository;
-use Crm\ApplicationModule\Core;
+use Crm\ApplicationModule\Application\Core;
+use Crm\ApplicationModule\Models\Config\ApplicationConfig;
+use Crm\ApplicationModule\Models\Config\LocalConfig;
+use Crm\ApplicationModule\Repositories\ConfigsRepository;
 use Crm\ApplicationModule\Seeders\ConfigsSeeder;
 use Crm\ApplicationModule\Tests\DatabaseTestCase;
 use Nette\Caching\Storage;
diff --git a/src/Tests/ReplicaManagerTest.php b/src/Tests/ReplicaManagerTest.php
index 3ab7dc1..624177a 100644
--- a/src/Tests/ReplicaManagerTest.php
+++ b/src/Tests/ReplicaManagerTest.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Tests;
 
-use Crm\ApplicationModule\Repository\ReplicaConfig;
-use Crm\ApplicationModule\Repository\ReplicaManager;
+use Crm\ApplicationModule\Models\Database\ReplicaConfig;
+use Crm\ApplicationModule\Models\Database\ReplicaManager;
 use Nette\Database\Connection;
 use Nette\Database\Explorer;
 use PHPUnit\Framework\Attributes\DataProvider;
diff --git a/src/Tests/RepositoryTest.php b/src/Tests/RepositoryTest.php
index 587be27..a283eb4 100644
--- a/src/Tests/RepositoryTest.php
+++ b/src/Tests/RepositoryTest.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ApplicationModule\Tests;
 
-use Crm\ApplicationModule\Models\Repository\SlugColumnTrait;
-use Crm\ApplicationModule\Models\Traits\SlugColumnException;
+use Crm\ApplicationModule\Models\Database\SlugColumnException;
+use Crm\ApplicationModule\Models\Database\SlugColumnTrait;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
diff --git a/src/Tests/RequestTest.php b/src/Tests/RequestTest.php
index c1e3662..8bac6ae 100644
--- a/src/Tests/RequestTest.php
+++ b/src/Tests/RequestTest.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Tests;
 
-use Crm\ApplicationModule\Request;
+use Crm\ApplicationModule\Models\Request;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
diff --git a/src/Tests/SeederManagerTest.php b/src/Tests/SeederManagerTest.php
index de61239..d266cb3 100644
--- a/src/Tests/SeederManagerTest.php
+++ b/src/Tests/SeederManagerTest.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Tests;
 
-use Crm\ApplicationModule\SeederManager;
+use Crm\ApplicationModule\Application\Managers\SeederManager;
 use Crm\ApplicationModule\Seeders\ISeeder;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/src/Tests/WidgetManagerTest.php b/src/Tests/WidgetManagerTest.php
index 5236093..f3e3c98 100644
--- a/src/Tests/WidgetManagerTest.php
+++ b/src/Tests/WidgetManagerTest.php
@@ -2,10 +2,10 @@
 
 namespace Crm\ApplicationModule\Tests;
 
+use Crm\ApplicationModule\Models\Widget\LazyWidgetManager;
+use Crm\ApplicationModule\Models\Widget\WidgetManager;
 use Crm\ApplicationModule\Tests\Widgets\TestingAWidget;
 use Crm\ApplicationModule\Tests\Widgets\TestingBWidget;
-use Crm\ApplicationModule\Widget\LazyWidgetManager;
-use Crm\ApplicationModule\Widget\WidgetManager;
 
 class WidgetManagerTest extends CrmTestCase
 {
diff --git a/src/Tests/Widgets/TestingAWidget.php b/src/Tests/Widgets/TestingAWidget.php
index 60212d1..19cf0f8 100644
--- a/src/Tests/Widgets/TestingAWidget.php
+++ b/src/Tests/Widgets/TestingAWidget.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Tests\Widgets;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
 
 class TestingAWidget extends BaseLazyWidget
 {
diff --git a/src/Tests/Widgets/TestingBWidget.php b/src/Tests/Widgets/TestingBWidget.php
index 92be399..fb96aef 100644
--- a/src/Tests/Widgets/TestingBWidget.php
+++ b/src/Tests/Widgets/TestingBWidget.php
@@ -2,7 +2,7 @@
 
 namespace Crm\ApplicationModule\Tests\Widgets;
 
-use Crm\ApplicationModule\Widget\BaseLazyWidget;
+use Crm\ApplicationModule\Models\Widget\BaseLazyWidget;
 
 class TestingBWidget extends BaseLazyWidget
 {
diff --git a/src/config/config.neon b/src/config/config.neon
index ebb5b5f..d5cac24 100644
--- a/src/config/config.neon
+++ b/src/config/config.neon
@@ -1,21 +1,21 @@
 services:
-	emitter: Crm\ApplicationModule\Event\LazyEventEmitter
+	emitter: Crm\ApplicationModule\Models\Event\LazyEventEmitter
 
-	environmentConfig: Crm\ApplicationModule\EnvironmentConfig
-	replicaConfig: Crm\ApplicationModule\Repository\ReplicaConfig
+	environmentConfig: Crm\ApplicationModule\Application\EnvironmentConfig
+	replicaConfig: Crm\ApplicationModule\Models\Database\ReplicaConfig
 
 	moduleManager:
-		factory: Crm\ApplicationModule\ModuleManager
+		factory: Crm\ApplicationModule\Application\Managers\ModuleManager
 		setup:
 			- addModule(Crm\ApplicationModule\ApplicationModule(), 1)
 
 	applicationManager:
-		factory: Crm\ApplicationModule\ApplicationManager
+		factory: Crm\ApplicationModule\Application\Managers\ApplicationManager
 		setup:
 			- initialize
 
 	frontendMenu:
-		factory: Crm\ApplicationModule\Components\FrontendMenu
+		factory: Crm\ApplicationModule\Components\FrontendMenu\FrontendMenu
 
 	# Latte filters
 	nette.latteFactory:
@@ -36,15 +36,15 @@ services:
 			- register('json', [Crm\ApplicationModule\Helpers\JsonHelper(), process])
 			- register('maskEmail', [Crm\ApplicationModule\Helpers\MaskEmailHelper(), process])
 
-	redisClientFactory: Crm\ApplicationModule\RedisClientFactory(%redis.host%, %redis.port%, %redis.password%, %redis.database%, %redis_client_factory.prefix%)
+	redisClientFactory: Crm\ApplicationModule\Models\Redis\RedisClientFactory(%redis.host%, %redis.port%, %redis.password%, %redis.database%, %redis_client_factory.prefix%)
 
-	configCategoriesRepository: Crm\ApplicationModule\Config\Repository\ConfigCategoriesRepository
-	configsRepository: Crm\ApplicationModule\Config\Repository\ConfigsRepository
-	cacheRepository: Crm\ApplicationModule\Cache\CacheRepository
-	snippetsRepository: Crm\ApplicationModule\Snippet\Repository\SnippetsRepository
-	hermesTasksRepository: Crm\ApplicationModule\Repository\HermesTasksRepository
+	configCategoriesRepository: Crm\ApplicationModule\Repositories\ConfigCategoriesRepository
+	configsRepository: Crm\ApplicationModule\Repositories\ConfigsRepository
+	cacheRepository: Crm\ApplicationModule\Repositories\CacheRepository
+	snippetsRepository: Crm\ApplicationModule\Repositories\SnippetsRepository
+	hermesTasksRepository: Crm\ApplicationModule\Repositories\HermesTasksRepository
 	auditLogRepository:
-		factory: Crm\ApplicationModule\Repository\AuditLogRepository
+		factory: Crm\ApplicationModule\Repositories\AuditLogRepository
 		setup:
 			- setNewTableName('audit_logs_v2')
 			- setNewTableDataMigrationIsRunningFlag(Crm\ApplicationModule\Commands\MigrateAuditLogsCommand::AUDIT_LOGS_MIGRATION_RUNNING)
@@ -56,10 +56,10 @@ services:
 	redirectValidator:
 		factory: Crm\ApplicationModule\Router\RedirectValidator
 
-	- Crm\ApplicationModule\Authenticator\AuthenticatorManager
-	- Crm\ApplicationModule\Widget\WidgetManager
-	lazyWidgetManager: Crm\ApplicationModule\Widget\LazyWidgetManager
-	- Crm\ApplicationModule\DataProvider\DataProviderManager
+	- Crm\ApplicationModule\Models\Authenticator\AuthenticatorManager
+	- Crm\ApplicationModule\Models\Widget\WidgetManager
+	lazyWidgetManager: Crm\ApplicationModule\Models\Widget\LazyWidgetManager
+	- Crm\ApplicationModule\Models\DataProvider\DataProviderManager
 	- Crm\ApplicationModule\Builder\ConfigBuilder
 
 	- Crm\ApplicationModule\Commands\DatabaseSeedCommand
@@ -73,57 +73,57 @@ services:
 	- Crm\ApplicationModule\Commands\BigintMigrationCleanupCommand
 
 	applicationConfig:
-		factory: Crm\ApplicationModule\Config\ApplicationConfig
-
-	- Crm\ApplicationModule\Snippet\Control\SnippetFactory
-	- Crm\ApplicationModule\Snippet\SnippetRenderer
-	- Crm\ApplicationModule\Components\FrontendMenuFactoryInterface
-	- Crm\ApplicationModule\Components\SimpleWidgetFactoryInterface
-	- Crm\ApplicationModule\Components\SingleStatWidgetFactoryInterface
-	- Crm\ApplicationModule\Criteria\CriteriaStorage
-	- Crm\ApplicationModule\Criteria\ScenariosCriteriaStorage
-	- Crm\ApplicationModule\Event\EventsStorage
-	- Crm\ApplicationModule\ExcelFactory
-	- Crm\ApplicationModule\CleanUpManager
-	- Crm\ApplicationModule\LayoutManager
-	- Crm\ApplicationModule\SeederManager
+		factory: Crm\ApplicationModule\Models\Config\ApplicationConfig
+
+	- Crm\ApplicationModule\Models\Snippet\Control\SnippetFactory
+	- Crm\ApplicationModule\Models\Snippet\SnippetRenderer
+	- Crm\ApplicationModule\Components\FrontendMenu\FrontendMenuFactoryInterface
+	- Crm\ApplicationModule\Components\Widgets\SimpleWidget\SimpleWidgetFactoryInterface
+	- Crm\ApplicationModule\Components\Widgets\SingleStatWidget\SingleStatWidgetFactoryInterface
+	- Crm\ApplicationModule\Models\Criteria\CriteriaStorage
+	- Crm\ApplicationModule\Models\Criteria\ScenariosCriteriaStorage
+	- Crm\ApplicationModule\Models\Event\EventsStorage
+	- Crm\ApplicationModule\Models\Exports\ExcelFactory
+	- Crm\ApplicationModule\Application\Managers\CleanUpManager
+	- Crm\ApplicationModule\Application\Managers\LayoutManager
+	- Crm\ApplicationModule\Application\Managers\SeederManager
 	- Crm\ApplicationModule\Commands\HermesShutdownCommand
 	- Crm\ApplicationModule\Commands\HermesWorkerCommand
 	- Crm\ApplicationModule\Commands\CleanupCommand
-	configsCache: Crm\ApplicationModule\Config\ConfigsCache
+	configsCache: Crm\ApplicationModule\Models\Config\ConfigsCache
 	- Crm\ApplicationModule\Helpers\PriceHelper
 	- Crm\ApplicationModule\Helpers\DiffPriceHelper
 	userDateHelper: Crm\ApplicationModule\Helpers\UserDateHelper
 	localizedDateHelper: Crm\ApplicationModule\Helpers\LocalizedDateHelper
-	assetsManager: Crm\ApplicationModule\AssetsManager('%wwwDir%')
+	assetsManager: Crm\ApplicationModule\Application\Managers\AssetsManager('%wwwDir%')
 
-	mountManagerConfig: Crm\ApplicationModule\Models\MountManagerConfig
-	applicationMountManager: Crm\ApplicationModule\Models\ApplicationMountManager
+	mountManagerConfig: Crm\ApplicationModule\Application\Managers\MountManagerConfig
+	applicationMountManager: Crm\ApplicationModule\Application\Managers\ApplicationMountManager
 
-	- Crm\ApplicationModule\ActiveRowFactory
+	- Crm\ApplicationModule\Models\Database\ActiveRowFactory
 
-	- Crm\ApplicationModule\Graphs\GraphData
-	- Crm\ApplicationModule\Graphs\ScaleFactory
-	- Crm\ApplicationModule\Graphs\Scale\Mysql\RangeScaleFactory
+	- Crm\ApplicationModule\Models\Graphs\GraphData
+	- Crm\ApplicationModule\Models\Graphs\ScaleFactory
+	- Crm\ApplicationModule\Models\Graphs\Scale\Mysql\RangeScaleFactory
 	- Crm\ApplicationModule\Models\Graphs\Scale\Measurements\RangeScaleFactory
 	- Crm\ApplicationModule\Models\Graphs\Scale\Measurements\DayScale
 	- Crm\ApplicationModule\Models\Graphs\Scale\Measurements\WeekScale
 	- Crm\ApplicationModule\Models\Graphs\Scale\Measurements\MonthScale
 	- Crm\ApplicationModule\Models\Graphs\Scale\Measurements\YearScale
 
-	redisEventManager: Crm\ApplicationModule\Event\RedisEventManager
-	- Crm\ApplicationModule\User\UserDataRegistrator
+	redisEventManager: Crm\ApplicationModule\Models\Event\RedisEventManager
+	- Crm\ApplicationModule\Models\User\UserDataRegistrator
 	- Crm\ApplicationModule\Api\EventsListApiHandler
 	- Crm\ApplicationModule\Api\EventGeneratorsListApiHandler
-	- Crm\ApplicationModule\User\DownloadUserData
-	- Crm\ApplicationModule\User\DeleteUserData
-	redisUserDataStorage: Crm\ApplicationModule\User\RedisUserDataStorage
+	- Crm\ApplicationModule\Models\User\DownloadUserData
+	- Crm\ApplicationModule\Models\User\DeleteUserData
+	redisUserDataStorage: Crm\ApplicationModule\Models\User\RedisUserDataStorage
 
 	- Crm\ApplicationModule\Seeders\CalendarSeeder
 	- Crm\ApplicationModule\Seeders\ConfigsSeeder
 	- Crm\ApplicationModule\Seeders\CountriesSeeder
 	- Crm\ApplicationModule\Seeders\SnippetsSeeder
-	accessManager: Crm\ApplicationModule\Access\AccessManager
+	accessManager: Crm\ApplicationModule\Models\Access\AccessManager
 
 	hermesLogRedact: Crm\ApplicationModule\Hermes\LogRedact
 	hermesLogger:
@@ -150,20 +150,20 @@ services:
 	redisTasksQueue: Crm\ApplicationModule\Hermes\RedisTasksQueue
 
 	- Crm\ApplicationModule\Hermes\HeartbeatMysql
-	- Crm\ApplicationModule\Request
+	- Crm\ApplicationModule\Models\Request
 
-	- Crm\ApplicationModule\Models\Measurements\Repository\MeasurementValuesRepository
-	- Crm\ApplicationModule\Models\Measurements\Repository\MeasurementsRepository
-	- Crm\ApplicationModule\Models\Measurements\Repository\MeasurementGroupsRepository
-	- Crm\ApplicationModule\Models\Measurements\Repository\MeasurementGroupValuesRepository
+	- Crm\ApplicationModule\Repositories\MeasurementValuesRepository
+	- Crm\ApplicationModule\Repositories\MeasurementsRepository
+	- Crm\ApplicationModule\Repositories\MeasurementGroupsRepository
+	- Crm\ApplicationModule\Repositories\MeasurementGroupValuesRepository
 	measurementManager:
 		factory: Crm\ApplicationModule\Models\Measurements\MeasurementManager
 
 	# components factories
-	- Crm\ApplicationModule\Components\Graphs\GoogleBarGraphControlFactoryInterface
-	- Crm\ApplicationModule\Components\Graphs\GoogleBarGraphGroupControlFactoryInterface
-	- Crm\ApplicationModule\Components\Graphs\GoogleLineGraphControlFactoryInterface
-	- Crm\ApplicationModule\Components\Graphs\GoogleLineGraphGroupControlFactoryInterface
-	- Crm\ApplicationModule\Components\Graphs\SmallBarGraphControlFactoryInterface
-	- Crm\ApplicationModule\Components\Graphs\InlineBarGraphControlFactoryInterface
-	- Crm\ApplicationModule\Components\Graphs\GoogleSankeyGraphGroupControlFactoryInterface
+	- Crm\ApplicationModule\Components\Graphs\GoogleBarGraph\GoogleBarGraphControlFactoryInterface
+	- Crm\ApplicationModule\Components\Graphs\GoogleBarGraphGroup\GoogleBarGraphGroupControlFactoryInterface
+	- Crm\ApplicationModule\Components\Graphs\GoogleLineGraph\GoogleLineGraphControlFactoryInterface
+	- Crm\ApplicationModule\Components\Graphs\GoogleLineGraphGroup\GoogleLineGraphGroupControlFactoryInterface
+	- Crm\ApplicationModule\Components\Graphs\SmallBarGraph\SmallBarGraphControlFactoryInterface
+	- Crm\ApplicationModule\Components\Graphs\InlineBarGraph\InlineBarGraphControlFactoryInterface
+	- Crm\ApplicationModule\Components\Graphs\GoogleSankeyGraphGroup\GoogleSankeyGraphGroupControlFactoryInterface