diff --git a/composer.json b/composer.json
index bfdbb68..4b361c9 100644
--- a/composer.json
+++ b/composer.json
@@ -9,8 +9,7 @@
         {
             "name":     "Pavel Buchnev",
             "email":    "butschster@gmail.com",
-            "homepage": "http://www.kodicms.ru/",
-            "role":     "developer"
+            "homepage": "http://www.kodicms.ru/"
         }
     ],
     "support": {
@@ -18,7 +17,12 @@
         "forum":    "http://www.kodicms.ru/forum",
         "source":   "https://github.com/KodiComponents/module-userguide"
     },
+    "autoload": {
+        "psr-4": {
+            "KodiCMS\\Userguide\\": "src/"
+        }
+    },
     "require": {
-        "kodicms/core": "dev-master"
+        "kodicms/module-loader": "3.*"
     }
 }
\ No newline at end of file
diff --git a/Http/Controllers/UserguideController.php b/src/Http/Controllers/UserguideController.php
similarity index 100%
rename from Http/Controllers/UserguideController.php
rename to src/Http/Controllers/UserguideController.php
diff --git a/Http/routes.php b/src/Http/routes.php
similarity index 100%
rename from Http/routes.php
rename to src/Http/routes.php
diff --git a/Providers/ModuleServiceProvider.php b/src/Providers/ModuleServiceProvider.php
similarity index 100%
rename from Providers/ModuleServiceProvider.php
rename to src/Providers/ModuleServiceProvider.php
diff --git a/UserguideMarkdown.php b/src/UserguideMarkdown.php
similarity index 100%
rename from UserguideMarkdown.php
rename to src/UserguideMarkdown.php
diff --git a/config/sitemap.php b/src/config/sitemap.php
similarity index 100%
rename from config/sitemap.php
rename to src/config/sitemap.php
diff --git a/config/userguide.php b/src/config/userguide.php
similarity index 100%
rename from config/userguide.php
rename to src/config/userguide.php
diff --git a/guide/laravel/artisan.md b/src/guide/laravel/artisan.md
similarity index 100%
rename from guide/laravel/artisan.md
rename to src/guide/laravel/artisan.md
diff --git a/guide/laravel/authentication.md b/src/guide/laravel/authentication.md
similarity index 100%
rename from guide/laravel/authentication.md
rename to src/guide/laravel/authentication.md
diff --git a/guide/laravel/authorization.md b/src/guide/laravel/authorization.md
similarity index 100%
rename from guide/laravel/authorization.md
rename to src/guide/laravel/authorization.md
diff --git a/guide/laravel/billing.md b/src/guide/laravel/billing.md
similarity index 100%
rename from guide/laravel/billing.md
rename to src/guide/laravel/billing.md
diff --git a/guide/laravel/blade.md b/src/guide/laravel/blade.md
similarity index 100%
rename from guide/laravel/blade.md
rename to src/guide/laravel/blade.md
diff --git a/guide/laravel/cache.md b/src/guide/laravel/cache.md
similarity index 100%
rename from guide/laravel/cache.md
rename to src/guide/laravel/cache.md
diff --git a/guide/laravel/collections.md b/src/guide/laravel/collections.md
similarity index 100%
rename from guide/laravel/collections.md
rename to src/guide/laravel/collections.md
diff --git a/guide/laravel/container.md b/src/guide/laravel/container.md
similarity index 100%
rename from guide/laravel/container.md
rename to src/guide/laravel/container.md
diff --git a/guide/laravel/contracts.md b/src/guide/laravel/contracts.md
similarity index 100%
rename from guide/laravel/contracts.md
rename to src/guide/laravel/contracts.md
diff --git a/guide/laravel/contributing.md b/src/guide/laravel/contributing.md
similarity index 100%
rename from guide/laravel/contributing.md
rename to src/guide/laravel/contributing.md
diff --git a/guide/laravel/contributions.md b/src/guide/laravel/contributions.md
similarity index 100%
rename from guide/laravel/contributions.md
rename to src/guide/laravel/contributions.md
diff --git a/guide/laravel/controllers.md b/src/guide/laravel/controllers.md
similarity index 100%
rename from guide/laravel/controllers.md
rename to src/guide/laravel/controllers.md
diff --git a/guide/laravel/database.md b/src/guide/laravel/database.md
similarity index 100%
rename from guide/laravel/database.md
rename to src/guide/laravel/database.md
diff --git a/guide/laravel/documentation.md b/src/guide/laravel/documentation.md
similarity index 100%
rename from guide/laravel/documentation.md
rename to src/guide/laravel/documentation.md
diff --git a/guide/laravel/elixir.md b/src/guide/laravel/elixir.md
similarity index 100%
rename from guide/laravel/elixir.md
rename to src/guide/laravel/elixir.md
diff --git a/guide/laravel/eloquent-collections.md b/src/guide/laravel/eloquent-collections.md
similarity index 100%
rename from guide/laravel/eloquent-collections.md
rename to src/guide/laravel/eloquent-collections.md
diff --git a/guide/laravel/eloquent-mutators.md b/src/guide/laravel/eloquent-mutators.md
similarity index 100%
rename from guide/laravel/eloquent-mutators.md
rename to src/guide/laravel/eloquent-mutators.md
diff --git a/guide/laravel/eloquent-relationships.md b/src/guide/laravel/eloquent-relationships.md
similarity index 100%
rename from guide/laravel/eloquent-relationships.md
rename to src/guide/laravel/eloquent-relationships.md
diff --git a/guide/laravel/eloquent-serialization.md b/src/guide/laravel/eloquent-serialization.md
similarity index 100%
rename from guide/laravel/eloquent-serialization.md
rename to src/guide/laravel/eloquent-serialization.md
diff --git a/guide/laravel/eloquent.md b/src/guide/laravel/eloquent.md
similarity index 100%
rename from guide/laravel/eloquent.md
rename to src/guide/laravel/eloquent.md
diff --git a/guide/laravel/encryption.md b/src/guide/laravel/encryption.md
similarity index 100%
rename from guide/laravel/encryption.md
rename to src/guide/laravel/encryption.md
diff --git a/guide/laravel/envoy.md b/src/guide/laravel/envoy.md
similarity index 100%
rename from guide/laravel/envoy.md
rename to src/guide/laravel/envoy.md
diff --git a/guide/laravel/errors.md b/src/guide/laravel/errors.md
similarity index 100%
rename from guide/laravel/errors.md
rename to src/guide/laravel/errors.md
diff --git a/guide/laravel/events.md b/src/guide/laravel/events.md
similarity index 100%
rename from guide/laravel/events.md
rename to src/guide/laravel/events.md
diff --git a/guide/laravel/facades.md b/src/guide/laravel/facades.md
similarity index 100%
rename from guide/laravel/facades.md
rename to src/guide/laravel/facades.md
diff --git a/guide/laravel/filesystem.md b/src/guide/laravel/filesystem.md
similarity index 100%
rename from guide/laravel/filesystem.md
rename to src/guide/laravel/filesystem.md
diff --git a/guide/laravel/hashing.md b/src/guide/laravel/hashing.md
similarity index 100%
rename from guide/laravel/hashing.md
rename to src/guide/laravel/hashing.md
diff --git a/guide/laravel/helpers.md b/src/guide/laravel/helpers.md
similarity index 100%
rename from guide/laravel/helpers.md
rename to src/guide/laravel/helpers.md
diff --git a/guide/laravel/homestead.md b/src/guide/laravel/homestead.md
similarity index 100%
rename from guide/laravel/homestead.md
rename to src/guide/laravel/homestead.md
diff --git a/guide/laravel/installation.md b/src/guide/laravel/installation.md
similarity index 100%
rename from guide/laravel/installation.md
rename to src/guide/laravel/installation.md
diff --git a/guide/laravel/license.md b/src/guide/laravel/license.md
similarity index 100%
rename from guide/laravel/license.md
rename to src/guide/laravel/license.md
diff --git a/guide/laravel/lifecycle.md b/src/guide/laravel/lifecycle.md
similarity index 100%
rename from guide/laravel/lifecycle.md
rename to src/guide/laravel/lifecycle.md
diff --git a/guide/laravel/localization.md b/src/guide/laravel/localization.md
similarity index 100%
rename from guide/laravel/localization.md
rename to src/guide/laravel/localization.md
diff --git a/guide/laravel/mail.md b/src/guide/laravel/mail.md
similarity index 100%
rename from guide/laravel/mail.md
rename to src/guide/laravel/mail.md
diff --git a/guide/laravel/middleware.md b/src/guide/laravel/middleware.md
similarity index 100%
rename from guide/laravel/middleware.md
rename to src/guide/laravel/middleware.md
diff --git a/guide/laravel/migrations.md b/src/guide/laravel/migrations.md
similarity index 100%
rename from guide/laravel/migrations.md
rename to src/guide/laravel/migrations.md
diff --git a/guide/laravel/packages.md b/src/guide/laravel/packages.md
similarity index 100%
rename from guide/laravel/packages.md
rename to src/guide/laravel/packages.md
diff --git a/guide/laravel/pagination.md b/src/guide/laravel/pagination.md
similarity index 100%
rename from guide/laravel/pagination.md
rename to src/guide/laravel/pagination.md
diff --git a/guide/laravel/providers.md b/src/guide/laravel/providers.md
similarity index 100%
rename from guide/laravel/providers.md
rename to src/guide/laravel/providers.md
diff --git a/guide/laravel/queries.md b/src/guide/laravel/queries.md
similarity index 100%
rename from guide/laravel/queries.md
rename to src/guide/laravel/queries.md
diff --git a/guide/laravel/queues.md b/src/guide/laravel/queues.md
similarity index 100%
rename from guide/laravel/queues.md
rename to src/guide/laravel/queues.md
diff --git a/guide/laravel/readme.md b/src/guide/laravel/readme.md
similarity index 100%
rename from guide/laravel/readme.md
rename to src/guide/laravel/readme.md
diff --git a/guide/laravel/redis.md b/src/guide/laravel/redis.md
similarity index 100%
rename from guide/laravel/redis.md
rename to src/guide/laravel/redis.md
diff --git a/guide/laravel/releases.md b/src/guide/laravel/releases.md
similarity index 100%
rename from guide/laravel/releases.md
rename to src/guide/laravel/releases.md
diff --git a/guide/laravel/requests.md b/src/guide/laravel/requests.md
similarity index 100%
rename from guide/laravel/requests.md
rename to src/guide/laravel/requests.md
diff --git a/guide/laravel/responses.md b/src/guide/laravel/responses.md
similarity index 100%
rename from guide/laravel/responses.md
rename to src/guide/laravel/responses.md
diff --git a/guide/laravel/routing.md b/src/guide/laravel/routing.md
similarity index 100%
rename from guide/laravel/routing.md
rename to src/guide/laravel/routing.md
diff --git a/guide/laravel/scheduling.md b/src/guide/laravel/scheduling.md
similarity index 100%
rename from guide/laravel/scheduling.md
rename to src/guide/laravel/scheduling.md
diff --git a/guide/laravel/seeding.md b/src/guide/laravel/seeding.md
similarity index 100%
rename from guide/laravel/seeding.md
rename to src/guide/laravel/seeding.md
diff --git a/guide/laravel/session.md b/src/guide/laravel/session.md
similarity index 100%
rename from guide/laravel/session.md
rename to src/guide/laravel/session.md
diff --git a/guide/laravel/structure.md b/src/guide/laravel/structure.md
similarity index 100%
rename from guide/laravel/structure.md
rename to src/guide/laravel/structure.md
diff --git a/guide/laravel/testing.md b/src/guide/laravel/testing.md
similarity index 100%
rename from guide/laravel/testing.md
rename to src/guide/laravel/testing.md
diff --git a/guide/laravel/upgrade.md b/src/guide/laravel/upgrade.md
similarity index 100%
rename from guide/laravel/upgrade.md
rename to src/guide/laravel/upgrade.md
diff --git a/guide/laravel/validation.md b/src/guide/laravel/validation.md
similarity index 100%
rename from guide/laravel/validation.md
rename to src/guide/laravel/validation.md
diff --git a/guide/laravel/views.md b/src/guide/laravel/views.md
similarity index 100%
rename from guide/laravel/views.md
rename to src/guide/laravel/views.md
diff --git a/guide/userguide/adding.md b/src/guide/userguide/adding.md
similarity index 100%
rename from guide/userguide/adding.md
rename to src/guide/userguide/adding.md
diff --git a/guide/userguide/documentation.md b/src/guide/userguide/documentation.md
similarity index 100%
rename from guide/userguide/documentation.md
rename to src/guide/userguide/documentation.md
diff --git a/guide/userguide/markdown.md b/src/guide/userguide/markdown.md
similarity index 100%
rename from guide/userguide/markdown.md
rename to src/guide/userguide/markdown.md
diff --git a/guide/userguide/works.md b/src/guide/userguide/works.md
similarity index 100%
rename from guide/userguide/works.md
rename to src/guide/userguide/works.md
diff --git a/resources/lang/ru/core.php b/src/resources/lang/ru/core.php
similarity index 100%
rename from resources/lang/ru/core.php
rename to src/resources/lang/ru/core.php
diff --git a/resources/packages.php b/src/resources/packages.php
similarity index 100%
rename from resources/packages.php
rename to src/resources/packages.php
diff --git a/resources/views/doc.blade.php b/src/resources/views/doc.blade.php
similarity index 100%
rename from resources/views/doc.blade.php
rename to src/resources/views/doc.blade.php
diff --git a/resources/views/index.blade.php b/src/resources/views/index.blade.php
similarity index 100%
rename from resources/views/index.blade.php
rename to src/resources/views/index.blade.php
diff --git a/resources/views/menu.blade.php b/src/resources/views/menu.blade.php
similarity index 100%
rename from resources/views/menu.blade.php
rename to src/resources/views/menu.blade.php