diff --git a/app/Console/Commands/NotificationsPayload.php b/app/Console/Commands/NotificationsPayload.php
--- a/app/Console/Commands/NotificationsPayload.php
+++ b/app/Console/Commands/NotificationsPayload.php
@@ -2,7 +2,7 @@
 
 namespace Nasqueron\Notifications\Console\Commands;
 
-use Nasqueron\Notifications\Notification;
+use Nasqueron\Notifications\Notifications\Notification;
 use Nasqueron\Notifications\Phabricator\PhabricatorStory;
 
 use Illuminate\Console\Command;
@@ -161,7 +161,7 @@
      * Initializes a new instance of the relevant notification class,
      * with the arguments given in the constructor property.
      *
-     * @return \Nasqueron\Notifications\Notification
+     * @return \Nasqueron\Notifications\Notifications\Notification
      */
     private function getNotification () : Notification {
         $class = $this->getNotificationClass();
diff --git a/app/Events/NotificationEvent.php b/app/Events/NotificationEvent.php
--- a/app/Events/NotificationEvent.php
+++ b/app/Events/NotificationEvent.php
@@ -2,15 +2,16 @@
 
 namespace Nasqueron\Notifications\Events;
 
-use Nasqueron\Notifications\Notification;
 use Nasqueron\Notifications\Events\Event;
+use Nasqueron\Notifications\Notifications\Notification;
+
 use Illuminate\Queue\SerializesModels;
 
 class NotificationEvent extends Event {
     use SerializesModels;
 
     /**
-     * @var \Nasqueron\Notifications\Notification
+     * @var Notification
      */
     public $notification;
 
diff --git a/app/Jobs/FireDockerHubNotification.php b/app/Jobs/FireDockerHubNotification.php
--- a/app/Jobs/FireDockerHubNotification.php
+++ b/app/Jobs/FireDockerHubNotification.php
@@ -41,7 +41,7 @@
      * Creates a DockerHub notification
      *
      * @param DockerHubPayloadEvent $event
-     * @return \Nasqueron\Notifications\Notification The notification
+     * @return \Nasqueron\Notifications\Notifications\Notification The notification
      */
     protected function createNotification() : DockerHubNotification {
         return new DockerHubNotification(
diff --git a/app/Jobs/FireGitHubNotification.php b/app/Jobs/FireGitHubNotification.php
--- a/app/Jobs/FireGitHubNotification.php
+++ b/app/Jobs/FireGitHubNotification.php
@@ -41,7 +41,7 @@
      * Creates a GitHub notification
      *
      * @param GitHubPayloadEvent $event
-     * @return \Nasqueron\Notifications\Notification The notification
+     * @return \Nasqueron\Notifications\Notifications\Notification The notification
      */
     protected function createNotification() : GitHubNotification {
         return new GitHubNotification(
diff --git a/app/Jobs/FireJenkinsNotification.php b/app/Jobs/FireJenkinsNotification.php
--- a/app/Jobs/FireJenkinsNotification.php
+++ b/app/Jobs/FireJenkinsNotification.php
@@ -45,7 +45,7 @@
      * Creates a Jenkins notification
      *
      * @param JenkinsPayloadEvent $event
-     * @return \Nasqueron\Notifications\Notification The notification
+     * @return \Nasqueron\Notifications\Notifications\Notification The notification
      */
     protected function createNotification() : JenkinsNotification {
         return new JenkinsNotification(
diff --git a/app/Jobs/FirePhabricatorNotification.php b/app/Jobs/FirePhabricatorNotification.php
--- a/app/Jobs/FirePhabricatorNotification.php
+++ b/app/Jobs/FirePhabricatorNotification.php
@@ -41,7 +41,7 @@
      * Creates a Phabricator notification
      *
      * @param PhabricatorPayloadEvent $event
-     * @return \Nasqueron\Notifications\Notification The notification
+     * @return \Nasqueron\Notifications\Notifications\Notification The notification
      */
     protected function createNotification() : PhabricatorNotification {
         return new PhabricatorNotification(
diff --git a/app/Listeners/AMQPEventListener.php b/app/Listeners/AMQPEventListener.php
--- a/app/Listeners/AMQPEventListener.php
+++ b/app/Listeners/AMQPEventListener.php
@@ -6,7 +6,7 @@
 use Nasqueron\Notifications\Events\NotificationEvent;
 use Nasqueron\Notifications\Analyzers\GitHub\GitHubPayloadAnalyzer;
 use Nasqueron\Notifications\Jobs\SendMessageToBroker;
-use Nasqueron\Notifications\Notification;
+use Nasqueron\Notifications\Notifications\Notification;
 
 use Config;
 
diff --git a/app/Notifications/DockerHubNotification.php b/app/Notifications/DockerHubNotification.php
--- a/app/Notifications/DockerHubNotification.php
+++ b/app/Notifications/DockerHubNotification.php
@@ -3,7 +3,6 @@
 namespace Nasqueron\Notifications\Notifications;
 
 use Nasqueron\Notifications\Analyzers\DockerHub\BaseEvent;
-use Nasqueron\Notifications\Notification;
 
 use InvalidArgumentException;
 
diff --git a/app/Notifications/GitHubNotification.php b/app/Notifications/GitHubNotification.php
--- a/app/Notifications/GitHubNotification.php
+++ b/app/Notifications/GitHubNotification.php
@@ -3,7 +3,6 @@
 namespace Nasqueron\Notifications\Notifications;
 
 use Nasqueron\Notifications\Analyzers\GitHub\GitHubPayloadAnalyzer;
-use Nasqueron\Notifications\Notification;
 
 class GitHubNotification extends Notification {
 
diff --git a/app/Notifications/JenkinsNotification.php b/app/Notifications/JenkinsNotification.php
--- a/app/Notifications/JenkinsNotification.php
+++ b/app/Notifications/JenkinsNotification.php
@@ -3,7 +3,6 @@
 namespace Nasqueron\Notifications\Notifications;
 
 use Nasqueron\Notifications\Analyzers\Jenkins\JenkinsPayloadAnalyzer;
-use Nasqueron\Notifications\Notification;
 
 /**
  * A Jenkins notification.
diff --git a/app/Notification.php b/app/Notifications/Notification.php
rename from app/Notification.php
rename to app/Notifications/Notification.php
--- a/app/Notification.php
+++ b/app/Notifications/Notification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Nasqueron\Notifications;
+namespace Nasqueron\Notifications\Notifications;
 
 class Notification {
 
diff --git a/app/Notifications/PhabricatorNotification.php b/app/Notifications/PhabricatorNotification.php
--- a/app/Notifications/PhabricatorNotification.php
+++ b/app/Notifications/PhabricatorNotification.php
@@ -3,7 +3,6 @@
 namespace Nasqueron\Notifications\Notifications;
 
 use Nasqueron\Notifications\Analyzers\Phabricator\PhabricatorPayloadAnalyzer;
-use Nasqueron\Notifications\Notification;
 use Nasqueron\Notifications\Phabricator\PhabricatorStory;
 
 class PhabricatorNotification extends Notification {