diff --git a/artisan b/artisan
index 1f46ff31a..0cf63cb67 100755
--- a/artisan
+++ b/artisan
@@ -1,51 +1,53 @@
 #!/usr/bin/env php
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Register The Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
-|
-*/
+    define('LARAVEL_START', microtime(true));
 
-require __DIR__.'/bootstrap/autoload.php';
+    /*
+    |--------------------------------------------------------------------------
+    | Register The Auto Loader
+    |--------------------------------------------------------------------------
+    |
+    | Composer provides a convenient, automatically generated class loader
+    | for our application. We just need to utilize it! We'll require it
+    | into the script here so that we do not have to worry about the
+    | loading of any of our classes manually. It's great to relax.
+    |
+    */
 
-$app = require __DIR__.'/bootstrap/app.php';
+    require __DIR__.'/vendor/autoload.php';
 
-/*
-|--------------------------------------------------------------------------
-| Run The Artisan Application
-|--------------------------------------------------------------------------
-|
-| When we run the console application, the current CLI command will be
-| executed in this console and the response sent back to a terminal
-| or another output device for the developers. Here goes nothing!
-|
-*/
+    $app = require_once __DIR__.'/bootstrap/app.php';
 
-$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
+    /*
+    |--------------------------------------------------------------------------
+    | Run The Artisan Application
+    |--------------------------------------------------------------------------
+    |
+    | When we run the console application, the current CLI command will be
+    | executed in this console and the response sent back to a terminal
+    | or another output device for the developers. Here goes nothing!
+    |
+    */
 
-$status = $kernel->handle(
-    $input = new Symfony\Component\Console\Input\ArgvInput,
-    new Symfony\Component\Console\Output\ConsoleOutput
-);
+    $kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
 
-/*
-|--------------------------------------------------------------------------
-| Shutdown The Application
-|--------------------------------------------------------------------------
-|
-| Once Artisan has finished running, we will fire off the shutdown events
-| so that any final work may be done by the application before we shut
-| down the process. This is the last thing to happen to the request.
-|
-*/
+    $status = $kernel->handle(
+        $input = new Symfony\Component\Console\Input\ArgvInput,
+        new Symfony\Component\Console\Output\ConsoleOutput
+    );
 
-$kernel->terminate($input, $status);
+    /*
+    |--------------------------------------------------------------------------
+    | Shutdown The Application
+    |--------------------------------------------------------------------------
+    |
+    | Once Artisan has finished running, we will fire off the shutdown events
+    | so that any final work may be done by the application before we shut
+    | down the process. This is the last thing to happen to the request.
+    |
+    */
 
-exit($status);
+    $kernel->terminate($input, $status);
+
+    exit($status);
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 037e17df0..c56e46699 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -1,55 +1,55 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Create The Application
-|--------------------------------------------------------------------------
-|
-| The first thing we will do is create a new Laravel application instance
-| which serves as the "glue" for all the components of Laravel, and is
-| the IoC container for the system binding all of the various parts.
-|
-*/
+    /*
+    |--------------------------------------------------------------------------
+    | Create The Application
+    |--------------------------------------------------------------------------
+    |
+    | The first thing we will do is create a new Laravel application instance
+    | which serves as the "glue" for all the components of Laravel, and is
+    | the IoC container for the system binding all of the various parts.
+    |
+    */
 
-$app = new Illuminate\Foundation\Application(
-    $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
-);
+    $app = new Illuminate\Foundation\Application(
+        $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
+    );
 
-/*
-|--------------------------------------------------------------------------
-| Bind Important Interfaces
-|--------------------------------------------------------------------------
-|
-| Next, we need to bind some important interfaces into the container so
-| we will be able to resolve them when needed. The kernels serve the
-| incoming requests to this application from both the web and CLI.
-|
-*/
+    /*
+    |--------------------------------------------------------------------------
+    | Bind Important Interfaces
+    |--------------------------------------------------------------------------
+    |
+    | Next, we need to bind some important interfaces into the container so
+    | we will be able to resolve them when needed. The kernels serve the
+    | incoming requests to this application from both the web and CLI.
+    |
+    */
 
-$app->singleton(
-    Illuminate\Contracts\Http\Kernel::class,
-    App\Http\Kernel::class
-);
+    $app->singleton(
+        Illuminate\Contracts\Http\Kernel::class,
+        App\Http\Kernel::class
+    );
 
