diff --git a/resources/views/dashboard/components/add.blade.php b/resources/views/dashboard/components/add.blade.php
index 5f6d4a7f..da363574 100644
--- a/resources/views/dashboard/components/add.blade.php
+++ b/resources/views/dashboard/components/add.blade.php
@@ -13,7 +13,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-sm-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form name="CreateComponentForm" class="form-vertical" role="form" action="/dashboard/components/add" method="POST">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
diff --git a/resources/views/dashboard/components/edit.blade.php b/resources/views/dashboard/components/edit.blade.php
index 3056f93f..0db0b099 100644
--- a/resources/views/dashboard/components/edit.blade.php
+++ b/resources/views/dashboard/components/edit.blade.php
@@ -13,7 +13,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-sm-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form name="EditComponentForm" class="form-vertical" role="form" action="/dashboard/components/{{ $component->id }}/edit" method="POST">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
diff --git a/resources/views/dashboard/components/groups/add.blade.php b/resources/views/dashboard/components/groups/add.blade.php
index d08d4507..d0f9073b 100644
--- a/resources/views/dashboard/components/groups/add.blade.php
+++ b/resources/views/dashboard/components/groups/add.blade.php
@@ -13,7 +13,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-sm-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form name="CreateComponentGroupForm" class="form-vertical" role="form" action="/dashboard/components/groups/add" method="POST">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
diff --git a/resources/views/dashboard/components/groups/edit.blade.php b/resources/views/dashboard/components/groups/edit.blade.php
index a39cb30c..114ff5e3 100644
--- a/resources/views/dashboard/components/groups/edit.blade.php
+++ b/resources/views/dashboard/components/groups/edit.blade.php
@@ -13,7 +13,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-sm-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form name="EditComponentGroupForm" class="form-vertical" role="form" method="POST">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
diff --git a/resources/views/dashboard/components/groups/index.blade.php b/resources/views/dashboard/components/groups/index.blade.php
index 64fbe997..5ab4f1df 100644
--- a/resources/views/dashboard/components/groups/index.blade.php
+++ b/resources/views/dashboard/components/groups/index.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="content-panel">
         @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
         @endif
         <div class="content-wrapper">
             <div class="header sub-header">
diff --git a/resources/views/dashboard/components/index.blade.php b/resources/views/dashboard/components/index.blade.php
index 1b7f2fe4..b0449a30 100644
--- a/resources/views/dashboard/components/index.blade.php
+++ b/resources/views/dashboard/components/index.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="content-panel">
         @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
         @endif
         <div class="content-wrapper">
             <div class="header sub-header">
diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php
index b4fd7bc4..2dfe9eac 100644
--- a/resources/views/dashboard/incidents/add.blade.php
+++ b/resources/views/dashboard/incidents/add.blade.php
@@ -13,7 +13,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
diff --git a/resources/views/dashboard/incidents/edit.blade.php b/resources/views/dashboard/incidents/edit.blade.php
index 6de3b495..a12700e8 100644
--- a/resources/views/dashboard/incidents/edit.blade.php
+++ b/resources/views/dashboard/incidents/edit.blade.php
@@ -13,7 +13,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
diff --git a/resources/views/dashboard/incidents/index.blade.php b/resources/views/dashboard/incidents/index.blade.php
index 3f8cf8bd..a4f9308f 100644
--- a/resources/views/dashboard/incidents/index.blade.php
+++ b/resources/views/dashboard/incidents/index.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="content-panel">
         @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
         @endif
         <div class="content-wrapper">
             <div class="header sub-header">
@@ -17,7 +17,7 @@
             </div>
             <div class="row">
                 <div class="col-sm-12">
-                    @include('partials.dashboard.errors')
+                    @include('dashboard.partials.errors')
                     <p class="lead">{!! trans_choice('dashboard.incidents.logged', $incidents->count(), ['count' => $incidents->count()]) !!}</p>
 
                     <div class="striped-list">
