diff --git a/.env.example b/.env.example
index 72d1aadf..a19068d7 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,5 @@
 APP_ENV=local
+APP_DEBUG=true
 APP_KEY=SomeRandomString
 DB_USERNAME=homestead
 DB_PASSWORD=homestead
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 9f290a4d..e4288fff 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -11,9 +11,9 @@
 |
 */
 
-$router->get('/', 'WelcomeController@index');
+Route::get('/', 'WelcomeController@index');
 
-$router->get('/home', 'HomeController@index');
+Route::get('home', 'HomeController@index');
 
 /*
 |--------------------------------------------------------------------------
@@ -26,7 +26,7 @@
 |
 */
 
-$router->controllers([
+Route::controllers([
 	'auth' => 'Auth\AuthController',
 	'password' => 'Auth\PasswordController',
 ]);
diff --git a/config/app.php b/config/app.php
index d4a04a0d..bc6c8f48 100644
--- a/config/app.php
+++ b/config/app.php
@@ -13,7 +13,7 @@
 	|
 	*/
 
-	'debug' => false,
+	'debug' => (bool) getenv('APP_DEBUG') ?: false,
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/config/cache.php b/config/cache.php
index 5363ffa1..2e542501 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -15,7 +15,7 @@
 	|
 	*/
 
-	'driver' => 'file',
+	'driver' => getenv('CACHE_DRIVER') ?: 'file',
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/config/local/app.php b/config/local/app.php
deleted file mode 100644
index 5ceb76dc..00000000
--- a/config/local/app.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-
-	/*
-	|--------------------------------------------------------------------------
-	| Application Debug Mode
-	|--------------------------------------------------------------------------
-	|
-	| When your application is in debug mode, detailed error messages with
-	| stack traces will be shown on every error that occurs within your
-	| application. If disabled, a simple generic error page is shown.
-	|
-	*/
-
-	'debug' => true,
-
-];
diff --git a/config/local/database.php b/config/local/database.php
deleted file mode 100644
index a42ca21d..00000000
--- a/config/local/database.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-return [
-
-	/*
-	|--------------------------------------------------------------------------
-	| Database Connections
-	|--------------------------------------------------------------------------
-	|
-	| Here are each of the database connections setup for your application.
-	| Of course, examples of configuring each database platform that is
-	| supported by Laravel is shown below to make development simple.
-	|
-	|
-	| All database work in Laravel is done through the PHP PDO facilities
-	| so make sure you have the driver for your particular database of
-	| choice installed on your machine before you begin development.
-	|
-	*/
-
-	'connections' => [
-
-		'mysql' => [
-			'driver'    => 'mysql',
-			'host'      => 'localhost',
-			'database'  => 'homestead',
-			'username'  => 'homestead',
-			'password'  => 'secret',
-			'charset'   => 'utf8',
-			'collation' => 'utf8_unicode_ci',
-			'prefix'    => '',
-		],
-
-		'pgsql' => [
-			'driver'   => 'pgsql',
-			'host'     => 'localhost',
-			'database' => 'homestead',
-			'username' => 'homestead',
-			'password' => 'secret',
-			'charset'  => 'utf8',
-			'prefix'   => '',
-			'schema'   => 'public',
-		],
-
-	],
-
-];
diff --git a/config/local/mail.php b/config/local/mail.php
deleted file mode 100644
index c4fac1d0..00000000
--- a/config/local/mail.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-return [
-
-	/*
-	|--------------------------------------------------------------------------
-	| Mail Driver
-	|--------------------------------------------------------------------------
-	|
-	| Laravel supports both SMTP and PHP's "mail" function as drivers for the
-	| sending of e-mail. You may specify which one you're using throughout
-	| your application here. By default, Laravel is setup for SMTP mail.
-	|
-	| Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "log"
-	|
-	*/
-
-	'driver' => 'smtp',
-
-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Address
-	|--------------------------------------------------------------------------
-	|
-	| Here you may provide the host address of the SMTP server used by your
-	| applications. A default option is provided that is compatible with
-	| the Mailgun mail service which will provide reliable deliveries.
-	|
-	*/
-
-	'host' => 'mailtrap.io',
-
-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Port
-	|--------------------------------------------------------------------------
-	|
-	| This is the SMTP port used by your application to deliver e-mails to
-	| users of the application. Like the host we have set this value to
-	| stay compatible with the Mailgun e-mail application by default.
-	|
-	*/
-
-	'port' => 465,
-
-	/*
-	|--------------------------------------------------------------------------
-	| Global "From" Address
-	|--------------------------------------------------------------------------
-	|
-	| You may wish for all e-mails sent by your application to be sent from
-	| the same address. Here, you may specify a name and address that is
-	| used globally for all e-mails that are sent by your application.
-	|
-	*/
-
-	'from' => ['address' => 'homestead@laravel.com', 'name' => 'Homestead'],
-
-	/*
-	|--------------------------------------------------------------------------
-	| E-Mail Encryption Protocol
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the encryption protocol that should be used when
-	| the application send e-mail messages. A sensible default using the
-	| transport layer security protocol should provide great security.
-	|
-	*/
-
-	'encryption' => 'tls',
-
-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Username
-	|--------------------------------------------------------------------------
-	|
-	| If your SMTP server requires a username for authentication, you should
-	| set it here. This will get used to authenticate with your server on
-	| connection. You may also set the "password" value below this one.
-	|
-	*/
-
-	'username' => '',
-
-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Password
-	|--------------------------------------------------------------------------
-	|
-	| Here you may set the password required by your SMTP server to send out
-	| messages from your application. This will be given to the server on
-	| connection so that the application will be able to send messages.
-	|
-	*/
-
-	'password' => '',
-
-];
diff --git a/config/packages/.gitkeep b/config/packages/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/config/queue.php b/config/queue.php
index f09c3dde..310cc0cb 100755
--- a/config/queue.php
+++ b/config/queue.php
@@ -15,7 +15,7 @@
 	|
 	*/
 
-	'default' => 'sync',
+	'default' => getenv('QUEUE_DRIVER') ?: 'sync',
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/config/session.php b/config/session.php
index 6af184e7..2e3a1405 100644
--- a/config/session.php
+++ b/config/session.php
@@ -16,7 +16,7 @@
 	|
 	*/
 
-	'driver' => 'file',
+	'driver' => getenv('SESSION_DRIVER') ?: 'file',
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/config/testing/cache.php b/config/testing/cache.php
deleted file mode 100644
index 729ae3a8..00000000
--- a/config/testing/cache.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-return [
-
-	/*
-	|--------------------------------------------------------------------------
-	| Default Cache Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the default cache "driver" that will be used when
-	| using the Caching library. Of course, you may use other drivers any
-	| time you wish. This is the default when another is not specified.
-	|
-	| Supported: "file", "database", "apc", "memcached", "redis", "array"
-	|
-	*/
-
-	'driver' => 'array',
-
-];
diff --git a/config/testing/session.php b/config/testing/session.php
deleted file mode 100644
index 46bf726a..00000000
--- a/config/testing/session.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-return [
-
-	/*
-	|--------------------------------------------------------------------------
-	| Default Session Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the default session "driver" that will be used on
-	| requests. By default, we will use the lightweight native driver but
-	| you may specify any of the other wonderful drivers provided here.
-	|
-	| Supported: "native", "cookie", "database", "apc",
-	|            "memcached", "redis", "array"
-	|
-	*/
-
-	'driver' => 'array',
-
-];
diff --git a/phpunit.xml b/phpunit.xml
index b22af540..08522be9 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -16,5 +16,7 @@
     </testsuites>
     <php>
         <env name="APP_ENV" value="testing"/>
+        <env name="CACHE_DRIVER" value="array"/>
+        <env name="SESSION_DRIVER" value="array"/>
     </php>
 </phpunit>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/app.blade.php
similarity index 100%
rename from resources/views/layouts/app.blade.php
rename to resources/views/app.blade.php
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 2c95a2d0..5ce966eb 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('app')
 
 @section('content')
 <div class="container">
diff --git a/resources/views/auth/password.blade.php b/resources/views/auth/password.blade.php
index b83c6ccc..e2e3f7d9 100644
--- a/resources/views/auth/password.blade.php
+++ b/resources/views/auth/password.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('app')
 
 @section('content')
 <div class="container">
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index d0b61e92..0cad656d 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('app')
 
 @section('content')
 <div class="container">
diff --git a/resources/views/auth/reset.blade.php b/resources/views/auth/reset.blade.php
index 1fe8802a..d206fb93 100644
--- a/resources/views/auth/reset.blade.php
+++ b/resources/views/auth/reset.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('app')
 
 @section('content')
 <div class="container">
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 8c741f90..5af22949 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('app')
 
 @section('content')
 <div class="container">
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 0b22a042..5ede21fa 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('app')
 
 @section('content')
 <div id="welcome">