diff --git a/src/Models/Api/EventGeneratorsListApiHandler.php b/src/Api/EventGeneratorsListApiHandler.php
similarity index 100%
rename from src/Models/Api/EventGeneratorsListApiHandler.php
rename to src/Api/EventGeneratorsListApiHandler.php
diff --git a/src/Models/Api/EventsListApiHandler.php b/src/Api/EventsListApiHandler.php
similarity index 100%
rename from src/Models/Api/EventsListApiHandler.php
rename to src/Api/EventsListApiHandler.php
diff --git a/src/Models/ApplicationModuleInterface.php b/src/Application/ApplicationModuleInterface.php
similarity index 90%
rename from src/Models/ApplicationModuleInterface.php
rename to src/Application/ApplicationModuleInterface.php
index 83c4b39..19a01d7 100644
--- a/src/Models/ApplicationModuleInterface.php
+++ b/src/Application/ApplicationModuleInterface.php
@@ -1,9 +1,13 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application;
 
 use Crm\ApiModule\Models\Api\ApiRoutersContainerInterface;
 use Crm\ApplicationModule\Access\AccessManager;
+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;
diff --git a/src/Models/CommandsContainer.php b/src/Application/CommandsContainer.php
similarity index 91%
rename from src/Models/CommandsContainer.php
rename to src/Application/CommandsContainer.php
index 83536a0..73e7037 100644
--- a/src/Models/CommandsContainer.php
+++ b/src/Application/CommandsContainer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Commands;
+namespace Crm\ApplicationModule\Application;
 
 use Symfony\Component\Console\Command\Command;
 
diff --git a/src/Models/CommandsContainerInterface.php b/src/Application/CommandsContainerInterface.php
similarity index 87%
rename from src/Models/CommandsContainerInterface.php
rename to src/Application/CommandsContainerInterface.php
index 7a27770..f7005ff 100644
--- a/src/Models/CommandsContainerInterface.php
+++ b/src/Application/CommandsContainerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Commands;
+namespace Crm\ApplicationModule\Application;
 
 use Symfony\Component\Console\Command\Command;
 
diff --git a/src/application/ComposerScripts.php b/src/Application/ComposerScripts.php
similarity index 97%
rename from src/application/ComposerScripts.php
rename to src/Application/ComposerScripts.php
index 95792b0..7aeb72d 100644
--- a/src/application/ComposerScripts.php
+++ b/src/Application/ComposerScripts.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application;
 
 use Composer\Composer;
 use Composer\Factory;
diff --git a/src/application/Core.php b/src/Application/Core.php
similarity index 99%
rename from src/application/Core.php
rename to src/Application/Core.php
index bfa16f9..f6cdd90 100644
--- a/src/application/Core.php
+++ b/src/Application/Core.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application;
 
 use Dotenv\Dotenv;
 use Nette\Bootstrap\Configurator;
@@ -148,7 +148,7 @@ public function getContainer()
     {
         return $this->container;
     }
