diff --git a/app/Console/Commands/Modules/DisableModule.php b/app/Console/Commands/Modules/DisableModule.php
new file mode 100644
index 00000000..823f52db
--- /dev/null
+++ b/app/Console/Commands/Modules/DisableModule.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Console\Commands\Modules;
+
+use App\Models\Module;
+use Illuminate\Console\Command;
+
+class DisableModule extends Command
+{
+    /**
+     * The name and signature of the console command.
+     * @var string
+     */
+    protected $signature = 'module:disable {module}';
+    /**
+     * The console command description.
+     * @var string
+     */
+    protected $description = 'Disable module';
+
+    /**
+     * Execute the console command.
+     * @return mixed
+     */
+    public function handle()
+    {
+        $moduleName = $this->argument('module');
+        $module = Module::where('static_name', $moduleName)
+                        ->firstOrFail();
+
+        if ($module->has_submodules) {
+            $submodules = $module->submodules;
+
+            foreach ($submodules as $submodule) {
+                $this->call('module:disable', ['module' => $submodule->static_name]);
+            }
+        }
+
+        $module->enabled = false;
+        $module->save();
+
+        $this->line('Module ' . $module->static_name . ' disabled.');
+    }
+}
diff --git a/app/Console/Commands/Modules/EnableModule.php b/app/Console/Commands/Modules/EnableModule.php
new file mode 100644
index 00000000..092afa0d
--- /dev/null
+++ b/app/Console/Commands/Modules/EnableModule.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Console\Commands\Modules;
+
+use App\Models\Module;
+use Illuminate\Console\Command;
+
+class EnableModule extends Command
+{
+    /**
+     * The name and signature of the console command.
+     * @var string
+     */
+    protected $signature = 'module:enable {module}';
+    /**
+     * The console command description.
+     * @var string
+     */
+    protected $description = 'Enable module';
+
+    /**
+     * Execute the console command.
+     * @return mixed
+     */
+    public function handle()
+    {
+        $moduleName = $this->argument('module');
+        $module = Module::where('static_name', $moduleName)
+                        ->firstOrFail();
+
+        if ($module->has_submodules) {
+            $submodules = $module->submodules;
+
+            foreach ($submodules as $submodule) {
+                $this->call('module:enable', ['module' => $submodule->static_name]);
+            }
+        }
+
+        if ($module->parent_id) {
+            $module->parent->update(['enabled' => true]);
+        }
+
+        $module->enabled = true;
+        $module->save();
+
+        $this->line('Module ' . $module->static_name . ' enabled.');
+    }
+}
diff --git a/app/Console/Commands/Modules/InstallModule.php b/app/Console/Commands/Modules/InstallModule.php
index 79348f6d..c5eb64a4 100644
--- a/app/Console/Commands/Modules/InstallModule.php
+++ b/app/Console/Commands/Modules/InstallModule.php
@@ -155,13 +155,12 @@ class InstallModule extends Command
         if (is_null($module)) {
             // insert module into database
             $settings = [
-                'staticName' => $this->moduleName,
                 'providers'  => $providers,
                 'order'      => isset($config['order']) ? $config['order'] : 0,
                 'files'      => isset($config['files']) ? $config['files'] : []
             ];
 
-            $module = Installer::install($name, $alias, $description, $handler, $this->parentModuleId, $settings);
+            $module = Installer::install($name, $alias, $this->moduleName, $description, $handler, $this->parentModuleId, $settings);
         }
 
         // try to install submodules
