diff --git a/.hidev/commits.md b/.hidev/commits.md
index 7376089..ce86a2c 100644
--- a/.hidev/commits.md
+++ b/.hidev/commits.md
@@ -3,6 +3,7 @@ hiqdev/hipanel-module-ticket commits history
 
 ## Under development
 
+    - 6549eea 2015-08-03 hideved (sol@hiqdev.com)
 - Added basic functionality
     - 752bd0e 2015-08-03 Bulk buttons change (andreyklochok@gmail.com)
     - 12aeebe 2015-08-02 * Plugin: + aliases (sol@hiqdev.com)
diff --git a/composer.json b/composer.json
index ed43872..e6adbbf 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
     },
     "autoload": {
         "psr-4": {
-            "hipanel\\modules\\ticket\\": ""
+            "hipanel\\modules\\ticket\\": "src"
         }
     }
 }
diff --git a/Module.php b/src/Module.php
similarity index 100%
rename from Module.php
rename to src/Module.php
diff --git a/Plugin.php b/src/Plugin.php
similarity index 100%
rename from Plugin.php
rename to src/Plugin.php
diff --git a/SidebarMenu.php b/src/SidebarMenu.php
similarity index 100%
rename from SidebarMenu.php
rename to src/SidebarMenu.php
diff --git a/controllers/TicketController.php b/src/controllers/TicketController.php
similarity index 100%
rename from controllers/TicketController.php
rename to src/controllers/TicketController.php
diff --git a/models/Thread.php b/src/models/Thread.php
similarity index 100%
rename from models/Thread.php
rename to src/models/Thread.php
diff --git a/models/ThreadSearch.php b/src/models/ThreadSearch.php
similarity index 100%
rename from models/ThreadSearch.php
rename to src/models/ThreadSearch.php
diff --git a/models/TicketSettings.php b/src/models/TicketSettings.php
similarity index 100%
rename from models/TicketSettings.php
rename to src/models/TicketSettings.php
diff --git a/views/ticket/_advanced_form.php b/src/views/ticket/_advanced_form.php
similarity index 100%
rename from views/ticket/_advanced_form.php
rename to src/views/ticket/_advanced_form.php
diff --git a/views/ticket/_attachment.php b/src/views/ticket/_attachment.php
similarity index 100%
rename from views/ticket/_attachment.php
rename to src/views/ticket/_attachment.php
diff --git a/views/ticket/_chat.php b/src/views/ticket/_chat.php
similarity index 100%
rename from views/ticket/_chat.php
rename to src/views/ticket/_chat.php
diff --git a/views/ticket/_comment.php b/src/views/ticket/_comment.php
similarity index 100%
rename from views/ticket/_comment.php
rename to src/views/ticket/_comment.php
diff --git a/views/ticket/_form.php b/src/views/ticket/_form.php
similarity index 100%
rename from views/ticket/_form.php
rename to src/views/ticket/_form.php
diff --git a/views/ticket/_leftBlock.php b/src/views/ticket/_leftBlock.php
similarity index 100%
rename from views/ticket/_leftBlock.php
rename to src/views/ticket/_leftBlock.php
diff --git a/views/ticket/_rightBlock.php b/src/views/ticket/_rightBlock.php
similarity index 100%
rename from views/ticket/_rightBlock.php
rename to src/views/ticket/_rightBlock.php
diff --git a/views/ticket/_search.php b/src/views/ticket/_search.php
similarity index 100%
rename from views/ticket/_search.php
rename to src/views/ticket/_search.php
diff --git a/views/ticket/_template.php b/src/views/ticket/_template.php
similarity index 100%
rename from views/ticket/_template.php
rename to src/views/ticket/_template.php
diff --git a/views/ticket/create.php b/src/views/ticket/create.php
similarity index 100%
rename from views/ticket/create.php
rename to src/views/ticket/create.php
diff --git a/views/ticket/index.php b/src/views/ticket/index.php
similarity index 100%
rename from views/ticket/index.php
rename to src/views/ticket/index.php
diff --git a/views/ticket/settings.php b/src/views/ticket/settings.php
similarity index 100%
rename from views/ticket/settings.php
rename to src/views/ticket/settings.php
diff --git a/views/ticket/view.php b/src/views/ticket/view.php
similarity index 100%
rename from views/ticket/view.php
rename to src/views/ticket/view.php
diff --git a/widgets/Label.php b/src/widgets/Label.php
similarity index 100%
rename from widgets/Label.php
rename to src/widgets/Label.php
diff --git a/widgets/Topic.php b/src/widgets/Topic.php
similarity index 100%
rename from widgets/Topic.php
rename to src/widgets/Topic.php
diff --git a/widgets/Watcher.php b/src/widgets/Watcher.php
similarity index 100%
rename from widgets/Watcher.php
rename to src/widgets/Watcher.php