diff --git a/resources/views/dashboard/incidents/templates/add.blade.php b/resources/views/dashboard/incidents/templates/add.blade.php
index 17599835..bc5b0db7 100644
--- a/resources/views/dashboard/incidents/templates/add.blade.php
+++ b/resources/views/dashboard/incidents/templates/add.blade.php
@@ -13,7 +13,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php
index 51ab2e9b..59968f0e 100644
--- a/resources/views/dashboard/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@@ -45,7 +45,7 @@
         </div>
     </div>
     @if(Session::get('setup.done'))
-    @include('partials.dashboard.welcome-modal')
+    @include('dashboard.partials.welcome-modal')
     <script>
         $(function() {
             $('#welcome-modal').modal('show');
diff --git a/resources/views/dashboard/metrics/add.blade.php b/resources/views/dashboard/metrics/add.blade.php
index 0ab03d77..727e29f3 100644
--- a/resources/views/dashboard/metrics/add.blade.php
+++ b/resources/views/dashboard/metrics/add.blade.php
@@ -13,7 +13,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form class='form-vertical' name='MetricsForm' role='form' method='POST'>
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
diff --git a/resources/views/dashboard/metrics/edit.blade.php b/resources/views/dashboard/metrics/edit.blade.php
index dee049a9..05ee6c3b 100644
--- a/resources/views/dashboard/metrics/edit.blade.php
+++ b/resources/views/dashboard/metrics/edit.blade.php
@@ -13,7 +13,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form class='form-vertical' name='MetricsForm' role='form' method='POST'>
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
diff --git a/resources/views/dashboard/metrics/index.blade.php b/resources/views/dashboard/metrics/index.blade.php
index 0648121c..2b995715 100644
--- a/resources/views/dashboard/metrics/index.blade.php
+++ b/resources/views/dashboard/metrics/index.blade.php
@@ -16,7 +16,7 @@
     <div class="content-wrapper header-fixed">
         <div class="row">
             <div class="col-sm-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <div class="striped-list">
                     @foreach($metrics as $metric)
                     <div class="row striped-list-item">
diff --git a/resources/views/partials/dashboard/_error.blade.php b/resources/views/dashboard/partials/_error.blade.php
similarity index 100%
rename from resources/views/partials/dashboard/_error.blade.php
rename to resources/views/dashboard/partials/_error.blade.php
diff --git a/resources/views/partials/dashboard/errors.blade.php b/resources/views/dashboard/partials/errors.blade.php
similarity index 61%
rename from resources/views/partials/dashboard/errors.blade.php
rename to resources/views/dashboard/partials/errors.blade.php
index df785361..3c5a29d9 100644
--- a/resources/views/partials/dashboard/errors.blade.php
+++ b/resources/views/dashboard/partials/errors.blade.php
@@ -1,15 +1,15 @@
 @if ($errors->any())
-  @include('partials.dashboard._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
+  @include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
 @endif
 
 @if ($message = Session::get('success'))
-  @include('partials.dashboard._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
+  @include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
 @endif
 
 @if ($message = Session::get('warning'))
-  @include('partials.dashboard._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
+  @include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
 @endif
 
 @if ($message = Session::get('info'))
-  @include('partials.dashboard._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
+  @include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
 @endif
diff --git a/resources/views/partials/dashboard/head.blade.php b/resources/views/dashboard/partials/head.blade.php
similarity index 100%
rename from resources/views/partials/dashboard/head.blade.php
rename to resources/views/dashboard/partials/head.blade.php
diff --git a/resources/views/partials/dashboard/sidebar.blade.php b/resources/views/dashboard/partials/sidebar.blade.php
similarity index 100%
rename from resources/views/partials/dashboard/sidebar.blade.php
rename to resources/views/dashboard/partials/sidebar.blade.php
diff --git a/resources/views/partials/dashboard/sub-sidebar.blade.php b/resources/views/dashboard/partials/sub-sidebar.blade.php
similarity index 100%
rename from resources/views/partials/dashboard/sub-sidebar.blade.php
rename to resources/views/dashboard/partials/sub-sidebar.blade.php
diff --git a/resources/views/partials/dashboard/welcome-modal.blade.php b/resources/views/dashboard/partials/welcome-modal.blade.php
similarity index 100%
rename from resources/views/partials/dashboard/welcome-modal.blade.php
rename to resources/views/dashboard/partials/welcome-modal.blade.php
diff --git a/resources/views/dashboard/schedule/add.blade.php b/resources/views/dashboard/schedule/add.blade.php
index 597481b8..067d845e 100644
--- a/resources/views/dashboard/schedule/add.blade.php
+++ b/resources/views/dashboard/schedule/add.blade.php
@@ -13,7 +13,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form class='form-vertical' name='ScheduleForm' role='form' method='POST' autocomplete="off">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <input type="hidden" name="incident[visible]" value="1">
diff --git a/resources/views/dashboard/schedule/edit.blade.php b/resources/views/dashboard/schedule/edit.blade.php
index 9dbbd4c1..46c6c7b0 100644
--- a/resources/views/dashboard/schedule/edit.blade.php
+++ b/resources/views/dashboard/schedule/edit.blade.php
@@ -13,7 +13,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form class='form-vertical' name='ScheduleForm' role='form' method='POST' autocomplete="off">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <input type="hidden" name="incident[visible]" value="1">
diff --git a/resources/views/dashboard/schedule/index.blade.php b/resources/views/dashboard/schedule/index.blade.php
index 183620d9..d47f4370 100644
--- a/resources/views/dashboard/schedule/index.blade.php
+++ b/resources/views/dashboard/schedule/index.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="content-panel">
         @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
         @endif
         <div class="content-wrapper">
             <div class="header sub-header">
@@ -17,7 +17,7 @@
             </div>
             <div class="row">
                 <div class="col-sm-12">
-                    @include('partials.dashboard.errors')
+                    @include('dashboard.partials.errors')
 
                     <div class="striped-list">
                         @foreach($schedule as $incident)
diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php
index 1949ba8a..65262ddd 100644
--- a/resources/views/dashboard/settings/app-setup.blade.php
+++ b/resources/views/dashboard/settings/app-setup.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="content-panel">
         @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
         @endif
         <div class="content-wrapper">
             <div class="header sub-header" id="application-setup">
@@ -15,7 +15,7 @@
                 <div class="col-sm-12">
                     <form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST" enctype="multipart/form-data">
                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                        @include('partials.dashboard.errors')
+                        @include('dashboard.partials.errors')
                         <fieldset>
                             <div class="row">
                                 <div class="col-xs-12">
diff --git a/resources/views/dashboard/settings/security.blade.php b/resources/views/dashboard/settings/security.blade.php
index c5f69985..8b333ef3 100644
--- a/resources/views/dashboard/settings/security.blade.php
+++ b/resources/views/dashboard/settings/security.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="content-panel">
         @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
         @endif
         <div class="content-wrapper">
             <div class="header sub-header" id="security">
@@ -15,7 +15,7 @@
                 <div class="col-sm-12">
                     <form name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST">
                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                        @include('partials.dashboard.errors')
+                        @include('dashboard.partials.errors')
                         <fieldset>
                             <div class="row">
                                 <div class="col-xs-12">
diff --git a/resources/views/dashboard/settings/stylesheet.blade.php b/resources/views/dashboard/settings/stylesheet.blade.php
index 996ba374..3a39703b 100644
--- a/resources/views/dashboard/settings/stylesheet.blade.php
+++ b/resources/views/dashboard/settings/stylesheet.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="content-panel">
         @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
         @endif
         <div class="content-wrapper">
             <div class="header sub-header" id="stylesheet">
@@ -15,7 +15,7 @@
                 <div class="col-sm-12">
                     <form name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST">
                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                        @include('partials.dashboard.errors')
+                        @include('dashboard.partials.errors')
                         <fieldset>
                             <div class="row">
                                 <div class="col-xs-12">
diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php
index d46ea134..157dca24 100644
--- a/resources/views/dashboard/settings/theme.blade.php
+++ b/resources/views/dashboard/settings/theme.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="content-panel">
         @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
         @endif
         <div class="content-wrapper">
             <div class="header sub-header" id="theme">
@@ -15,7 +15,7 @@
                 <div class="col-sm-12">
                     <form name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST">
                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                        @include('partials.dashboard.errors')
+                        @include('dashboard.partials.errors')
                         <fieldset>
                             <div class="row">
                                 <div class="col-xs-6">
diff --git a/resources/views/dashboard/subscribers/add.blade.php b/resources/views/dashboard/subscribers/add.blade.php
index ac478d87..159b7220 100644
--- a/resources/views/dashboard/subscribers/add.blade.php
+++ b/resources/views/dashboard/subscribers/add.blade.php
@@ -12,7 +12,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-sm-12">
-            @include('partials.dashboard.errors')
+            @include('dashboard.partials.errors')
             <form name="SubscriberForm" class="form-vertical" role="form" action="/dashboard/subscribers/add" method="POST">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}">
                 <fieldset>
diff --git a/resources/views/dashboard/team/add.blade.php b/resources/views/dashboard/team/add.blade.php
index 70268216..72aa4e03 100644
--- a/resources/views/dashboard/team/add.blade.php
+++ b/resources/views/dashboard/team/add.blade.php
@@ -12,7 +12,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-sm-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form name="UserForm" class="form-vertical" role="form" action="/dashboard/team/add" method="POST">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
diff --git a/resources/views/dashboard/team/edit.blade.php b/resources/views/dashboard/team/edit.blade.php
index f8ea6f47..d337bfb4 100644
--- a/resources/views/dashboard/team/edit.blade.php
+++ b/resources/views/dashboard/team/edit.blade.php
@@ -12,7 +12,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-sm-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form name="UserForm" class="form-vertical" role="form" action="/dashboard/team/{{ $user->id }}" method="POST">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
diff --git a/resources/views/dashboard/user/index.blade.php b/resources/views/dashboard/user/index.blade.php
index 2965ab81..c281bb39 100644
--- a/resources/views/dashboard/user/index.blade.php
+++ b/resources/views/dashboard/user/index.blade.php
@@ -12,7 +12,7 @@
     <div class="content-wrapper">
         <div class="row">
             <div class="col-sm-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                 <form name="UserForm" class="form-vertical" role="form" action="/dashboard/user" method="POST">
                     <fieldset>
                         <div class="form-group">
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 8271ed67..0caf3b14 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -10,7 +10,7 @@
     <div class="clearfix"></div>
 
     <div class="section-messages">
-        @include('partials.dashboard.errors')
+        @include('dashboard.partials.errors')
     </div>
 
     @if($bannerImage = Setting::get('app_banner'))
diff --git a/resources/views/layout/clean.blade.php b/resources/views/layout/clean.blade.php
index 25d9d23d..572b7323 100644
--- a/resources/views/layout/clean.blade.php
+++ b/resources/views/layout/clean.blade.php
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-@include('partials.dashboard.head')
+@include('dashboard.partials.head')
 
 <body class="dashboard @yield('bodyClass')">
     <div class="content">
diff --git a/resources/views/layout/dashboard.blade.php b/resources/views/layout/dashboard.blade.php
index eea0113f..b78a710d 100644
--- a/resources/views/layout/dashboard.blade.php
+++ b/resources/views/layout/dashboard.blade.php
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
-@include('partials.dashboard.head')
+@include('dashboard.partials.head')
 
 <body class="dashboard">
     <div class="wrapper">
-        @include('partials.dashboard.sidebar')
+        @include('dashboard.partials.sidebar')
         <div class="page-content">
             @yield('content')
         </div>
diff --git a/resources/views/subscribe.blade.php b/resources/views/subscribe.blade.php
index 89b085e7..225c12cc 100644
--- a/resources/views/subscribe.blade.php
+++ b/resources/views/subscribe.blade.php
@@ -27,7 +27,7 @@
     </div>
     @endif
 
-    @include('partials.dashboard.errors')
+    @include('dashboard.partials.errors')
 
     <h1>{{ trans('cachet.subscriber.subscribe') }}</h1>
     <form action="{{ route('subscribe', [], false) }}" method="post">