diff --git a/app/Console/Commands/Modules/ModuleMigrate.php b/app/Console/Commands/Modules/ModuleMigrate.php
new file mode 100644
index 00000000..8af774f9
--- /dev/null
+++ b/app/Console/Commands/Modules/ModuleMigrate.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Console\Commands\Modules;
+
+use App\Models\Module;
+use Illuminate\Console\Command;
+
+class ModuleMigrate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     * @var string
+     */
+    protected $signature = 'module:migrate {module}';
+    /**
+     * The console command description.
+     * @var string
+     */
+    protected $description = 'Run migrations in specified module';
+
+    /**
+     * Execute the console command.
+     * @return mixed
+     */
+    public function handle()
+    {
+        $moduleName = $this->argument('module');
+        $module = Module::where('static_name', $moduleName)
+                        ->firstOrFail();
+
+        if ($module->has_submodules) {
+            $submodules = $module->submodules;
+
+            foreach ($submodules as $submodule) {
+                $this->call('module:migrate', ['module' => $submodule->static_name]);
+            }
+        }
+
+        $this->line('Migrating ' . $module->static_name);
+        $this->call('migrate', ['--path' => config('modules.paths.modules').'/'.$moduleName.'/Database']);
+    }
+}
diff --git a/app/Console/Commands/SetTemplate.php b/app/Console/Commands/SetTemplate.php
index 2b7cca26..4766f4c2 100644
--- a/app/Console/Commands/SetTemplate.php
+++ b/app/Console/Commands/SetTemplate.php
@@ -45,7 +45,7 @@ class SetTemplate extends Command
         $config['staticName'] = $template;
 
         if ($current) {
-            $this->line('Template is already installed. Currently using template ' . trans($current->name) . ' located in /templates/' . $current->module_settings['staticName'] . '.');
+            $this->line('Template is already installed. Currently using template ' . trans($current->name) . ' located in /templates/' . $current->static_name . '.');
             $confirm = $this->confirm('Uninstall it and install *' . trans($config['name']) . '*? All data associated with installed template will be lost!');
 
             if ($confirm) {
@@ -59,7 +59,7 @@ class SetTemplate extends Command
         }
 
         try {
-            Installer::install($config['name'], $config['alias'], $config['description'], $config['handler'], false, $config);
+            Installer::install($config['name'], $config['alias'], $current->static_name, $config['description'], $config['handler'], false, $config);
         } catch (\Exception $e) {
             $this->error('Cannot install template ' . $template . '. Message: ' . $e->getMessage());
             return;
diff --git a/app/Console/Commands/UninstallModule.php b/app/Console/Commands/UninstallModule.php
new file mode 100644
index 00000000..6c79c84f
--- /dev/null
+++ b/app/Console/Commands/UninstallModule.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class UninstallModule extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'command:name';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 19c2c898..796f9d42 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -3,6 +3,9 @@
 namespace App\Console;
 
 use App\Console\Commands\Modules\CreateNew;
+use App\Console\Commands\Modules\DisableModule;
+use App\Console\Commands\Modules\EnableModule;
+use App\Console\Commands\Modules\ModuleMigrate;
 use App\Console\Commands\PublishTemplateResources;
 use App\Console\Commands\TemplateInfo;
 use Illuminate\Console\Scheduling\Schedule;
@@ -12,13 +15,15 @@ class Kernel extends ConsoleKernel
 {
     /**
      * The Artisan commands provided by your application.
-     *
      * @var array
      */
     protected $commands = [
         Commands\NewUser::class,
         Commands\ChangePassword::class,
         CreateNew::class,
+        ModuleMigrate::class,
+        EnableModule::class,
+        DisableModule::class,
         Commands\Modules\InstallModule::class,
         Commands\Modules\InstallAllModules::class,
         Commands\TranslateDirectory::class,
diff --git a/app/Models/Module.php b/app/Models/Module.php
index 43a4e2cf..d2bbf649 100644
--- a/app/Models/Module.php
+++ b/app/Models/Module.php
@@ -15,6 +15,7 @@ class Module extends Model
         'parent_id',
         'name',
         'description',
+        'static_name', // @todo instalace potrebuje naplnit tento sloupec!
         'alias',
         'module_settings',
         'enabled',
@@ -30,6 +31,15 @@ class Module extends Model
 
     public function getRouteKeyName()
     {
-       return 'alias';
+        return 'alias';
+    }
+
+    public function submodules()
+    {
+        return $this->hasMany(Module::class, 'parent_id');
+    }
+
+    public function parent() {
+        return $this->belongsTo(Module::class, 'parent_id');
     }
 }
\ No newline at end of file
diff --git a/app/ModuleManager/Installer.php b/app/ModuleManager/Installer.php
index 2d8f4add..d58b0898 100644
--- a/app/ModuleManager/Installer.php
+++ b/app/ModuleManager/Installer.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace App\ModuleManager;
 
 use App\CMS\Contracts\Modules\AppHandler;
@@ -6,7 +7,8 @@ use App\CMS\Contracts\Modules\TemplateHandler;
 use App\Models\Module;
 use Illuminate\Support\Facades\App;
 
-class Installer {
+class Installer
+{
     /**
      * Create new module in database
      *
@@ -20,7 +22,7 @@ class Installer {
      * @return Module
      * @throws \ErrorException
      */
-    public static function install($name, $alias, $description, $handler, $parentModuleId, $settings)
+    public static function install($name, $alias, $staticName, $description, $handler, $parentModuleId, $settings)
     {
         // check if user does not want to install module in runtime
         if (!App::runningInConsole()) {
@@ -39,17 +41,18 @@ class Installer {
 
         // insert module into database
         $module = Module::create([
-                                          'name'               => $name,
-                                          'description'        => $description,
-                                          'handler'            => $handler,
-                                          'manages_content'    => $managesContent,
-                                          'support_categories' => $supportCategories,
-                                          'alias'              => $alias,
-                                          'module_settings'    => $settings,
-                                          'parent_id'          => $parentModuleId ? $parentModuleId : null,
-                                          'enabled'            => 1,
-                                          'is_template'        => $isTemplate
-                                      ]);
+                                     'name'               => $name,
+                                     'description'        => $description,
+                                     'handler'            => $handler,
+                                     'static_name'        => $staticName,
+                                     'manages_content'    => $managesContent,
+                                     'support_categories' => $supportCategories,
+                                     'alias'              => $alias,
+                                     'module_settings'    => $settings,
+                                     'parent_id'          => $parentModuleId ? $parentModuleId : null,
+                                     'enabled'            => 1,
+                                     'is_template'        => $isTemplate
+                                 ]);
 
         // install something module-specific
         if ($handler && is_callable([$handler, 'install'])) {
diff --git a/app/ModuleManager/Providers/ModuleManager.php b/app/ModuleManager/Providers/ModuleManager.php
index 199d0a83..c7c3ef47 100644
--- a/app/ModuleManager/Providers/ModuleManager.php
+++ b/app/ModuleManager/Providers/ModuleManager.php
@@ -32,7 +32,7 @@ class ModuleManager extends ServiceProvider
             // include files (if any)
             if (isset($module->module_settings['files']) && !empty($module->module_settings['files'])) {
                 foreach ($module->module_settings['files'] as $file) {
-                    include config('modules.paths.modules') . '/' . $module->module_settings['staticName'] . '/' . $file;
+                    include config('modules.paths.modules') . '/' . $module->static_name . '/' . $file;
                 }
             }
         }
diff --git a/app/Providers/TemplateServiceProvider.php b/app/Providers/TemplateServiceProvider.php
index 08f4a04a..55b4c42f 100644
--- a/app/Providers/TemplateServiceProvider.php
+++ b/app/Providers/TemplateServiceProvider.php
@@ -94,7 +94,7 @@ class TemplateServiceProvider extends ServiceProvider
             return;
         }
 
-        $templateDir = base_path('templates/' . $template->module_settings['staticName']. '/Resources');
+        $templateDir = base_path('templates/' . $template->static_name. '/Resources');
         $assetsDir = $templateDir . '/' . TemplateContract::ASSETS_DIRECTORY;
         $viewsDir = $templateDir . '/views';
 
diff --git a/database/migrations/2017_08_01_181056_add_static_name_to_modules_table.php b/database/migrations/2017_08_01_181056_add_static_name_to_modules_table.php
new file mode 100644
index 00000000..4818ab62
--- /dev/null
+++ b/database/migrations/2017_08_01_181056_add_static_name_to_modules_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddStaticNameToModulesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('modules', function (Blueprint $table) {
+            $table->string('static_name')->after('description');
+        });
+
+        $modules = \App\Models\Module::all();
+        foreach ($modules as $module) {
+            $module->update(['static_name' => $module->static_name]);
+        }
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('modules', function (Blueprint $table) {
+            $table->dropColumn('static_name');
+        });
+    }
+}