diff --git a/envs/dev/composer.json b/envs/dev/composer.json
index cfdf7f711..7704c7cbb 100644
--- a/envs/dev/composer.json
+++ b/envs/dev/composer.json
@@ -27,18 +27,15 @@
             "luya\\" : "../../core/",
             "luya\\admin\\" : "../../modules/admin/src",
             "luya\\cms\\" : "../../modules/cms/src",
-            "luya\\account\\" : "../../modules/account",
-            "luya\\crawler\\" : "../../modules/crawler",
+            "luya\\account\\" : "../../modules/account/src",
+            "luya\\crawler\\" : "../../modules/crawler/src",
             "luya\\errorapi\\" : "../../modules/errorapi/src",
-            "luya\\gallery\\" : "../../modules/gallery",
-            "luya\\exporter\\" : "../../modules/exporter",
-            "luya\\frontendgroup\\" : "../../modules/frontendgroup",
+            "luya\\gallery\\" : "../../modules/gallery/src",
+            "luya\\exporter\\" : "../../modules/exporter/src",
+            "luya\\frontendgroup\\" : "../../modules/frontendgroup/src",
             "luya\\news\\" : "../../modules/news/src",
-            
-            
-            
-            "styleguide\\" : "../../modules/styleguide",
-            "remoteadmin\\" : "../../modules/remoteadmin",
+            "luya\\remoteadmin\\" : "../../modules/remoteadmin/src",
+            "luya\\styleguide\\" : "../../modules/styleguide/src",
             
             "payment\\" : "../../../luya-module-payment/src",
             "basicauth\\" : "../../../luya-module-basicauth/src",
