diff --git a/src/CrudMake.php b/src/CrudMake.php
index 1d171df..806a9b5 100644
--- a/src/CrudMake.php
+++ b/src/CrudMake.php
@@ -2,70 +2,8 @@
 
 namespace Luthfi\CrudGenerator;
 
-use Illuminate\Console\Command;
-use Illuminate\Console\DetectsApplicationNamespace;
-use Illuminate\Filesystem\Filesystem;
-use Luthfi\CrudGenerator\Generators\ControllerGenerator;
-use Luthfi\CrudGenerator\Generators\FeatureTestGenerator;
-use Luthfi\CrudGenerator\Generators\FormViewGenerator;
-use Luthfi\CrudGenerator\Generators\IndexViewGenerator;
-use Luthfi\CrudGenerator\Generators\LangFileGenerator;
-use Luthfi\CrudGenerator\Generators\MigrationGenerator;
-use Luthfi\CrudGenerator\Generators\ModelFactoryGenerator;
-use Luthfi\CrudGenerator\Generators\ModelGenerator;
-use Luthfi\CrudGenerator\Generators\ModelPolicyGenerator;
-use Luthfi\CrudGenerator\Generators\ModelPolicyTestGenerator;
-use Luthfi\CrudGenerator\Generators\ModelTestGenerator;
-use Luthfi\CrudGenerator\Generators\WebRouteGenerator;
-
-class CrudMake extends Command
+class CrudMake extends GeneratorCommand
 {
-    use DetectsApplicationNamespace;
-
-    /**
-     * The injected Filesystem class
-     *
-     * @var Filesystem
-     */
-    private $files;
-
-    /**
-     * Array of defined model names
-     *
-     * @var array
-     */
-    public $modelNames = [];
-
-    /**
-     * Array of stub's model names
-     *
-     * @var array
-     */
-    public $stubModelNames;
-
-    /**
-     * Construct CrudMake class
-     *
-     * @param Filesystem $files Put generated file content to application file system
-     */
-    public function __construct(Filesystem $files)
-    {
-        parent::__construct();
-
-        $this->files = $files;
-
-        $this->stubModelNames = [
-            'model_namespace'           => 'mstrNmspc',
-            'full_model_name'           => 'fullMstr',
-            'plural_model_name'         => 'Masters',
-            'model_name'                => 'Master',
-            'table_name'                => 'masters',
-            'lang_name'                 => 'master',
-            'collection_model_var_name' => 'mstrCollections',
-            'single_model_var_name'     => 'singleMstr',
-        ];
-    }
-
     /**
      * The name and signature of the console command.
      *
@@ -78,7 +16,7 @@ class CrudMake extends Command
      *
      * @var string
      */
-    protected $description = 'Create simple Laravel complete CRUD files of given model name.';
+    protected $description = 'Create simple Laravel CRUD files of given model name.';
 
     /**
      * Execute the console command.
@@ -107,107 +45,69 @@ class CrudMake extends Command
             return;
         }
 
-        app(WebRouteGenerator::class, ['command' => $this])->generate();
-        app(ModelGenerator::class, ['command' => $this])->generate();
-        app(MigrationGenerator::class, ['command' => $this])->generate();
-        app(ControllerGenerator::class, ['command' => $this])->generate();
-        app(IndexViewGenerator::class, ['command' => $this])->generate();
-        app(FormViewGenerator::class, ['command' => $this])->generate();
-        app(LangFileGenerator::class, ['command' => $this])->generate();
-        app(ModelFactoryGenerator::class, ['command' => $this])->generate();
-        app(ModelPolicyGenerator::class, ['command' => $this])->generate();
-
+        $this->generateRoutes();
+        $this->generateModel();
+        $this->generateController();
+        $this->generateResources();
         $this->generateTestFiles();
 
         $this->info('CRUD files generated successfully!');
     }
 
     /**
-     * Generate class properties for model names in different usage
+     * Generate test files
      *
      * @return void
      */
-    public function getModelName($modelName = null)
-    {
-        $modelName = is_null($modelName) ? $this->argument('name') : $modelName;
-        $model_name = ucfirst(class_basename($modelName));
-        $plural_model_name = str_plural($model_name);
-        $modelPath = $this->getModelPath($modelName);
-        $modelNamespace = $this->getModelNamespace($modelPath);
-
-        return $this->modelNames = [
-            'model_namespace'           => $modelNamespace,
-            'full_model_name'           => $modelNamespace.'\\'.$model_name,
-            'plural_model_name'         => $plural_model_name,
-            'model_name'                => $model_name,
-            'table_name'                => snake_case($plural_model_name),
-            'lang_name'                 => snake_case($model_name),
-            'collection_model_var_name' => camel_case($plural_model_name),
-            'single_model_var_name'     => camel_case($model_name),
-            'model_path'                => $modelPath,
-        ];
-    }
-
-    /**
-     * Get model path on storage
-     *
-     * @param  string $modelName Input model name from command argument
-     * @return string            Model path on storage
-     */
-    protected function getModelPath($modelName)
+    public function generateTestFiles()
     {
-        $inputName = explode('/', ucfirst($modelName));
-        array_pop($inputName);
-
-        return implode('/', $inputName);
+        app('Luthfi\CrudGenerator\Generators\ModelTestGenerator', ['command' => $this])->generate();
+        app('Luthfi\CrudGenerator\Generators\FeatureTestGenerator', ['command' => $this])->generate();
+        app('Luthfi\CrudGenerator\Generators\ModelPolicyTestGenerator', ['command' => $this])->generate();
     }
 
     /**
-     * Get model namespace
+     * Generate Controller
      *
-     * @param  string $modelPath Model path
-     * @return string            Model namespace
+     * @return void
      */
-    protected function getModelNamespace($modelPath)
+    public function generateController()
     {
-        $appNamespace = trim($this->getAppNamespace(), '\\');
-        $modelNamespace = str_replace('/', '\\', $appNamespace.'/'.ucfirst($modelPath));
-        return $modelNamespace == 'App\\' ? 'App' : $modelNamespace;
+        app('Luthfi\CrudGenerator\Generators\ControllerGenerator', ['command' => $this])->generate();
     }
 
     /**
-     * Check for Model file existance
+     * Generate Model
      *
      * @return void
      */
-    public function modelExists()
+    public function generateModel()
     {
-        return $this->files->exists(
-            app_path($this->modelNames['model_path'].'/'.$this->modelNames['model_name'].'.php')
-        );
+        app('Luthfi\CrudGenerator\Generators\ModelGenerator', ['command' => $this])->generate();
+        app('Luthfi\CrudGenerator\Generators\MigrationGenerator', ['command' => $this])->generate();
+        app('Luthfi\CrudGenerator\Generators\ModelPolicyGenerator', ['command' => $this])->generate();
+        app('Luthfi\CrudGenerator\Generators\ModelFactoryGenerator', ['command' => $this])->generate();
     }
 
     /**
-     * Check for default layout view file existance
+     * Generate Route Route
      *
      * @return void
      */
-    public function defaultLayoutNotExists()
+    public function generateRoutes()
     {
-        return !$this->files->exists(
-            resource_path('views/'.str_replace('.', '/', config('simple-crud.default_layout_view')).'.blade.php')
-        );
+        app('Luthfi\CrudGenerator\Generators\WebRouteGenerator', ['command' => $this])->generate();
     }
 
     /**
-     * Generate test files
+     * Generate Resources
      *
      * @return void
      */
-    public function generateTestFiles()
+    public function generateResources()
     {
-        app(ModelTestGenerator::class, ['command' => $this])->generate();
-        app(FeatureTestGenerator::class, ['command' => $this])->generate();
-        app(ModelPolicyTestGenerator::class, ['command' => $this])->generate();
+        app('Luthfi\CrudGenerator\Generators\LangFileGenerator', ['command' => $this])->generate();
+        app('Luthfi\CrudGenerator\Generators\FormViewGenerator', ['command' => $this])->generate();
+        app('Luthfi\CrudGenerator\Generators\IndexViewGenerator', ['command' => $this])->generate();
     }
 }
