diff --git a/.env.example.php b/.env.example.php
new file mode 100644
index 00000000..6b3e9c98
--- /dev/null
+++ b/.env.example.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'DB_DRIVER'   => 'mysql',
+    'DB_HOST'     => 'localhost',
+    'DB_DATABASE' => 'cachet',
+    'DB_USERNAME' => 'homestead',
+    'DB_PASSWORD' => 'secret',
+];
diff --git a/.gitignore b/.gitignore
index 290dae62..23dc9251 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 .env.php
 config.codekit
 !.env.heroku.php
+!.env.example.php
 
 # Assets development
 /node_modules
diff --git a/app/config/app.php b/app/config/app.php
index 15f6db4b..db422d9c 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -127,6 +127,7 @@ return [
 
         'CachetHQ\Cachet\Providers\RepositoryServiceProvider',
         'CachetHQ\Cachet\Providers\RoutingServiceProvider',
+        'CachetHQ\Cachet\Providers\ConsoleServiceProvider',
 
     ],
 
diff --git a/app/start/artisan.php b/app/start/artisan.php
deleted file mode 100644
index 409e9adb..00000000
--- a/app/start/artisan.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Register The Artisan Commands
-|--------------------------------------------------------------------------
-|
-| Each available Artisan command must be registered with the console so
-| that it is available to be called. We'll register every command so
-| the console gets access to each of the command object instances.
-|
-*/
diff --git a/app/start/global.php b/app/start/global.php
index aa63d7af..ebf02914 100644
--- a/app/start/global.php
+++ b/app/start/global.php
@@ -71,7 +71,5 @@ App::down(function () {
 */
 
 require app_path().'/filters.php';
-
 require app_path().'/view-composers.php';
-
 require app_path().'/helpers.php';
diff --git a/composer.json b/composer.json
index 1fb54ee4..b2a16a1a 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
         "post-install-cmd": [
             "php artisan optimize",
             "chmod -R 755 app/storage",
-            "php artisan migrate"
+            "php artisan cachet:one-click-deploy"
         ],
         "post-update-cmd": [
             "php artisan clear-compiled",
diff --git a/src/Commands/OneClickDeployCommand.php b/src/Commands/OneClickDeployCommand.php
new file mode 100644
index 00000000..1621eb60
--- /dev/null
+++ b/src/Commands/OneClickDeployCommand.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace CachetHQ\Cachet\Commands;
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+
+class OneClickDeployCommand extends Command
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'cachet:one-click-deploy';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Installs CachetHQ on one click supported services';
+
+    /**
+     * Should we run the migrations?
+     *
+     * @var bool
+     */
+    protected $migrate;
+
+    /**
+     * Create a new one click deploy command instance.
+     *
+     * @param bool $migrate
+     *
+     * @return void
+     */
+    public function __construct($migrate)
+    {
+        $this->migrate = $migrate;
+
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int|null
+     */
+    public function fire()
+    {
+        if ($this->migrate) {
+            return $this->runMigrations();
+        }
+
+        $this->info('Please run "php artisan migrate" to finish the installation.');
+    }
+
+    /**
+     * Run the migrations.
+     *
+     * @return int|null
+     */
+    protected function runMigrations()
+    {
+        $options = [
+            '--database' => $this->input->getOption('database'),
+            '--force'    => $this->input->getOption('force'),
+            '--seed'     => $this->input->getOption('seed'),
+        ];
+
+        return $this->call('migrate', $options);
+    }
+
+    /**
+     * Get the console command options.
+     *
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return [
+            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+            ['seed', null, InputOption::VALUE_NONE, 'Indicates if the seed task should be re-run.'],
+        ];
+    }
+}
diff --git a/src/Providers/ConsoleServiceProvider.php b/src/Providers/ConsoleServiceProvider.php
new file mode 100644
index 00000000..368c78a1
--- /dev/null
+++ b/src/Providers/ConsoleServiceProvider.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace CachetHQ\Cachet\Providers;
+
+use CachetHQ\Cachet\Commands\OneClickDeployCommand;
+use Illuminate\Support\ServiceProvider;
+
+class ConsoleServiceProvider extends ServiceProvider
+{
+    /**
+     * Boot the service provider.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $this->commands('CachetHQ\Cachet\Commands\OneClickDeployCommand');
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->singleton('CachetHQ\Cachet\Commands\OneClickDeployCommand', function ($app) {
+            return new OneClickDeployCommand($app->environment('heroku'));
+        });
+    }
+}
diff --git a/src/Providers/RepositoryServiceProvider.php b/src/Providers/RepositoryServiceProvider.php
index 89166bd0..c24cba99 100644
--- a/src/Providers/RepositoryServiceProvider.php
+++ b/src/Providers/RepositoryServiceProvider.php
@@ -6,6 +6,21 @@ use Illuminate\Support\ServiceProvider;
 
 class RepositoryServiceProvider extends ServiceProvider
 {
+    /**
+     * Boot the service provider.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        //
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
     public function register()
     {
         $this->app->bind(
diff --git a/src/Providers/RoutingServiceProvider.php b/src/Providers/RoutingServiceProvider.php
index 07fc0f99..97011fd3 100644
--- a/src/Providers/RoutingServiceProvider.php
+++ b/src/Providers/RoutingServiceProvider.php
@@ -3,38 +3,30 @@
 namespace CachetHQ\Cachet\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use RecursiveDirectoryIterator;
 
 class RoutingServiceProvider extends ServiceProvider
 {
+    /**
+     * Boot the service provider.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $files = glob(app_path('routes').'/*.php');
+
+        foreach ($files as $file) {
+            require $file;
+        }
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
     public function register()
     {
         //
     }
-
-    public function boot()
-    {
-        $this->routesInDirectory();
-    }
-
-    /**
-     * Organise Routes.
-     *
-     * @param string $app
-     */
-    private function routesInDirectory($app = '')
-    {
-        $routeDir = app_path('routes/'.$app.($app !== '' ? '/' : null));
-
-        $iterator = new RecursiveDirectoryIterator($routeDir);
-        $iterator->setFlags(RecursiveDirectoryIterator::SKIP_DOTS);
-
-        foreach ($iterator as $route) {
-            $isDotFile = strpos($route->getFilename(), '.') === 0;
-
-            if (!$isDotFile && !$route->isDir()) {
-                require $routeDir.$route->getFilename();
-            }
-        }
-    }
 }