diff --git a/application/config/factories/templateFactory.php b/application/config/factories/templateFactory.php
index 9e0c67a..4b1cf58 100644
--- a/application/config/factories/templateFactory.php
+++ b/application/config/factories/templateFactory.php
@@ -1,4 +1,4 @@
 <?php
 return (new \Rmphp\Content\Content('/application/src/Infrastructure/templates/base.tpl'))->setSubtemplatePath('/application/src/Infrastructure/templates/')->setSubtemplatePathAlias([
-	"main" => "/src/Main/Infrastructure/templates",
+	"main" => "/src/Infrastructure/templates",
 ]);
diff --git a/application/config/routes/90-main.yaml b/application/config/routes/90-main.yaml
index 5ed7763..9f9eaf4 100644
--- a/application/config/routes/90-main.yaml
+++ b/application/config/routes/90-main.yaml
@@ -1,13 +1,13 @@
 # Index
 - key: "/"
   routes:
-      - action: "App\\Main\\Infrastructure\\Controllers\\IndexController"
+      - action: "App\\Infrastructure\\Controllers\\IndexController"
         method: "index"
         params: ""
 
 # Empty
 - key: "<@any>"
   routes:
-      - action: "App\\Main\\Infrastructure\\Controllers\\IndexController"
+      - action: "App\\nfrastructure\\Controllers\\IndexController"
         method: "emptyAction"
         params: ""
diff --git a/application/config/routes/routes.php b/application/config/routes/routes.php
index 1151ccc..a02ee31 100644
--- a/application/config/routes/routes.php
+++ b/application/config/routes/routes.php
@@ -1,17 +1,15 @@
 <?php
 
-if(getenv("APP_MODE") == "PROD" && file_exists(dirname(__DIR__,3).'/var/routes/routes')){
-	return unserialize(file_get_contents(dirname(__DIR__,3).'/var/routes/routes'));
+if(getenv("APP_MODE") == "PROD" && file_exists(dirname(__DIR__,3).'/var/routes/routes-main')){
+	return unserialize(file_get_contents(dirname(__DIR__,3).'/var/routes/routes-main'));
 } else {
 	$routesCollection = array_map(function ($routesFile){
 		return file_get_contents($routesFile).PHP_EOL;
-	}, array_merge(glob(__DIR__."/*/{*.yaml}", GLOB_BRACE), glob(__DIR__."/{*.yaml}", GLOB_BRACE)));
+	}, glob(__DIR__."/{*.yaml}", GLOB_BRACE));
 
 	$routes = yaml_parse(implode($routesCollection));
 
-	if(getenv("APP_MODE") == "PROD") {
-		if (!is_dir(dirname(__DIR__, 3).'/var/routes')) mkdir(dirname(__DIR__, 3).'/var/routes', 0777, true);
-		file_put_contents(dirname(__DIR__, 3).'/var/routes/routes', serialize($routes));
-	}
+	if (!is_dir(dirname(__DIR__, 3).'/var/routes')) mkdir(dirname(__DIR__, 3).'/var/routes', 0777, true);
+	file_put_contents(dirname(__DIR__, 3).'/var/routes/routes-main', serialize($routes));
 	return $routes;
 }
diff --git a/application/config/routes/main/.gitkeep b/src/Application/.gitkeep
similarity index 100%
rename from application/config/routes/main/.gitkeep
rename to src/Application/.gitkeep
diff --git a/src/Main/Application/.gitkeep b/src/Domain/Entity/.gitkeep
similarity index 100%
rename from src/Main/Application/.gitkeep
rename to src/Domain/Entity/.gitkeep
diff --git a/src/Main/Domain/Entity/.gitkeep b/src/Domain/Repository/.gitkeep
similarity index 100%
rename from src/Main/Domain/Entity/.gitkeep
rename to src/Domain/Repository/.gitkeep
diff --git a/src/Main/Domain/Repository/.gitkeep b/src/Domain/ValueObject/.gitkeep
similarity index 100%
rename from src/Main/Domain/Repository/.gitkeep
rename to src/Domain/ValueObject/.gitkeep
diff --git a/src/Main/Infrastructure/Controllers/IndexController.php b/src/Infrastructure/Controllers/IndexController.php
similarity index 68%
rename from src/Main/Infrastructure/Controllers/IndexController.php
rename to src/Infrastructure/Controllers/IndexController.php
index b8d609c..836b177 100644
--- a/src/Main/Infrastructure/Controllers/IndexController.php
+++ b/src/Infrastructure/Controllers/IndexController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Main\Infrastructure\Controllers;
+namespace App\Infrastructure\Controllers;
 use Base\Infrastructure\Controllers\AbstractPageController;
 use Psr\Http\Message\ResponseInterface;
 
@@ -13,11 +13,12 @@ class IndexController extends AbstractPageController {
 		try {
 			//$this->addHeader("App-Mode", "Dev");
 			$this->template()->setValue("title", "Главная");
-			$this->template()->setSubtemplate("main", "@main/index.tpl", [
-				"date" => (new \DateTime())->format('Y-m-d H:i:s')
-			]);
 		}
 		catch(\Throwable $e){$error = $this->checkError($e);}
-		return $this->render();
+
+		return $this->renderResponse("main", "@main/index.tpl", [
+			"date" => (new \DateTime())->format('Y-m-d H:i:s'),
+			"error" => $error ?? null
+		]);
 	}
 }
diff --git a/src/Main/Domain/ValueObject/.gitkeep b/src/Infrastructure/Repository/.gitkeep
similarity index 100%
rename from src/Main/Domain/ValueObject/.gitkeep
rename to src/Infrastructure/Repository/.gitkeep
diff --git a/src/Main/Infrastructure/templates/index.tpl b/src/Infrastructure/templates/index.tpl
similarity index 100%
rename from src/Main/Infrastructure/templates/index.tpl
rename to src/Infrastructure/templates/index.tpl
diff --git a/src/Main/Infrastructure/Repository/.gitkeep b/src/Main/Infrastructure/Repository/.gitkeep
deleted file mode 100644
index e69de29..0000000