diff --git a/app/composers.php b/app/composers.php
deleted file mode 100644
index 747b953f..00000000
--- a/app/composers.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-use CachetHQ\Cachet\Models\Component;
-use CachetHQ\Cachet\Models\Incident;
-use Illuminate\Support\Facades\View;
-
-View::composer('index', function ($view) {
-    $date = date('Y-m-d');
-
-    $components = Component::notStatus(1);
-
-    if (Component::all()->count() === 0 || $components->count() === 0) {
-        // If all our components are ok, do we have any non-fixed incidents?
-        $incidents = Incident::orderBy('created_at', 'desc')->get();
-        $incidentCount = $incidents->count();
-
-        if ($incidentCount === 0 || ($incidentCount >= 1 && (int) $incidents->first()->status === 4)) {
-            $status = 'success';
-            $message = trans('cachet.service.good');
-        } else {
-            $status = 'danger';
-            $message = trans('cachet.service.bad');
-        }
-    } else {
-        $status  = 'danger';
-        $message = trans('cachet.service.bad');
-    }
-
-    $view->with([
-        'systemStatus'  => $status,
-        'systemMessage' => $message,
-    ]);
-});
diff --git a/app/config/app.php b/app/config/app.php
index 8f8dd215..3680bdb4 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -144,6 +144,7 @@ return [
         'CachetHQ\Cachet\Providers\ConsoleServiceProvider',
         'CachetHQ\Cachet\Providers\RepositoryServiceProvider',
         'CachetHQ\Cachet\Providers\RoutingServiceProvider',
+        'CachetHQ\Cachet\Providers\ViewComposerServiceProvider',
 
     ],
 
diff --git a/app/start/global.php b/app/start/global.php
index fffabad6..4853e52d 100644
--- a/app/start/global.php
+++ b/app/start/global.php
@@ -61,14 +61,3 @@ App::missing(function ($exception) {
 App::down(function () {
     return Response::make("Be right back!", 503);
 });
-
-/*
-|--------------------------------------------------------------------------
-| View Composers
-|--------------------------------------------------------------------------
-|
-| Register Cachet's view composers.
-|
-*/
-
-require app_path('composers.php');
diff --git a/src/Composers/IndexComposer.php b/src/Composers/IndexComposer.php
new file mode 100644
index 00000000..917c5fa5
--- /dev/null
+++ b/src/Composers/IndexComposer.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace CachetHQ\Cachet\Composers;
+
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Incident;
+use Illuminate\Support\Facades\View;
+
+class IndexComposer
+{
+    /**
+     * Index page view composer.
+     *
+     * @param \Illuminate\View\View $view
+     *
+     * @return void
+     */
+    public function compose(\Illuminate\View\View $view)
+    {
+        $components = Component::notStatus(1);
+
+        if (Component::all()->count() === 0 || $components->count() === 0) {
+            // If all our components are ok, do we have any non-fixed incidents?
+            $incidents = Incident::orderBy('created_at', 'desc')->get();
+            $incidentCount = $incidents->count();
+
+            if ($incidentCount === 0 || ($incidentCount >= 1 && (int) $incidents->first()->status === 4)) {
+                $status = 'success';
+                $message = trans('cachet.service.good');
+            } else {
+                $status = 'danger';
+                $message = trans('cachet.service.bad');
+            }
+        } else {
+            $status  = 'danger';
+            $message = trans('cachet.service.bad');
+        }
+
+        $view->with([
+            'systemStatus'  => $status,
+            'systemMessage' => $message,
+        ]);
+    }
+}
diff --git a/src/Providers/ViewComposerServiceProvider.php b/src/Providers/ViewComposerServiceProvider.php
new file mode 100644
index 00000000..e832b663
--- /dev/null
+++ b/src/Providers/ViewComposerServiceProvider.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace CachetHQ\Cachet\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class ViewComposerServiceProvider extends ServiceProvider
+{
+    /**
+     * Boot the service provider.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        //
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->view->composer('index', 'CachetHQ\Cachet\Composers\IndexComposer');
+    }
+}