diff --git a/modules/account/composer.json b/modules/account/composer.json
index 2813589fb..82937c17e 100644
--- a/modules/account/composer.json
+++ b/modules/account/composer.json
@@ -17,7 +17,7 @@
 	},
 	"autoload" : {
 		"psr-4" : {
-			"luya\\account\\" : ""
+			"luya\\account\\" : "src/"
 		}
 	},
 	"extra": {
diff --git a/modules/account/RegisterInterface.php b/modules/account/src/RegisterInterface.php
similarity index 100%
rename from modules/account/RegisterInterface.php
rename to modules/account/src/RegisterInterface.php
diff --git a/modules/account/admin/Module.php b/modules/account/src/admin/Module.php
similarity index 100%
rename from modules/account/admin/Module.php
rename to modules/account/src/admin/Module.php
diff --git a/modules/account/admin/apis/UserController.php b/modules/account/src/admin/apis/UserController.php
similarity index 100%
rename from modules/account/admin/apis/UserController.php
rename to modules/account/src/admin/apis/UserController.php
diff --git a/modules/account/admin/controllers/UserController.php b/modules/account/src/admin/controllers/UserController.php
similarity index 100%
rename from modules/account/admin/controllers/UserController.php
rename to modules/account/src/admin/controllers/UserController.php
diff --git a/modules/account/frontend/Module.php b/modules/account/src/frontend/Module.php
similarity index 100%
rename from modules/account/frontend/Module.php
rename to modules/account/src/frontend/Module.php
diff --git a/modules/account/frontend/base/Controller.php b/modules/account/src/frontend/base/Controller.php
similarity index 100%
rename from modules/account/frontend/base/Controller.php
rename to modules/account/src/frontend/base/Controller.php
diff --git a/modules/account/frontend/base/RegisterForm.php b/modules/account/src/frontend/base/RegisterForm.php
similarity index 100%
rename from modules/account/frontend/base/RegisterForm.php
rename to modules/account/src/frontend/base/RegisterForm.php
diff --git a/modules/account/frontend/components/User.php b/modules/account/src/frontend/components/User.php
similarity index 100%
rename from modules/account/frontend/components/User.php
rename to modules/account/src/frontend/components/User.php
diff --git a/modules/account/frontend/controllers/DefaultController.php b/modules/account/src/frontend/controllers/DefaultController.php
similarity index 100%
rename from modules/account/frontend/controllers/DefaultController.php
rename to modules/account/src/frontend/controllers/DefaultController.php
diff --git a/modules/account/frontend/controllers/RegisterController.php b/modules/account/src/frontend/controllers/RegisterController.php
similarity index 100%
rename from modules/account/frontend/controllers/RegisterController.php
rename to modules/account/src/frontend/controllers/RegisterController.php
diff --git a/modules/account/frontend/controllers/SettingsController.php b/modules/account/src/frontend/controllers/SettingsController.php
similarity index 100%
rename from modules/account/frontend/controllers/SettingsController.php
rename to modules/account/src/frontend/controllers/SettingsController.php
diff --git a/modules/account/frontend/migrations/m150302_154115_account_user.php b/modules/account/src/frontend/migrations/m150302_154115_account_user.php
similarity index 100%
rename from modules/account/frontend/migrations/m150302_154115_account_user.php
rename to modules/account/src/frontend/migrations/m150302_154115_account_user.php
diff --git a/modules/account/frontend/migrations/m151214_095728_add_more_user_data.php b/modules/account/src/frontend/migrations/m151214_095728_add_more_user_data.php
similarity index 100%
rename from modules/account/frontend/migrations/m151214_095728_add_more_user_data.php
rename to modules/account/src/frontend/migrations/m151214_095728_add_more_user_data.php
diff --git a/modules/account/frontend/properties/IsProtectedAreaProperty.php b/modules/account/src/frontend/properties/IsProtectedAreaProperty.php
similarity index 100%
rename from modules/account/frontend/properties/IsProtectedAreaProperty.php
rename to modules/account/src/frontend/properties/IsProtectedAreaProperty.php
diff --git a/modules/account/frontend/views/default/index.php b/modules/account/src/frontend/views/default/index.php
similarity index 100%
rename from modules/account/frontend/views/default/index.php
rename to modules/account/src/frontend/views/default/index.php
diff --git a/modules/account/frontend/views/default/lostpass.php b/modules/account/src/frontend/views/default/lostpass.php
similarity index 100%
rename from modules/account/frontend/views/default/lostpass.php
rename to modules/account/src/frontend/views/default/lostpass.php
diff --git a/modules/account/frontend/views/layout.php b/modules/account/src/frontend/views/layout.php
similarity index 100%
rename from modules/account/frontend/views/layout.php
rename to modules/account/src/frontend/views/layout.php
diff --git a/modules/account/frontend/views/register/index.php b/modules/account/src/frontend/views/register/index.php
similarity index 100%
rename from modules/account/frontend/views/register/index.php
rename to modules/account/src/frontend/views/register/index.php
diff --git a/modules/account/frontend/views/register/mail/_login.php b/modules/account/src/frontend/views/register/mail/_login.php
similarity index 100%
rename from modules/account/frontend/views/register/mail/_login.php
rename to modules/account/src/frontend/views/register/mail/_login.php
diff --git a/modules/account/frontend/views/register/mail/_validationlink.php b/modules/account/src/frontend/views/register/mail/_validationlink.php
similarity index 100%
rename from modules/account/frontend/views/register/mail/_validationlink.php
rename to modules/account/src/frontend/views/register/mail/_validationlink.php
diff --git a/modules/account/frontend/views/register/mail/_waituntilvalidation.php b/modules/account/src/frontend/views/register/mail/_waituntilvalidation.php
similarity index 100%
rename from modules/account/frontend/views/register/mail/_waituntilvalidation.php
rename to modules/account/src/frontend/views/register/mail/_waituntilvalidation.php
diff --git a/modules/account/frontend/views/settings/index.php b/modules/account/src/frontend/views/settings/index.php
similarity index 100%
rename from modules/account/frontend/views/settings/index.php
rename to modules/account/src/frontend/views/settings/index.php
diff --git a/modules/account/models/LoginForm.php b/modules/account/src/models/LoginForm.php
similarity index 100%
rename from modules/account/models/LoginForm.php
rename to modules/account/src/models/LoginForm.php
diff --git a/modules/account/models/RegisterForm.php b/modules/account/src/models/RegisterForm.php
similarity index 100%
rename from modules/account/models/RegisterForm.php
rename to modules/account/src/models/RegisterForm.php
diff --git a/modules/account/models/User.php b/modules/account/src/models/User.php
similarity index 100%
rename from modules/account/models/User.php
rename to modules/account/src/models/User.php
diff --git a/modules/crawler/composer.json b/modules/crawler/composer.json
index 0afd22824..76a13ffc3 100644
--- a/modules/crawler/composer.json
+++ b/modules/crawler/composer.json
@@ -21,7 +21,7 @@
 	},
 	"autoload" : {
 		"psr-4" : {
-			"luya\\crawler\\" : ""
+			"luya\\crawler\\" : "src/"
 		}
 	},
 	"extra": {
diff --git a/modules/crawler/admin/Module.php b/modules/crawler/src/admin/Module.php
similarity index 100%
rename from modules/crawler/admin/Module.php
rename to modules/crawler/src/admin/Module.php
diff --git a/modules/crawler/admin/apis/BuilderindexController.php b/modules/crawler/src/admin/apis/BuilderindexController.php
similarity index 100%
rename from modules/crawler/admin/apis/BuilderindexController.php
rename to modules/crawler/src/admin/apis/BuilderindexController.php
diff --git a/modules/crawler/admin/apis/IndexController.php b/modules/crawler/src/admin/apis/IndexController.php
similarity index 100%
rename from modules/crawler/admin/apis/IndexController.php
rename to modules/crawler/src/admin/apis/IndexController.php
diff --git a/modules/crawler/admin/apis/SearchdataController.php b/modules/crawler/src/admin/apis/SearchdataController.php
similarity index 100%
rename from modules/crawler/admin/apis/SearchdataController.php
rename to modules/crawler/src/admin/apis/SearchdataController.php
diff --git a/modules/crawler/admin/controllers/BuilderindexController.php b/modules/crawler/src/admin/controllers/BuilderindexController.php
similarity index 100%
rename from modules/crawler/admin/controllers/BuilderindexController.php
rename to modules/crawler/src/admin/controllers/BuilderindexController.php
diff --git a/modules/crawler/admin/controllers/IndexController.php b/modules/crawler/src/admin/controllers/IndexController.php
similarity index 100%
rename from modules/crawler/admin/controllers/IndexController.php
rename to modules/crawler/src/admin/controllers/IndexController.php
diff --git a/modules/crawler/admin/controllers/SearchdataController.php b/modules/crawler/src/admin/controllers/SearchdataController.php
similarity index 100%
rename from modules/crawler/admin/controllers/SearchdataController.php
rename to modules/crawler/src/admin/controllers/SearchdataController.php
diff --git a/modules/crawler/admin/messages/de/crawleradmin.php b/modules/crawler/src/admin/messages/de/crawleradmin.php
similarity index 100%
rename from modules/crawler/admin/messages/de/crawleradmin.php
rename to modules/crawler/src/admin/messages/de/crawleradmin.php
diff --git a/modules/crawler/admin/messages/en/crawleradmin.php b/modules/crawler/src/admin/messages/en/crawleradmin.php
similarity index 100%
rename from modules/crawler/admin/messages/en/crawleradmin.php
rename to modules/crawler/src/admin/messages/en/crawleradmin.php
diff --git a/modules/crawler/admin/messages/ru/crawleradmin.php b/modules/crawler/src/admin/messages/ru/crawleradmin.php
similarity index 100%
rename from modules/crawler/admin/messages/ru/crawleradmin.php
rename to modules/crawler/src/admin/messages/ru/crawleradmin.php
diff --git a/modules/crawler/admin/migrations/m150727_104346_crawler_index.php b/modules/crawler/src/admin/migrations/m150727_104346_crawler_index.php
similarity index 100%
rename from modules/crawler/admin/migrations/m150727_104346_crawler_index.php
rename to modules/crawler/src/admin/migrations/m150727_104346_crawler_index.php
diff --git a/modules/crawler/admin/migrations/m150727_105126_crawler_builder_index.php b/modules/crawler/src/admin/migrations/m150727_105126_crawler_builder_index.php
similarity index 100%
rename from modules/crawler/admin/migrations/m150727_105126_crawler_builder_index.php
rename to modules/crawler/src/admin/migrations/m150727_105126_crawler_builder_index.php
diff --git a/modules/crawler/admin/migrations/m151213_201944_add_md5_sum.php b/modules/crawler/src/admin/migrations/m151213_201944_add_md5_sum.php
similarity index 100%
rename from modules/crawler/admin/migrations/m151213_201944_add_md5_sum.php
rename to modules/crawler/src/admin/migrations/m151213_201944_add_md5_sum.php
diff --git a/modules/crawler/admin/migrations/m160420_093031_addreflink.php b/modules/crawler/src/admin/migrations/m160420_093031_addreflink.php
similarity index 100%
rename from modules/crawler/admin/migrations/m160420_093031_addreflink.php
rename to modules/crawler/src/admin/migrations/m160420_093031_addreflink.php
diff --git a/modules/crawler/admin/migrations/m160524_134433_searchindex.php b/modules/crawler/src/admin/migrations/m160524_134433_searchindex.php
similarity index 100%
rename from modules/crawler/admin/migrations/m160524_134433_searchindex.php
rename to modules/crawler/src/admin/migrations/m160524_134433_searchindex.php
diff --git a/modules/crawler/frontend/Module.php b/modules/crawler/src/frontend/Module.php
similarity index 100%
rename from modules/crawler/frontend/Module.php
rename to modules/crawler/src/frontend/Module.php
diff --git a/modules/crawler/frontend/classes/CrawlContainer.php b/modules/crawler/src/frontend/classes/CrawlContainer.php
similarity index 100%
rename from modules/crawler/frontend/classes/CrawlContainer.php
rename to modules/crawler/src/frontend/classes/CrawlContainer.php
diff --git a/modules/crawler/frontend/classes/CrawlPage.php b/modules/crawler/src/frontend/classes/CrawlPage.php
similarity index 100%
rename from modules/crawler/frontend/classes/CrawlPage.php
rename to modules/crawler/src/frontend/classes/CrawlPage.php
diff --git a/modules/crawler/frontend/commands/CrawlController.php b/modules/crawler/src/frontend/commands/CrawlController.php
similarity index 100%
rename from modules/crawler/frontend/commands/CrawlController.php
rename to modules/crawler/src/frontend/commands/CrawlController.php
diff --git a/modules/crawler/frontend/commands/StatisticController.php b/modules/crawler/src/frontend/commands/StatisticController.php
similarity index 100%
rename from modules/crawler/frontend/commands/StatisticController.php
rename to modules/crawler/src/frontend/commands/StatisticController.php
diff --git a/modules/crawler/frontend/controllers/DefaultController.php b/modules/crawler/src/frontend/controllers/DefaultController.php
similarity index 100%
rename from modules/crawler/frontend/controllers/DefaultController.php
rename to modules/crawler/src/frontend/controllers/DefaultController.php
diff --git a/modules/crawler/frontend/controllers/RestController.php b/modules/crawler/src/frontend/controllers/RestController.php
similarity index 100%
rename from modules/crawler/frontend/controllers/RestController.php
rename to modules/crawler/src/frontend/controllers/RestController.php
diff --git a/modules/crawler/models/Builderindex.php b/modules/crawler/src/models/Builderindex.php
similarity index 100%
rename from modules/crawler/models/Builderindex.php
rename to modules/crawler/src/models/Builderindex.php
diff --git a/modules/crawler/models/Index.php b/modules/crawler/src/models/Index.php
similarity index 100%
rename from modules/crawler/models/Index.php
rename to modules/crawler/src/models/Index.php
diff --git a/modules/crawler/models/Searchdata.php b/modules/crawler/src/models/Searchdata.php
similarity index 100%
rename from modules/crawler/models/Searchdata.php
rename to modules/crawler/src/models/Searchdata.php
diff --git a/modules/exporter/composer.json b/modules/exporter/composer.json
index 706f2de6f..d92380460 100644
--- a/modules/exporter/composer.json
+++ b/modules/exporter/composer.json
@@ -20,7 +20,7 @@
     },
     "autoload" : {
         "psr-4" : {
-            "luya\\exporter\\" : ""
+            "luya\\exporter\\" : "src/"
         }
     },
     "extra": {
diff --git a/modules/exporter/Module.php b/modules/exporter/src/Module.php
similarity index 100%
rename from modules/exporter/Module.php
rename to modules/exporter/src/Module.php
diff --git a/modules/exporter/commands/DatabaseController.php b/modules/exporter/src/commands/DatabaseController.php
similarity index 100%
rename from modules/exporter/commands/DatabaseController.php
rename to modules/exporter/src/commands/DatabaseController.php
diff --git a/modules/exporter/commands/ExportController.php b/modules/exporter/src/commands/ExportController.php
similarity index 100%
rename from modules/exporter/commands/ExportController.php
rename to modules/exporter/src/commands/ExportController.php
diff --git a/modules/exporter/controllers/DefaultController.php b/modules/exporter/src/controllers/DefaultController.php
similarity index 100%
rename from modules/exporter/controllers/DefaultController.php
rename to modules/exporter/src/controllers/DefaultController.php
diff --git a/modules/frontendgroup/composer.json b/modules/frontendgroup/composer.json
index e96128af0..c75cfb7d0 100644
--- a/modules/frontendgroup/composer.json
+++ b/modules/frontendgroup/composer.json
@@ -17,7 +17,7 @@
     },
     "autoload" : {
         "psr-4" : {
-            "luya\\frontendgroup\\" : ""
+            "luya\\frontendgroup\\" : "src/"
         }
     },
     "extra": {
diff --git a/modules/frontendgroup/Module.php b/modules/frontendgroup/src/Module.php
similarity index 100%
rename from modules/frontendgroup/Module.php
rename to modules/frontendgroup/src/Module.php
diff --git a/modules/frontendgroup/properties/GroupAuthProperty.php b/modules/frontendgroup/src/properties/GroupAuthProperty.php
similarity index 100%
rename from modules/frontendgroup/properties/GroupAuthProperty.php
rename to modules/frontendgroup/src/properties/GroupAuthProperty.php
diff --git a/modules/gallery/composer.json b/modules/gallery/composer.json
index 30ae4eec8..809736960 100644
--- a/modules/gallery/composer.json
+++ b/modules/gallery/composer.json
@@ -17,7 +17,7 @@
 	},
 	"autoload" : {
 		"psr-4" : {
-			"luya\\gallery\\" : ""
+			"luya\\gallery\\" : "src/"
 		}
 	},
 	"extra": {
diff --git a/modules/gallery/admin/Module.php b/modules/gallery/src/admin/Module.php
similarity index 100%
rename from modules/gallery/admin/Module.php
rename to modules/gallery/src/admin/Module.php
diff --git a/modules/gallery/admin/apis/AlbumController.php b/modules/gallery/src/admin/apis/AlbumController.php
similarity index 100%
rename from modules/gallery/admin/apis/AlbumController.php
rename to modules/gallery/src/admin/apis/AlbumController.php
diff --git a/modules/gallery/admin/apis/CatController.php b/modules/gallery/src/admin/apis/CatController.php
similarity index 100%
rename from modules/gallery/admin/apis/CatController.php
rename to modules/gallery/src/admin/apis/CatController.php
diff --git a/modules/gallery/admin/blocks/GalleryAlbum.php b/modules/gallery/src/admin/blocks/GalleryAlbum.php
similarity index 100%
rename from modules/gallery/admin/blocks/GalleryAlbum.php
rename to modules/gallery/src/admin/blocks/GalleryAlbum.php
diff --git a/modules/gallery/admin/controllers/AlbumController.php b/modules/gallery/src/admin/controllers/AlbumController.php
similarity index 100%
rename from modules/gallery/admin/controllers/AlbumController.php
rename to modules/gallery/src/admin/controllers/AlbumController.php
diff --git a/modules/gallery/admin/controllers/CatController.php b/modules/gallery/src/admin/controllers/CatController.php
similarity index 100%
rename from modules/gallery/admin/controllers/CatController.php
rename to modules/gallery/src/admin/controllers/CatController.php
diff --git a/modules/gallery/admin/messages/de/galleryadmin.php b/modules/gallery/src/admin/messages/de/galleryadmin.php
similarity index 100%
rename from modules/gallery/admin/messages/de/galleryadmin.php
rename to modules/gallery/src/admin/messages/de/galleryadmin.php
diff --git a/modules/gallery/admin/messages/en/galleryadmin.php b/modules/gallery/src/admin/messages/en/galleryadmin.php
similarity index 100%
rename from modules/gallery/admin/messages/en/galleryadmin.php
rename to modules/gallery/src/admin/messages/en/galleryadmin.php
diff --git a/modules/gallery/admin/messages/ru/galleryadmin.php b/modules/gallery/src/admin/messages/ru/galleryadmin.php
similarity index 100%
rename from modules/gallery/admin/messages/ru/galleryadmin.php
rename to modules/gallery/src/admin/messages/ru/galleryadmin.php
diff --git a/modules/gallery/admin/migrations/m150504_094950_gallery_album.php b/modules/gallery/src/admin/migrations/m150504_094950_gallery_album.php
similarity index 100%
rename from modules/gallery/admin/migrations/m150504_094950_gallery_album.php
rename to modules/gallery/src/admin/migrations/m150504_094950_gallery_album.php
diff --git a/modules/gallery/admin/migrations/m150504_132138_gallery_album_image.php b/modules/gallery/src/admin/migrations/m150504_132138_gallery_album_image.php
similarity index 100%
rename from modules/gallery/admin/migrations/m150504_132138_gallery_album_image.php
rename to modules/gallery/src/admin/migrations/m150504_132138_gallery_album_image.php
diff --git a/modules/gallery/admin/migrations/m150601_105400_gallery_cat.php b/modules/gallery/src/admin/migrations/m150601_105400_gallery_cat.php
similarity index 100%
rename from modules/gallery/admin/migrations/m150601_105400_gallery_cat.php
rename to modules/gallery/src/admin/migrations/m150601_105400_gallery_cat.php
diff --git a/modules/gallery/admin/migrations/m160603_080705_album_add_sortindex_highlight.php b/modules/gallery/src/admin/migrations/m160603_080705_album_add_sortindex_highlight.php
similarity index 100%
rename from modules/gallery/admin/migrations/m160603_080705_album_add_sortindex_highlight.php
rename to modules/gallery/src/admin/migrations/m160603_080705_album_add_sortindex_highlight.php
diff --git a/modules/gallery/frontend/Module.php b/modules/gallery/src/frontend/Module.php
similarity index 100%
rename from modules/gallery/frontend/Module.php
rename to modules/gallery/src/frontend/Module.php
diff --git a/modules/gallery/frontend/controllers/AlbenController.php b/modules/gallery/src/frontend/controllers/AlbenController.php
similarity index 100%
rename from modules/gallery/frontend/controllers/AlbenController.php
rename to modules/gallery/src/frontend/controllers/AlbenController.php
diff --git a/modules/gallery/frontend/controllers/AlbumController.php b/modules/gallery/src/frontend/controllers/AlbumController.php
similarity index 100%
rename from modules/gallery/frontend/controllers/AlbumController.php
rename to modules/gallery/src/frontend/controllers/AlbumController.php
diff --git a/modules/gallery/frontend/controllers/CatController.php b/modules/gallery/src/frontend/controllers/CatController.php
similarity index 100%
rename from modules/gallery/frontend/controllers/CatController.php
rename to modules/gallery/src/frontend/controllers/CatController.php
diff --git a/modules/gallery/frontend/controllers/CollectionsController.php b/modules/gallery/src/frontend/controllers/CollectionsController.php
similarity index 100%
rename from modules/gallery/frontend/controllers/CollectionsController.php
rename to modules/gallery/src/frontend/controllers/CollectionsController.php
diff --git a/modules/gallery/models/Album.php b/modules/gallery/src/models/Album.php
similarity index 100%
rename from modules/gallery/models/Album.php
rename to modules/gallery/src/models/Album.php
diff --git a/modules/gallery/models/Cat.php b/modules/gallery/src/models/Cat.php
similarity index 100%
rename from modules/gallery/models/Cat.php
rename to modules/gallery/src/models/Cat.php
diff --git a/modules/newsadmin/composer.json b/modules/newsadmin/composer.json
index 66e635e70..5884253fe 100644
--- a/modules/newsadmin/composer.json
+++ b/modules/newsadmin/composer.json
@@ -17,7 +17,7 @@
 	},
 	"autoload" : {
 		"psr-4" : {
-			"luya\news\admin\\" : ""
+			"luya\\news\\admin\\" : ""
 		}
 	},
 	"extra": {
diff --git a/modules/remoteadmin/README.md b/modules/remoteadmin/README.md
index 5836fbc29..a5f3ef081 100644
--- a/modules/remoteadmin/README.md
+++ b/modules/remoteadmin/README.md
@@ -24,14 +24,14 @@ Remote Admin will work out of the box with all [LUYA](https://github.com/zephir/
 require remoteadmin in composer.json:
 
 ```
-"luyadev/luya-module-remoteadmin" : "1.0.0-beta8",
+"luyadev/luya-module-remoteadmin" : "^1.0@dev",
 ```
 
 add remote admin to the list of your modules:
 
 ```
 'remoteadmin' => [
-    'class' => 'remoteadmin\Module'
+    'class' => 'luya\remoteadmin\Module'
 ],
 ```
 
diff --git a/modules/remoteadmin/apis/SiteController.php b/modules/remoteadmin/apis/SiteController.php
deleted file mode 100755
index 6ddb93ba8..000000000
--- a/modules/remoteadmin/apis/SiteController.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace remoteadmin\apis;
-
-class SiteController extends \luya\admin\ngrest\base\Api
-{
-    public $modelClass = 'remoteadmin\models\Site';
-}
diff --git a/modules/remoteadmin/composer.json b/modules/remoteadmin/composer.json
index 94d3560a5..376b8767e 100644
--- a/modules/remoteadmin/composer.json
+++ b/modules/remoteadmin/composer.json
@@ -17,7 +17,7 @@
 	},
 	"autoload" : {
 		"psr-4" : {
-			"remoteadmin\\" : ""
+			"luya\\remoteadmin\\" : "src/"
 		}
 	},
 	"extra": {
diff --git a/modules/remoteadmin/controllers/SiteController.php b/modules/remoteadmin/controllers/SiteController.php
deleted file mode 100755
index b5599f1e0..000000000
--- a/modules/remoteadmin/controllers/SiteController.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace remoteadmin\controllers;
-
-class SiteController extends \luya\admin\ngrest\base\Controller
-{
-    public $modelClass = 'remoteadmin\models\Site';
-}
diff --git a/modules/remoteadmin/Module.php b/modules/remoteadmin/src/Module.php
similarity index 79%
rename from modules/remoteadmin/Module.php
rename to modules/remoteadmin/src/Module.php
index 10c410a89..28d2c6608 100755
--- a/modules/remoteadmin/Module.php
+++ b/modules/remoteadmin/src/Module.php
@@ -1,10 +1,10 @@
 <?php
-namespace remoteadmin;
+namespace luya\remoteadmin;
 
 class Module extends \luya\admin\base\Module
 {
     public $apis = [
-        'api-remote-site' => 'remoteadmin\apis\SiteController',
+        'api-remote-site' => 'luya\remoteadmin\apis\SiteController',
     ];
     
     public function getMenu()
diff --git a/modules/remoteadmin/src/apis/SiteController.php b/modules/remoteadmin/src/apis/SiteController.php
new file mode 100755
index 000000000..e40aaf9e0
--- /dev/null
+++ b/modules/remoteadmin/src/apis/SiteController.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace luya\remoteadmin\apis;
+
+class SiteController extends \luya\admin\ngrest\base\Api
+{
+    public $modelClass = 'luya\remoteadmin\models\Site';
+}
diff --git a/modules/remoteadmin/src/controllers/SiteController.php b/modules/remoteadmin/src/controllers/SiteController.php
new file mode 100755
index 000000000..8588e4a78
--- /dev/null
+++ b/modules/remoteadmin/src/controllers/SiteController.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace luya\remoteadmin\controllers;
+
+class SiteController extends \luya\admin\ngrest\base\Controller
+{
+    public $modelClass = 'luya\remoteadmin\models\Site';
+}
diff --git a/modules/remoteadmin/controllers/StatusController.php b/modules/remoteadmin/src/controllers/StatusController.php
similarity index 95%
rename from modules/remoteadmin/controllers/StatusController.php
rename to modules/remoteadmin/src/controllers/StatusController.php
index b0c75904e..9c39a0463 100755
--- a/modules/remoteadmin/controllers/StatusController.php
+++ b/modules/remoteadmin/src/controllers/StatusController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace remoteadmin\controllers;
+namespace luya\remoteadmin\controllers;
 
 use yii\helpers\Json;
-use remoteadmin\models\Site;
+use luya\remoteadmin\models\Site;
 
 /**
  * @see packages api https://packagist.org/apidoc
diff --git a/modules/remoteadmin/migrations/m150722_125833_remote_site.php b/modules/remoteadmin/src/migrations/m150722_125833_remote_site.php
similarity index 100%
rename from modules/remoteadmin/migrations/m150722_125833_remote_site.php
rename to modules/remoteadmin/src/migrations/m150722_125833_remote_site.php
diff --git a/modules/remoteadmin/migrations/m151013_084408_add_http_auth.php b/modules/remoteadmin/src/migrations/m151013_084408_add_http_auth.php
similarity index 100%
rename from modules/remoteadmin/migrations/m151013_084408_add_http_auth.php
rename to modules/remoteadmin/src/migrations/m151013_084408_add_http_auth.php
diff --git a/modules/remoteadmin/models/Site.php b/modules/remoteadmin/src/models/Site.php
similarity index 98%
rename from modules/remoteadmin/models/Site.php
rename to modules/remoteadmin/src/models/Site.php
index 9b21e1be4..b0e920fbb 100755
--- a/modules/remoteadmin/models/Site.php
+++ b/modules/remoteadmin/src/models/Site.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace remoteadmin\models;
+namespace luya\remoteadmin\models;
 
 use Yii;
 use luya\helpers\Url;
diff --git a/modules/remoteadmin/views/status/index.php b/modules/remoteadmin/src/views/status/index.php
similarity index 100%
rename from modules/remoteadmin/views/status/index.php
rename to modules/remoteadmin/src/views/status/index.php
diff --git a/modules/styleguide/composer.json b/modules/styleguide/composer.json
index fd66917ca..8f295a0e4 100644
--- a/modules/styleguide/composer.json
+++ b/modules/styleguide/composer.json
@@ -17,7 +17,7 @@
 	},
 	"autoload" : {
 		"psr-4" : {
-			"styleguide\\" : ""
+			"luya\\styleguide\\" : "src/"
 		}
 	},
 	"extra": {
diff --git a/modules/styleguide/Module.php b/modules/styleguide/src/Module.php
similarity index 100%
rename from modules/styleguide/Module.php
rename to modules/styleguide/src/Module.php
diff --git a/modules/styleguide/controllers/DefaultController.php b/modules/styleguide/src/controllers/DefaultController.php
similarity index 97%
rename from modules/styleguide/controllers/DefaultController.php
rename to modules/styleguide/src/controllers/DefaultController.php
index 3263eff81..3fbe0ccaf 100644
--- a/modules/styleguide/controllers/DefaultController.php
+++ b/modules/styleguide/src/controllers/DefaultController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace styleguide\controllers;
+namespace luya\styleguide\controllers;
 
 use Yii;
 
diff --git a/modules/styleguide/views/default/index.php b/modules/styleguide/src/views/default/index.php
similarity index 100%
rename from modules/styleguide/views/default/index.php
rename to modules/styleguide/src/views/default/index.php
diff --git a/modules/styleguide/views/default/login.php b/modules/styleguide/src/views/default/login.php
similarity index 100%
rename from modules/styleguide/views/default/login.php
rename to modules/styleguide/src/views/default/login.php
diff --git a/modules/styleguide/views/layouts/main.php b/modules/styleguide/src/views/layouts/main.php
similarity index 100%
rename from modules/styleguide/views/layouts/main.php
rename to modules/styleguide/src/views/layouts/main.php