-$app->singleton(
-    Illuminate\Contracts\Console\Kernel::class,
-    App\Console\Kernel::class
-);
+    $app->singleton(
+        Illuminate\Contracts\Console\Kernel::class,
+        App\Console\Kernel::class
+    );
 
-$app->singleton(
-    Illuminate\Contracts\Debug\ExceptionHandler::class,
-    App\Exceptions\Handler::class
-);
+    $app->singleton(
+        Illuminate\Contracts\Debug\ExceptionHandler::class,
+        App\Exceptions\Handler::class
+    );
 
-/*
-|--------------------------------------------------------------------------
-| Return The Application
-|--------------------------------------------------------------------------
-|
-| This script returns the application instance. The instance is given to
-| the calling script so we can separate the building of the instances
-| from the actual running of the application and sending responses.
-|
-*/
+    /*
+    |--------------------------------------------------------------------------
+    | Return The Application
+    |--------------------------------------------------------------------------
+    |
+    | This script returns the application instance. The instance is given to
+    | the calling script so we can separate the building of the instances
+    | from the actual running of the application and sending responses.
+    |
+    */
 
-return $app;
+    return $app;
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
deleted file mode 100644
index eec58a304..000000000
--- a/bootstrap/autoload.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
-require __DIR__.DIRECTORY_SEPARATOR.'app.php';
-require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'app/Extensions/util/PhpYenc.php';
-
-use Dotenv\Dotenv;
-use Dotenv\Repository\RepositoryBuilder;
-
-$repository = RepositoryBuilder::createWithDefaultAdapters()
-    ->make();
-
-$dotenv = Dotenv::create($repository, dirname(__DIR__, 1), null)->load();
-
-$app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
diff --git a/public/index.php b/public/index.php
index 8eb0733d7..58500ccd5 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,15 +1,55 @@
 <?php
 
-require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'bootstrap/autoload.php';
+    use Illuminate\Contracts\Http\Kernel;
+    use Illuminate\Http\Request;
 
-define('LARAVEL_START', microtime(true));
+    define('LARAVEL_START', microtime(true));
 
-if (file_exists(__DIR__.'/../storage/framework/maintenance.php')) {
-    require __DIR__.'/../storage/framework/maintenance.php';
-}
+    /*
+    |--------------------------------------------------------------------------
+    | Check If The Application Is Under Maintenance
+    |--------------------------------------------------------------------------
+    |
+    | If the application is in maintenance / demo mode via the "down" command
+    | we will load this file so that any pre-rendered content can be shown
+    | instead of starting the framework, which could cause an exception.
+    |
+    */
 
-$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
+    if (file_exists($maintenance = __DIR__.'/../storage/framework/maintenance.php')) {
+        require $maintenance;
+    }
 
-$response = $kernel->handle($request = Illuminate\Http\Request::capture());
-$response->send();
-$kernel->terminate($request, $response);
+    /*
+    |--------------------------------------------------------------------------
+    | Register The Auto Loader
+    |--------------------------------------------------------------------------
+    |
+    | Composer provides a convenient, automatically generated class loader for
+    | this application. We just need to utilize it! We'll simply require it
+    | into the script here so we don't need to manually load our classes.
+    |
+    */
+
+    require __DIR__.'/../vendor/autoload.php';
+
+    /*
+    |--------------------------------------------------------------------------
+    | Run The Application
+    |--------------------------------------------------------------------------
+    |
+    | Once we have the application, we can handle the incoming request using
+    | the application's HTTP kernel. Then, we will send the response back
+    | to this client's browser, allowing them to enjoy our application.
+    |
+    */
+
+    $app = require_once __DIR__.'/../bootstrap/app.php';
+
+    $kernel = $app->make(Kernel::class);
+
+    $response = $kernel->handle(
+        $request = Request::capture()
+    )->send();
+
+    $kernel->terminate($request, $response);
diff --git a/server.php b/server.php
deleted file mode 100644
index 20bc389f0..000000000
--- a/server.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Laravel - A PHP Framework For Web Artisans.
- *
- * @author   Taylor Otwell <taylor@laravel.com>
- */
-$uri = urldecode(
-    parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
-);
-
-// This file allows us to emulate Apache's "mod_rewrite" functionality from the
-// built-in PHP web server. This provides a convenient way to test a Laravel
-// application without having installed a "real" web server software here.
-if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
-    return false;
-}
-
-require_once __DIR__.'/public/index.php';