diff --git a/site/plugins/site/site.php b/site/plugins/site/bootstrap.php
similarity index 92%
rename from site/plugins/site/site.php
rename to site/plugins/site/bootstrap.php
index 77cd8ee2..7025f462 100644
--- a/site/plugins/site/site.php
+++ b/site/plugins/site/bootstrap.php
@@ -9,7 +9,7 @@ namespace Flextype;
 $loader = require_once $autoload;
 
 // Include routes
-include_once 'routes.php';
+include_once 'routes/web.php';
 
 /**
  * Add site controller to Flextype container
diff --git a/site/plugins/site/composer.json b/site/plugins/site/composer.json
index 4916fec1..96b66743 100644
--- a/site/plugins/site/composer.json
+++ b/site/plugins/site/composer.json
@@ -3,7 +3,7 @@
     "type": "project",
     "description": "Site plugin for Flextype",
     "keywords": ["site", "plugin", "flextype", "php", "html"],
-    "homepage": "https://github.com/flextype-plugins/admin",
+    "homepage": "https://github.com/flextype",
     "license": "MIT",
     "authors": [
         {
@@ -13,7 +13,7 @@
         }
     ],
     "support": {
-      "issues": "https://github.com/flextype-plugins/admin/issues"
+      "issues": "https://github.com/flextype/issues"
     },
     "require": {
         "php": ">=7.1.3"
diff --git a/site/plugins/site/site.json b/site/plugins/site/plugin.json
similarity index 59%
rename from site/plugins/site/site.json
rename to site/plugins/site/plugin.json
index 4030b871..44a9c54b 100755
--- a/site/plugins/site/site.json
+++ b/site/plugins/site/plugin.json
@@ -1,13 +1,13 @@
 {
   "name": "Site",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "description": "Site plugin for Flextype",
   "author": {
     "name": "Sergey Romanenko",
     "email": "hello@romanenko.digital",
     "url": "http://flextype.org"
   },
-  "homepage": "https://github.com/flextype-plugins/admin",
-  "bugs": "https://github.com/flextype-plugins/admin/issues",
+  "homepage": "https://github.com/flextype",
+  "bugs": "https://github.com/flextype/issues",
   "license": "MIT"
 }
diff --git a/site/plugins/site/routes.php b/site/plugins/site/routes/web.php
similarity index 100%
rename from site/plugins/site/routes.php
rename to site/plugins/site/routes/web.php
diff --git a/site/plugins/site/settings.json b/site/plugins/site/settings.json
index 4e609c71..60e7e096 100644
--- a/site/plugins/site/settings.json
+++ b/site/plugins/site/settings.json
@@ -1,3 +1,3 @@
 {
-  "enabled": true
+    "enabled": true
 }