diff --git a/app/Events/IncidentHasReportedEvent.php b/app/Events/Incident/IncidentHasReportedEvent.php
similarity index 100%
rename from app/Events/IncidentHasReportedEvent.php
rename to app/Events/Incident/IncidentHasReportedEvent.php
diff --git a/app/Events/MaintenanceHasScheduledEvent.php b/app/Events/Incident/MaintenanceHasScheduledEvent.php
similarity index 100%
rename from app/Events/MaintenanceHasScheduledEvent.php
rename to app/Events/Incident/MaintenanceHasScheduledEvent.php
diff --git a/app/Events/SubscriberHasSubscribedEvent.php b/app/Events/Subscriber/SubscriberHasSubscribedEvent.php
similarity index 93%
rename from app/Events/SubscriberHasSubscribedEvent.php
rename to app/Events/Subscriber/SubscriberHasSubscribedEvent.php
index db6fd5a0..b1c8297f 100644
--- a/app/Events/SubscriberHasSubscribedEvent.php
+++ b/app/Events/Subscriber/SubscriberHasSubscribedEvent.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events;
+namespace CachetHQ\Cachet\Events\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
diff --git a/app/Events/SubscriberHasUnsubscribedEvent.php b/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php
similarity index 93%
rename from app/Events/SubscriberHasUnsubscribedEvent.php
rename to app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php
index 8c20a98d..cbd1ec83 100644
--- a/app/Events/SubscriberHasUnsubscribedEvent.php
+++ b/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events;
+namespace CachetHQ\Cachet\Events\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
diff --git a/app/Events/SubscriberHasVerifiedEvent.php b/app/Events/Subscriber/SubscriberHasVerifiedEvent.php
similarity index 93%
rename from app/Events/SubscriberHasVerifiedEvent.php
rename to app/Events/Subscriber/SubscriberHasVerifiedEvent.php
index e095ddb9..0d072f12 100644
--- a/app/Events/SubscriberHasVerifiedEvent.php
+++ b/app/Events/Subscriber/SubscriberHasVerifiedEvent.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events;
+namespace CachetHQ\Cachet\Events\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
diff --git a/app/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php b/app/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php
index 07ae6fae..e96fb8fe 100644
--- a/app/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php
+++ b/app/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Handlers\Commands\Subscriber;
 
 use CachetHQ\Cachet\Commands\Subscriber\SubscribeSubscriberCommand;
 use CachetHQ\Cachet\Commands\Subscriber\VerifySubscriberCommand;
-use CachetHQ\Cachet\Events\SubscriberHasSubscribedEvent;
+use CachetHQ\Cachet\Events\Subscriber\SubscriberHasSubscribedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 
diff --git a/app/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php b/app/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php
index 7552b820..904e1fe5 100644
--- a/app/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php
+++ b/app/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php
@@ -12,7 +12,7 @@
 namespace CachetHQ\Cachet\Handlers\Commands\Subscriber;
 
 use CachetHQ\Cachet\Commands\Subscriber\UnsubscribeSubscriberCommand;
-use CachetHQ\Cachet\Events\SubscriberHasUnsubscribedEvent;
+use CachetHQ\Cachet\Events\Subscriber\SubscriberHasUnsubscribedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 
 class UnsubscribeSubscriberCommandHandler
diff --git a/app/Handlers/Commands/Subscriber/VerifySubscriberCommandHandler.php b/app/Handlers/Commands/Subscriber/VerifySubscriberCommandHandler.php
index 25f94e42..9f4c1ba3 100644
--- a/app/Handlers/Commands/Subscriber/VerifySubscriberCommandHandler.php
+++ b/app/Handlers/Commands/Subscriber/VerifySubscriberCommandHandler.php
@@ -12,7 +12,7 @@
 namespace CachetHQ\Cachet\Handlers\Commands\Subscriber;
 
 use CachetHQ\Cachet\Commands\Subscriber\VerifySubscriberCommand;
-use CachetHQ\Cachet\Events\SubscriberHasVerifiedEvent;
+use CachetHQ\Cachet\Events\Subscriber\SubscriberHasVerifiedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 use Carbon\Carbon;
 
diff --git a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php b/app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
similarity index 94%
rename from app/Handlers/Events/SendIncidentEmailNotificationHandler.php
rename to app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
index 4f8abc02..9c44ee74 100644
--- a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php
+++ b/app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Events;
+namespace CachetHQ\Cachet\Handlers\Events\Incident;
 
