diff --git a/app/Exceptions/ExceptionInterface.php b/app/Bus/Exceptions/ExceptionInterface.php
similarity index 80%
rename from app/Exceptions/ExceptionInterface.php
rename to app/Bus/Exceptions/ExceptionInterface.php
index 15ce0eee2..5d60b6a7c 100644
--- a/app/Exceptions/ExceptionInterface.php
+++ b/app/Bus/Exceptions/ExceptionInterface.php
@@ -9,12 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Exceptions;
+namespace CachetHQ\Cachet\Bus\Exceptions;
 
 /**
  * This is the exception interface.
  *
  * @author Graham Campbell <graham@alt-three.com>
+ * @author James Brooks <james@alt-three.com>
  */
 interface ExceptionInterface
 {
diff --git a/app/Exceptions/AlreadySubscribedException.php b/app/Bus/Exceptions/Subscriber/AlreadySubscribedException.php
similarity index 73%
rename from app/Exceptions/AlreadySubscribedException.php
rename to app/Bus/Exceptions/Subscriber/AlreadySubscribedException.php
index dacf00dcd..8e88578c1 100644
--- a/app/Exceptions/AlreadySubscribedException.php
+++ b/app/Bus/Exceptions/Subscriber/AlreadySubscribedException.php
@@ -9,14 +9,16 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Exceptions;
+namespace CachetHQ\Cachet\Bus\Exceptions\Subscriber;
 
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
 use Exception;
 
 /**
  * This is the already subscribed exception class.
  *
  * @author Graham Campbell <graham@alt-three.com>
+ * @author James Brooks <james@alt-three.com>
  */
 class AlreadySubscribedException extends Exception implements ExceptionInterface
 {
diff --git a/app/Bus/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php b/app/Bus/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php
index a61fc8582..122382689 100644
--- a/app/Bus/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php
+++ b/app/Bus/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php
@@ -14,7 +14,7 @@ namespace CachetHQ\Cachet\Bus\Handlers\Commands\Subscriber;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand;
 use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasSubscribedEvent;
-use CachetHQ\Cachet\Exceptions\AlreadySubscribedException;
+use CachetHQ\Cachet\Bus\Exceptions\Subscriber\AlreadySubscribedException;
 use CachetHQ\Cachet\Models\Subscriber;
 
 class SubscribeSubscriberCommandHandler
diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php
index bba62779a..43085729b 100644
--- a/app/Http/Controllers/SubscribeController.php
+++ b/app/Http/Controllers/SubscribeController.php
@@ -15,7 +15,7 @@ use AltThree\Validator\ValidationException;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand;
-use CachetHQ\Cachet\Exceptions\AlreadySubscribedException;
+use CachetHQ\Cachet\Bus\Exceptions\Subscriber\AlreadySubscribedException;
 use CachetHQ\Cachet\Facades\Setting;
 use CachetHQ\Cachet\Models\Subscriber;
 use GrahamCampbell\Binput\Facades\Binput;