diff --git a/app/Http/Filters/BasicAuthFilter.php b/app/Http/Filters/BasicAuthFilter.php
deleted file mode 100644
index 77a37296..00000000
--- a/app/Http/Filters/BasicAuthFilter.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php namespace App\Http\Filters;
-
-use Illuminate\Contracts\Auth\Authenticator;
-
-class BasicAuthFilter {
-
-	/**
-	 * The authenticator implementation.
-	 *
-	 * @var Authenticator
-	 */
-	protected $auth;
-
-	/**
-	 * Create a new filter instance.
-	 *
-	 * @param  Authenticator  $auth
-	 * @return void
-	 */
-	public function __construct(Authenticator $auth)
-	{
-		$this->auth = $auth;
-	}
-
-	/**
-	 * Run the request filter.
-	 *
-	 * @return mixed
-	 */
-	public function filter()
-	{
-		return $this->auth->basic();
-	}
-
-}
diff --git a/app/Http/Filters/CsrfFilter.php b/app/Http/Filters/CsrfFilter.php
deleted file mode 100644
index 3ded7153..00000000
--- a/app/Http/Filters/CsrfFilter.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php namespace App\Http\Filters;
-
-use Illuminate\Http\Request;
-use Illuminate\Routing\Route;
-use Illuminate\Session\TokenMismatchException;
-
-class CsrfFilter {
-
-	/**
-	 * Run the request filter.
-	 *
-	 * @param  \Illuminate\Routing\Route  $route
-	 * @param  \Illuminate\Http\Request  $request
-	 * @return void
-	 *
-	 * @throws \Illuminate\Session\TokenMismatchException
-	 */
-	public function filter(Route $route, Request $request)
-	{
-		if ($request->getSession()->token() != $request->input('_token'))
-		{
-			throw new TokenMismatchException;
-		}
-	}
-
-}
diff --git a/app/Http/Filters/AuthFilter.php b/app/Http/Middleware/AuthMiddleware.php
similarity index 67%
rename from app/Http/Filters/AuthFilter.php
rename to app/Http/Middleware/AuthMiddleware.php
index 98e7ba8c..108f27d4 100644
--- a/app/Http/Filters/AuthFilter.php
+++ b/app/Http/Middleware/AuthMiddleware.php
@@ -1,11 +1,12 @@
-<?php namespace App\Http\Filters;
+<?php namespace App\Http\Middleware;
 
-use Illuminate\Http\Request;
+use Closure;
 use Illuminate\Routing\Route;
 use Illuminate\Contracts\Auth\Authenticator;