-    
+
     protected function createContainer()
     {
         $configurator = new Configurator;
diff --git a/src/Models/EnvironmentConfig.php b/src/Application/EnvironmentConfig.php
similarity index 95%
rename from src/Models/EnvironmentConfig.php
rename to src/Application/EnvironmentConfig.php
index dcfc6ad..279d905 100644
--- a/src/Models/EnvironmentConfig.php
+++ b/src/Application/EnvironmentConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application;
 
 use Nette\Utils\Strings;
 use Tracy\Debugger;
diff --git a/src/Models/ApplicationManager.php b/src/Application/Managers/ApplicationManager.php
similarity index 99%
rename from src/Models/ApplicationManager.php
rename to src/Application/Managers/ApplicationManager.php
index cca912e..33d1b1c 100644
--- a/src/Models/ApplicationManager.php
+++ b/src/Application/Managers/ApplicationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application\Managers;
 
 use Crm\ApiModule\Models\Router\ApiRoutesContainer;
 use Crm\ApplicationModule\Access\AccessManager;
diff --git a/src/Models/ApplicationMountManager.php b/src/Application/Managers/ApplicationMountManager.php
similarity index 97%
rename from src/Models/ApplicationMountManager.php
rename to src/Application/Managers/ApplicationMountManager.php
index 4377582..a4d06ec 100644
--- a/src/Models/ApplicationMountManager.php
+++ b/src/Application/Managers/ApplicationMountManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Models;
+namespace Crm\ApplicationModule\Application\Managers;
 
 use League\Flysystem\FilesystemException;
 use League\Flysystem\MountManager;
diff --git a/src/Models/AssetsManager.php b/src/Application/Managers/AssetsManager.php
similarity index 96%
rename from src/Models/AssetsManager.php
rename to src/Application/Managers/AssetsManager.php
index 7fe9385..efc2fc7 100644
--- a/src/Models/AssetsManager.php
+++ b/src/Application/Managers/AssetsManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application\Managers;
 
 use Nette\Utils\Strings;
 
diff --git a/src/Models/CallbackManagerInterface.php b/src/Application/Managers/CallbackManagerInterface.php
similarity index 81%
rename from src/Models/CallbackManagerInterface.php
rename to src/Application/Managers/CallbackManagerInterface.php
index 96828d4..7ecdcc4 100644
--- a/src/Models/CallbackManagerInterface.php
+++ b/src/Application/Managers/CallbackManagerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application\Managers;
 
 use Closure;
 use Nette\DI\Container;
diff --git a/src/Models/CleanUpManager.php b/src/Application/Managers/CleanUpManager.php
similarity index 91%
rename from src/Models/CleanUpManager.php
rename to src/Application/Managers/CleanUpManager.php
index f163d4d..873f3a3 100644
--- a/src/Models/CleanUpManager.php
+++ b/src/Application/Managers/CleanUpManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application\Managers;
 
 use Closure;
 use Nette\DI\Container;
diff --git a/src/Models/LayoutManager.php b/src/Application/Managers/LayoutManager.php
similarity index 92%
rename from src/Models/LayoutManager.php
rename to src/Application/Managers/LayoutManager.php
index c94f2ce..450271a 100644
--- a/src/Models/LayoutManager.php
+++ b/src/Application/Managers/LayoutManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application\Managers;
 
 use Crm\ApplicationModule\model\MissingLayoutException;
 
diff --git a/src/Models/MissingLayoutException.php b/src/Application/Managers/MissingLayoutException.php
similarity index 52%
rename from src/Models/MissingLayoutException.php
rename to src/Application/Managers/MissingLayoutException.php
index 0700cc4..7852c60 100644
--- a/src/Models/MissingLayoutException.php
+++ b/src/Application/Managers/MissingLayoutException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\model;
+namespace Crm\ApplicationModule\Application\Managers;
 
 class MissingLayoutException extends \Exception
 {
diff --git a/src/Models/ModuleManager.php b/src/Application/Managers/ModuleManager.php
similarity index 96%
rename from src/Models/ModuleManager.php
rename to src/Application/Managers/ModuleManager.php
index 584ffa8..f34b54d 100644
--- a/src/Models/ModuleManager.php
+++ b/src/Application/Managers/ModuleManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application\Managers;
 
 use Nette\Application\ApplicationException;
 use Nette\Utils\Strings;
diff --git a/src/Models/MountManagerConfig.php b/src/Application/Managers/MountManagerConfig.php
similarity index 89%
rename from src/Models/MountManagerConfig.php
rename to src/Application/Managers/MountManagerConfig.php
index 991e183..81b0ad7 100644
--- a/src/Models/MountManagerConfig.php
+++ b/src/Application/Managers/MountManagerConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Models;
+namespace Crm\ApplicationModule\Application\Managers;
 
 use League\Flysystem\FilesystemOperator;
 
diff --git a/src/Models/SeederManager.php b/src/Application/Managers/SeederManager.php
similarity index 94%
rename from src/Models/SeederManager.php
rename to src/Application/Managers/SeederManager.php
index 4144140..0ac2bbe 100644
--- a/src/Models/SeederManager.php
+++ b/src/Application/Managers/SeederManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application\Managers;
 
 use Crm\ApplicationModule\Seeders\ISeeder;
 
diff --git a/src/Models/PhinxRegistrator.php b/src/Application/PhinxRegistrator.php
similarity index 97%
rename from src/Models/PhinxRegistrator.php
rename to src/Application/PhinxRegistrator.php
index d94d6a1..5e49fd2 100644
--- a/src/Models/PhinxRegistrator.php
+++ b/src/Application/PhinxRegistrator.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Application;
 
 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/Components/FrontendMenu/FrontendMenu.php b/src/Components/FrontendMenu/FrontendMenu.php
index 81297da..7b18b46 100644
--- a/src/Components/FrontendMenu/FrontendMenu.php
+++ b/src/Components/FrontendMenu/FrontendMenu.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components;
+namespace Crm\ApplicationModule\Components\FrontendMenu;
 
 use Crm\ApplicationModule\Config\ApplicationConfig;
 use Crm\ApplicationModule\DataProvider\DataProviderManager;
diff --git a/src/Components/FrontendMenu/FrontendMenuFactoryInterface.php b/src/Components/FrontendMenu/FrontendMenuFactoryInterface.php
index 54c9579..1a4a0c9 100644
--- a/src/Components/FrontendMenu/FrontendMenuFactoryInterface.php
+++ b/src/Components/FrontendMenu/FrontendMenuFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components;
+namespace Crm\ApplicationModule\Components\FrontendMenu;
 
 interface FrontendMenuFactoryInterface
 {
diff --git a/src/Components/Graphs/GoogleBarGraph/GoogleBarGraph.php b/src/Components/Graphs/GoogleBarGraph/GoogleBarGraph.php
index 703d686..ea9509e 100644
--- a/src/Components/Graphs/GoogleBarGraph/GoogleBarGraph.php
+++ b/src/Components/Graphs/GoogleBarGraph/GoogleBarGraph.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\GoogleBarGraph;
+
+use Crm\ApplicationModule\Components\Graphs\BaseGraphControl;
 
 /**
  * Google bar graph component
diff --git a/src/Components/Graphs/GoogleBarGraph/GoogleBarGraphControlFactoryInterface.php b/src/Components/Graphs/GoogleBarGraph/GoogleBarGraphControlFactoryInterface.php
index 3fad335..2eb1fa3 100644
--- a/src/Components/Graphs/GoogleBarGraph/GoogleBarGraphControlFactoryInterface.php
+++ b/src/Components/Graphs/GoogleBarGraph/GoogleBarGraphControlFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\GoogleBarGraph;
 
 interface GoogleBarGraphControlFactoryInterface
 {
diff --git a/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroup.php b/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroup.php
index 12d0d6a..a394b12 100644
--- a/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroup.php
+++ b/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroup.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\GoogleBarGraphGroup;
 
+use Crm\ApplicationModule\Components\Graphs\BaseGraphControl;
 use Crm\ApplicationModule\Graphs\GraphData;
 use Nette\Application\UI\Multiplier;
 use Nette\Utils\DateTime;
diff --git a/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroupControlFactoryInterface.php b/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroupControlFactoryInterface.php
index 7ffc104..0917365 100644
--- a/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroupControlFactoryInterface.php
+++ b/src/Components/Graphs/GoogleBarGraphGroup/GoogleBarGraphGroupControlFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\GoogleBarGraphGroup;
 
 interface GoogleBarGraphGroupControlFactoryInterface
 {
diff --git a/src/Components/Graphs/GoogleLineGraph/GoogleLineGraph.php b/src/Components/Graphs/GoogleLineGraph/GoogleLineGraph.php
index 2dece5a..f70b30c 100644
--- a/src/Components/Graphs/GoogleLineGraph/GoogleLineGraph.php
+++ b/src/Components/Graphs/GoogleLineGraph/GoogleLineGraph.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\GoogleLineGraph;
+
+use Crm\ApplicationModule\Components\Graphs\BaseGraphControl;
 
 /**
  * Google line graph component
diff --git a/src/Components/Graphs/GoogleLineGraph/GoogleLineGraphControlFactoryInterface.php b/src/Components/Graphs/GoogleLineGraph/GoogleLineGraphControlFactoryInterface.php
index 5f01c99..e6dcc33 100644
--- a/src/Components/Graphs/GoogleLineGraph/GoogleLineGraphControlFactoryInterface.php
+++ b/src/Components/Graphs/GoogleLineGraph/GoogleLineGraphControlFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\GoogleLineGraph;
 
 interface GoogleLineGraphControlFactoryInterface
 {
diff --git a/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroup.php b/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroup.php
index 75c3f03..e0b52ac 100644
--- a/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroup.php
+++ b/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroup.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\GoogleLineGraphGroup;
 
+use Crm\ApplicationModule\Components\Graphs\BaseGraphControl;
 use Crm\ApplicationModule\Graphs\GraphData;
 use Crm\ApplicationModule\Graphs\ScaleFactory;
 use Nette\Application\UI\Multiplier;
diff --git a/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroupControlFactoryInterface.php b/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroupControlFactoryInterface.php
index 41a99cc..ab67df1 100644
--- a/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroupControlFactoryInterface.php
+++ b/src/Components/Graphs/GoogleLineGraphGroup/GoogleLineGraphGroupControlFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\GoogleLineGraphGroup;
 
 interface GoogleLineGraphGroupControlFactoryInterface
 {
diff --git a/src/Components/Graphs/GoogleSankeyGraphGroup/GoogleSankeyGraphGroup.php b/src/Components/Graphs/GoogleSankeyGraphGroup/GoogleSankeyGraphGroup.php
index 6cef573..bd1a32b 100644
--- a/src/Components/Graphs/GoogleSankeyGraphGroup/GoogleSankeyGraphGroup.php
+++ b/src/Components/Graphs/GoogleSankeyGraphGroup/GoogleSankeyGraphGroup.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\GoogleSankeyGraphGroup;
 
+use Crm\ApplicationModule\Components\Graphs\BaseGraphControl;
 use Nette\Utils\Json;
 
 class GoogleSankeyGraphGroup extends BaseGraphControl
diff --git a/src/Components/Graphs/GoogleSankeyGraphGroup/GoogleSankeyGraphGroupControlFactoryInterface.php b/src/Components/Graphs/GoogleSankeyGraphGroup/GoogleSankeyGraphGroupControlFactoryInterface.php
index 42edffd..2d8cc1a 100644
--- a/src/Components/Graphs/GoogleSankeyGraphGroup/GoogleSankeyGraphGroupControlFactoryInterface.php
+++ b/src/Components/Graphs/GoogleSankeyGraphGroup/GoogleSankeyGraphGroupControlFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\GoogleSankeyGraphGroup;
 
 interface GoogleSankeyGraphGroupControlFactoryInterface
 {
diff --git a/src/Components/Graphs/InlineBarGraph/InlineBarGraph.php b/src/Components/Graphs/InlineBarGraph/InlineBarGraph.php
index b85844f..03e648b 100644
--- a/src/Components/Graphs/InlineBarGraph/InlineBarGraph.php
+++ b/src/Components/Graphs/InlineBarGraph/InlineBarGraph.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\InlineBarGraph;
+
+use Crm\ApplicationModule\Components\Graphs\BaseGraphControl;
 
 /**
  * Inline bar graph
diff --git a/src/Components/Graphs/InlineBarGraph/InlineBarGraphControlFactoryInterface.php b/src/Components/Graphs/InlineBarGraph/InlineBarGraphControlFactoryInterface.php
index 60f5280..82fea66 100644
--- a/src/Components/Graphs/InlineBarGraph/InlineBarGraphControlFactoryInterface.php
+++ b/src/Components/Graphs/InlineBarGraph/InlineBarGraphControlFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\InlineBarGraph;
 
 interface InlineBarGraphControlFactoryInterface
 {
diff --git a/src/Components/Graphs/SmallBarchart/SmallBarGraph.php b/src/Components/Graphs/SmallBarGraph/SmallBarGraph.php
similarity index 87%
rename from src/Components/Graphs/SmallBarchart/SmallBarGraph.php
rename to src/Components/Graphs/SmallBarGraph/SmallBarGraph.php
index b873916..3fa2893 100644
--- a/src/Components/Graphs/SmallBarchart/SmallBarGraph.php
+++ b/src/Components/Graphs/SmallBarGraph/SmallBarGraph.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\SmallBarGraph;
+
+use Crm\ApplicationModule\Components\Graphs\BaseGraphControl;
 
 /**
  * Bar graph
diff --git a/src/Components/Graphs/SmallBarchart/SmallBarGraphControlFactoryInterface.php b/src/Components/Graphs/SmallBarGraph/SmallBarGraphControlFactoryInterface.php
similarity index 61%
rename from src/Components/Graphs/SmallBarchart/SmallBarGraphControlFactoryInterface.php
rename to src/Components/Graphs/SmallBarGraph/SmallBarGraphControlFactoryInterface.php
index 1c745c5..fcaabcb 100644
--- a/src/Components/Graphs/SmallBarchart/SmallBarGraphControlFactoryInterface.php
+++ b/src/Components/Graphs/SmallBarGraph/SmallBarGraphControlFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components\Graphs;
+namespace Crm\ApplicationModule\Components\Graphs\SmallBarGraph;
 
 interface SmallBarGraphControlFactoryInterface
 {
diff --git a/src/Components/Graphs/SmallBarchart/small_bar_graph.latte b/src/Components/Graphs/SmallBarGraph/small_bar_graph.latte
similarity index 100%
rename from src/Components/Graphs/SmallBarchart/small_bar_graph.latte
rename to src/Components/Graphs/SmallBarGraph/small_bar_graph.latte
diff --git a/src/Components/PreviousNextPaginator/PreviousNextPaginator.php b/src/Components/PreviousNextPaginator/PreviousNextPaginator.php
index 4d82c2e..7f338da 100644
--- a/src/Components/PreviousNextPaginator/PreviousNextPaginator.php
+++ b/src/Components/PreviousNextPaginator/PreviousNextPaginator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components;
+namespace Crm\ApplicationModule\Components\PreviousNextPaginator;
 
 use Nette\Application\Attributes\Persistent;
 use Nette\Application\UI\Control;
diff --git a/src/Components/VisualPaginator/VisualPaginator.php b/src/Components/VisualPaginator/VisualPaginator.php
index 509ab34..9b55daa 100644
--- a/src/Components/VisualPaginator/VisualPaginator.php
+++ b/src/Components/VisualPaginator/VisualPaginator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components;
+namespace Crm\ApplicationModule\Components\VisualPaginator;
 
 use Nette\Application\Attributes\Persistent;
 use Nette\Application\UI\Control;
diff --git a/src/Components/Widgets/SimpleWidget/SimpleWidget.php b/src/Components/Widgets/SimpleWidget/SimpleWidget.php
index 6dfe68b..0e4649d 100644
--- a/src/Components/Widgets/SimpleWidget/SimpleWidget.php
+++ b/src/Components/Widgets/SimpleWidget/SimpleWidget.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components;
+namespace Crm\ApplicationModule\Components\Widgets\SimpleWidget;
 
 use Crm\ApplicationModule\Widget\BaseLazyWidget;
 
diff --git a/src/Components/Widgets/SimpleWidget/SimpleWidgetFactoryInterface.php b/src/Components/Widgets/SimpleWidget/SimpleWidgetFactoryInterface.php
index a195afc..98ab13d 100644
--- a/src/Components/Widgets/SimpleWidget/SimpleWidgetFactoryInterface.php
+++ b/src/Components/Widgets/SimpleWidget/SimpleWidgetFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components;
+namespace Crm\ApplicationModule\Components\Widgets\SimpleWidget;
 
 interface SimpleWidgetFactoryInterface
 {
diff --git a/src/Components/Widgets/SingleStatWidget/SingleStatWidget.php b/src/Components/Widgets/SingleStatWidget/SingleStatWidget.php
index 276801f..031b9f9 100644
--- a/src/Components/Widgets/SingleStatWidget/SingleStatWidget.php
+++ b/src/Components/Widgets/SingleStatWidget/SingleStatWidget.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components;
+namespace Crm\ApplicationModule\Components\Widgets\SingleStatWidget;
 
 use Crm\ApplicationModule\Widget\BaseLazyWidget;
 use Crm\ApplicationModule\Widget\LazyWidgetManager;
diff --git a/src/Components/Widgets/SingleStatWidget/SingleStatWidgetFactoryInterface.php b/src/Components/Widgets/SingleStatWidget/SingleStatWidgetFactoryInterface.php
index abb7269..f9ababa 100644
--- a/src/Components/Widgets/SingleStatWidget/SingleStatWidgetFactoryInterface.php
+++ b/src/Components/Widgets/SingleStatWidget/SingleStatWidgetFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Components;
+namespace Crm\ApplicationModule\Components\Widgets\SingleStatWidget;
 
 interface SingleStatWidgetFactoryInterface
 {
diff --git a/src/renderers/BootstrapSmallInlineFormRenderer.php b/src/Forms/BootstrapSmallInlineFormRenderer.php
similarity index 100%
rename from src/renderers/BootstrapSmallInlineFormRenderer.php
rename to src/Forms/BootstrapSmallInlineFormRenderer.php
diff --git a/src/Models/FormFactoryDefaultsTrait.php b/src/Forms/FormFactoryDefaultsTrait.php
similarity index 87%
rename from src/Models/FormFactoryDefaultsTrait.php
rename to src/Forms/FormFactoryDefaultsTrait.php
index c4109e7..112d059 100644
--- a/src/Models/FormFactoryDefaultsTrait.php
+++ b/src/Forms/FormFactoryDefaultsTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Forms;
 
 trait FormFactoryDefaultsTrait
 {
diff --git a/src/Models/Access/AccessManager.php b/src/Models/Access/AccessManager.php
index 51c7db0..65e0a18 100644
--- a/src/Models/Access/AccessManager.php
+++ b/src/Models/Access/AccessManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Access;
+namespace Crm\ApplicationModule\Models\Access;
 
 use Nette\Security\User;
 
diff --git a/src/Models/Access/DummyAccessProvider.php b/src/Models/Access/DummyAccessProvider.php
index da1dd5e..746e5fb 100644
--- a/src/Models/Access/DummyAccessProvider.php
+++ b/src/Models/Access/DummyAccessProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Access;
+namespace Crm\ApplicationModule\Models\Access;
 
 class DummyAccessProvider implements ProviderInterface
 {
diff --git a/src/Models/Access/ProviderInterface.php b/src/Models/Access/ProviderInterface.php
index 943a651..65b2e22 100644
--- a/src/Models/Access/ProviderInterface.php
+++ b/src/Models/Access/ProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Access;
+namespace Crm\ApplicationModule\Models\Access;
 
 interface ProviderInterface
 {
diff --git a/src/Models/Access/UnknownAccessException.php b/src/Models/Access/UnknownAccessException.php
index 9c5b855..8bffabb 100644
--- a/src/Models/Access/UnknownAccessException.php
+++ b/src/Models/Access/UnknownAccessException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Access;
+namespace Crm\ApplicationModule\Models\Access;
 
 use Throwable;
 
diff --git a/src/Models/Authenticator/AuthenticatorInterface.php b/src/Models/Authenticator/AuthenticatorInterface.php
index 8464ca7..6fc8a33 100644
--- a/src/Models/Authenticator/AuthenticatorInterface.php
+++ b/src/Models/Authenticator/AuthenticatorInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Authenticator;
+namespace Crm\ApplicationModule\Models\Authenticator;
 
 use Nette\Database\Table\ActiveRow;
 
diff --git a/src/Models/Authenticator/AuthenticatorManager.php b/src/Models/Authenticator/AuthenticatorManager.php
index a095db7..383f1eb 100644
--- a/src/Models/Authenticator/AuthenticatorManager.php
+++ b/src/Models/Authenticator/AuthenticatorManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Authenticator;
+namespace Crm\ApplicationModule\Models\Authenticator;
 
 use Crm\ApplicationModule\ResettableInterface;
 
diff --git a/src/Models/Authenticator/AuthenticatorManagerInterface.php b/src/Models/Authenticator/AuthenticatorManagerInterface.php
index 869fa4b..9b5d916 100644
--- a/src/Models/Authenticator/AuthenticatorManagerInterface.php
+++ b/src/Models/Authenticator/AuthenticatorManagerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Authenticator;
+namespace Crm\ApplicationModule\Models\Authenticator;
 
 interface AuthenticatorManagerInterface
 {
diff --git a/src/Models/Authenticator/BaseAuthenticator.php b/src/Models/Authenticator/BaseAuthenticator.php
index 83759bb..5a53777 100644
--- a/src/Models/Authenticator/BaseAuthenticator.php
+++ b/src/Models/Authenticator/BaseAuthenticator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Authenticator;
+namespace Crm\ApplicationModule\Models\Authenticator;
 
 use Crm\ApplicationModule\Hermes\HermesMessage;
 use Crm\UsersModule\Events\LoginAttemptEvent;
diff --git a/src/Models/Config/ApplicationConfig.php b/src/Models/Config/ApplicationConfig.php
index 020e81e..5d89355 100644
--- a/src/Models/Config/ApplicationConfig.php
+++ b/src/Models/Config/ApplicationConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Config;
+namespace Crm\ApplicationModule\Models\Config;
 
 use Crm\ApplicationModule\Config\Repository\ConfigsRepository;
 use Nette\Caching\Cache;
diff --git a/src/Models/Config/ConfigExtension.php b/src/Models/Config/ConfigExtension.php
index bdd8a03..d51c2a2 100644
--- a/src/Models/Config/ConfigExtension.php
+++ b/src/Models/Config/ConfigExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Config;
+namespace Crm\ApplicationModule\Models\Config;
 
 use Nette\DI\CompilerExtension;
 
@@ -13,7 +13,7 @@ public function loadConfiguration()
         $builder = $this->getContainerBuilder();
 
         $builder->addDefinition($this->prefix('config_overrider'))
-            ->setType('Crm\ApplicationModule\Config\LocalConfig')
+            ->setType('Crm\ApplicationModule\Models\Config\LocalConfig')
             ->setArguments([$config])
             ->setAutowired(true);
     }
diff --git a/src/Models/Config/ConfigsCache.php b/src/Models/Config/ConfigsCache.php
index fec6630..93bae29 100644
--- a/src/Models/Config/ConfigsCache.php
+++ b/src/Models/Config/ConfigsCache.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Config;
+namespace Crm\ApplicationModule\Models\Config;
 
 use Crm\ApplicationModule\RedisClientFactory;
 use Crm\ApplicationModule\RedisClientTrait;
diff --git a/src/Models/Config/LocalConfig.php b/src/Models/Config/LocalConfig.php
index be5eb46..54fc6f3 100644
--- a/src/Models/Config/LocalConfig.php
+++ b/src/Models/Config/LocalConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Config;
+namespace Crm\ApplicationModule\Models\Config;
 
 class LocalConfig
 {
diff --git a/src/Models/Criteria/CriteriaInterface.php b/src/Models/Criteria/CriteriaInterface.php
index 28d5611..bc12638 100644
--- a/src/Models/Criteria/CriteriaInterface.php
+++ b/src/Models/Criteria/CriteriaInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Criteria;
+namespace Crm\ApplicationModule\Models\Criteria;
 
 use Crm\SegmentModule\Models\Params\BaseParam;
 use Crm\SegmentModule\Models\Params\ParamsBag;
diff --git a/src/Models/Criteria/CriteriaParam.php b/src/Models/Criteria/CriteriaParam.php
index f57065a..4c6e603 100644
--- a/src/Models/Criteria/CriteriaParam.php
+++ b/src/Models/Criteria/CriteriaParam.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Criteria;
+namespace Crm\ApplicationModule\Models\Criteria;
 
 interface CriteriaParam
 {
diff --git a/src/Models/Criteria/CriteriaStorage.php b/src/Models/Criteria/CriteriaStorage.php
index 1b4820a..36c9085 100644
--- a/src/Models/Criteria/CriteriaStorage.php
+++ b/src/Models/Criteria/CriteriaStorage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Criteria;
+namespace Crm\ApplicationModule\Models\Criteria;
 
 class CriteriaStorage
 {
diff --git a/src/Models/Criteria/ScenarioConditionModelInterface.php b/src/Models/Criteria/ScenarioConditionModelInterface.php
index 2e19afd..17eecec 100644
--- a/src/Models/Criteria/ScenarioConditionModelInterface.php
+++ b/src/Models/Criteria/ScenarioConditionModelInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Criteria;
+namespace Crm\ApplicationModule\Models\Criteria;
 
 use Crm\ApplicationModule\Selection;
 
diff --git a/src/Models/Criteria/ScenarioCriteriaParamInterface.php b/src/Models/Criteria/ScenarioCriteriaParamInterface.php
index 70ccc04..4c5007d 100644
--- a/src/Models/Criteria/ScenarioCriteriaParamInterface.php
+++ b/src/Models/Criteria/ScenarioCriteriaParamInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Scenarios;
+namespace Crm\ApplicationModule\Models\Criteria;
 
 interface ScenarioCriteriaParamInterface
 {
diff --git a/src/Models/Criteria/ScenarioParams/BooleanParam.php b/src/Models/Criteria/ScenarioParams/BooleanParam.php
index 4b07f4a..6b3e489 100644
--- a/src/Models/Criteria/ScenarioParams/BooleanParam.php
+++ b/src/Models/Criteria/ScenarioParams/BooleanParam.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Criteria\ScenarioParams;
+namespace Crm\ApplicationModule\Models\Criteria\ScenarioParams;
 
 use Crm\ApplicationModule\Scenarios\ScenarioCriteriaParamInterface;
 
diff --git a/src/Models/Criteria/ScenarioParams/NumberParam.php b/src/Models/Criteria/ScenarioParams/NumberParam.php
index b340383..2455ff0 100644
--- a/src/Models/Criteria/ScenarioParams/NumberParam.php
+++ b/src/Models/Criteria/ScenarioParams/NumberParam.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Criteria\ScenarioParams;
+namespace Crm\ApplicationModule\Models\Criteria\ScenarioParams;
 
 use Crm\ApplicationModule\Scenarios\ScenarioCriteriaParamInterface;
 
diff --git a/src/Models/Criteria/ScenarioParams/StringLabeledArrayParam.php b/src/Models/Criteria/ScenarioParams/StringLabeledArrayParam.php
index 3b7cfeb..7781c8e 100644
--- a/src/Models/Criteria/ScenarioParams/StringLabeledArrayParam.php
+++ b/src/Models/Criteria/ScenarioParams/StringLabeledArrayParam.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Criteria\ScenarioParams;
+namespace Crm\ApplicationModule\Models\Criteria\ScenarioParams;
 
 use Crm\ApplicationModule\Scenarios\ScenarioCriteriaParamInterface;
 
diff --git a/src/Models/Criteria/ScenarioParams/TimeframeParam.php b/src/Models/Criteria/ScenarioParams/TimeframeParam.php
index f7e7c3b..494c040 100644
--- a/src/Models/Criteria/ScenarioParams/TimeframeParam.php
+++ b/src/Models/Criteria/ScenarioParams/TimeframeParam.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Criteria\ScenarioParams;
+namespace Crm\ApplicationModule\Models\Criteria\ScenarioParams;
 
 use Crm\ApplicationModule\Scenarios\ScenarioCriteriaParamInterface;
 
diff --git a/src/Models/Criteria/ScenariosCriteriaInterface.php b/src/Models/Criteria/ScenariosCriteriaInterface.php
index 265ef9a..87a5f40 100644
--- a/src/Models/Criteria/ScenariosCriteriaInterface.php
+++ b/src/Models/Criteria/ScenariosCriteriaInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Criteria;
+namespace Crm\ApplicationModule\Models\Criteria;
 
 use Crm\ApplicationModule\Scenarios\ScenarioCriteriaParamInterface;
 use Nette\Database\Table\ActiveRow;
diff --git a/src/Models/Criteria/ScenariosCriteriaStorage.php b/src/Models/Criteria/ScenariosCriteriaStorage.php
index 58cfb90..02b56cc 100644
--- a/src/Models/Criteria/ScenariosCriteriaStorage.php
+++ b/src/Models/Criteria/ScenariosCriteriaStorage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Criteria;
+namespace Crm\ApplicationModule\Models\Criteria;
 
 class ScenariosCriteriaStorage
 {
diff --git a/src/Models/DataProvider/DataProviderException.php b/src/Models/DataProvider/DataProviderException.php
index 33b4209..d8ae35a 100644
--- a/src/Models/DataProvider/DataProviderException.php
+++ b/src/Models/DataProvider/DataProviderException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\DataProvider;
+namespace Crm\ApplicationModule\Models\DataProvider;
 
 class DataProviderException extends \Exception
 {
diff --git a/src/Models/DataProvider/DataProviderInterface.php b/src/Models/DataProvider/DataProviderInterface.php
index 38afea0..952be92 100644
--- a/src/Models/DataProvider/DataProviderInterface.php
+++ b/src/Models/DataProvider/DataProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\DataProvider;
+namespace Crm\ApplicationModule\Models\DataProvider;
 
 interface DataProviderInterface
 {
diff --git a/src/Models/DataProvider/DataProviderManager.php b/src/Models/DataProvider/DataProviderManager.php
index d507d3b..7a8fd7b 100644
--- a/src/Models/DataProvider/DataProviderManager.php
+++ b/src/Models/DataProvider/DataProviderManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\DataProvider;
+namespace Crm\ApplicationModule\Models\DataProvider;
 
 class DataProviderManager
 {
diff --git a/src/Models/DataProvider/FrontendMenuDataProviderInterface.php b/src/Models/DataProvider/FrontendMenuDataProviderInterface.php
index d3a8c13..8a353c8 100644
--- a/src/Models/DataProvider/FrontendMenuDataProviderInterface.php
+++ b/src/Models/DataProvider/FrontendMenuDataProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\DataProvider;
+namespace Crm\ApplicationModule\Models\DataProvider;
 
 use Crm\ApplicationModule\Menu\MenuContainerInterface;
 
diff --git a/src/Models/Repository/ActiveRow.php b/src/Models/Database/ActiveRow.php
similarity index 87%
rename from src/Models/Repository/ActiveRow.php
rename to src/Models/Database/ActiveRow.php
index 661f465..8c09aba 100644
--- a/src/Models/Repository/ActiveRow.php
+++ b/src/Models/Database/ActiveRow.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models\Database;
 
 class ActiveRow extends \Nette\Database\Table\ActiveRow
 {
diff --git a/src/Models/Repository/ActiveRowFactory.php b/src/Models/Database/ActiveRowFactory.php
similarity index 91%
rename from src/Models/Repository/ActiveRowFactory.php
rename to src/Models/Database/ActiveRowFactory.php
index 4e63c87..be12e0f 100644
--- a/src/Models/Repository/ActiveRowFactory.php
+++ b/src/Models/Database/ActiveRowFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models\Database;
 
 use Nette\Database\Conventions\StaticConventions;
 use Nette\Database\Explorer;
diff --git a/src/Models/Repository/DateFieldsProcessorTrait.php b/src/Models/Database/DateFieldsProcessorTrait.php
similarity index 87%
rename from src/Models/Repository/DateFieldsProcessorTrait.php
rename to src/Models/Database/DateFieldsProcessorTrait.php
index 6ba1052..1aed4d1 100644
--- a/src/Models/Repository/DateFieldsProcessorTrait.php
+++ b/src/Models/Database/DateFieldsProcessorTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models\Database;
 
 trait DateFieldsProcessorTrait
 {
diff --git a/src/Models/Repository/NewTableDataMigrationTrait.php b/src/Models/Database/NewTableDataMigrationTrait.php
similarity index 97%
rename from src/Models/Repository/NewTableDataMigrationTrait.php
rename to src/Models/Database/NewTableDataMigrationTrait.php
index cee42fb..a226df3 100644
--- a/src/Models/Repository/NewTableDataMigrationTrait.php
+++ b/src/Models/Database/NewTableDataMigrationTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Remp\MailerModule\Repositories;
+namespace Crm\ApplicationModule\Models\Database;
 
 use Crm\ApplicationModule\RedisClientFactory;
 use Crm\ApplicationModule\RedisClientTrait;
diff --git a/src/Models/Repository/ReplicaConfig.php b/src/Models/Database/ReplicaConfig.php
similarity index 92%
rename from src/Models/Repository/ReplicaConfig.php
rename to src/Models/Database/ReplicaConfig.php
index 1119907..36aff39 100644
--- a/src/Models/Repository/ReplicaConfig.php
+++ b/src/Models/Database/ReplicaConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Repository;
+namespace Crm\ApplicationModule\Models\Database;
 
 use Nette\Database\Explorer;
 
diff --git a/src/Models/Repository/ReplicaManager.php b/src/Models/Database/ReplicaManager.php
similarity index 97%
rename from src/Models/Repository/ReplicaManager.php
rename to src/Models/Database/ReplicaManager.php
index c2aaa9a..391fe73 100644
--- a/src/Models/Repository/ReplicaManager.php
+++ b/src/Models/Database/ReplicaManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Repository;
+namespace Crm\ApplicationModule\Models\Database;
 
 use Nette\Database\Explorer;
 
diff --git a/src/Models/Repository/ReplicaTrait.php b/src/Models/Database/ReplicaTrait.php
similarity index 96%
rename from src/Models/Repository/ReplicaTrait.php
rename to src/Models/Database/ReplicaTrait.php
index 5b463fc..cd2522c 100644
--- a/src/Models/Repository/ReplicaTrait.php
+++ b/src/Models/Database/ReplicaTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Repository;
+namespace Crm\ApplicationModule\Models\Database;
 
 use Nette\Database\Explorer;
 
diff --git a/src/Models/Repository/Repository.php b/src/Models/Database/Repository.php
similarity index 99%
rename from src/Models/Repository/Repository.php
rename to src/Models/Database/Repository.php
index fbe27c8..ed9893f 100644
--- a/src/Models/Repository/Repository.php
+++ b/src/Models/Database/Repository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models\Database;
 
 use Closure;
 use Crm\ApplicationModule\Models\Repository\SlugColumnTrait;
diff --git a/src/Models/Repository/RetentionData.php b/src/Models/Database/RetentionData.php
similarity index 95%
rename from src/Models/Repository/RetentionData.php
rename to src/Models/Database/RetentionData.php
index 01d7298..fa98412 100644
--- a/src/Models/Repository/RetentionData.php
+++ b/src/Models/Database/RetentionData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Repository;
+namespace Crm\ApplicationModule\Models\Database;
 
 use Nette\Utils\DateTime;
 
diff --git a/src/Models/Repository/Selection.php b/src/Models/Database/Selection.php
similarity index 97%
rename from src/Models/Repository/Selection.php
rename to src/Models/Database/Selection.php
index 2dedbf3..5082927 100644
--- a/src/Models/Repository/Selection.php
+++ b/src/Models/Database/Selection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models\Database;
 
 use Crm\ApplicationModule\Repository\ReplicaManager;
 
diff --git a/src/Models/Repository/SlugColumnException.php b/src/Models/Database/SlugColumnException.php
similarity index 54%
rename from src/Models/Repository/SlugColumnException.php
rename to src/Models/Database/SlugColumnException.php
index 9c95a97..a85398a 100644
--- a/src/Models/Repository/SlugColumnException.php
+++ b/src/Models/Database/SlugColumnException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Models\Traits;
+namespace Crm\ApplicationModule\Models\Database;
 
 class SlugColumnException extends \Exception
 {
diff --git a/src/Models/Repository/SlugColumnTrait.php b/src/Models/Database/SlugColumnTrait.php
similarity index 94%
rename from src/Models/Repository/SlugColumnTrait.php
rename to src/Models/Database/SlugColumnTrait.php
index 10a2acd..d09a651 100644
--- a/src/Models/Repository/SlugColumnTrait.php
+++ b/src/Models/Database/SlugColumnTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Models\Repository;
+namespace Crm\ApplicationModule\Models\Database;
 
 use Crm\ApplicationModule\Models\Traits\SlugColumnException;
 use Nette\Utils\Strings;
diff --git a/src/Models/Event/BeforeEvent.php b/src/Models/Event/BeforeEvent.php
index 6a0075e..b9774fc 100644
--- a/src/Models/Event/BeforeEvent.php
+++ b/src/Models/Event/BeforeEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Event;
+namespace Crm\ApplicationModule\Models\Event;
 
 class BeforeEvent
 {
diff --git a/src/Models/Event/Event.php b/src/Models/Event/Event.php
index e1d7716..96ba340 100644
--- a/src/Models/Event/Event.php
+++ b/src/Models/Event/Event.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Event;
+namespace Crm\ApplicationModule\Models\Event;
 
 class Event
 {
diff --git a/src/Models/Event/EventGeneratorInterface.php b/src/Models/Event/EventGeneratorInterface.php
index bea8908..2e0b187 100644
--- a/src/Models/Event/EventGeneratorInterface.php
+++ b/src/Models/Event/EventGeneratorInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Event;
+namespace Crm\ApplicationModule\Models\Event;
 
 use DateInterval;
 
diff --git a/src/Models/Event/EventManagerInterface.php b/src/Models/Event/EventManagerInterface.php
index 9b8e4e3..75b56da 100644
--- a/src/Models/Event/EventManagerInterface.php
+++ b/src/Models/Event/EventManagerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Event;
+namespace Crm\ApplicationModule\Models\Event;
 
 interface EventManagerInterface
 {
diff --git a/src/Models/Event/EventsStorage.php b/src/Models/Event/EventsStorage.php
index a104f69..99770c1 100644
--- a/src/Models/Event/EventsStorage.php
+++ b/src/Models/Event/EventsStorage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Event;
+namespace Crm\ApplicationModule\Models\Event;
 
 class EventsStorage
 {
diff --git a/src/Models/Event/LazyEventEmitter.php b/src/Models/Event/LazyEventEmitter.php
index 940900a..fc0c9e9 100644
--- a/src/Models/Event/LazyEventEmitter.php
+++ b/src/Models/Event/LazyEventEmitter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Event;
+namespace Crm\ApplicationModule\Models\Event;
 
 use InvalidArgumentException;
 use League\Event\CallbackListener;
diff --git a/src/Models/Event/RedisEventManager.php b/src/Models/Event/RedisEventManager.php
index 23a5370..2b9413c 100644
--- a/src/Models/Event/RedisEventManager.php
+++ b/src/Models/Event/RedisEventManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Event;
+namespace Crm\ApplicationModule\Models\Event;
 
 use Crm\ApplicationModule\RedisClientFactory;
 use Crm\ApplicationModule\RedisClientTrait;
diff --git a/src/Models/ExcelFactory.php b/src/Models/Exports/ExcelFactory.php
similarity index 93%
rename from src/Models/ExcelFactory.php
rename to src/Models/Exports/ExcelFactory.php
index d198ccd..1523156 100644
--- a/src/Models/ExcelFactory.php
+++ b/src/Models/Exports/ExcelFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models\Exports;
 
 use Crm\ApplicationModule\Config\ApplicationConfig;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
diff --git a/src/Models/Graphs/Criteria.php b/src/Models/Graphs/Criteria.php
index 9c9cea5..9135644 100644
--- a/src/Models/Graphs/Criteria.php
+++ b/src/Models/Graphs/Criteria.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs;
+namespace Crm\ApplicationModule\Models\Graphs;
 
 class Criteria
 {
diff --git a/src/Models/Graphs/GraphData.php b/src/Models/Graphs/GraphData.php
index 2b93c48..2840ebd 100644
--- a/src/Models/Graphs/GraphData.php
+++ b/src/Models/Graphs/GraphData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs;
+namespace Crm\ApplicationModule\Models\Graphs;
 
 use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
 use Nette\Database\Explorer;
diff --git a/src/Models/Graphs/GraphDataItem.php b/src/Models/Graphs/GraphDataItem.php
index 799949d..3cad8f8 100644
--- a/src/Models/Graphs/GraphDataItem.php
+++ b/src/Models/Graphs/GraphDataItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs;
+namespace Crm\ApplicationModule\Models\Graphs;
 
 use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
 
diff --git a/src/Models/Graphs/Scale/DayScale.php b/src/Models/Graphs/Scale/DayScale.php
index 2a780cf..9f5d24a 100644
--- a/src/Models/Graphs/Scale/DayScale.php
+++ b/src/Models/Graphs/Scale/DayScale.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs\Scale;
+namespace Crm\ApplicationModule\Models\Graphs\Scale;
 
 use DateTime;
 
diff --git a/src/Models/Graphs/Scale/MonthScale.php b/src/Models/Graphs/Scale/MonthScale.php
index 83e0888..6d2f560 100644
--- a/src/Models/Graphs/Scale/MonthScale.php
+++ b/src/Models/Graphs/Scale/MonthScale.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs\Scale;
+namespace Crm\ApplicationModule\Models\Graphs\Scale;
 
 use DateTime;
 
diff --git a/src/Models/Graphs/Scale/Mysql/DayScale.php b/src/Models/Graphs/Scale/Mysql/DayScale.php
index fdd8c11..c0f5df6 100644
--- a/src/Models/Graphs/Scale/Mysql/DayScale.php
+++ b/src/Models/Graphs/Scale/Mysql/DayScale.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs\Scale\Mysql;
+namespace Crm\ApplicationModule\Models\Graphs\Scale\Mysql;
 
 use Crm\ApplicationModule\Graphs\Criteria;
 use Nette\Database\Explorer;
diff --git a/src/Models/Graphs/Scale/Mysql/MonthScale.php b/src/Models/Graphs/Scale/Mysql/MonthScale.php
index bfd9a15..877d146 100644
--- a/src/Models/Graphs/Scale/Mysql/MonthScale.php
+++ b/src/Models/Graphs/Scale/Mysql/MonthScale.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs\Scale\Mysql;
+namespace Crm\ApplicationModule\Models\Graphs\Scale\Mysql;
 
 use Crm\ApplicationModule\Graphs\Criteria;
 use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
diff --git a/src/Models/Graphs/Scale/Mysql/RangeScaleFactory.php b/src/Models/Graphs/Scale/Mysql/RangeScaleFactory.php
index 52b43c2..273297c 100644
--- a/src/Models/Graphs/Scale/Mysql/RangeScaleFactory.php
+++ b/src/Models/Graphs/Scale/Mysql/RangeScaleFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs\Scale\Mysql;
+namespace Crm\ApplicationModule\Models\Graphs\Scale\Mysql;
 
 use Crm\ApplicationModule\Graphs\ScaleFactory;
 use Nette\Database\Explorer;
diff --git a/src/Models/Graphs/Scale/Mysql/WeekScale.php b/src/Models/Graphs/Scale/Mysql/WeekScale.php
index 137ebbf..c028735 100644
--- a/src/Models/Graphs/Scale/Mysql/WeekScale.php
+++ b/src/Models/Graphs/Scale/Mysql/WeekScale.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs\Scale\Mysql;
+namespace Crm\ApplicationModule\Models\Graphs\Scale\Mysql;
 
 use Crm\ApplicationModule\Graphs\Criteria;
 use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
diff --git a/src/Models/Graphs/Scale/Mysql/YearScale.php b/src/Models/Graphs/Scale/Mysql/YearScale.php
index 6b41796..4a788cd 100644
--- a/src/Models/Graphs/Scale/Mysql/YearScale.php
+++ b/src/Models/Graphs/Scale/Mysql/YearScale.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs\Scale\Mysql;
+namespace Crm\ApplicationModule\Models\Graphs\Scale\Mysql;
 
 use Crm\ApplicationModule\Graphs\Criteria;
 use Crm\ApplicationModule\Graphs\Scale\ScaleBase;
diff --git a/src/Models/Graphs/Scale/ScaleBase.php b/src/Models/Graphs/Scale/ScaleBase.php
index 2a61464..b8502ed 100644
--- a/src/Models/Graphs/Scale/ScaleBase.php
+++ b/src/Models/Graphs/Scale/ScaleBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs\Scale;
+namespace Crm\ApplicationModule\Models\Graphs\Scale;
 
 use Nette\Database\ResultSet;
 
diff --git a/src/Models/Graphs/Scale/ScaleInterface.php b/src/Models/Graphs/Scale/ScaleInterface.php
index d4ddc38..f12c7a4 100644
--- a/src/Models/Graphs/Scale/ScaleInterface.php
+++ b/src/Models/Graphs/Scale/ScaleInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs\Scale;
+namespace Crm\ApplicationModule\Models\Graphs\Scale;
 
 use Crm\ApplicationModule\Graphs\Criteria;
 
diff --git a/src/Models/Graphs/Scale/WeekScale.php b/src/Models/Graphs/Scale/WeekScale.php
index d91c808..ca49423 100644
--- a/src/Models/Graphs/Scale/WeekScale.php
+++ b/src/Models/Graphs/Scale/WeekScale.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs\Scale;
+namespace Crm\ApplicationModule\Models\Graphs\Scale;
 
 use DateTime;
 
diff --git a/src/Models/Graphs/ScaleFactory.php b/src/Models/Graphs/ScaleFactory.php
index 3fe3feb..5593cb5 100644
--- a/src/Models/Graphs/ScaleFactory.php
+++ b/src/Models/Graphs/ScaleFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Graphs;
+namespace Crm\ApplicationModule\Models\Graphs;
 
 use Crm\ApplicationModule\Graphs\Scale\Mysql\RangeScaleFactory as MysqlScaleFactory;
 use Crm\ApplicationModule\Graphs\Scale\ScaleInterface;
diff --git a/src/Models/LogRedact.php b/src/Models/LogRedact.php
index 9d11223..440599f 100644
--- a/src/Models/LogRedact.php
+++ b/src/Models/LogRedact.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models;
 
 use Monolog\LogRecord;
 
diff --git a/src/Models/Menu/MenuContainer.php b/src/Models/Menu/MenuContainer.php
index b78fc9c..4d5007d 100644
--- a/src/Models/Menu/MenuContainer.php
+++ b/src/Models/Menu/MenuContainer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Menu;
+namespace Crm\ApplicationModule\Models\Menu;
 
 use Tracy\Debugger;
 
diff --git a/src/Models/Menu/MenuContainerInterface.php b/src/Models/Menu/MenuContainerInterface.php
index 3b45862..708f34f 100644
--- a/src/Models/Menu/MenuContainerInterface.php
+++ b/src/Models/Menu/MenuContainerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Menu;
+namespace Crm\ApplicationModule\Models\Menu;
 
 interface MenuContainerInterface
 {
diff --git a/src/Models/Menu/MenuItem.php b/src/Models/Menu/MenuItem.php
index e0d42e6..2da0fb6 100644
--- a/src/Models/Menu/MenuItem.php
+++ b/src/Models/Menu/MenuItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Menu;
+namespace Crm\ApplicationModule\Models\Menu;
 
 class MenuItem implements MenuItemInterface
 {
diff --git a/src/Models/Menu/MenuItemInterface.php b/src/Models/Menu/MenuItemInterface.php
index 01ffa26..4f9468d 100644
--- a/src/Models/Menu/MenuItemInterface.php
+++ b/src/Models/Menu/MenuItemInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Menu;
+namespace Crm\ApplicationModule\Models\Menu;
 
 interface MenuItemInterface
 {
diff --git a/src/Models/NowTrait.php b/src/Models/NowTrait.php
index fe21e4d..69f4e84 100644
--- a/src/Models/NowTrait.php
+++ b/src/Models/NowTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models;
 
 /**
  * Trait serving as getter and setter of $now value, useful for testing and controlling time in components.
diff --git a/src/Models/RedisClientFactory.php b/src/Models/Redis/RedisClientFactory.php
similarity index 97%
rename from src/Models/RedisClientFactory.php
rename to src/Models/Redis/RedisClientFactory.php
index 98b1fb1..2121d5e 100644
--- a/src/Models/RedisClientFactory.php
+++ b/src/Models/Redis/RedisClientFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models\Redis;
 
 use Predis\Client;
 
diff --git a/src/Models/RedisClientTrait.php b/src/Models/Redis/RedisClientTrait.php
similarity index 95%
rename from src/Models/RedisClientTrait.php
rename to src/Models/Redis/RedisClientTrait.php
index ad3b348..14ff376 100644
--- a/src/Models/RedisClientTrait.php
+++ b/src/Models/Redis/RedisClientTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models\Redis;
 
 use Predis\Client;
 
diff --git a/src/Models/RedisClientTraitException.php b/src/Models/Redis/RedisClientTraitException.php
similarity index 58%
rename from src/Models/RedisClientTraitException.php
rename to src/Models/Redis/RedisClientTraitException.php
index 2d98c36..9225687 100644
--- a/src/Models/RedisClientTraitException.php
+++ b/src/Models/Redis/RedisClientTraitException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models\Redis;
 
 class RedisClientTraitException extends \Exception
 {
diff --git a/src/Models/Request.php b/src/Models/Request.php
index d8d043d..91aeb9d 100644
--- a/src/Models/Request.php
+++ b/src/Models/Request.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models;
 
 // hnusna skareda staticka vec! fuj!
 class Request
diff --git a/src/Models/ResettableInterface.php b/src/Models/ResettableInterface.php
index 740db28..d1d8154 100644
--- a/src/Models/ResettableInterface.php
+++ b/src/Models/ResettableInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule;
+namespace Crm\ApplicationModule\Models;
 
 interface ResettableInterface
 {
diff --git a/src/Models/Snippet/Control/Snippet.php b/src/Models/Snippet/Control/Snippet.php
index 408283e..b1e3d35 100644
--- a/src/Models/Snippet/Control/Snippet.php
+++ b/src/Models/Snippet/Control/Snippet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Snippet\Control;
+namespace Crm\ApplicationModule\Models\Snippet\Control;
 
 use Crm\ApplicationModule\Snippet\SnippetRenderer;
 use Nette\Application\UI\Control;
diff --git a/src/Models/Snippet/Control/SnippetFactory.php b/src/Models/Snippet/Control/SnippetFactory.php
index bab1ebf..c251ac8 100644
--- a/src/Models/Snippet/Control/SnippetFactory.php
+++ b/src/Models/Snippet/Control/SnippetFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Snippet\Control;
+namespace Crm\ApplicationModule\Models\Snippet\Control;
 
 interface SnippetFactory
 {
diff --git a/src/Models/Snippet/SnippetRenderer.php b/src/Models/Snippet/SnippetRenderer.php
index b938c25..fb9bf1f 100644
--- a/src/Models/Snippet/SnippetRenderer.php
+++ b/src/Models/Snippet/SnippetRenderer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Snippet;
+namespace Crm\ApplicationModule\Models\Snippet;
 
 use Contributte\Translation\Translator;
 use Crm\ApplicationModule\Snippet\Repository\SnippetsRepository;
diff --git a/src/Models/User/DeleteUserData.php b/src/Models/User/DeleteUserData.php
index 5d576a0..ae6967f 100644
--- a/src/Models/User/DeleteUserData.php
+++ b/src/Models/User/DeleteUserData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\User;
+namespace Crm\ApplicationModule\Models\User;
 
 use Nette\Localization\Translator;
 use Tracy\Debugger;
diff --git a/src/Models/User/DownloadUserData.php b/src/Models/User/DownloadUserData.php
index 12969b9..a3c2058 100644
--- a/src/Models/User/DownloadUserData.php
+++ b/src/Models/User/DownloadUserData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\User;
+namespace Crm\ApplicationModule\Models\User;
 
 class DownloadUserData
 {
diff --git a/src/Models/User/RedisUserDataStorage.php b/src/Models/User/RedisUserDataStorage.php
index 98283f8..4dbe438 100644
--- a/src/Models/User/RedisUserDataStorage.php
+++ b/src/Models/User/RedisUserDataStorage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\User;
+namespace Crm\ApplicationModule\Models\User;
 
 use Crm\ApplicationModule\RedisClientFactory;
 use Crm\ApplicationModule\RedisClientTrait;
diff --git a/src/Models/User/UserDataProviderInterface.php b/src/Models/User/UserDataProviderInterface.php
index 9838743..3da7467 100644
--- a/src/Models/User/UserDataProviderInterface.php
+++ b/src/Models/User/UserDataProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\User;
+namespace Crm\ApplicationModule\Models\User;
 
 interface UserDataProviderInterface
 {
diff --git a/src/Models/User/UserDataRegistrator.php b/src/Models/User/UserDataRegistrator.php
index dae43ce..1131aa5 100644
--- a/src/Models/User/UserDataRegistrator.php
+++ b/src/Models/User/UserDataRegistrator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\User;
+namespace Crm\ApplicationModule\Models\User;
 
 class UserDataRegistrator
 {
diff --git a/src/Models/User/UserDataStorageInterface.php b/src/Models/User/UserDataStorageInterface.php
index 802b2e3..8eb4b7b 100644
--- a/src/Models/User/UserDataStorageInterface.php
+++ b/src/Models/User/UserDataStorageInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\User;
+namespace Crm\ApplicationModule\Models\User;
 
 interface UserDataStorageInterface
 {
diff --git a/src/Models/Widget/BaseLazyWidget.php b/src/Models/Widget/BaseLazyWidget.php
index 4148674..3d87e81 100644
--- a/src/Models/Widget/BaseLazyWidget.php
+++ b/src/Models/Widget/BaseLazyWidget.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Widget;
+namespace Crm\ApplicationModule\Models\Widget;
 
 use Crm\ApplicationModule\Components\SimpleWidgetFactoryInterface;
 use Crm\ApplicationModule\Snippet\Control\SnippetFactory;
diff --git a/src/Models/Widget/BaseWidget.php b/src/Models/Widget/BaseWidget.php
index 5245ea0..4abca01 100644
--- a/src/Models/Widget/BaseWidget.php
+++ b/src/Models/Widget/BaseWidget.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Widget;
+namespace Crm\ApplicationModule\Models\Widget;
 
 use Crm\ApplicationModule\Components\SimpleWidgetFactoryInterface;
 use Crm\ApplicationModule\Snippet\Control\SnippetFactory;
diff --git a/src/Models/Widget/LazyWidgetManager.php b/src/Models/Widget/LazyWidgetManager.php
index 0d13a06..2c269ef 100644
--- a/src/Models/Widget/LazyWidgetManager.php
+++ b/src/Models/Widget/LazyWidgetManager.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Crm\ApplicationModule\Widget;
+namespace Crm\ApplicationModule\Models\Widget;
 
 use Nette\Caching\Cache;
 use Nette\Caching\Storage;
diff --git a/src/Models/Widget/LazyWidgetManagerInterface.php b/src/Models/Widget/LazyWidgetManagerInterface.php
index 939f083..68bde14 100644
--- a/src/Models/Widget/LazyWidgetManagerInterface.php
+++ b/src/Models/Widget/LazyWidgetManagerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Widget;
+namespace Crm\ApplicationModule\Models\Widget;
 
 interface LazyWidgetManagerInterface
 {
diff --git a/src/Models/Widget/WidgetFactoryInterface.php b/src/Models/Widget/WidgetFactoryInterface.php
index 184a078..2ab3248 100644
--- a/src/Models/Widget/WidgetFactoryInterface.php
+++ b/src/Models/Widget/WidgetFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Widget;
+namespace Crm\ApplicationModule\Models\Widget;
 
 interface WidgetFactoryInterface
 {
diff --git a/src/Models/Widget/WidgetInterface.php b/src/Models/Widget/WidgetInterface.php
index 2e07581..56f1cb5 100644
--- a/src/Models/Widget/WidgetInterface.php
+++ b/src/Models/Widget/WidgetInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Widget;
+namespace Crm\ApplicationModule\Models\Widget;
 
 use Nette\ComponentModel\IComponent;
 
diff --git a/src/Models/Widget/WidgetManager.php b/src/Models/Widget/WidgetManager.php
index 14ce07d..58f96e1 100644
--- a/src/Models/Widget/WidgetManager.php
+++ b/src/Models/Widget/WidgetManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Widget;
+namespace Crm\ApplicationModule\Models\Widget;
 
 /**
  * @deprecated . Use Crm\ApplicationModule\Widget\LazyWidgetManager
diff --git a/src/Models/Widget/WidgetManagerInterface.php b/src/Models/Widget/WidgetManagerInterface.php
index dcf8ea3..692726b 100644
--- a/src/Models/Widget/WidgetManagerInterface.php
+++ b/src/Models/Widget/WidgetManagerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Widget;
+namespace Crm\ApplicationModule\Models\Widget;
 
 interface WidgetManagerInterface
 {
diff --git a/src/Populators/AbstractPopulator.php b/src/Populators/AbstractPopulator.php
index 86b42ca..1877082 100644
--- a/src/Populators/AbstractPopulator.php
+++ b/src/Populators/AbstractPopulator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Populator;
+namespace Crm\ApplicationModule\Populators;
 
 use Crm\ApplicationModule\Commands\PopulatorCommand;
 use Faker\Generator;
diff --git a/src/auditlog/AuditLogRepository.php b/src/Repositories/AuditLogRepository.php
similarity index 96%
rename from src/auditlog/AuditLogRepository.php
rename to src/Repositories/AuditLogRepository.php
index a44d00c..00b60b0 100644
--- a/src/auditlog/AuditLogRepository.php
+++ b/src/Repositories/AuditLogRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Repository;
+namespace Crm\ApplicationModule\Repositories;
 
 use Crm\ApplicationModule\Repository;
 use Crm\ApplicationModule\Selection;
diff --git a/src/Models/Cache/CacheRepository.php b/src/Repositories/CacheRepository.php
similarity index 97%
rename from src/Models/Cache/CacheRepository.php
rename to src/Repositories/CacheRepository.php
index c9ad475..40155f5 100644
--- a/src/Models/Cache/CacheRepository.php
+++ b/src/Repositories/CacheRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Cache;
+namespace Crm\ApplicationModule\Repositories;
 
 use Crm\ApplicationModule\Repository;
 use Nette\Database\Explorer;
diff --git a/src/Models/Config/Repository/ConfigCategoriesRepository.php b/src/Repositories/ConfigCategoriesRepository.php
similarity index 94%
rename from src/Models/Config/Repository/ConfigCategoriesRepository.php
rename to src/Repositories/ConfigCategoriesRepository.php
index 2bda5eb..3bc0489 100644
--- a/src/Models/Config/Repository/ConfigCategoriesRepository.php
+++ b/src/Repositories/ConfigCategoriesRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Config\Repository;
+namespace Crm\ApplicationModule\Repositories;
 
 use Crm\ApplicationModule\Repository;
 use DateTime;
diff --git a/src/Models/Config/Repository/ConfigsRepository.php b/src/Repositories/ConfigsRepository.php
similarity index 97%
rename from src/Models/Config/Repository/ConfigsRepository.php
rename to src/Repositories/ConfigsRepository.php
index ca41197..de76895 100644
--- a/src/Models/Config/Repository/ConfigsRepository.php
+++ b/src/Repositories/ConfigsRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Config\Repository;
+namespace Crm\ApplicationModule\Repositories;
 
 use Crm\ApplicationModule\Events\ConfigUpdatedEvent;
 use Crm\ApplicationModule\Repository;
diff --git a/src/Hermes/HermesTasksRepository.php b/src/Repositories/HermesTasksRepository.php
similarity index 97%
rename from src/Hermes/HermesTasksRepository.php
rename to src/Repositories/HermesTasksRepository.php
index 54057cd..199d17e 100644
--- a/src/Hermes/HermesTasksRepository.php
+++ b/src/Repositories/HermesTasksRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Repository;
+namespace Crm\ApplicationModule\Repositories;
 
 use Crm\ApplicationModule\Repository;
 use Nette\Utils\DateTime;
diff --git a/src/Models/Measurements/Repository/MeasurementGroupValuesRepository.php b/src/Repositories/MeasurementGroupValuesRepository.php
similarity index 97%
rename from src/Models/Measurements/Repository/MeasurementGroupValuesRepository.php
rename to src/Repositories/MeasurementGroupValuesRepository.php
index 9b3e506..7229a89 100644
--- a/src/Models/Measurements/Repository/MeasurementGroupValuesRepository.php
+++ b/src/Repositories/MeasurementGroupValuesRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Models\Measurements\Repository;
+namespace Crm\ApplicationModule\Repositories;
 
 use Crm\ApplicationModule\Models\Measurements\PointAggregate;
 use Crm\ApplicationModule\Repository;
diff --git a/src/Models/Measurements/Repository/MeasurementGroupsRepository.php b/src/Repositories/MeasurementGroupsRepository.php
similarity index 95%
rename from src/Models/Measurements/Repository/MeasurementGroupsRepository.php
rename to src/Repositories/MeasurementGroupsRepository.php
index cc4f71d..4972ee7 100644
--- a/src/Models/Measurements/Repository/MeasurementGroupsRepository.php
+++ b/src/Repositories/MeasurementGroupsRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Models\Measurements\Repository;
+namespace Crm\ApplicationModule\Repositories;
 
 use Crm\ApplicationModule\Repository;
 use Crm\ApplicationModule\Selection;
diff --git a/src/Models/Measurements/Repository/MeasurementValuesRepository.php b/src/Repositories/MeasurementValuesRepository.php
similarity index 97%
rename from src/Models/Measurements/Repository/MeasurementValuesRepository.php
rename to src/Repositories/MeasurementValuesRepository.php
index d1dbb8f..c896cf8 100644
--- a/src/Models/Measurements/Repository/MeasurementValuesRepository.php
+++ b/src/Repositories/MeasurementValuesRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Models\Measurements\Repository;
+namespace Crm\ApplicationModule\Repositories;
 
 use Crm\ApplicationModule\ActiveRow;
 use Crm\ApplicationModule\Models\Measurements\PointAggregate;
diff --git a/src/Models/Measurements/Repository/MeasurementsRepository.php b/src/Repositories/MeasurementsRepository.php
similarity index 94%
rename from src/Models/Measurements/Repository/MeasurementsRepository.php
rename to src/Repositories/MeasurementsRepository.php
index 0f80bc9..d910983 100644
--- a/src/Models/Measurements/Repository/MeasurementsRepository.php
+++ b/src/Repositories/MeasurementsRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Models\Measurements\Repository;
+namespace Crm\ApplicationModule\Repositories;
 
 use Crm\ApplicationModule\Models\Measurements\BaseMeasurement;
 use Crm\ApplicationModule\Repository;
diff --git a/src/Models/Snippet/Repository/SnippetsRepository.php b/src/Repositories/SnippetsRepository.php
similarity index 96%
rename from src/Models/Snippet/Repository/SnippetsRepository.php
rename to src/Repositories/SnippetsRepository.php
index deb6c1e..0cde22b 100644
--- a/src/Models/Snippet/Repository/SnippetsRepository.php
+++ b/src/Repositories/SnippetsRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Snippet\Repository;
+namespace Crm\ApplicationModule\Repositories;
 
 use Crm\ApplicationModule\Repository;
 use Nette\Database\Table\ActiveRow;
diff --git a/src/Tests/Models/Config/ApplicationConfigTest.php b/src/Tests/Models/Config/ApplicationConfigTest.php
index bb1b209..6a84b5a 100644
--- a/src/Tests/Models/Config/ApplicationConfigTest.php
+++ b/src/Tests/Models/Config/ApplicationConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crm\ApplicationModule\Models\Config\Tests;
+namespace Crm\ApplicationModule\Tests\Models\Config;
 
 use Crm\ApplicationModule\Config\ApplicationConfig;
 use Crm\ApplicationModule\Config\LocalConfig;