diff --git a/app/Commands/Command.php b/app/Commands/Command.php
deleted file mode 100644
index 018bc219..00000000
--- a/app/Commands/Command.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php namespace App\Commands;
-
-abstract class Command {
-
-	//
-
-}
diff --git a/app/Handlers/Events/.gitkeep b/app/Handlers/Events/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php
new file mode 100644
index 00000000..4b5d950d
--- /dev/null
+++ b/app/Jobs/Job.php
@@ -0,0 +1,7 @@
+<?php namespace App\Jobs;
+
+abstract class Job {
+
+	//
+
+}
diff --git a/app/Handlers/Commands/.gitkeep b/app/Listeners/.gitkeep
similarity index 100%
rename from app/Handlers/Commands/.gitkeep
rename to app/Listeners/.gitkeep
diff --git a/app/Providers/BusServiceProvider.php b/app/Providers/BusServiceProvider.php
deleted file mode 100644
index f0d9be6f..00000000
--- a/app/Providers/BusServiceProvider.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php namespace App\Providers;
-
-use Illuminate\Bus\Dispatcher;
-use Illuminate\Support\ServiceProvider;
-
-class BusServiceProvider extends ServiceProvider {
-
-	/**
-	 * Bootstrap any application services.
-	 *
-	 * @param  \Illuminate\Bus\Dispatcher  $dispatcher
-	 * @return void
-	 */
-	public function boot(Dispatcher $dispatcher)
-	{
-		$dispatcher->mapUsing(function($command)
-		{
-			return Dispatcher::simpleMapping(
-				$command, 'App\Commands', 'App\Handlers\Commands'
-			);
-		});
-	}
-
-	/**
-	 * Register any application services.
-	 *
-	 * @return void
-	 */
-	public function register()
-	{
-		//
-	}
-
-}
diff --git a/app/Providers/ConfigServiceProvider.php b/app/Providers/ConfigServiceProvider.php
deleted file mode 100644
index 06e57992..00000000
--- a/app/Providers/ConfigServiceProvider.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php namespace App\Providers;
-
-use Illuminate\Support\ServiceProvider;
-
-class ConfigServiceProvider extends ServiceProvider {
-
-	/**
-	 * Overwrite any vendor / package configuration.
-	 *
-	 * This service provider is intended to provide a convenient location for you
-	 * to overwrite any "vendor" or package configuration that you may want to
-	 * modify before the application handles the incoming request / command.
-	 *
-	 * @return void
-	 */
-	public function register()
-	{
-		config([
-			//
-		]);
-	}
-
-}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 1cece999..cf0e5d7c 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -6,13 +6,13 @@
 class EventServiceProvider extends ServiceProvider {
 
 	/**
-	 * The event handler mappings for the application.
+	 * The event listener mappings for the application.
 	 *
 	 * @var array
 	 */
 	protected $listen = [
-		'event.name' => [
-			'EventListener',
+		'App\Events\SomeEvent' => [
+			'App\Listeners\EventListener',
 		],
 	];
 
diff --git a/config/app.php b/config/app.php
index d97f4884..0505ecf0 100644
--- a/config/app.php
+++ b/config/app.php
@@ -140,8 +140,6 @@
 		 * Application Service Providers...
 		 */
 		'App\Providers\AppServiceProvider',
-		'App\Providers\BusServiceProvider',
-		'App\Providers\ConfigServiceProvider',
 		'App\Providers\EventServiceProvider',
 		'App\Providers\RouteServiceProvider',
 
diff --git a/config/compile.php b/config/compile.php
index 3a002fca..0609306b 100644
--- a/config/compile.php
+++ b/config/compile.php
@@ -16,8 +16,6 @@
 	'files' => [
 
 		realpath(__DIR__.'/../app/Providers/AppServiceProvider.php'),
-		realpath(__DIR__.'/../app/Providers/BusServiceProvider.php'),
-		realpath(__DIR__.'/../app/Providers/ConfigServiceProvider.php'),
 		realpath(__DIR__.'/../app/Providers/EventServiceProvider.php'),
 		realpath(__DIR__.'/../app/Providers/RouteServiceProvider.php'),