diff --git a/.env.dist b/.env.dist
index 33e0dc9..38f9352 100644
--- a/.env.dist
+++ b/.env.dist
@@ -10,10 +10,10 @@
 
 # PROD / DEV
 APP_MODE=DEV
-APP_NODES_FILE=application/config/app.php
-CLI_NODES_FILE=application/config/app-cli.php
-APP_COMPONENTS_FILE=application/config/components.php
-CONTAINER_INI=application/config/container.php
+APP_NODES_FILE=config/app.php
+CLI_NODES_FILE=config/app-cli.php
+APP_COMPONENTS_FILE=config/components.php
+CONTAINER_INI=config/container.php
 CONTAINER_CACHE=var/cache/container
 
 # Default page
diff --git a/application/base/Domain/ValueObject/.gitkeep b/application/base/Domain/ValueObject/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/application/base/Controllers/AbstractHandler.php b/application/base/Handlers/AbstractHandler.php
similarity index 98%
rename from application/base/Controllers/AbstractHandler.php
rename to application/base/Handlers/AbstractHandler.php
index ede564c..69ff2a1 100644
--- a/application/base/Controllers/AbstractHandler.php
+++ b/application/base/Handlers/AbstractHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Base\Controllers;
+namespace Base\Handlers;
 
 use Laminas\Diactoros\Response\HtmlResponse;
 use Laminas\Diactoros\Response\JsonResponse;
diff --git a/application/bin/cli b/application/bin/cli
index 4e9e09c..ff6d2f0 100644
--- a/application/bin/cli
+++ b/application/bin/cli
@@ -1,3 +1,3 @@
 #!/usr/bin/php
 <?php
-require_once dirname(__FILE__).'/console.php';
+require_once dirname(__FILE__).'/cli.php';
diff --git a/application/bin/console.php b/application/bin/cli.php
similarity index 100%
rename from application/bin/console.php
rename to application/bin/cli.php
diff --git a/application/bin/console b/application/bin/console
deleted file mode 100644
index 4e9e09c..0000000
--- a/application/bin/console
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/php
-<?php
-require_once dirname(__FILE__).'/console.php';
diff --git a/application/config/container.php b/application/config/container.php
deleted file mode 100644
index bcef79a..0000000
--- a/application/config/container.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return [
-	"application/config/container/services.php",
-	"application/config/container/settings.php",
-];
diff --git a/application/config/app-cli.php b/config/app-cli.php
similarity index 82%
rename from application/config/app-cli.php
rename to config/app-cli.php
index 52483da..c54a82d 100644
--- a/application/config/app-cli.php
+++ b/config/app-cli.php
@@ -1,7 +1,7 @@
 <?php
 # Example:
 # ['key'=>'/', "action"=>"App\\Main\\Controllers\\IndexController", "method"=>"index"],
