[PSR4] ApplicationModule - (Rector) Fix uses of changed classes

remp/crm#2228
remp2020 · Jan 22, 2024 · f388d7f · f388d7f
1 parent adadc7b
commit f388d7f
Show file tree

Hide file tree

Showing 99 changed files with 267 additions and 262 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,16 +2,16 @@
 
 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;
 use Crm\ApplicationModule\Models\Measurements\Aggregation\Week;
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;