diff --git a/src/GeneratorCommand.php b/src/GeneratorCommand.php
new file mode 100644
index 0000000..9e9cd17
--- /dev/null
+++ b/src/GeneratorCommand.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Luthfi\CrudGenerator;
+
+use Illuminate\Console\Command;
+use Illuminate\Console\DetectsApplicationNamespace;
+use Illuminate\Filesystem\Filesystem;
+
+class GeneratorCommand extends Command
+{
+    use DetectsApplicationNamespace;
+
+    /**
+     * The injected Filesystem class
+     *
+     * @var Filesystem
+     */
+    private $files;
+
+    /**
+     * Array of defined model names
+     *
+     * @var array
+     */
+    public $modelNames = [];
+
+    /**
+     * Array of stub's model names
+     *
+     * @var array
+     */
+    public $stubModelNames = [
+        'model_namespace'           => 'mstrNmspc',
+        'full_model_name'           => 'fullMstr',
+        'plural_model_name'         => 'Masters',
+        'model_name'                => 'Master',
+        'table_name'                => 'masters',
+        'lang_name'                 => 'master',
+        'collection_model_var_name' => 'mstrCollections',
+        'single_model_var_name'     => 'singleMstr',
+    ];
+
+    /**
+     * Construct CrudMake class
+     *
+     * @param Filesystem $files Put generated file content to application file system
+     */
+    public function __construct(Filesystem $files)
+    {
+        parent::__construct();
+
+        $this->files = $files;
+    }
+
+    /**
+     * Generate class properties for model names in different usage
+     *
+     * @return void
+     */
+    public function getModelName($modelName = null)
+    {
+        $modelName = is_null($modelName) ? $this->argument('name') : $modelName;
+        $model_name = ucfirst(class_basename($modelName));
+        $plural_model_name = str_plural($model_name);
+        $modelPath = $this->getModelPath($modelName);
+        $modelNamespace = $this->getModelNamespace($modelPath);
+
+        return $this->modelNames = [
+            'model_namespace'           => $modelNamespace,
+            'full_model_name'           => $modelNamespace.'\\'.$model_name,
+            'plural_model_name'         => $plural_model_name,
+            'model_name'                => $model_name,
+            'table_name'                => snake_case($plural_model_name),
+            'lang_name'                 => snake_case($model_name),
+            'collection_model_var_name' => camel_case($plural_model_name),
+            'single_model_var_name'     => camel_case($model_name),
+            'model_path'                => $modelPath,
+        ];
+    }
+
+    /**
+     * Get model path on storage
+     *
+     * @param  string $modelName Input model name from command argument
+     * @return string            Model path on storage
+     */
+    protected function getModelPath($modelName)
+    {
+        $inputName = explode('/', ucfirst($modelName));
+        array_pop($inputName);
+
+        return implode('/', $inputName);
+    }
+
+    /**
+     * Get model namespace
+     *
+     * @param  string $modelPath Model path
+     * @return string            Model namespace
+     */
+    protected function getModelNamespace($modelPath)
+    {
+        $appNamespace = trim($this->getAppNamespace(), '\\');
+        $modelNamespace = str_replace('/', '\\', $appNamespace.'/'.ucfirst($modelPath));
+        return $modelNamespace == 'App\\' ? 'App' : $modelNamespace;
+    }
+
+    /**
+     * Check for Model file existance
+     *
+     * @return void
+     */
+    public function modelExists()
+    {
+        return $this->files->exists(
+            app_path($this->modelNames['model_path'].'/'.$this->modelNames['model_name'].'.php')
+        );
+    }
+
+    /**
+     * Check for default layout view file existance
+     *
+     * @return void
+     */
+    public function defaultLayoutNotExists()
+    {
+        return !$this->files->exists(
+            resource_path('views/'.str_replace('.', '/', config('simple-crud.default_layout_view')).'.blade.php')
+        );
+    }
+}