-# ['key'=>'', 'router'=>'application/config/routes-cli/routes.php'],
+# ['key'=>'', 'router'=>'config/routes-cli/routes.php'],
 # ['key'=>'/', 'router'=>[]],
 
 return [
diff --git a/application/config/app.php b/config/app.php
similarity index 62%
rename from application/config/app.php
rename to config/app.php
index e0ed3f8..b768540 100644
--- a/application/config/app.php
+++ b/config/app.php
@@ -5,9 +5,9 @@
 
 # Example:
 # ['key'=>'/', "action"=>"App\\Main\\Controllers\\IndexController", "method"=>"index"],
-# ['key'=>'/', 'router'=>'application/config/routes/main/routes.php'],
+# ['key'=>'/', 'router'=>'config/routes/main/routes.php'],
 # ['key'=>'/', 'router'=>[]],
 
 return [
-	['key'=>'/', 'router'=>'application/config/routes/routes.php'],
+	['key'=>'/', 'router'=>'config/routes/routes.php'],
 ];
diff --git a/application/config/components.php b/config/components.php
similarity index 63%
rename from application/config/components.php
rename to config/components.php
index 4259ea6..77b97ee 100644
--- a/application/config/components.php
+++ b/config/components.php
@@ -4,17 +4,17 @@ return [
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию RouterInterface или сам экземпляр класса
 	 */
-	\Rmphp\Foundation\RouterInterface::class => 'application/config/components/routerFactory.php',
+	\Rmphp\Foundation\RouterInterface::class => 'config/components/routerFactory.php',
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию TemplateInterface или сам экземпляр класса
 	 */
-	\Rmphp\Foundation\TemplateInterface::class => 'application/config/components/templateFactory.php',
+	\Rmphp\Foundation\TemplateInterface::class => 'config/components/templateFactory.php',
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию PSR-3 LoggerInterface или сам экземпляр класса
 	 */
-	\Psr\Log\LoggerInterface::class => 'application/config/components/loggerFactory.php',
+	\Psr\Log\LoggerInterface::class => 'config/components/loggerFactory.php',
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию PSR-11 ContainerInterface или сам экземпляр класса
 	 */
-	\Psr\Container\ContainerInterface::class => 'application/config/components/containerFactory.php',
+	\Psr\Container\ContainerInterface::class => 'config/components/containerFactory.php',
 ];
diff --git a/application/config/components/containerFactory.php b/config/components/containerFactory.php
similarity index 65%
rename from application/config/components/containerFactory.php
rename to config/components/containerFactory.php
index c01cd8b..e27eeee 100644
--- a/application/config/components/containerFactory.php
+++ b/config/components/containerFactory.php
@@ -2,18 +2,18 @@
 
 use DI\ContainerBuilder;
 
-$containerIni = (getenv("CONTAINER_INI")) ?: "application/config/container.php";
+$containerIni = (getenv("CONTAINER_INI")) ?: "config/container.php";
 $containerCache = (getenv("CONTAINER_CACHE")) ?: "var/cache/container";
 
-$dependencies = require dirname(__DIR__,3).'/'.$containerIni;
+$dependencies = require dirname(__DIR__,2).'/'.$containerIni;
 
 $dependenciesCollection = array_map(function ($dependenciesFile){
-	return require dirname(__DIR__,3)."/".$dependenciesFile;
+	return require dirname(__DIR__,2)."/".$dependenciesFile;
 }, $dependencies);
 
 try {
 	$builder = new ContainerBuilder();
-	if(getenv("APP_MODE") == "PROD") $builder->enableCompilation(dirname(__DIR__,3)."/".$containerCache);
+	if(getenv("APP_MODE") == "PROD") $builder->enableCompilation(dirname(__DIR__,2)."/".$containerCache);
 	$builder->addDefinitions(array_replace_recursive(...$dependenciesCollection));
 	return $builder->build();
 } catch (Exception $e) {echo $e->getMessage();}
diff --git a/application/config/components/loggerFactory.php b/config/components/loggerFactory.php
similarity index 57%
rename from application/config/components/loggerFactory.php
rename to config/components/loggerFactory.php
index 01598a6..e18b6bf 100644
--- a/application/config/components/loggerFactory.php
+++ b/config/components/loggerFactory.php
@@ -1,2 +1,2 @@
 <?php
-return (new \Monolog\Logger('system'))->pushHandler(new \Monolog\Handler\StreamHandler(dirname(__DIR__, 3).'/var/logs/log'.date('Ymd').'.log'));
+return (new \Monolog\Logger('system'))->pushHandler(new \Monolog\Handler\StreamHandler(dirname(__DIR__, 2).'/var/logs/log'.date('Ymd').'.log'));
diff --git a/application/config/components/routerFactory.php b/config/components/routerFactory.php
similarity index 100%
rename from application/config/components/routerFactory.php
rename to config/components/routerFactory.php
diff --git a/application/config/components/templateFactory.php b/config/components/templateFactory.php
similarity index 100%
rename from application/config/components/templateFactory.php
rename to config/components/templateFactory.php
diff --git a/config/container.php b/config/container.php
new file mode 100644
index 0000000..f336b2e
--- /dev/null
+++ b/config/container.php
@@ -0,0 +1,5 @@
+<?php
+return [
+	"config/container/services.php",
+	"config/container/settings.php",
+];
diff --git a/application/config/container/services.php b/config/container/services.php
similarity index 100%
rename from application/config/container/services.php
rename to config/container/services.php
diff --git a/application/config/container/settings.php b/config/container/settings.php
similarity index 100%
rename from application/config/container/settings.php
rename to config/container/settings.php
diff --git a/application/config/routes/99-main.yaml b/config/routes/99-main.yaml
similarity index 100%
rename from application/config/routes/99-main.yaml
rename to config/routes/99-main.yaml
diff --git a/application/config/routes/routes.php b/config/routes/routes.php
similarity index 84%
rename from application/config/routes/routes.php
rename to config/routes/routes.php
index fdeb878..c86bf65 100644
--- a/application/config/routes/routes.php
+++ b/config/routes/routes.php
@@ -1,6 +1,6 @@
 <?php
 
-$cashFile = preg_replace("'.application.*$'",'', __DIR__).'/var/routes/'.md5(__FILE__);
+$cashFile = preg_replace("'.config.*$'",'', __DIR__).'/var/routes/'.md5(__FILE__);
 
 if(getenv("APP_MODE") == "PROD" && file_exists($cashFile)){
 	return unserialize(file_get_contents($cashFile));
diff --git a/src/Infrastructure/Handlers/IndexHandler.php b/src/Infrastructure/Handlers/IndexHandler.php
index 3db3211..e75d021 100644
--- a/src/Infrastructure/Handlers/IndexHandler.php
+++ b/src/Infrastructure/Handlers/IndexHandler.php
@@ -8,7 +8,7 @@
 
 namespace App\Infrastructure\Handlers;
 
-use Base\Controllers\AbstractHandler;
+use Base\Handlers\AbstractHandler;
 use Psr\Http\Message\ResponseInterface;
 
 class IndexHandler extends AbstractHandler {