+use Illuminate\Contracts\Routing\Middleware;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
-class AuthFilter {
+class AuthMiddleware implements Middleware {
 
 	/**
 	 * The authenticator implementation.
@@ -36,13 +37,13 @@ class AuthFilter {
 	}
 
 	/**
-	 * Run the request filter.
+	 * Handle an incoming request.
 	 *
-	 * @param  \Illuminate\Routing\Route  $route
-	 * @param  \Illuminate\Http\Request  $request
-	 * @return mixed
+	 * @param  \Symfony\Component\HttpFoundation\Request  $request
+	 * @param  \Closure  $next
+	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	public function filter(Route $route, Request $request)
+	public function handle($request, Closure $next)
 	{
 		if ($this->auth->guest())
 		{
@@ -55,6 +56,8 @@ class AuthFilter {
 				return $this->response->redirectGuest('auth/login');
 			}
 		}
+
+		return $next($request);
 	}
 
 }
diff --git a/app/Http/Middleware/BasicAuthMiddleware.php b/app/Http/Middleware/BasicAuthMiddleware.php
new file mode 100644
index 00000000..9c566ff9
--- /dev/null
+++ b/app/Http/Middleware/BasicAuthMiddleware.php
@@ -0,0 +1,39 @@
+<?php namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Routing\Middleware;
+use Illuminate\Contracts\Auth\Authenticator;
+
+class BasicAuthMiddleware implements Middleware {
+
+	/**
+	 * The authenticator implementation.
+	 *
+	 * @var Authenticator
+	 */
+	protected $auth;
+
+	/**
+	 * Create a new filter instance.
+	 *
+	 * @param  Authenticator  $auth
+	 * @return void
+	 */
+	public function __construct(Authenticator $auth)
+	{
+		$this->auth = $auth;
+	}
+
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Symfony\Component\HttpFoundation\Request  $request
+	 * @param  \Closure  $next
+	 * @return \Symfony\Component\HttpFoundation\Response
+	 */
+	public function handle($request, Closure $next)
+	{
+		return $this->auth->basic() ?: $next($request);
+	}
+
+}
diff --git a/app/Http/Middleware/CsrfMiddleware.php b/app/Http/Middleware/CsrfMiddleware.php
new file mode 100644
index 00000000..4cbef12e
--- /dev/null
+++ b/app/Http/Middleware/CsrfMiddleware.php
@@ -0,0 +1,26 @@
+<?php namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Routing\Middleware;
+use Illuminate\Session\TokenMismatchException;
+
+class CsrfMiddleware implements Middleware {
+
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Symfony\Component\HttpFoundation\Request  $request
+	 * @param  \Closure  $next
+	 * @return \Symfony\Component\HttpFoundation\Response
+	 */
+	public function handle($request, Closure $next)
+	{
+		if ($request->getSession()->token() != $request->input('_token'))
+		{
+			throw new TokenMismatchException;
+		}
+
+		return $next($request);
+	}
+
+}
diff --git a/app/Http/Filters/GuestFilter.php b/app/Http/Middleware/GuestMiddleware.php
similarity index 53%
rename from app/Http/Filters/GuestFilter.php
rename to app/Http/Middleware/GuestMiddleware.php
index 7ac42969..10293607 100644
--- a/app/Http/Filters/GuestFilter.php
+++ b/app/Http/Middleware/GuestMiddleware.php
@@ -1,9 +1,11 @@
-<?php namespace App\Http\Filters;
+<?php namespace App\Http\Middleware;
 
-use Illuminate\Contracts\Auth\Authenticator;
+use Closure;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Contracts\Auth\Authenticator;
+use Illuminate\Contracts\Routing\Middleware;
 
-class GuestFilter {
+class GuestMiddleware implements Middleware {
 
 	/**
 	 * The authenticator implementation.
@@ -24,16 +26,20 @@ class GuestFilter {
 	}
 
 	/**
-	 * Run the request filter.
+	 * Handle an incoming request.
 	 *
-	 * @return mixed
+	 * @param  \Symfony\Component\HttpFoundation\Request  $request
+	 * @param  \Closure  $next
+	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	public function filter()
+	public function handle($request, Closure $next)
 	{
 		if ($this->auth->check())
 		{
 			return new RedirectResponse(url('/'));
 		}
+
+		return $next($request);
 	}
 
 }
diff --git a/app/Http/Filters/MaintenanceFilter.php b/app/Http/Middleware/MaintenanceMiddleware.php
similarity index 54%
rename from app/Http/Filters/MaintenanceFilter.php
rename to app/Http/Middleware/MaintenanceMiddleware.php
index b4f4b17f..02fa6b27 100644
--- a/app/Http/Filters/MaintenanceFilter.php
+++ b/app/Http/Middleware/MaintenanceMiddleware.php
@@ -1,9 +1,11 @@
-<?php namespace App\Http\Filters;
+<?php namespace App\Http\Middleware;
 
+use Closure;
 use Illuminate\Http\Response;
+use Illuminate\Contracts\Routing\Middleware;
 use Illuminate\Contracts\Foundation\Application;
 
-class MaintenanceFilter {
+class MaintenanceMiddleware {
 
 	/**
 	 * The application implementation.
@@ -24,16 +26,20 @@ class MaintenanceFilter {
 	}
 
 	/**
-	 * Run the request filter.
+	 * Handle an incoming request.
 	 *
-	 * @return mixed
+	 * @param  \Symfony\Component\HttpFoundation\Request  $request
+	 * @param  \Closure  $next
+	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	public function filter()
+	public function handle($request, Closure $next)
 	{
 		if ($this->app->isDownForMaintenance())
 		{
 			return new Response('Be right back!', 503);
 		}
+
+		return $next($request);
 	}
 
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 4c104acc..c1066148 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -6,6 +6,31 @@ use Illuminate\Routing\Stack\Builder as Stack;
 
 class AppServiceProvider extends ServiceProvider {
 
+	/**
+	 * All of the application's route middleware keys.
+	 *
+	 * @var array
+	 */
+	protected $middleware = [
+		'auth' => 'App\Http\Middleware\AuthMiddleware',
+		'auth.basic' => 'App\Http\Middleware\BasicAuthMiddleware',
+		'csrf' => 'App\Http\Middleware\CsrfMiddleware',
+		'guest' => 'App\Http\Middleware\GusetMiddleware',
+	];
+
+	/**
+	 * The application's middleware stack.
+	 *
+	 * @var array
+	 */
+	protected $stack = [
+		'App\Http\Middleware\MaintenanceMiddleware',
+		'Illuminate\Cookie\Guard',
+		'Illuminate\Cookie\Queue',
+		'Illuminate\Session\Middleware\Reader',
+		'Illuminate\Session\Middleware\Writer',
+	];
+
 	/**
 	 * Bootstrap any necessary services.
 	 *
@@ -20,10 +45,7 @@ class AppServiceProvider extends ServiceProvider {
 		$this->app->stack(function(Stack $stack, Router $router)
 		{
 			return $stack
-				->middleware('Illuminate\Cookie\Guard')
-				->middleware('Illuminate\Cookie\Queue')
-				->middleware('Illuminate\Session\Middlewares\Reader')
-				->middleware('Illuminate\Session\Middlewares\Writer')
+				->middleware($this->stack)
 				->then(function($request) use ($router)
 				{
 					return $router->dispatch($request);
diff --git a/app/Providers/FilterServiceProvider.php b/app/Providers/FilterServiceProvider.php
deleted file mode 100644
index 9452eeda..00000000
--- a/app/Providers/FilterServiceProvider.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php namespace App\Providers;
-
-use Illuminate\Foundation\Support\Providers\FilterServiceProvider as ServiceProvider;
-
-class FilterServiceProvider extends ServiceProvider {
-
-	/**
-	 * The filters that should run before all requests.
-	 *
-	 * @var array
-	 */
-	protected $before = [
-		'App\Http\Filters\MaintenanceFilter',
-	];
-
-	/**
-	 * The filters that should run after all requests.
-	 *
-	 * @var array
-	 */
-	protected $after = [
-		//
-	];
-
-	/**
-	 * All available route filters.
-	 *
-	 * @var array
-	 */
-	protected $filters = [
-		'auth' => 'App\Http\Filters\AuthFilter',
-		'auth.basic' => 'App\Http\Filters\BasicAuthFilter',
-		'csrf' => 'App\Http\Filters\CsrfFilter',
-		'guest' => 'App\Http\Filters\GuestFilter',
-	];
-
-}
diff --git a/config/app.php b/config/app.php
index 330dd95a..258dd4f2 100644
--- a/config/app.php
+++ b/config/app.php
@@ -102,7 +102,6 @@ return [
 		'App\Providers\ArtisanServiceProvider',
 		'App\Providers\ErrorServiceProvider',
 		'App\Providers\EventServiceProvider',
-		'App\Providers\FilterServiceProvider',
 		'App\Providers\LogServiceProvider',
 		'App\Providers\RouteServiceProvider',