diff --git a/.travis.yml b/.travis.yml
index d2556725..e919cc66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,9 +44,83 @@ script:
 after_failure:
   - cat storage/logs/*.log
 
+# Refer to: https://github.com/doctrine/dbal/blob/master/.travis.yml#L39
 jobs:
-  fast_finish: true
   include:
+    # Different test stages
+#    - stage: Test
+#      name: PHP 7.2 + MySQL 5.7
+#      php: 7.2
+#      env: DB=mysql
+#      services:
+#        - mysql
+#    - stage: Test
+#      name: PHP 7.3 + MySQL 5.7
+#      php: 7.3
+#      env: DB=mysql
+#      services:
+#        - mysql
+#    - stage: Test
+#      name: PHP 7.4 + MySQL 5.7
+#      php: 7.4
+#      env: DB=mysql
+#      services:
+#        - mysql
+#    - stage: Test
+#      name: PHP 7.2 + MariaDB 10.1
+#      php: 7.2
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.1'
+#    - stage: Test
+#      name: PHP 7.3 + MariaDB 10.1
+#      php: 7.3
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.1'
+#    - stage: Test
+#      name: PHP 7.4 + MariaDB 10.1
+#      php: 7.4
+#      env: DB=mariadb MARIADB_VERSION=10.1
+#      addons:
+#        mariadb: '10.1'
+#    - stage: Test
+#      name: PHP 7.2 + MariaDB 10.2
+#      php: 7.2
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.2'
+#    - stage: Test
+#      name: PHP 7.3 + MariaDB 10.3
+#      php: 7.3
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.2'
+#    - stage: Test
+#      name: PHP 7.4 + MariaDB 10.2
+#      php: 7.4
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.2'
+#    - stage: Test
+#      name: PHP 7.2 + MariaDB 10.3
+#      php: 7.2
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.3'
+#    - stage: Test
+#      name: PHP 7.3 + MariaDB 10.3
+#      php: 7.3
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.3'
+#    - stage: Test
+#      name: PHP 7.4 + MariaDB 10.3
+#      php: 7.4
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.3'
+
     # Just packages up a release
     - stage: package
       script: skip
diff --git a/app/Contracts/Model.php b/app/Contracts/Model.php
index 9f0587fc..20e94c97 100644
--- a/app/Contracts/Model.php
+++ b/app/Contracts/Model.php
@@ -6,7 +6,7 @@ namespace App\Contracts;
  * @property mixed $id
  * @property bool  $skip_mutator
  *
- * @method static create(array $attrs)
+ * @method static Model create(array $attrs)
  * @method static Model find(int $id)
  * @method static Model select(array $array)
  * @method static Model where(array $array)
diff --git a/app/Facades/Utils.php b/app/Facades/Utils.php
index c077c819..8a9973e0 100644
--- a/app/Facades/Utils.php
+++ b/app/Facades/Utils.php
@@ -5,9 +5,6 @@ namespace App\Facades;
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Facade;
 
-/**
- * Class Utils
- */
 class Utils extends Facade
 {
     /**
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 4c35ccca..2605280a 100755
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -25,7 +25,7 @@ use App\Models\Subfleet;
 use App\Models\User;
 use App\Repositories\SettingRepository;
 use App\Services\ModuleService;
-use Illuminate\Contracts\Container\BindingResolutionException;
+use App\Support\Utils;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
@@ -76,13 +76,10 @@ class AppServiceProvider extends ServiceProvider
                 $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
             }
 
-            try {
-                if (config('app.debug_toolbar') === true) {
-                    app('debugbar')->enable();
-                } else {
-                    app('debugbar')->disable();
-                }
-            } catch (BindingResolutionException $e) {
+            if (config('app.debug_toolbar') === true) {
+                Utils::enableDebugToolbar();
+            } else {
+                Utils::disableDebugToolbar();
             }
         }
     }
diff --git a/modules/Installer/Services/DatabaseService.php b/app/Services/Installer/DatabaseService.php
similarity index 97%
rename from modules/Installer/Services/DatabaseService.php
rename to app/Services/Installer/DatabaseService.php
index 9a1618b6..57ddabfa 100644
--- a/modules/Installer/Services/DatabaseService.php
+++ b/app/Services/Installer/DatabaseService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Installer\Services;
+namespace App\Services\Installer;
 
 use App\Contracts\Service;
 use Illuminate\Support\Facades\Artisan;
diff --git a/app/Services/Installer/InstallerService.php b/app/Services/Installer/InstallerService.php
index 9cfdca31..f0ccdb35 100644
--- a/app/Services/Installer/InstallerService.php
+++ b/app/Services/Installer/InstallerService.php
@@ -3,6 +3,7 @@
 namespace App\Services\Installer;
 
 use App\Contracts\Service;
+use Nwidart\Modules\Facades\Module;
 
 class InstallerService extends Service
 {
@@ -36,4 +37,16 @@ class InstallerService extends Service
 
         return false;
     }
+
+    /**
+     * Disable the installer and importer modules
+     */
+    public function disableInstallerModules()
+    {
+        $module = Module::find('installer');
+        $module->disable();
+
+        $module = Module::find('importer');
+        $module->disable();
+    }
 }
diff --git a/modules/Installer/Utils/LoggerTrait.php b/app/Services/Installer/LoggerTrait.php
similarity index 89%
rename from modules/Installer/Utils/LoggerTrait.php
rename to app/Services/Installer/LoggerTrait.php
index f8faa60b..872827ef 100644
--- a/modules/Installer/Utils/LoggerTrait.php
+++ b/app/Services/Installer/LoggerTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Installer\Utils;
+namespace App\Services\Installer;
 
 use Illuminate\Support\Facades\Log;
 