-use CachetHQ\Cachet\Events\IncidentHasReportedEvent;
+use CachetHQ\Cachet\Events\Incident\HasReportedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Contracts\Mail\MailQueue;
 use Illuminate\Mail\Message;
@@ -59,7 +59,7 @@ class SendIncidentEmailNotificationHandler
     /**
      * Handle the event.
      *
-     * @param \CachetHQ\Cachet\Events\IncidentHasReportedEvent $event
+     * @param \CachetHQ\Cachet\Events\Incident\IncidentHasReportedEvent $event
      *
      * @return void
      */
diff --git a/app/Handlers/Events/SendMaintenanceEmailNotificationHandler.php b/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
similarity index 98%
rename from app/Handlers/Events/SendMaintenanceEmailNotificationHandler.php
rename to app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
index 983d8358..b1195c34 100644
--- a/app/Handlers/Events/SendMaintenanceEmailNotificationHandler.php
+++ b/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Events;
+namespace CachetHQ\Cachet\Handlers\Events\Incident;
 
 use CachetHQ\Cachet\Events\MaintenanceHasScheduledEvent;
 use CachetHQ\Cachet\Models\Subscriber;
diff --git a/app/Handlers/Events/SendSubscriberVerificationEmailHandler.php b/app/Handlers/Events/Subscriber/SendSubscriberVerificationEmailHandler.php
similarity index 96%
rename from app/Handlers/Events/SendSubscriberVerificationEmailHandler.php
rename to app/Handlers/Events/Subscriber/SendSubscriberVerificationEmailHandler.php
index 1de26a31..593734f9 100644
--- a/app/Handlers/Events/SendSubscriberVerificationEmailHandler.php
+++ b/app/Handlers/Events/Subscriber/SendSubscriberVerificationEmailHandler.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Events;
+namespace CachetHQ\Cachet\Handlers\Events\Subscriber;
 
 use CachetHQ\Cachet\Events\SubscriberHasSubscribedEvent;
 use Illuminate\Contracts\Mail\MailQueue;
diff --git a/app/Http/Controllers/Api/IncidentController.php b/app/Http/Controllers/Api/IncidentController.php
index 69026e29..16d5d3c9 100644
--- a/app/Http/Controllers/Api/IncidentController.php
+++ b/app/Http/Controllers/Api/IncidentController.php
@@ -11,7 +11,7 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Api;
 
-use CachetHQ\Cachet\Events\IncidentHasReportedEvent;
+use CachetHQ\Cachet\Events\Incident\IncidentHasReportedEvent;
 use CachetHQ\Cachet\Models\Incident;
 use Exception;
 use GrahamCampbell\Binput\Facades\Binput;
diff --git a/app/Http/Controllers/Dashboard/IncidentController.php b/app/Http/Controllers/Dashboard/IncidentController.php
index cdb68d93..e89f69c7 100644
--- a/app/Http/Controllers/Dashboard/IncidentController.php
+++ b/app/Http/Controllers/Dashboard/IncidentController.php
@@ -12,7 +12,7 @@
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use AltThree\Validator\ValidationException;
-use CachetHQ\Cachet\Events\IncidentHasReportedEvent;
+use CachetHQ\Cachet\Events\Incident\IncidentHasReportedEvent;
 use CachetHQ\Cachet\Facades\Setting;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 1f0e5cc6..aef6d1e6 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -21,14 +21,14 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'CachetHQ\Cachet\Events\SubscriberHasSubscribedEvent' => [
+        'CachetHQ\Cachet\Events\Subscriber\SubscriberHasSubscribedEvent' => [
             'CachetHQ\Cachet\Handlers\Events\SendSubscriberVerificationEmailHandler',
         ],
-        'CachetHQ\Cachet\Events\IncidentHasReportedEvent' => [
-            'CachetHQ\Cachet\Handlers\Events\SendIncidentEmailNotificationHandler',
+        'CachetHQ\Cachet\Events\Incident\IncidentHasReportedEvent' => [
+            'CachetHQ\Cachet\Handlers\Events\Incident\SendIncidentEmailNotificationHandler',
         ],
-        'CachetHQ\Cachet\Events\MaintenanceHasScheduledEvent' => [
-            'CachetHQ\Cachet\Handlers\Events\SendMaintenanceEmailNotificationHandler',
+        'CachetHQ\Cachet\Events\Incident\MaintenanceHasScheduledEvent' => [
+            'CachetHQ\Cachet\Handlers\Events\Incident\SendMaintenanceEmailNotificationHandler',
         ],
     ];
 }