diff --git a/app/views/imports/components.blade.php b/app/views/imports/components.blade.php
new file mode 100644
index 00000000..97052e2e
--- /dev/null
+++ b/app/views/imports/components.blade.php
@@ -0,0 +1,12 @@
+@if($components->count() > 0)
+<div class='page-header'>
+	<ul class='list-group components'>
+		@foreach($components as $component)
+		<li class='list-group-item component '>
+			<h4>{{ $component->name }} <small class='{{ $component->color }}'>{{ $component->humanStatus }}</small></h4>
+			<p>{{ $component->description }}</p>
+		</li>
+		@endforeach
+	</ul>
+</div>
+@endif
diff --git a/app/views/incident.blade.php b/app/views/imports/incident.blade.php
similarity index 100%
rename from app/views/incident.blade.php
rename to app/views/imports/incident.blade.php
diff --git a/app/views/imports/support-link.blade.php b/app/views/imports/support-link.blade.php
new file mode 100644
index 00000000..bf329491
--- /dev/null
+++ b/app/views/imports/support-link.blade.php
@@ -0,0 +1,6 @@
+@if(Setting::get('show_support'))
+<hr />
+<div class='footer'>
+	<p>{{ Setting::get('app_name') }} Status Page is powered by <a href='https://github.com/jbrooksuk/Cachet' target="_blank">Cachet</a>.</p>
+</div>
+@endif
diff --git a/app/views/index.blade.php b/app/views/index.blade.php
index 51ff5655..315d342f 100644
--- a/app/views/index.blade.php
+++ b/app/views/index.blade.php
@@ -7,27 +7,11 @@
 	<p>You're logged in. This will be a link to the Dashboard.</p>
 	@endif
 
-	@if($components->count() > 0)
-	<div class='page-header'>
-		<ul class='list-group components'>
-			@foreach($components as $component)
-			<li class='list-group-item component '>
-				<h4>{{ $component->name }} <small class='{{ $component->color }}'>{{ $component->humanStatus }}</small></h4>
-				<p>{{ $component->description }}</p>
-			</li>
-			@endforeach
-		</ul>
-	</div>
-	@endif
+	@include('imports.components')
 
 	@for($i=0; $i <= 7; $i++)
-	@include('incident', array('i', $i))
+	@include('imports.incident', array('i', $i))
 	@endfor
 
-	@if(Setting::get('show_support'))
-	<hr />
-	<div class='footer'>
-		<p>{{ Setting::get('app_name') }} Status Page is powered by <a href='https://github.com/jbrooksuk/Cachet' target="_blank">Cachet</a>.</p>
-	</div>
-	@endif
+	@include('imports.support-link')
 @stop