diff --git a/app/Support/Utils.php b/app/Support/Utils.php
index cd371d7c..69ceccd7 100644
--- a/app/Support/Utils.php
+++ b/app/Support/Utils.php
@@ -2,6 +2,7 @@
 
 namespace App\Support;
 
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Nwidart\Modules\Facades\Module;
 
 /**
@@ -9,6 +10,28 @@ use Nwidart\Modules\Facades\Module;
  */
 class Utils
 {
+    /**
+     * Enable the debug toolbar
+     */
+    public static function enableDebugToolbar()
+    {
+        try {
+            app('debugbar')->enable();
+        } catch (BindingResolutionException $e) {
+        }
+    }
+
+    /**
+     * Disable the debug toolbar
+     */
+    public static function disableDebugToolbar()
+    {
+        try {
+            app('debugbar')->disable();
+        } catch (BindingResolutionException $e) {
+        }
+    }
+
     /**
      * Is the installer enabled?
      *
diff --git a/config/modules_statuses.json b/config/modules_statuses.json
index 6aba0422..d7b8ddbe 100644
--- a/config/modules_statuses.json
+++ b/config/modules_statuses.json
@@ -1,7 +1,9 @@
 {
     "Awards": true,
+    "Importer": true,
     "Installer": true,
     "Sample": true,
+    "Updater": true,
     "VMSAcars": true,
     "Vacentral": true
-}
\ No newline at end of file
+}
diff --git a/intellij_style.xml b/intellij_style.xml
index 9c0b5256..3fc35b05 100644
--- a/intellij_style.xml
+++ b/intellij_style.xml
@@ -17,9 +17,9 @@
     <option name="VARIABLE_NAMING_STYLE" value="CAMEL_CASE" />
     <option name="BLANK_LINES_BEFORE_RETURN_STATEMENT" value="1" />
     <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
-    <option name="SPACE_AFTER_UNARY_NOT" value="true" />
     <option name="SPACES_WITHIN_SHORT_ECHO_TAGS" value="false" />
     <option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" />
+    <option name="PHPDOC_USE_FQCN" value="true" />
   </PHPCodeStyleSettings>
   <XML>
     <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
@@ -32,6 +32,8 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="PHP">
+    <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="LINE_COMMENT_ADD_SPACE" value="true" />
     <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
@@ -44,6 +46,7 @@
     <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
     <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
     <option name="SPACE_AFTER_TYPE_CAST" value="true" />
+    <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
     <option name="SPACE_BEFORE_CLASS_LBRACE" value="false" />
     <option name="METHOD_PARAMETERS_WRAP" value="5" />
     <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
diff --git a/modules/.gitignore b/modules/.gitignore
index 75e889fb..f957b1e3 100644
--- a/modules/.gitignore
+++ b/modules/.gitignore
@@ -7,4 +7,5 @@
 !/Importer
 !/Installer
 !/Sample
+!/Updater
 !/Vacentral
diff --git a/modules/Importer/Config/config.php b/modules/Importer/Config/config.php
new file mode 100644
index 00000000..04a08883
--- /dev/null
+++ b/modules/Importer/Config/config.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'importer' => [
+        'batch_size' => 20,
+    ],
+];
diff --git a/modules/Installer/Console/Commands/ImportFromClassicCommand.php b/modules/Importer/Console/Commands/ImportFromClassicCommand.php
similarity index 91%
rename from modules/Installer/Console/Commands/ImportFromClassicCommand.php
rename to modules/Importer/Console/Commands/ImportFromClassicCommand.php
index 89d3b72b..97c73d82 100644
--- a/modules/Installer/Console/Commands/ImportFromClassicCommand.php
+++ b/modules/Importer/Console/Commands/ImportFromClassicCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Modules\Installer\Console\Commands;
+namespace Modules\Importer\Console\Commands;
 
 use App\Contracts\Command;
 use Illuminate\Support\Facades\Log;
-use Modules\Installer\Services\Importer\ImporterService;
+use Modules\Importer\Services\ImporterService;
 
 class ImportFromClassicCommand extends Command
 {
diff --git a/modules/Installer/Http/Controllers/ImporterController.php b/modules/Importer/Http/Controllers/ImporterController.php
similarity index 55%
rename from modules/Installer/Http/Controllers/ImporterController.php
rename to modules/Importer/Http/Controllers/ImporterController.php
index d0ad704f..921f63c8 100644
--- a/modules/Installer/Http/Controllers/ImporterController.php
+++ b/modules/Importer/Http/Controllers/ImporterController.php
@@ -1,25 +1,26 @@
 <?php
 
-namespace Modules\Installer\Http\Controllers;
+namespace Modules\Importer\Http\Controllers;
 
 use App\Contracts\Controller;
-use Illuminate\Contracts\Container\BindingResolutionException;
+use App\Services\Installer\DatabaseService;
+use App\Services\Installer\InstallerService;
+use App\Support\Utils;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
-use Modules\Installer\Services\Importer\ImporterService;
+use Modules\Importer\Services\ImporterService;
 
 class ImporterController extends Controller
 {
+    private $dbSvc;
     private $importerSvc;
 
-    public function __construct(ImporterService $importerSvc)
+    public function __construct(DatabaseService $dbSvc, ImporterService $importerSvc)
     {
+        $this->dbSvc = $dbSvc;
         $this->importerSvc = $importerSvc;
 
-        try {
-            app('debugbar')->disable();
-        } catch (BindingResolutionException $e) {
-        }
+        Utils::disableDebugToolbar();
     }
 
     /**
@@ -28,16 +29,43 @@ class ImporterController extends Controller
      *
      * @param \Illuminate\Http\Request $request
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
      */
     public function index(Request $request)
     {
+        return view('importer::step1-configure');
+    }
+
+    /**
+     * Check the database connection
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return mixed
+     */
+    public function dbtest(Request $request)
+    {
+        $status = 'success';  // success|warn|danger
+        $message = 'Database connection looks good!';
+
         try {
-            app('debugbar')->disable();
-        } catch (BindingResolutionException $e) {
+            $this->dbSvc->checkDbConnection(
+                $request->post('db_conn'),
+                $request->post('db_host'),
+                $request->post('db_port'),
+                $request->post('db_name'),
+                $request->post('db_user'),
+                $request->post('db_pass')
+            );
+        } catch (\Exception $e) {
+            $status = 'danger';
+            $message = 'Failed! '.$e->getMessage();
         }
 
-        return view('installer::importer/step1-configure');
+        return view('importer::dbtest', [
+            'status'  => $status,
+            'message' => $message,
+        ]);
     }
 
     /**
@@ -45,15 +73,10 @@ class ImporterController extends Controller
      *
      * @param \Illuminate\Http\Request $request
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return mixed
      */
     public function config(Request $request)
     {
-        try {
-            app('debugbar')->disable();
-        } catch (BindingResolutionException $e) {
-        }
-
         try {
             // Save the credentials to use later
             $this->importerSvc->saveCredentialsFromRequest($request);
@@ -62,14 +85,15 @@ class ImporterController extends Controller
             $manifest = $this->importerSvc->generateImportManifest();
         } catch (\Exception $e) {
             Log::error($e->getMessage());
+
             // Send it to run, step1
-            return view('installer::importer/error', [
+            return view('importer::error', [
                 'error' => $e->getMessage(),
             ]);
         }
 
         // Send it to run, step1
-        return view('installer::importer/step2-processing', [
+        return view('importer::step2-processing', [
             'manifest' => $manifest,
         ]);
     }
@@ -84,15 +108,10 @@ class ImporterController extends Controller
      *
      * @throws \Exception
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return mixed
      */
     public function run(Request $request)
     {
-        try {
-            app('debugbar')->disable();
-        } catch (BindingResolutionException $e) {
-        }
-
         $importer = $request->input('importer');
         $start = $request->input('start');
 
@@ -110,6 +129,9 @@ class ImporterController extends Controller
      */
     public function complete()
     {
+        $installerSvc = app(InstallerService::class);
+        $installerSvc->disableInstallerModules();
+
         return redirect('/');
     }
 }
diff --git a/modules/Importer/Providers/ImporterServiceProvider.php b/modules/Importer/Providers/ImporterServiceProvider.php
new file mode 100644
index 00000000..8a36b204
--- /dev/null
+++ b/modules/Importer/Providers/ImporterServiceProvider.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Modules\Importer\Providers;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\ServiceProvider;
+use Modules\Importer\Console\Commands\ImportFromClassicCommand;
+
+class ImporterServiceProvider extends ServiceProvider
+{
+    /**
+     * Boot the application events.
+     */
+    public function boot()
+    {
+        $this->registerCommands();
+        $this->registerRoutes();
+        $this->registerTranslations();
+        $this->registerConfig();
+        $this->registerViews();
+    }
+
+    protected function registerCommands()
+    {
+        $this->commands([
+            ImportFromClassicCommand::class,
+        ]);
+    }
+
+    /**
+     * Register the routes
+     */
+    protected function registerRoutes()
+    {
+        Route::group([
+            'as'         => 'importer.',
+            'prefix'     => 'importer',
+            'middleware' => ['web'],
+            'namespace'  => 'Modules\Importer\Http\Controllers',
+        ], function () {
+            Route::get('/', 'ImporterController@index')->name('index');
+            Route::post('/config', 'ImporterController@config')->name('config');
+            Route::post('/dbtest', 'ImporterController@dbtest')->name('dbtest');
+
+            // Run the actual importer process. Additional middleware
+            Route::post('/run', 'ImporterController@run')->middleware('api')->name('run');
+
+            Route::post('/complete', 'ImporterController@complete')->name('complete');
+        });
+    }
+
+    /**
+     * Register config.
+     */
+    protected function registerConfig()
+    {
+        $this->mergeConfigFrom(__DIR__.'/../Config/config.php', 'importer');
+    }
+
+    /**
+     * Register views.
+     */
+    public function registerViews()
+    {
+        $viewPath = resource_path('views/modules/importer');
+        $sourcePath = __DIR__.'/../Resources/views';
+
+        $this->publishes([$sourcePath => $viewPath], 'views');
+
+        $paths = array_map(
+            function ($path) {
+                return $path.'/modules/importer';
+            },
+            \Config::get('view.paths')
+        );
+
+        $paths[] = $sourcePath;
+        $this->loadViewsFrom($paths, 'importer');
+    }
+
+    /**
+     * Register translations.
+     */
+    public function registerTranslations()
+    {
+        $langPath = resource_path('lang/modules/importer');
+
+        if (is_dir($langPath)) {
+            $this->loadTranslationsFrom($langPath, 'importer');
+        } else {
+            $this->loadTranslationsFrom(__DIR__.'/../Resources/lang', 'importer');
+        }
+    }
+
+    /**
+     * Get the services provided by the provider.
+     */
+    public function provides(): array
+    {
+        return [];
+    }
+}
diff --git a/modules/Importer/Resources/views/app.blade.php b/modules/Importer/Resources/views/app.blade.php
new file mode 100644
index 00000000..052d6481
--- /dev/null
+++ b/modules/Importer/Resources/views/app.blade.php
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+
+    <title>@yield('title') - importer</title>
+
+    <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
+
+    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
+          name='viewport'/>
+    <meta name="base-url" content="{!! url('') !!}">
+    <meta name="api-key" content="{!! Auth::check() ? Auth::user()->api_key: '' !!}">
+    <meta name="csrf-token" content="{!! csrf_token() !!}">
+
+    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
+
+    <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
+    <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
+    <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
+    <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
+
+    <link rel="stylesheet"
+          href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
+
+    <style>
+        .table tr:first-child td { border-top: 0px; }
+        @yield('css')
+    </style>
+</head>
+
+<body>
+<!-- Navbar -->
+<nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
+    <div class="container" style="width: 85%!important;">
+        <div class="navbar-translate">
+            <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
+                <a href="{{ url('/') }}">
+                    <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
+                </a>
+            </p>
+        </div>
+        <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
+            @yield('title')
+        </div>
+    </div>
+</nav>
+<!-- End Navbar -->
+{{--<div class="clearfix" style="height: 25px;"></div>--}}
+<div class="wrapper">
+    <div class="clear"></div>
+    <div class="container" style="width: 50%">
+        <div class="row">
+            <div class="col-12">
+                @include('importer::flash.message')
+                @yield('content')
+            </div>
+        </div>
+    </div>
+    <div class="clearfix" style="height: 200px;"></div>
+</div>
+
+{{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}
+
+<script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/frontend/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
+<script src="{{ public_asset('/assets/installer/js/vendor.js') }}" type="text/javascript"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+
+<script>
+    hljs.configure({languages: ['sh']});
+
+    $(document).ready(function () {
+
+        $(".select2").select2();
+
+        $('pre code').each(function (i, block) {
+            hljs.fixMarkup(block);
+            hljs.highlightBlock(block);
+        });
+    });
+</script>
+
+@yield('scripts')
+
+</body>
+</html>
diff --git a/modules/Installer/Resources/views/importer/complete.blade.php b/modules/Importer/Resources/views/complete.blade.php
similarity index 72%
rename from modules/Installer/Resources/views/importer/complete.blade.php
rename to modules/Importer/Resources/views/complete.blade.php
index 1c776a18..ee52e38c 100644
--- a/modules/Installer/Resources/views/importer/complete.blade.php
+++ b/modules/Importer/Resources/views/complete.blade.php
@@ -1,9 +1,9 @@
-@extends('installer::app')
+@extends('importer::app')
 @section('title', 'Import Completed!')
 
 @section('content')
   <div style="align-content: center;">
-    {{ Form::open(['route' => 'installer.complete', 'method' => 'GET']) }}
+    {{ Form::open(['route' => 'importer.complete', 'method' => 'GET']) }}
 
     <h4>Installer Completed!</h4>
 
@@ -11,7 +11,7 @@
     <p>Click the button to proceed to the login screen!</p>
 
     <p style="text-align: right">
-      {{ Form::submit('Install Complete! Continue to Log-In >>',
+      {{ Form::submit('Import Complete! Continue to Log-In >>',
                        ['class' => 'btn btn-success'])
       }}
     </p>
diff --git a/modules/Installer/Resources/views/flash/dbtest.blade.php b/modules/Importer/Resources/views/dbtest.blade.php
similarity index 100%
rename from modules/Installer/Resources/views/flash/dbtest.blade.php
rename to modules/Importer/Resources/views/dbtest.blade.php
diff --git a/modules/Installer/Resources/views/importer/error.blade.php b/modules/Importer/Resources/views/error.blade.php
similarity index 86%
rename from modules/Installer/Resources/views/importer/error.blade.php
rename to modules/Importer/Resources/views/error.blade.php
index 41610bde..938f29c9 100644
--- a/modules/Installer/Resources/views/importer/error.blade.php
+++ b/modules/Importer/Resources/views/error.blade.php
@@ -1,4 +1,4 @@
-@extends('installer::app')
+@extends('importer::app')
 @section('title', 'Import Error!')
 
 @section('content')
diff --git a/modules/Importer/Resources/views/flash/check_error.blade.php b/modules/Importer/Resources/views/flash/check_error.blade.php
new file mode 100644
index 00000000..cc67ffc0
--- /dev/null
+++ b/modules/Importer/Resources/views/flash/check_error.blade.php
@@ -0,0 +1,6 @@
+@if($errors->has($field))
+    <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
+{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
+    {{ $errors->first($field) }}
+</div>--}}
+@endif
diff --git a/modules/Importer/Resources/views/flash/message.blade.php b/modules/Importer/Resources/views/flash/message.blade.php
new file mode 100644
index 00000000..5633dc36
--- /dev/null
+++ b/modules/Importer/Resources/views/flash/message.blade.php
@@ -0,0 +1,11 @@
+@foreach (session('flash_notification', collect())->toArray() as $message)
+<div class="alert alert-danger" role="alert">
+    <div class="container">
+        <div class="alert-icon">
+            <i class="now-ui-icons ui-2_like"></i>
+        </div>
+        {{ $message['message'] }}
+    </div>
+</div>
+@endforeach
+{{ session()->forget('flash_notification') }}
diff --git a/modules/Installer/Resources/views/importer/step1-configure.blade.php b/modules/Importer/Resources/views/step1-configure.blade.php
similarity index 97%
rename from modules/Installer/Resources/views/importer/step1-configure.blade.php
rename to modules/Importer/Resources/views/step1-configure.blade.php
index 3a45e6f2..b50e41bd 100644
--- a/modules/Installer/Resources/views/importer/step1-configure.blade.php
+++ b/modules/Importer/Resources/views/step1-configure.blade.php
@@ -1,4 +1,4 @@
-@extends('installer::app')
+@extends('importer::app')
 @section('title', 'Import Configuration')
 
 @section('content')
@@ -125,7 +125,7 @@
           db_pass: $("input[name=db_pass]").val(),
         };
 
-        $.post("{{ route('installer.dbtest') }}", opts, (data) => {
+        $.post("{{ route('importer.dbtest') }}", opts, (data) => {
           $("#dbtest").html(data);
         })
       })
diff --git a/modules/Installer/Resources/views/importer/step2-processing.blade.php b/modules/Importer/Resources/views/step2-processing.blade.php
similarity index 93%
rename from modules/Installer/Resources/views/importer/step2-processing.blade.php
rename to modules/Importer/Resources/views/step2-processing.blade.php
index e482b457..ce6c27ce 100644
--- a/modules/Installer/Resources/views/importer/step2-processing.blade.php
+++ b/modules/Importer/Resources/views/step2-processing.blade.php
@@ -1,4 +1,4 @@
-@extends('installer::app')
+@extends('importer::app')
 @section('title', 'Import Configuration')
 
 @section('content')
@@ -37,21 +37,6 @@
   <script>
     const manifest = {!!json_encode($manifest) !!};
 
-    /**
-     * Get the total number of steps
-     */
-    const getTotalSteps = () => {
-      let total = 0;
-
-      for (let importer of manifest_keys) {
-        for (let stage of manifest[importer]) {
-          total++;
-        }
-      }
-
-      return total;
-    };
-
     /**
      * Run each step of the importer
      */
diff --git a/modules/Installer/Services/Importer/BaseImporter.php b/modules/Importer/Services/BaseImporter.php
similarity index 84%
rename from modules/Installer/Services/Importer/BaseImporter.php
rename to modules/Importer/Services/BaseImporter.php
index d410626d..7ffdb92c 100644
--- a/modules/Installer/Services/Importer/BaseImporter.php
+++ b/modules/Importer/Services/BaseImporter.php
@@ -1,22 +1,39 @@
 <?php
 
-namespace Modules\Installer\Services\Importer;
+namespace Modules\Importer\Services;
 
+use App\Services\Installer\LoggerTrait;
 use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
-use Modules\Installer\Utils\IdMapper;
-use Modules\Installer\Utils\ImporterDB;
-use Modules\Installer\Utils\LoggerTrait;
+use Modules\Importer\Utils\IdMapper;
+use Modules\Importer\Utils\ImporterDB;
 
 abstract class BaseImporter implements ShouldQueue
 {
     use LoggerTrait, Dispatchable, InteractsWithQueue, Queueable;
 
+    /**
+     * Holds the connection to the legacy database
+     *
+     * @var \Modules\Importer\Utils\ImporterDB
+     */
     protected $db;
+
+    /**
+     * The mapper class used for old IDs to new IDs
+     *
+     * @var \Illuminate\Contracts\Foundation\Application|mixed
+     */
     protected $idMapper;
+
+    /**
+     * The legacy table this importer targets
+     *
+     * @var string
+     */
     protected $table;
 
     public function __construct()
diff --git a/modules/Installer/Services/Importer/ImporterService.php b/modules/Importer/Services/ImporterService.php
similarity index 77%
rename from modules/Installer/Services/Importer/ImporterService.php
rename to modules/Importer/Services/ImporterService.php
index dcd9fe4d..3f72ab21 100644
--- a/modules/Installer/Services/Importer/ImporterService.php
+++ b/modules/Importer/Services/ImporterService.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace Modules\Installer\Services\Importer;
+namespace Modules\Importer\Services;
 
 use App\Contracts\Service;
 use App\Repositories\KvpRepository;
 use Exception;
 use Illuminate\Http\Request;
-use Modules\Installer\Services\Importer\Importers\AircraftImporter;
-use Modules\Installer\Services\Importer\Importers\AirlineImporter;
-use Modules\Installer\Services\Importer\Importers\AirportImporter;
-use Modules\Installer\Services\Importer\Importers\ClearDatabase;
-use Modules\Installer\Services\Importer\Importers\FinalizeImporter;
-use Modules\Installer\Services\Importer\Importers\FlightImporter;
-use Modules\Installer\Services\Importer\Importers\GroupImporter;
-use Modules\Installer\Services\Importer\Importers\PirepImporter;
-use Modules\Installer\Services\Importer\Importers\RankImport;
-use Modules\Installer\Services\Importer\Importers\UserImport;
+use Modules\Importer\Services\Importers\AircraftImporter;
+use Modules\Importer\Services\Importers\AirlineImporter;
+use Modules\Importer\Services\Importers\AirportImporter;
+use Modules\Importer\Services\Importers\ClearDatabase;
+use Modules\Importer\Services\Importers\FinalizeImporter;
+use Modules\Importer\Services\Importers\FlightImporter;
+use Modules\Importer\Services\Importers\GroupImporter;
+use Modules\Importer\Services\Importers\PirepImporter;
+use Modules\Importer\Services\Importers\RankImport;
+use Modules\Importer\Services\Importers\UserImport;
 
 class ImporterService extends Service
 {
@@ -104,7 +104,7 @@ class ImporterService extends Service
         $manifest = [];
 
         foreach ($this->importList as $importerKlass) {
-            /** @var \Modules\Installer\Services\Importer\BaseImporter $importer */
+            /** @var \Modules\Importer\Services\BaseImporter $importer */
             $importer = new $importerKlass();
             $manifest = array_merge($manifest, $importer->getManifest());
         }
@@ -128,7 +128,7 @@ class ImporterService extends Service
             throw new Exception('Unknown importer "'.$importer.'"');
         }
 
-        /** @var $importerInst \Modules\Installer\Services\Importer\BaseImporter */
+        /** @var $importerInst \Modules\Importer\Services\BaseImporter */
         $importerInst = new $importer();
         $importerInst->run($start);
     }
diff --git a/modules/Installer/Services/Importer/Importers/AircraftImporter.php b/modules/Importer/Services/Importers/AircraftImporter.php
similarity index 93%
rename from modules/Installer/Services/Importer/Importers/AircraftImporter.php
rename to modules/Importer/Services/Importers/AircraftImporter.php
index b2f6389a..55e70574 100644
--- a/modules/Installer/Services/Importer/Importers/AircraftImporter.php
+++ b/modules/Importer/Services/Importers/AircraftImporter.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Modules\Installer\Services\Importer\Importers;
+namespace Modules\Importer\Services\Importers;
 
 use App\Models\Aircraft;
 use App\Models\Airline;
 use App\Models\Subfleet;
-use Modules\Installer\Services\Importer\BaseImporter;
+use Modules\Importer\Services\BaseImporter;
 
 class AircraftImporter extends BaseImporter
 {
diff --git a/modules/Installer/Services/Importer/Importers/AirlineImporter.php b/modules/Importer/Services/Importers/AirlineImporter.php
similarity index 90%
rename from modules/Installer/Services/Importer/Importers/AirlineImporter.php
rename to modules/Importer/Services/Importers/AirlineImporter.php
index f2b1e298..939a6b3f 100644
--- a/modules/Installer/Services/Importer/Importers/AirlineImporter.php
+++ b/modules/Importer/Services/Importers/AirlineImporter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Modules\Installer\Services\Importer\Importers;
+namespace Modules\Importer\Services\Importers;
 
 use App\Models\Airline;
 use Illuminate\Support\Facades\Log;
-use Modules\Installer\Services\Importer\BaseImporter;
+use Modules\Importer\Services\BaseImporter;
 
 class AirlineImporter extends BaseImporter
 {
diff --git a/modules/Installer/Services/Importer/Importers/AirportImporter.php b/modules/Importer/Services/Importers/AirportImporter.php
similarity index 93%
rename from modules/Installer/Services/Importer/Importers/AirportImporter.php
rename to modules/Importer/Services/Importers/AirportImporter.php
index 7cf17bde..f37183d5 100644
--- a/modules/Installer/Services/Importer/Importers/AirportImporter.php
+++ b/modules/Importer/Services/Importers/AirportImporter.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Modules\Installer\Services\Importer\Importers;
+namespace Modules\Importer\Services\Importers;
 
 use App\Models\Airport;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Log;
-use Modules\Installer\Services\Importer\BaseImporter;
+use Modules\Importer\Services\BaseImporter;
 
 class AirportImporter extends BaseImporter
 {
diff --git a/modules/Installer/Services/Importer/Importers/ClearDatabase.php b/modules/Importer/Services/Importers/ClearDatabase.php
similarity index 94%
rename from modules/Installer/Services/Importer/Importers/ClearDatabase.php
rename to modules/Importer/Services/Importers/ClearDatabase.php
index 6e98d72a..a4e01da6 100644
--- a/modules/Installer/Services/Importer/Importers/ClearDatabase.php
+++ b/modules/Importer/Services/Importers/ClearDatabase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Installer\Services\Importer\Importers;
+namespace Modules\Importer\Services\Importers;
 
 use App\Models\Acars;
 use App\Models\Airline;
@@ -19,7 +19,7 @@ use App\Models\Subfleet;
 use App\Models\User;
 use App\Models\UserAward;
 use Illuminate\Support\Facades\DB;
-use Modules\Installer\Services\Importer\BaseImporter;
+use Modules\Importer\Services\BaseImporter;
 
 class ClearDatabase extends BaseImporter
 {
diff --git a/modules/Installer/Services/Importer/Importers/FinalizeImporter.php b/modules/Importer/Services/Importers/FinalizeImporter.php
similarity index 91%
rename from modules/Installer/Services/Importer/Importers/FinalizeImporter.php
rename to modules/Importer/Services/Importers/FinalizeImporter.php
index 87ed7249..b3b56b25 100644
--- a/modules/Installer/Services/Importer/Importers/FinalizeImporter.php
+++ b/modules/Importer/Services/Importers/FinalizeImporter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Modules\Installer\Services\Importer\Importers;
+namespace Modules\Importer\Services\Importers;
 
 use App\Models\User;
 use App\Services\UserService;
-use Modules\Installer\Services\Importer\BaseImporter;
+use Modules\Importer\Services\BaseImporter;
 
 class FinalizeImporter extends BaseImporter
 {
diff --git a/modules/Installer/Services/Importer/Importers/FlightImporter.php b/modules/Importer/Services/Importers/FlightImporter.php
similarity index 94%
rename from modules/Installer/Services/Importer/Importers/FlightImporter.php
rename to modules/Importer/Services/Importers/FlightImporter.php
index f4fd6261..2e1a7be1 100644
--- a/modules/Installer/Services/Importer/Importers/FlightImporter.php
+++ b/modules/Importer/Services/Importers/FlightImporter.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Modules\Installer\Services\Importer\Importers;
+namespace Modules\Importer\Services\Importers;
 
 use App\Models\Flight;
-use Modules\Installer\Services\Importer\BaseImporter;
+use Modules\Importer\Services\BaseImporter;
 
 class FlightImporter extends BaseImporter
 {
diff --git a/modules/Installer/Services/Importer/Importers/GroupImporter.php b/modules/Importer/Services/Importers/GroupImporter.php
similarity index 96%
rename from modules/Installer/Services/Importer/Importers/GroupImporter.php
rename to modules/Importer/Services/Importers/GroupImporter.php
index 00650833..97aa9ebf 100644
--- a/modules/Installer/Services/Importer/Importers/GroupImporter.php
+++ b/modules/Importer/Services/Importers/GroupImporter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Modules\Installer\Services\Importer\Importers;
+namespace Modules\Importer\Services\Importers;
 
 use App\Models\Role;
 use App\Services\RoleService;
-use Modules\Installer\Services\Importer\BaseImporter;
+use Modules\Importer\Services\BaseImporter;
 
 /**
  * Imports the groups into the permissions feature(s)
diff --git a/modules/Installer/Services/Importer/Importers/PirepImporter.php b/modules/Importer/Services/Importers/PirepImporter.php
similarity index 97%
rename from modules/Installer/Services/Importer/Importers/PirepImporter.php
rename to modules/Importer/Services/Importers/PirepImporter.php
index e9265355..b4486774 100644
--- a/modules/Installer/Services/Importer/Importers/PirepImporter.php
+++ b/modules/Importer/Services/Importers/PirepImporter.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Modules\Installer\Services\Importer\Importers;
+namespace Modules\Importer\Services\Importers;
 
 use App\Models\Enums\FlightType;
 use App\Models\Enums\PirepSource;
 use App\Models\Enums\PirepState;
 use App\Models\Pirep;
-use Modules\Installer\Services\Importer\BaseImporter;
+use Modules\Importer\Services\BaseImporter;
 
 class PirepImporter extends BaseImporter
 {
diff --git a/modules/Installer/Services/Importer/Importers/RankImport.php b/modules/Importer/Services/Importers/RankImport.php
similarity index 87%
rename from modules/Installer/Services/Importer/Importers/RankImport.php
rename to modules/Importer/Services/Importers/RankImport.php
index aba00cb7..5c4efcc4 100644
--- a/modules/Installer/Services/Importer/Importers/RankImport.php
+++ b/modules/Importer/Services/Importers/RankImport.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Modules\Installer\Services\Importer\Importers;
+namespace Modules\Importer\Services\Importers;
 
 use App\Models\Rank;
-use Modules\Installer\Services\Importer\BaseImporter;
+use Modules\Importer\Services\BaseImporter;
 
 class RankImport extends BaseImporter
 {
diff --git a/modules/Installer/Services/Importer/Importers/UserImport.php b/modules/Importer/Services/Importers/UserImport.php
similarity index 97%
rename from modules/Installer/Services/Importer/Importers/UserImport.php
rename to modules/Importer/Services/Importers/UserImport.php
index 968b3be4..6a417d37 100644
--- a/modules/Installer/Services/Importer/Importers/UserImport.php
+++ b/modules/Importer/Services/Importers/UserImport.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Installer\Services\Importer\Importers;
+namespace Modules\Importer\Services\Importers;
 
 use App\Facades\Utils;
 use App\Models\Enums\UserState;
@@ -9,7 +9,7 @@ use App\Services\UserService;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
-use Modules\Installer\Services\Importer\BaseImporter;
+use Modules\Importer\Services\BaseImporter;
 
 class UserImport extends BaseImporter
 {
diff --git a/modules/Installer/Utils/IdMapper.php b/modules/Importer/Utils/IdMapper.php
similarity index 96%
rename from modules/Installer/Utils/IdMapper.php
rename to modules/Importer/Utils/IdMapper.php
index 2df6a59a..14399b06 100644
--- a/modules/Installer/Utils/IdMapper.php
+++ b/modules/Importer/Utils/IdMapper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Installer\Utils;
+namespace Modules\Importer\Utils;
 
 use App\Contracts\Service;
 use Spatie\Valuestore\Valuestore;
diff --git a/modules/Installer/Utils/ImporterDB.php b/modules/Importer/Utils/ImporterDB.php
similarity index 99%
rename from modules/Installer/Utils/ImporterDB.php
rename to modules/Importer/Utils/ImporterDB.php
index bc3b0683..769d1967 100644
--- a/modules/Installer/Utils/ImporterDB.php
+++ b/modules/Importer/Utils/ImporterDB.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Installer\Utils;
+namespace Modules\Importer\Utils;
 
 use Illuminate\Support\Facades\Log;
 use PDO;
diff --git a/modules/Importer/composer.json b/modules/Importer/composer.json
new file mode 100644
index 00000000..3265e9da
--- /dev/null
+++ b/modules/Importer/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "phpvms/importer",
+    "type": "laravel-library",
+    "description": "The importer module for phpVMS",
+    "authors": [
+        {
+            "name": "Nabeel Shahzad",
+            "email": ""
+        }
+    ],
+    "require": {
+        "composer/installers": "~1.0"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Modules\\Importer\\Providers\\ImporterServiceProvider"
+            ],
+            "aliases": {
+
+            }
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Modules\\Importer\\": ""
+        }
+    }
+}
diff --git a/modules/Importer/module.json b/modules/Importer/module.json
new file mode 100644
index 00000000..8c23d2b1
--- /dev/null
+++ b/modules/Importer/module.json
@@ -0,0 +1,14 @@
+{
+    "name": "Importer",
+    "alias": "importer",
+    "description": "",
+    "keywords": [],
+    "active": 1,
+    "order": 0,
+    "providers": [
+        "Modules\\Importer\\Providers\\ImporterServiceProvider"
+    ],
+    "aliases": {},
+    "files": [],
+    "requires": []
+}
diff --git a/modules/Installer/Config/config.php b/modules/Installer/Config/config.php
index cdd6e2fe..60713270 100644
--- a/modules/Installer/Config/config.php
+++ b/modules/Installer/Config/config.php
@@ -37,8 +37,4 @@ return [
         'storage/framework/views',
         'storage/logs',
     ],
-
-    'importer' => [
-        'batch_size' => 20,
-    ],
 ];
diff --git a/modules/Installer/Exceptions/ImporterNextRecordSet.php b/modules/Installer/Exceptions/ImporterNextRecordSet.php
deleted file mode 100644
index 02933caa..00000000
--- a/modules/Installer/Exceptions/ImporterNextRecordSet.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Modules\Installer\Exceptions;
-
-/**
- * Go to the next page of the importer
- */
-class ImporterNextRecordSet extends \Exception
-{
-    public $nextOffset;
-
-    /**
-     * ImporterNextRecordSet constructor.
-     *
-     * @param int $nextOffset Where to start the next set of reads from
-     */
-    public function __construct($nextOffset)
-    {
-        parent::__construct('', 0, null);
-        $this->nextOffset = $nextOffset;
-    }
-}
diff --git a/modules/Installer/Exceptions/ImporterNoMoreRecords.php b/modules/Installer/Exceptions/ImporterNoMoreRecords.php
deleted file mode 100644
index 53d022f6..00000000
--- a/modules/Installer/Exceptions/ImporterNoMoreRecords.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Modules\Installer\Exceptions;
-
-class ImporterNoMoreRecords extends \Exception
-{
-    public function __construct()
-    {
-        parent::__construct('', 0, null);
-    }
-}
diff --git a/modules/Installer/Exceptions/StageCompleted.php b/modules/Installer/Exceptions/StageCompleted.php
deleted file mode 100644
index 4d9fefca..00000000
--- a/modules/Installer/Exceptions/StageCompleted.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Modules\Installer\Exceptions;
-
-/**
- * Signals that the stage is completed and we should go to the next one
- */
-class StageCompleted extends \Exception
-{
-    public $nextStage;
-
-    public function __construct($nextStage)
-    {
-        $this->nextStage = $nextStage;
-        parent::__construct('', 0, null);
-    }
-}
diff --git a/modules/Installer/Http/Controllers/InstallerController.php b/modules/Installer/Http/Controllers/InstallerController.php
index 9d49cfe4..6a92a91e 100644
--- a/modules/Installer/Http/Controllers/InstallerController.php
+++ b/modules/Installer/Http/Controllers/InstallerController.php
@@ -7,18 +7,18 @@ use App\Facades\Utils;
 use App\Models\User;
 use App\Repositories\AirlineRepository;
 use App\Services\AnalyticsService;
+use App\Services\Installer\DatabaseService;
+use App\Services\Installer\InstallerService;
 use App\Services\Installer\MigrationService;
 use App\Services\Installer\SeederService;
 use App\Services\UserService;
 use App\Support\Countries;
-use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 use Modules\Installer\Services\ConfigService;
-use Modules\Installer\Services\DatabaseService;
 use Modules\Installer\Services\RequirementsService;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 
@@ -64,10 +64,7 @@ class InstallerController extends Controller
         $this->seederSvc = $seederSvc;
         $this->userService = $userService;
 
-        try {
-            app('debugbar')->disable();
-        } catch (BindingResolutionException $e) {
-        }
+        \App\Support\Utils::disableDebugToolbar();
     }
 
     /**
@@ -109,7 +106,7 @@ class InstallerController extends Controller
             $message = 'Failed! '.$e->getMessage();
         }
 
-        return view('installer::flash/dbtest', [
+        return view('installer::install/dbtest', [
             'status'  => $status,
             'message' => $message,
         ]);
@@ -354,6 +351,9 @@ class InstallerController extends Controller
      */
     public function complete(Request $request)
     {
+        $installerSvc = app(InstallerService::class);
+        $installerSvc->disableInstallerModules();
+
         return redirect('/login');
     }
 }
diff --git a/modules/Installer/Http/Routes/importer.php b/modules/Installer/Http/Routes/importer.php
deleted file mode 100644
index 92821138..00000000
--- a/modules/Installer/Http/Routes/importer.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Route;
-
-Route::get('/', 'ImporterController@index')->name('index');
-Route::post('/config', 'ImporterController@config')->name('config');
-Route::post('/run', 'ImporterController@run')->middleware('api')->name('run');
-
-Route::post('/complete', 'ImporterController@complete')->name('complete');
diff --git a/modules/Installer/Http/Routes/install.php b/modules/Installer/Http/Routes/install.php
deleted file mode 100644
index 97c899b7..00000000
--- a/modules/Installer/Http/Routes/install.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-Route::get('/', 'InstallerController@index')->name('index');
-Route::post('/dbtest', 'InstallerController@dbtest')->name('dbtest');
-
-Route::get('/step1', 'InstallerController@step1')->name('step1');
-Route::post('/step1', 'InstallerController@step1')->name('step1');
-
-Route::get('/step2', 'InstallerController@step2')->name('step2');
-Route::post('/envsetup', 'InstallerController@envsetup')->name('envsetup');
-Route::get('/dbsetup', 'InstallerController@dbsetup')->name('dbsetup');
-
-Route::get('/step3', 'InstallerController@step3')->name('step3');
-Route::post('/usersetup', 'InstallerController@usersetup')->name('usersetup');
-
-Route::get('/complete', 'InstallerController@complete')->name('complete');
diff --git a/modules/Installer/Http/Routes/update.php b/modules/Installer/Http/Routes/update.php
deleted file mode 100644
index 82247fb7..00000000
--- a/modules/Installer/Http/Routes/update.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-Route::get('/', 'UpdaterController@index')->name('index');
-
-Route::get('/step1', 'UpdaterController@step1')->name('step1');
-Route::post('/step1', 'UpdaterController@step1')->name('step1');
-
-Route::post('/run-migrations', 'UpdaterController@run_migrations')->name('run_migrations');
-Route::get('/complete', 'UpdaterController@complete')->name('complete');
diff --git a/modules/Installer/Providers/InstallerServiceProvider.php b/modules/Installer/Providers/InstallerServiceProvider.php
index 391f18b9..06adb3f1 100644
--- a/modules/Installer/Providers/InstallerServiceProvider.php
+++ b/modules/Installer/Providers/InstallerServiceProvider.php
@@ -2,36 +2,20 @@
 
 namespace Modules\Installer\Providers;
 
-use App\Services\ModuleService;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
-use Modules\Installer\Console\Commands\ImportFromClassicCommand;
 
 class InstallerServiceProvider extends ServiceProvider
 {
-    protected $moduleSvc;
-
     /**
      * Boot the application events.
      */
     public function boot()
     {
-        $this->moduleSvc = app(ModuleService::class);
-
-        $this->registerCommands();
         $this->registerRoutes();
         $this->registerTranslations();
         $this->registerConfig();
         $this->registerViews();
-
-        $this->loadMigrationsFrom(__DIR__.'/../Database/migrations');
-    }
-
-    protected function registerCommands()
-    {
-        $this->commands([
-            ImportFromClassicCommand::class,
-        ]);
     }
 
     /**
@@ -45,25 +29,20 @@ class InstallerServiceProvider extends ServiceProvider
             'middleware' => ['web'],
             'namespace'  => 'Modules\Installer\Http\Controllers',
         ], function () {
-            $this->loadRoutesFrom(__DIR__.'/../Http/Routes/install.php');
-        });
+            Route::get('/', 'InstallerController@index')->name('index');
+            Route::post('/dbtest', 'InstallerController@dbtest')->name('dbtest');
 
-        Route::group([
-             'as'         => 'update.',
-             'prefix'     => 'update',
-             'middleware' => ['web'],
-             'namespace'  => 'Modules\Installer\Http\Controllers',
-         ], function () {
-             $this->loadRoutesFrom(__DIR__.'/../Http/Routes/update.php');
-         });
+            Route::get('/step1', 'InstallerController@step1')->name('step1');
+            Route::post('/step1', 'InstallerController@step1')->name('step1');
 
-        Route::group([
-            'as'         => 'importer.',
-            'prefix'     => 'importer',
-            'middleware' => ['web'],
-            'namespace'  => 'Modules\Installer\Http\Controllers',
-        ], function () {
-            $this->loadRoutesFrom(__DIR__.'/../Http/Routes/importer.php');
+            Route::get('/step2', 'InstallerController@step2')->name('step2');
+            Route::post('/envsetup', 'InstallerController@envsetup')->name('envsetup');
+            Route::get('/dbsetup', 'InstallerController@dbsetup')->name('dbsetup');
+
+            Route::get('/step3', 'InstallerController@step3')->name('step3');
+            Route::post('/usersetup', 'InstallerController@usersetup')->name('usersetup');
+
+            Route::get('/complete', 'InstallerController@complete')->name('complete');
         });
     }
 
@@ -72,13 +51,7 @@ class InstallerServiceProvider extends ServiceProvider
      */
     protected function registerConfig()
     {
-        $this->publishes([
-            __DIR__.'/../Config/config.php' => config_path('installer.php'),
-        ], 'installer');
-
-        $this->mergeConfigFrom(
-            __DIR__.'/../Config/config.php', 'installer'
-        );
+        $this->mergeConfigFrom(__DIR__.'/../Config/config.php', 'installer');
     }
 
     /**
diff --git a/modules/Installer/Resources/views/install/dbtest.blade.php b/modules/Installer/Resources/views/install/dbtest.blade.php
new file mode 100644
index 00000000..70a9694b
--- /dev/null
+++ b/modules/Installer/Resources/views/install/dbtest.blade.php
@@ -0,0 +1,8 @@
+<div class="alert alert-{{ $status }}" role="alert">
+    <div class="container">
+        <div class="alert-icon">
+            <i class="now-ui-icons ui-1_bell-53"></i>
+        </div>
+        {{ $message }}
+    </div>
+</div>
diff --git a/modules/Installer/Services/ConfigService.php b/modules/Installer/Services/ConfigService.php
index 660be416..6750f6fe 100644
--- a/modules/Installer/Services/ConfigService.php
+++ b/modules/Installer/Services/ConfigService.php
@@ -13,9 +13,6 @@ use Nwidart\Modules\Support\Stub;
 use PDO;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 
-/**
- * Class ConfigService
- */
 class ConfigService extends Service
 {
     /**
diff --git a/modules/Installer/composer.json b/modules/Installer/composer.json
index 77e32abe..3de0cf79 100644
--- a/modules/Installer/composer.json
+++ b/modules/Installer/composer.json
@@ -1,11 +1,12 @@
 {
     "name": "phpvms/installer",
+    "license": "",
     "type": "laravel-library",
     "description": "The installer module for phpVMS",
     "authors": [
         {
             "name": "Nabeel Shahzad",
-            "email": ""
+            "email": "nabeel@phpvms.net"
         }
     ],
     "require": {
diff --git a/modules/Updater/Config/config.php b/modules/Updater/Config/config.php
new file mode 100644
index 00000000..b6251283
--- /dev/null
+++ b/modules/Updater/Config/config.php
@@ -0,0 +1,4 @@
+<?php
+
+return [
+];
diff --git a/modules/Installer/Http/Controllers/UpdaterController.php b/modules/Updater/Http/Controllers/UpdateController.php
similarity index 72%
rename from modules/Installer/Http/Controllers/UpdaterController.php
rename to modules/Updater/Http/Controllers/UpdateController.php
index a2bfeed5..5e97d409 100644
--- a/modules/Installer/Http/Controllers/UpdaterController.php
+++ b/modules/Updater/Http/Controllers/UpdateController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Installer\Http\Controllers;
+namespace Modules\Updater\Http\Controllers;
 
 use App\Contracts\Controller;
 use App\Services\Installer\MigrationService;
@@ -9,17 +9,12 @@ use function count;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 
-/**
- * Class UpdaterController
- */
-class UpdaterController extends Controller
+class UpdateController extends Controller
 {
     private $migrationSvc;
     private $seederSvc;
 
     /**
-     * UpdaterController constructor.
-     *
      * @param MigrationService $migrationSvc
      * @param SeederService    $seederSvc
      */
@@ -36,7 +31,7 @@ class UpdaterController extends Controller
      */
     public function index()
     {
-        return view('installer::update/index-start');
+        return view('updater::index-start');
     }
 
     /**
@@ -45,7 +40,7 @@ class UpdaterController extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
      */
     public function step1(Request $request)
     {
@@ -54,7 +49,7 @@ class UpdaterController extends Controller
             Log::info('No migrations found');
         }
 
-        return view('installer::update/steps/step1-update-available');
+        return view('updater::steps/step1-update-available');
     }
 
     /**
@@ -62,7 +57,7 @@ class UpdaterController extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return mixed
      */
     public function run_migrations(Request $request)
     {
@@ -71,13 +66,13 @@ class UpdaterController extends Controller
         $migrations = $this->migrationSvc->migrationsAvailable();
         if (count($migrations) === 0) {
             $this->seederSvc->syncAllSeeds();
-            return view('installer::update/steps/step3-update-complete');
+            return view('updater::steps/step3-update-complete');
         }
 
         $output = $this->migrationSvc->runAllMigrations();
         $this->seederSvc->syncAllSeeds();
 
-        return view('installer::update/steps/step2-migrations-done', [
+        return view('updater::steps/step2-migrations-done', [
             'console_output' => $output,
         ]);
     }
@@ -87,7 +82,7 @@ class UpdaterController extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return mixed
      */
     public function complete(Request $request)
     {
diff --git a/modules/Updater/Providers/UpdateServiceProvider.php b/modules/Updater/Providers/UpdateServiceProvider.php
new file mode 100644
index 00000000..6082d804
--- /dev/null
+++ b/modules/Updater/Providers/UpdateServiceProvider.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Modules\Updater\Providers;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\ServiceProvider;
+
+class UpdateServiceProvider extends ServiceProvider
+{
+    public function boot()
+    {
+        $this->registerRoutes();
+        $this->registerTranslations();
+        $this->registerConfig();
+        $this->registerViews();
+    }
+
+    /**
+     * Register the routes
+     */
+    protected function registerRoutes()
+    {
+        Route::group([
+             'as'         => 'update.',
+             'prefix'     => 'update',
+             'middleware' => ['web'],
+             'namespace'  => 'Modules\Updater\Http\Controllers',
+         ], function () {
+             Route::get('/', 'UpdateController@index')->name('index');
+
+             Route::get('/step1', 'UpdateController@step1')->name('step1');
+             Route::post('/step1', 'UpdateController@step1')->name('step1');
+
+             Route::post('/run-migrations', 'UpdateController@run_migrations')->name('run_migrations');
+             Route::get('/complete', 'UpdateController@complete')->name('complete');
+         });
+    }
+
+    /**
+     * Register config.
+     */
+    protected function registerConfig()
+    {
+        $this->mergeConfigFrom(__DIR__.'/../Config/config.php', 'updater');
+    }
+
+    /**
+     * Register views.
+     */
+    public function registerViews()
+    {
+        $viewPath = resource_path('views/modules/updater');
+        $sourcePath = __DIR__.'/../Resources/views';
+
+        $this->publishes([
+            $sourcePath => $viewPath,
+        ], 'views');
+
+        $paths = array_map(
+            function ($path) {
+                return $path.'/modules/updater';
+            },
+            \Config::get('view.paths')
+        );
+
+        $paths[] = $sourcePath;
+        $this->loadViewsFrom($paths, 'updater');
+    }
+
+    /**
+     * Register translations.
+     */
+    public function registerTranslations()
+    {
+        $langPath = resource_path('lang/modules/updater');
+
+        if (is_dir($langPath)) {
+            $this->loadTranslationsFrom($langPath, 'updater');
+        } else {
+            $this->loadTranslationsFrom(__DIR__.'/../Resources/lang', 'updater');
+        }
+    }
+
+    /**
+     * Get the services provided by the provider.
+     */
+    public function provides(): array
+    {
+        return [];
+    }
+}
diff --git a/modules/Updater/Resources/views/app.blade.php b/modules/Updater/Resources/views/app.blade.php
new file mode 100644
index 00000000..0e4cc175
--- /dev/null
+++ b/modules/Updater/Resources/views/app.blade.php
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+
+    <title>@yield('title') - updater</title>
+
+    <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
+
+    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
+          name='viewport'/>
+    <meta name="base-url" content="{!! url('') !!}">
+    <meta name="api-key" content="{!! Auth::check() ? Auth::user()->api_key: '' !!}">
+    <meta name="csrf-token" content="{!! csrf_token() !!}">
+
+    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
+
+    <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
+    <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
+    <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
+    <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
+
+    <link rel="stylesheet"
+          href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
+
+    <style>
+        .table tr:first-child td { border-top: 0px; }
+        @yield('css')
+    </style>
+</head>
+
+<body>
+<!-- Navbar -->
+<nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
+    <div class="container" style="width: 85%!important;">
+        <div class="navbar-translate">
+            <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
+                <a href="{{ url('/') }}">
+                    <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
+                </a>
+            </p>
+        </div>
+        <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
+            @yield('title')
+        </div>
+    </div>
+</nav>
+<!-- End Navbar -->
+{{--<div class="clearfix" style="height: 25px;"></div>--}}
+<div class="wrapper">
+    <div class="clear"></div>
+    <div class="container" style="width: 50%">
+        <div class="row">
+            <div class="col-12">
+                @include('installer::flash.message')
+                @yield('content')
+            </div>
+        </div>
+    </div>
+    <div class="clearfix" style="height: 200px;"></div>
+</div>
+
+{{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}
+
+<script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/frontend/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
+<script src="{{ public_asset('/assets/installer/js/vendor.js') }}" type="text/javascript"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+
+<script>
+    hljs.configure({languages: ['sh']});
+
+    $(document).ready(function () {
+
+        $(".select2").select2();
+
+        $('pre code').each(function (i, block) {
+            hljs.fixMarkup(block);
+            hljs.highlightBlock(block);
+        });
+    });
+</script>
+
+@yield('scripts')
+
+</body>
+</html>
diff --git a/modules/Updater/Resources/views/flash/check_error.blade.php b/modules/Updater/Resources/views/flash/check_error.blade.php
new file mode 100644
index 00000000..cc67ffc0
--- /dev/null
+++ b/modules/Updater/Resources/views/flash/check_error.blade.php
@@ -0,0 +1,6 @@
+@if($errors->has($field))
+    <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
+{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
+    {{ $errors->first($field) }}
+</div>--}}
+@endif
diff --git a/modules/Updater/Resources/views/flash/message.blade.php b/modules/Updater/Resources/views/flash/message.blade.php
new file mode 100644
index 00000000..5633dc36
--- /dev/null
+++ b/modules/Updater/Resources/views/flash/message.blade.php
@@ -0,0 +1,11 @@
+@foreach (session('flash_notification', collect())->toArray() as $message)
+<div class="alert alert-danger" role="alert">
+    <div class="container">
+        <div class="alert-icon">
+            <i class="now-ui-icons ui-2_like"></i>
+        </div>
+        {{ $message['message'] }}
+    </div>
+</div>
+@endforeach
+{{ session()->forget('flash_notification') }}
diff --git a/modules/Updater/Resources/views/index-start.blade.php b/modules/Updater/Resources/views/index-start.blade.php
new file mode 100644
index 00000000..fefb0b7d
--- /dev/null
+++ b/modules/Updater/Resources/views/index-start.blade.php
@@ -0,0 +1,12 @@
+@extends('installer::app')
+@section('title', 'Update phpVMS')
+
+@section('content')
+    <h2>phpvms updater</h2>
+    <p>Press continue to check if there are any updates available.</p>
+    {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
+    <p style="text-align: right">
+        {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
+    </p>
+    {{ Form::close() }}
+@endsection
diff --git a/modules/Updater/Resources/views/steps/step1-no-update.blade.php b/modules/Updater/Resources/views/steps/step1-no-update.blade.php
new file mode 100644
index 00000000..fd636611
--- /dev/null
+++ b/modules/Updater/Resources/views/steps/step1-no-update.blade.php
@@ -0,0 +1,13 @@
+@extends('installer::app')
+@section('title', 'Update phpVMS')
+
+@section('content')
+    <h2>phpvms updater</h2>
+    <p>It seems like you're up to date!</p>
+    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+
+    <p style="text-align: right">
+        {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
+    </p>
+    {{ Form::close() }}
+@endsection
diff --git a/modules/Updater/Resources/views/steps/step1-update-available.blade.php b/modules/Updater/Resources/views/steps/step1-update-available.blade.php
new file mode 100644
index 00000000..5503a60f
--- /dev/null
+++ b/modules/Updater/Resources/views/steps/step1-update-available.blade.php
@@ -0,0 +1,12 @@
+@extends('installer::app')
+@section('title', 'Update phpVMS')
+
+@section('content')
+    <h2>phpvms updater</h2>
+    <p>Click run to complete the update!.</p>
+    {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
+    <p style="text-align: right">
+        {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}
+    </p>
+    {{ Form::close() }}
+@endsection
diff --git a/modules/Updater/Resources/views/steps/step2-migrations-done.blade.php b/modules/Updater/Resources/views/steps/step2-migrations-done.blade.php
new file mode 100644
index 00000000..540705d4
--- /dev/null
+++ b/modules/Updater/Resources/views/steps/step2-migrations-done.blade.php
@@ -0,0 +1,18 @@
+@extends('installer::app')
+@section('title', 'Update Completed')
+@section('content')
+    <div style="align-content: center;">
+        {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+
+        <pre class="lang-sh">
+        <code class="lang-sh">
+            {{ $console_output }}
+        </code>
+    </pre>
+
+        <p style="text-align: right">
+            {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
+        </p>
+        {{ Form::close() }}
+    </div>
+@endsection
diff --git a/modules/Updater/Resources/views/steps/step3-update-complete.blade.php b/modules/Updater/Resources/views/steps/step3-update-complete.blade.php
new file mode 100644
index 00000000..bcd4cd66
--- /dev/null
+++ b/modules/Updater/Resources/views/steps/step3-update-complete.blade.php
@@ -0,0 +1,13 @@
+@extends('installer::app')
+@section('title', 'Update Completed')
+
+@section('content')
+    <h2>phpvms updater</h2>
+    <p>Update completed!.</p>
+
+    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+    <p style="text-align: right">
+        {{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }}
+    </p>
+    {{ Form::close() }}
+@endsection
diff --git a/modules/Updater/composer.json b/modules/Updater/composer.json
new file mode 100644
index 00000000..b88da50e
--- /dev/null
+++ b/modules/Updater/composer.json
@@ -0,0 +1,30 @@
+{
+    "name": "phpvms/updater",
+    "license": "",
+    "type": "laravel-library",
+    "description": "The installer module for phpVMS",
+    "authors": [
+        {
+            "name": "Nabeel Shahzad",
+            "email": "nabeel@phpvms.net"
+        }
+    ],
+    "require": {
+        "composer/installers": "~1.0"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Modules\\Updater\\Providers\\UpdateServiceProvider"
+            ],
+            "aliases": {
+
+            }
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Modules\\Installer\\": ""
+        }
+    }
+}
diff --git a/modules/Updater/module.json b/modules/Updater/module.json
new file mode 100644
index 00000000..0860a8ef
--- /dev/null
+++ b/modules/Updater/module.json
@@ -0,0 +1,14 @@
+{
+    "name": "Updater",
+    "alias": "updater",
+    "description": "",
+    "keywords": [],
+    "active": 1,
+    "order": 0,
+    "providers": [
+        "Modules\\Updater\\Providers\\UpdateServiceProvider"
+    ],
+    "aliases": {},
+    "files": [],
+    "requires": []
+}