From 26d4ca787f92da47f5cf7d31eb19baf1d9fa0bc1 Mon Sep 17 00:00:00 2001
From: KHOUBZA Younes <younes.khoubza@smile-maroc.com>
Date: Thu, 3 Dec 2020 09:15:47 +0100
Subject: [PATCH] update namespace

---
 Dispatcher/Event/AfterFilter.php              |  8 +++
 .../Event/AfterNotificationDispatched.php     |  8 +++
 .../Event/AfterNotificationRendered.php       |  8 +++
 Dispatcher/Event/BeforeFilter.php             |  8 +++
 .../Event/BeforeNotificationDispatched.php    |  8 +++
 .../Event/BeforeNotificationRendered.php      |  8 +++
 Dispatcher/Event/EventInterface.php           |  8 +++
 Dispatcher/Event/NotificationDispatched.php   |  8 +++
 Dispatcher/Event/NotificationRendered.php     |  8 +++
 Dispatcher/Event/PresenterReady.php           |  8 +++
 Dispatcher/EventDispatcher.php                | 58 +++++++++++++++++++
 Dispatcher/EventDispatcherInterface.php       | 23 ++++++++
 Dispatcher/FlusherEvents.php                  | 12 ++++
 Dispatcher/Listener/ListenerInterface.php     | 10 ++++
 Dispatcher/Listener/SubscriberInterface.php   |  8 +++
 Envelope.php                                  |  6 +-
 .../AbstractFlasher.php                       | 12 ++--
 Factory/FactoryInterface.php                  | 27 +++++++++
 Filter/CriteriaBuilder.php                    | 10 ++--
 Filter/DefaultFilter.php                      |  2 +-
 Filter/FilterBuilder.php                      | 32 ++++++----
 Filter/FilterInterface.php                    |  2 +-
 Filter/FilterManager.php                      |  6 +-
 Filter/Specification/AndSpecification.php     |  6 +-
 Filter/Specification/NotSpecification.php     |  6 +-
 Filter/Specification/OrSpecification.php      |  6 +-
 .../Specification/PrioritySpecification.php   |  8 +--
 ...cification.php => ReplaySpecification.php} | 14 ++---
 .../Specification/SpecificationInterface.php  |  6 +-
 Filter/Specification/TimeSpecification.php    |  8 +--
 Flasher.php                                   |  6 +-
 Manager/AbstractManager.php                   |  4 +-
 Middleware/AddCreatedAtStampMiddleware.php    |  8 +--
 Middleware/AddHopsStampMiddleware.php         | 18 ++++++
 Middleware/AddPriorityStampMiddleware.php     |  8 +--
 Middleware/AddRenderedAtStampMiddleware.php   |  8 +--
 Middleware/AddReplayStampMiddleware.php       | 18 ------
 Middleware/MiddlewareInterface.php            |  8 +--
 Middleware/NotifyBus.php                      | 13 +++--
 Notification/Notification.php                 |  2 +-
 Notification/NotificationBuilder.php          | 21 ++++++-
 Notification/NotificationBuilderInterface.php | 12 ++--
 Notification/NotificationInterface.php        |  2 +-
 Presenter/AbstractPresenter.php               | 47 ++++++++-------
 Presenter/Adapter/HtmlPresenter.php           | 12 ++--
 Presenter/Adapter/JsonPresenter.php           |  8 +--
 Presenter/PresenterInterface.php              |  2 +-
 Presenter/PresenterManager.php                |  6 +-
 Renderer/HasOptionsInterface.php              |  2 +-
 Renderer/HasScriptsInterface.php              |  2 +-
 Renderer/HasStylesInterface.php               |  2 +-
 Renderer/RendererInterface.php                |  6 +-
 Renderer/RendererManager.php                  |  6 +-
 Stamp/CreatedAtStamp.php                      | 20 ++++---
 Stamp/HandlerStamp.php                        |  2 +-
 Stamp/{ReplayStamp.php => HopsStamp.php}      |  4 +-
 Stamp/OrderableStampInterface.php             |  4 +-
 Stamp/PriorityStamp.php                       |  4 +-
 Stamp/RenderedAtStamp.php                     | 18 +++---
 Stamp/StampInterface.php                      |  2 +-
 Stamp/UuidStamp.php                           | 10 ++--
 Storage/ArrayStorage.php                      | 12 ++--
 Storage/StorageInterface.php                  | 10 ++--
 Storage/StorageManager.php                    | 14 ++---
 Storage/StorageManagerInterface.php           | 12 ++--
 Tests/Envelope/EnvelopeTest.php               | 36 ++++++------
 Tests/Envelope/Stamp/CreatedAtStampTest.php   | 18 +++---
 Tests/Envelope/Stamp/LifeStampTest.php        | 10 ++--
 Tests/Envelope/Stamp/PriorityStampTest.php    | 14 ++---
 Tests/Envelope/Stamp/RendererStampTest.php    | 10 ++--
 Tests/Envelope/Stamp/UuidStampTest.php        | 10 ++--
 Tests/Filter/CriteriaBuilderTest.php          | 16 ++---
 Tests/Filter/DefaultFilterTest.php            | 20 +++----
 Tests/Filter/FilterManagerTest.php            | 32 +++++-----
 Tests/Manager/ManagerTest.php                 |  6 +-
 Tests/Notification/NotificationTest.php       |  2 +-
 Tests/Producer/ProducerManagerTest.php        | 12 ++--
 Tests/Storage/ArrayStorageTest.php            | 10 ++--
 Tests/Storage/StorageManagerTest.php          | 16 ++---
 Translator/TranslatorInterface.php            |  8 +++
 80 files changed, 582 insertions(+), 313 deletions(-)
 create mode 100644 Dispatcher/Event/AfterFilter.php
 create mode 100644 Dispatcher/Event/AfterNotificationDispatched.php
 create mode 100644 Dispatcher/Event/AfterNotificationRendered.php
 create mode 100644 Dispatcher/Event/BeforeFilter.php
 create mode 100644 Dispatcher/Event/BeforeNotificationDispatched.php
 create mode 100644 Dispatcher/Event/BeforeNotificationRendered.php
 create mode 100644 Dispatcher/Event/EventInterface.php
 create mode 100644 Dispatcher/Event/NotificationDispatched.php
 create mode 100644 Dispatcher/Event/NotificationRendered.php
 create mode 100644 Dispatcher/Event/PresenterReady.php
 create mode 100644 Dispatcher/EventDispatcher.php
 create mode 100644 Dispatcher/EventDispatcherInterface.php
 create mode 100644 Dispatcher/FlusherEvents.php
 create mode 100644 Dispatcher/Listener/ListenerInterface.php
 create mode 100644 Dispatcher/Listener/SubscriberInterface.php
 rename AbstractFlasher.php => Factory/AbstractFlasher.php (82%)
 create mode 100644 Factory/FactoryInterface.php
 rename Filter/Specification/{LifeSpecification.php => ReplaySpecification.php} (56%)
 create mode 100644 Middleware/AddHopsStampMiddleware.php
 delete mode 100644 Middleware/AddReplayStampMiddleware.php
 rename Stamp/{ReplayStamp.php => HopsStamp.php} (77%)
 create mode 100644 Translator/TranslatorInterface.php

diff --git a/Dispatcher/Event/AfterFilter.php b/Dispatcher/Event/AfterFilter.php
new file mode 100644
index 00000000..90d36ac5
--- /dev/null
+++ b/Dispatcher/Event/AfterFilter.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Event;
+
+final class AfterFilter
+{
+
+}
diff --git a/Dispatcher/Event/AfterNotificationDispatched.php b/Dispatcher/Event/AfterNotificationDispatched.php
new file mode 100644
index 00000000..d956b8e3
--- /dev/null
+++ b/Dispatcher/Event/AfterNotificationDispatched.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Event;
+
+class AfterNotificationDispatched
+{
+
+}
diff --git a/Dispatcher/Event/AfterNotificationRendered.php b/Dispatcher/Event/AfterNotificationRendered.php
new file mode 100644
index 00000000..0c3fc9fa
--- /dev/null
+++ b/Dispatcher/Event/AfterNotificationRendered.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Event;
+
+class AfterNotificationRendered
+{
+
+}
diff --git a/Dispatcher/Event/BeforeFilter.php b/Dispatcher/Event/BeforeFilter.php
new file mode 100644
index 00000000..b8de45f0
--- /dev/null
+++ b/Dispatcher/Event/BeforeFilter.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Event;
+
+class BeforeFilter
+{
+
+}
diff --git a/Dispatcher/Event/BeforeNotificationDispatched.php b/Dispatcher/Event/BeforeNotificationDispatched.php
new file mode 100644
index 00000000..c3740398
--- /dev/null
+++ b/Dispatcher/Event/BeforeNotificationDispatched.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Event;
+
+class BeforeNotificationDispatched
+{
+
+}
diff --git a/Dispatcher/Event/BeforeNotificationRendered.php b/Dispatcher/Event/BeforeNotificationRendered.php
new file mode 100644
index 00000000..c036ecba
--- /dev/null
+++ b/Dispatcher/Event/BeforeNotificationRendered.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Event;
+
+class BeforeNotificationRendered
+{
+
+}
diff --git a/Dispatcher/Event/EventInterface.php b/Dispatcher/Event/EventInterface.php
new file mode 100644
index 00000000..a2e76a5e
--- /dev/null
+++ b/Dispatcher/Event/EventInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Event;
+
+interface EventInterface
+{
+
+}
diff --git a/Dispatcher/Event/NotificationDispatched.php b/Dispatcher/Event/NotificationDispatched.php
new file mode 100644
index 00000000..a0c1cf5b
--- /dev/null
+++ b/Dispatcher/Event/NotificationDispatched.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Event;
+
+class NotificationDispatched implements EventInterface
+{
+
+}
diff --git a/Dispatcher/Event/NotificationRendered.php b/Dispatcher/Event/NotificationRendered.php
new file mode 100644
index 00000000..19dac986
--- /dev/null
+++ b/Dispatcher/Event/NotificationRendered.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Event;
+
+class NotificationRendered implements EventInterface
+{
+
+}
diff --git a/Dispatcher/Event/PresenterReady.php b/Dispatcher/Event/PresenterReady.php
new file mode 100644
index 00000000..7b9d826c
--- /dev/null
+++ b/Dispatcher/Event/PresenterReady.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Event;
+
+class PresenterReady implements EventInterface
+{
+
+}
diff --git a/Dispatcher/EventDispatcher.php b/Dispatcher/EventDispatcher.php
new file mode 100644
index 00000000..b9c4541b
--- /dev/null
+++ b/Dispatcher/EventDispatcher.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher;
+
+use Flasher\Prime\Dispatcher\Event\EventInterface;
+use Flasher\Prime\Dispatcher\Listener\ListenerInterface;
+
+final class EventDispatcher implements EventDispatcherInterface
+{
+    private $listeners = array();
+
+    /**
+     * @inheritDoc
+     */
+    public function addListener($eventName, ListenerInterface $listener)
+    {
+        $this->listeners[$eventName][] = $listener;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function dispatch(EventInterface $event, $eventName = null)
+    {
+        $eventName = $eventName ?: get_class($event);
+
+        $listeners = $this->getListeners($eventName);
+
+        $this->callListeners($listeners, $event);
+
+        return $event;
+    }
+
+    /**
+     * @param string $eventName
+     *
+     * @return ListenerInterface[]
+     */
+    public function getListeners($eventName)
+    {
+        if (empty($this->listeners[$eventName])) {
+            return array();
+        }
+
+        return $this->listeners[$eventName];
+    }
+
+    /**
+     * @param ListenerInterface[] $listeners
+     * @param EventInterface      $event
+     */
+    protected function callListeners(array $listeners, $event)
+    {
+        foreach ($listeners as $listener) {
+            $listener->handle($event);
+        }
+    }
+}
diff --git a/Dispatcher/EventDispatcherInterface.php b/Dispatcher/EventDispatcherInterface.php
new file mode 100644
index 00000000..be9a45af
--- /dev/null
+++ b/Dispatcher/EventDispatcherInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher;
+
+use Flasher\Prime\Dispatcher\Event\EventInterface;
+use Flasher\Prime\Dispatcher\Listener\ListenerInterface;
+
+interface EventDispatcherInterface
+{
+    /**
+     * @param string            $eventName
+     * @param ListenerInterface $listener
+     */
+    public function addListener($eventName, ListenerInterface $listener);
+
+    /**
+     * @param EventInterface $event
+     * @param string|null    $eventName
+     *
+     * @return EventInterface
+     */
+    public function dispatch(EventInterface $event, $eventName = null);
+}
diff --git a/Dispatcher/FlusherEvents.php b/Dispatcher/FlusherEvents.php
new file mode 100644
index 00000000..34fc091b
--- /dev/null
+++ b/Dispatcher/FlusherEvents.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher;
+
+final class FlusherEvents
+{
+    const NOTIFICATION_CREATED = 'flusher.notification.created';
+
+    const NOTIFICATION_RENDERED = 'flusher.notification.rendered';
+
+    const NOTIFICATION_CLEARED = 'flusher.notification.cleared';
+}
diff --git a/Dispatcher/Listener/ListenerInterface.php b/Dispatcher/Listener/ListenerInterface.php
new file mode 100644
index 00000000..15e46229
--- /dev/null
+++ b/Dispatcher/Listener/ListenerInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Listener;
+
+use Flasher\Prime\Dispatcher\Event\EventInterface;
+
+interface ListenerInterface
+{
+    public function handle(EventInterface $event);
+}
diff --git a/Dispatcher/Listener/SubscriberInterface.php b/Dispatcher/Listener/SubscriberInterface.php
new file mode 100644
index 00000000..b1cd213e
--- /dev/null
+++ b/Dispatcher/Listener/SubscriberInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Dispatcher\Listener;
+
+interface SubscriberInterface
+{
+
+}
diff --git a/Envelope.php b/Envelope.php
index d2deb687..33156c26 100644
--- a/Envelope.php
+++ b/Envelope.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Notify;
+namespace Flasher\Prime;
 
-use Flasher\Prime\TestsNotification\NotificationInterface;
-use Flasher\Prime\TestsStamp\StampInterface;
+use Flasher\Prime\Notification\NotificationInterface;
+use Flasher\Prime\Stamp\StampInterface;
 
 final class Envelope
 {
diff --git a/AbstractFlasher.php b/Factory/AbstractFlasher.php
similarity index 82%
rename from AbstractFlasher.php
rename to Factory/AbstractFlasher.php
index 74fbde88..b07c10ef 100644
--- a/AbstractFlasher.php
+++ b/Factory/AbstractFlasher.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Flasher\Prime;
+namespace Flasher\Prime\Factory;
 
-use Flasher\Prime\TestsNotification\Notification;
-use Flasher\Prime\TestsNotification\NotificationBuilder;
-use Flasher\Prime\TestsNotification\NotificationBuilderInterface;
-use Flasher\Prime\TestsNotification\NotificationInterface;
+use Flasher\Prime\Notification\Notification;
+use Flasher\Prime\Notification\NotificationBuilder;
+use Flasher\Prime\Notification\NotificationBuilderInterface;
+use Flasher\Prime\Notification\NotificationInterface;
 
 /**
  * @method NotificationBuilderInterface type($type, $message = null, array $options = array())
@@ -19,7 +19,7 @@ use Flasher\Prime\TestsNotification\NotificationInterface;
  * @method NotificationBuilderInterface warning($message = null, array $options = array())
  * @method NotificationInterface getNotification()
  */
-abstract class AbstractFlasher implements NotifyFactoryInterface
+abstract class AbstractFlasher implements FactoryInterface
 {
     /**
      * {@inheritdoc}
diff --git a/Factory/FactoryInterface.php b/Factory/FactoryInterface.php
new file mode 100644
index 00000000..3d9663e0
--- /dev/null
+++ b/Factory/FactoryInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Flasher\Prime\Factory;
+
+use Flasher\Prime\Notification\NotificationBuilderInterface;
+use Flasher\Prime\Notification\NotificationInterface;
+
+interface FactoryInterface
+{
+    /**
+     * @return NotificationBuilderInterface
+     */
+    public function createNotificationBuilder();
+
+    /**
+     * @return NotificationInterface
+     */
+    public function createNotification();
+
+    /**
+     * @param string $name
+     * @param array $context
+     *
+     * @return bool
+     */
+    public function supports($name = null, array $context = array());
+}
diff --git a/Filter/CriteriaBuilder.php b/Filter/CriteriaBuilder.php
index 8c131f2d..15feb2f7 100644
--- a/Filter/CriteriaBuilder.php
+++ b/Filter/CriteriaBuilder.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter;
+namespace Flasher\Prime\Filter;
 
-use Flasher\Prime\TestsFilter\Specification\LifeSpecification;
-use Flasher\Prime\TestsFilter\Specification\PrioritySpecification;
+use Flasher\Prime\Filter\Specification\ReplaySpecification;
+use Flasher\Prime\Filter\Specification\PrioritySpecification;
 
 final class CriteriaBuilder
 {
     /**
-     * @var \Flasher\Prime\TestsFilter\FilterBuilder
+     * @var \Flasher\Prime\Filter\FilterBuilder
      */
     private $filterBuilder;
 
@@ -66,7 +66,7 @@ final class CriteriaBuilder
         $min = isset($life['min']) ? $life['min'] : null;
         $max = isset($life['max']) ? $life['max'] : null;
 
-        $this->filterBuilder->andWhere(new LifeSpecification($min, $max));
+        $this->filterBuilder->andWhere(new ReplaySpecification($min, $max));
     }
 
     public function buildLimit()
diff --git a/Filter/DefaultFilter.php b/Filter/DefaultFilter.php
index b72d3416..2f8a49c9 100644
--- a/Filter/DefaultFilter.php
+++ b/Filter/DefaultFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter;
+namespace Flasher\Prime\Filter;
 
 final class DefaultFilter implements FilterInterface
 {
diff --git a/Filter/FilterBuilder.php b/Filter/FilterBuilder.php
index a26ddc30..e4b54bb8 100644
--- a/Filter/FilterBuilder.php
+++ b/Filter/FilterBuilder.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter;
+namespace Flasher\Prime\Filter;
 
-use Notify\Envelope;
-use Flasher\Prime\TestsFilter\Specification\AndSpecification;
-use Flasher\Prime\TestsFilter\Specification\OrSpecification;
-use Flasher\Prime\TestsFilter\Specification\SpecificationInterface;
-use Flasher\Prime\TestsStamp\OrderableStampInterface;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Filter\Specification\AndSpecification;
+use Flasher\Prime\Filter\Specification\OrSpecification;
+use Flasher\Prime\Filter\Specification\SpecificationInterface;
+use Flasher\Prime\Stamp\OrderableStampInterface;
 
 final class FilterBuilder
 {
@@ -14,7 +14,7 @@ final class FilterBuilder
     const DESC = 'DESC';
 
     /**
-     * @var \Flasher\Prime\TestsFilter\Specification\SpecificationInterface
+     * @var SpecificationInterface
      */
     private $specification;
 
@@ -103,7 +103,7 @@ final class FilterBuilder
     }
 
     /**
-     * @return \Flasher\Prime\TestsFilter\Specification\SpecificationInterface
+     * @return SpecificationInterface
      */
     public function getSpecification()
     {
@@ -131,7 +131,7 @@ final class FilterBuilder
     }
 
     /**
-     * @param \Flasher\Prime\TestsFilter\Specification\SpecificationInterface $specification
+     * @param SpecificationInterface $specification
      *
      * @return $this
      */
@@ -147,7 +147,7 @@ final class FilterBuilder
     }
 
     /**
-     * @param \Flasher\Prime\TestsFilter\Specification\SpecificationInterface $specification
+     * @param SpecificationInterface $specification
      *
      * @return $this
      */
@@ -159,7 +159,7 @@ final class FilterBuilder
     }
 
     /**
-     * @param \Flasher\Prime\TestsFilter\Specification\SpecificationInterface $specification
+     * @param SpecificationInterface $specification
      *
      * @return $this
      */
@@ -173,4 +173,14 @@ final class FilterBuilder
 
         return $this;
     }
+
+    public function whereType()
+    {
+
+    }
+
+    public function wherePriority()
+    {
+
+    }
 }
diff --git a/Filter/FilterInterface.php b/Filter/FilterInterface.php
index f609de71..ccf7bd50 100644
--- a/Filter/FilterInterface.php
+++ b/Filter/FilterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter;
+namespace Flasher\Prime\Filter;
 
 interface FilterInterface
 {
diff --git a/Filter/FilterManager.php b/Filter/FilterManager.php
index 24ef17dd..856763cb 100644
--- a/Filter/FilterManager.php
+++ b/Filter/FilterManager.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter;
+namespace Flasher\Prime\Filter;
 
-use Flasher\Prime\TestsManager\AbstractManager;
+use Flasher\Prime\Manager\AbstractManager;
 
 /**
- * @method \Flasher\Prime\TestsFilter\FilterInterface make($driver = null)
+ * @method \Flasher\Prime\Filter\FilterInterface make($driver = null)
  */
 final class FilterManager extends AbstractManager
 {
diff --git a/Filter/Specification/AndSpecification.php b/Filter/Specification/AndSpecification.php
index e592f737..3c4eccb9 100644
--- a/Filter/Specification/AndSpecification.php
+++ b/Filter/Specification/AndSpecification.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter\Specification;
+namespace Flasher\Prime\Filter\Specification;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 
 final class AndSpecification implements SpecificationInterface
 {
     /**
-     * @var \Flasher\Prime\TestsFilter\Specification\SpecificationInterface[]
+     * @var SpecificationInterface[]
      */
     private $specifications;
 
diff --git a/Filter/Specification/NotSpecification.php b/Filter/Specification/NotSpecification.php
index f6c62506..5b40cd5e 100644
--- a/Filter/Specification/NotSpecification.php
+++ b/Filter/Specification/NotSpecification.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter\Specification;
+namespace Flasher\Prime\Filter\Specification;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 
 final class NotSpecification implements SpecificationInterface
 {
     /**
-     * @var \Flasher\Prime\TestsFilter\Specification\SpecificationInterface
+     * @var SpecificationInterface
      */
     private $specification;
 
diff --git a/Filter/Specification/OrSpecification.php b/Filter/Specification/OrSpecification.php
index 72946578..e4175b21 100644
--- a/Filter/Specification/OrSpecification.php
+++ b/Filter/Specification/OrSpecification.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter\Specification;
+namespace Flasher\Prime\Filter\Specification;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 
 final class OrSpecification implements SpecificationInterface
 {
     /**
-     * @var \Flasher\Prime\TestsFilter\Specification\SpecificationInterface[]
+     * @var \Flasher\Prime\Filter\Specification\SpecificationInterface[]
      */
     private $specifications;
 
diff --git a/Filter/Specification/PrioritySpecification.php b/Filter/Specification/PrioritySpecification.php
index 892926e0..98c24a57 100644
--- a/Filter/Specification/PrioritySpecification.php
+++ b/Filter/Specification/PrioritySpecification.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter\Specification;
+namespace Flasher\Prime\Filter\Specification;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 
 final class PrioritySpecification implements SpecificationInterface
 {
@@ -23,13 +23,13 @@ final class PrioritySpecification implements SpecificationInterface
     }
 
     /**
-     * @param \Notify\Envelope $envelope
+     * @param \Flasher\Prime\Envelope $envelope
      *
      * @return bool
      */
     public function isSatisfiedBy(Envelope $envelope)
     {
-        $stamp = $envelope->get('Flasher\Prime\TestsStamp\PriorityStamp');
+        $stamp = $envelope->get('Flasher\Prime\Stamp\PriorityStamp');
 
         if (null === $stamp) {
             return false;
diff --git a/Filter/Specification/LifeSpecification.php b/Filter/Specification/ReplaySpecification.php
similarity index 56%
rename from Filter/Specification/LifeSpecification.php
rename to Filter/Specification/ReplaySpecification.php
index 76791f6b..9253593e 100644
--- a/Filter/Specification/LifeSpecification.php
+++ b/Filter/Specification/ReplaySpecification.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter\Specification;
+namespace Flasher\Prime\Filter\Specification;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 
-final class LifeSpecification implements SpecificationInterface
+final class ReplaySpecification implements SpecificationInterface
 {
     /**
      * @var int
@@ -23,22 +23,22 @@ final class LifeSpecification implements SpecificationInterface
     }
 
     /**
-     * @param \Notify\Envelope $envelope
+     * @param Envelope $envelope
      *
      * @return bool
      */
     public function isSatisfiedBy(Envelope $envelope)
     {
-        $stamp = $envelope->get('Flasher\Prime\TestsStamp\ReplayStamp');
+        $stamp = $envelope->get('Flasher\Prime\Stamp\HopsStamp');
 
         if (null === $stamp) {
             return false;
         }
 
-        if (null !== $this->maxLife && $stamp->getLife() > $this->maxLife) {
+        if (null !== $this->maxLife && $stamp->getCount() > $this->maxLife) {
             return false;
         }
 
-        return $stamp->getLife() >= $this->minLife;
+        return $stamp->getCount() >= $this->minLife;
     }
 }
diff --git a/Filter/Specification/SpecificationInterface.php b/Filter/Specification/SpecificationInterface.php
index fccee585..4d8f6da1 100644
--- a/Filter/Specification/SpecificationInterface.php
+++ b/Filter/Specification/SpecificationInterface.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter\Specification;
+namespace Flasher\Prime\Filter\Specification;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 
 interface SpecificationInterface
 {
     /**
-     * @param \Notify\Envelope $envelope
+     * @param \Flasher\Prime\Envelope $envelope
      *
      * @return bool
      */
diff --git a/Filter/Specification/TimeSpecification.php b/Filter/Specification/TimeSpecification.php
index 17d65db9..bf16f495 100644
--- a/Filter/Specification/TimeSpecification.php
+++ b/Filter/Specification/TimeSpecification.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flasher\Prime\TestsFilter\Specification;
+namespace Flasher\Prime\Filter\Specification;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 
 final class TimeSpecification implements SpecificationInterface
 {
@@ -23,13 +23,13 @@ final class TimeSpecification implements SpecificationInterface
     }
 
     /**
-     * @param \Notify\Envelope $envelope
+     * @param \Flasher\Prime\Envelope $envelope
      *
      * @return bool
      */
     public function isSatisfiedBy(Envelope $envelope)
     {
-        $stamp = $envelope->get('Flasher\Prime\TestsStamp\CreatedAtStamp');
+        $stamp = $envelope->get('Flasher\Prime\Stamp\CreatedAtStamp');
 
         if (null === $stamp) {
             return false;
diff --git a/Flasher.php b/Flasher.php
index e8d5b333..a48e28df 100644
--- a/Flasher.php
+++ b/Flasher.php
@@ -2,9 +2,9 @@
 
 namespace Flasher\Prime;
 
-use Flasher\Prime\Config\ConfigInterface;
-use Flasher\Prime\TestsNotification\NotificationBuilderInterface;
-use Flasher\Prime\TestsNotification\NotificationInterface;
+use Flasher\Prime\Manager\AbstractManager;
+use Flasher\Prime\Notification\NotificationBuilderInterface;
+use Flasher\Prime\Notification\NotificationInterface;
 
 /**
  * @method NotificationBuilderInterface type($type, $message = null, array $options = array())
diff --git a/Manager/AbstractManager.php b/Manager/AbstractManager.php
index 0d2e8101..76da596c 100644
--- a/Manager/AbstractManager.php
+++ b/Manager/AbstractManager.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Flasher\Prime\TestsManager;
+namespace Flasher\Prime\Manager;
 
 use InvalidArgumentException;
-use Notify\Config\ConfigInterface;
+use Flasher\Prime\Config\ConfigInterface;
 
 abstract class AbstractManager
 {
diff --git a/Middleware/AddCreatedAtStampMiddleware.php b/Middleware/AddCreatedAtStampMiddleware.php
index 9f93d610..cbcd4c8a 100644
--- a/Middleware/AddCreatedAtStampMiddleware.php
+++ b/Middleware/AddCreatedAtStampMiddleware.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Flasher\Prime\TestsMiddleware;
+namespace Flasher\Prime\Middleware;
 
-use Notify\Envelope;
-use Flasher\Prime\TestsStamp\CreatedAtStamp;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Stamp\CreatedAtStamp;
 
 final class AddCreatedAtStampMiddleware implements MiddlewareInterface
 {
     public function handle(Envelope $envelope, callable $next)
     {
-        if (null === $envelope->get('Flasher\Prime\TestsStamp\CreatedAtStamp')) {
+        if (null === $envelope->get('Flasher\Prime\Stamp\CreatedAtStamp')) {
             $envelope->withStamp(new CreatedAtStamp());
         }
 
diff --git a/Middleware/AddHopsStampMiddleware.php b/Middleware/AddHopsStampMiddleware.php
new file mode 100644
index 00000000..205e1a9d
--- /dev/null
+++ b/Middleware/AddHopsStampMiddleware.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Flasher\Prime\Middleware;
+
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Stamp\HopsStamp;
+
+final class AddHopsStampMiddleware implements MiddlewareInterface
+{
+    public function handle(Envelope $envelope, callable $next)
+    {
+        if (null === $envelope->get('Flasher\Prime\Stamp\HopsStamp')) {
+            $envelope->withStamp(new HopsStamp(1));
+        }
+
+        return $next($envelope);
+    }
+}
diff --git a/Middleware/AddPriorityStampMiddleware.php b/Middleware/AddPriorityStampMiddleware.php
index e887dd3e..979cb8f0 100644
--- a/Middleware/AddPriorityStampMiddleware.php
+++ b/Middleware/AddPriorityStampMiddleware.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Flasher\Prime\TestsMiddleware;
+namespace Flasher\Prime\Middleware;
 
-use Notify\Envelope;
-use Flasher\Prime\TestsStamp\PriorityStamp;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Stamp\PriorityStamp;
 
 final class AddPriorityStampMiddleware implements MiddlewareInterface
 {
     public function handle(Envelope $envelope, callable $next)
     {
-        if (null === $envelope->get('Flasher\Prime\TestsStamp\PriorityStamp')) {
+        if (null === $envelope->get('Flasher\Prime\Stamp\PriorityStamp')) {
             $envelope->withStamp(new PriorityStamp(0));
         }
 
diff --git a/Middleware/AddRenderedAtStampMiddleware.php b/Middleware/AddRenderedAtStampMiddleware.php
index f5370673..a6c4db08 100644
--- a/Middleware/AddRenderedAtStampMiddleware.php
+++ b/Middleware/AddRenderedAtStampMiddleware.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Flasher\Prime\TestsMiddleware;
+namespace Flasher\Prime\Middleware;
 
-use Notify\Envelope;
-use Flasher\Prime\TestsStamp\RenderedAtStamp;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Stamp\RenderedAtStamp;
 
 final class AddRenderedAtStampMiddleware implements MiddlewareInterface
 {
     public function handle(Envelope $envelope, callable $next)
     {
-        if (null === $envelope->get('Flasher\Prime\TestsStamp\RenderedAtStamp')) {
+        if (null === $envelope->get('Flasher\Prime\Stamp\RenderedAtStamp')) {
             $envelope->withStamp(new RenderedAtStamp());
         }
 
diff --git a/Middleware/AddReplayStampMiddleware.php b/Middleware/AddReplayStampMiddleware.php
deleted file mode 100644
index f7433f18..00000000
--- a/Middleware/AddReplayStampMiddleware.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Flasher\Prime\TestsMiddleware;
-
-use Notify\Envelope;
-use Flasher\Prime\TestsStamp\ReplayStamp;
-
-final class AddReplayStampMiddleware implements MiddlewareInterface
-{
-    public function handle(Envelope $envelope, callable $next)
-    {
-        if (null === $envelope->get('Flasher\Prime\TestsStamp\ReplayStamp')) {
-            $envelope->withStamp(new ReplayStamp(1));
-        }
-
-        return $next($envelope);
-    }
-}
diff --git a/Middleware/MiddlewareInterface.php b/Middleware/MiddlewareInterface.php
index 40050678..db806fb3 100644
--- a/Middleware/MiddlewareInterface.php
+++ b/Middleware/MiddlewareInterface.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Flasher\Prime\TestsMiddleware;
+namespace Flasher\Prime\Middleware;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 
 interface MiddlewareInterface
 {
     /**
-     * @param \Notify\Envelope $envelope
+     * @param Envelope $envelope
      * @param callable         $next
      *
-     * @return \Notify\Envelope
+     * @return Envelope
      */
     public function handle(Envelope $envelope, callable $next);
 }
diff --git a/Middleware/NotifyBus.php b/Middleware/NotifyBus.php
index 95291bcc..2f53f3b4 100644
--- a/Middleware/NotifyBus.php
+++ b/Middleware/NotifyBus.php
@@ -1,21 +1,22 @@
 <?php
 
-namespace Flasher\Prime\TestsMiddleware;
+namespace Flasher\Prime\Middleware;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Notification\NotificationInterface;
 
 final class NotifyBus
 {
     /**
-     * @var \Flasher\Prime\TestsMiddleware\MiddlewareInterface[]
+     * @var MiddlewareInterface[]
      */
     private $middlewares;
 
     /**
      * Executes the given command and optionally returns a value
      *
-     * @param \Notify\Envelope|\Flasher\Prime\TestsNotification\NotificationInterface $envelope
-     * @param array                                                       $stamps
+     * @param Envelope|NotificationInterface $envelope
+     * @param array                          $stamps
      *
      * @return mixed
      */
@@ -31,7 +32,7 @@ final class NotifyBus
     }
 
     /**
-     * @param \Flasher\Prime\TestsMiddleware\MiddlewareInterface $middleware
+     * @param MiddlewareInterface $middleware
      *
      * @return $this
      */
diff --git a/Notification/Notification.php b/Notification/Notification.php
index 0e8f8271..0bc0f6db 100644
--- a/Notification/Notification.php
+++ b/Notification/Notification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsNotification;
+namespace Flasher\Prime\Notification;
 
 class Notification implements NotificationInterface
 {
diff --git a/Notification/NotificationBuilder.php b/Notification/NotificationBuilder.php
index 01f9bca5..fbf158ac 100644
--- a/Notification/NotificationBuilder.php
+++ b/Notification/NotificationBuilder.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Flasher\Prime\TestsNotification;
+namespace Flasher\Prime\Notification;
 
 class NotificationBuilder implements NotificationBuilderInterface
 {
     /**
-     * @var \Flasher\Prime\TestsNotification\NotificationInterface
+     * @var NotificationInterface
      */
     protected $notification;
 
     /**
-     * @param \Flasher\Prime\TestsNotification\NotificationInterface|null $notification
+     * @param NotificationInterface|null $notification
      */
     public function __construct(NotificationInterface $notification = null)
     {
@@ -108,4 +108,19 @@ class NotificationBuilder implements NotificationBuilderInterface
     {
         return $this->type(NotificationInterface::TYPE_WARNING, $message, $options);
     }
+
+    public function priority($priority)
+    {
+
+    }
+
+    public function hops()
+    {
+
+    }
+
+    public function sticky()
+    {
+
+    }
 }
diff --git a/Notification/NotificationBuilderInterface.php b/Notification/NotificationBuilderInterface.php
index 95e9a993..23cf5a96 100644
--- a/Notification/NotificationBuilderInterface.php
+++ b/Notification/NotificationBuilderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsNotification;
+namespace Flasher\Prime\Notification;
 
 interface NotificationBuilderInterface
 {
@@ -9,14 +9,14 @@ interface NotificationBuilderInterface
      * @param string|null $message
      * @param array       $options
      *
-     * @return \Flasher\Prime\TestsNotification\NotificationBuilder
+     * @return NotificationBuilder
      */
     public function type($type, $message = null, array $options = array());
 
     /**
      * @param string $message
      *
-     * @return \Flasher\Prime\TestsNotification\NotificationBuilder
+     * @return NotificationBuilder
      */
     public function message($message);
 
@@ -24,7 +24,7 @@ interface NotificationBuilderInterface
      * @param array<string, mixed> $options
      * @param bool                 $merge
      *
-     * @return \Flasher\Prime\TestsNotification\NotificationBuilder
+     * @return NotificationBuilder
      */
     public function options($options, $merge = true);
 
@@ -32,12 +32,12 @@ interface NotificationBuilderInterface
      * @param string $name
      * @param mixed  $value
      *
-     * @return \Flasher\Prime\TestsNotification\NotificationBuilder
+     * @return NotificationBuilder
      */
     public function option($name, $value);
 
     /**
-     * @return \Flasher\Prime\TestsNotification\NotificationInterface
+     * @return NotificationInterface
      */
     public function getNotification();
 
diff --git a/Notification/NotificationInterface.php b/Notification/NotificationInterface.php
index 4ffbbe8e..6c154695 100644
--- a/Notification/NotificationInterface.php
+++ b/Notification/NotificationInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsNotification;
+namespace Flasher\Prime\Notification;
 
 interface NotificationInterface
 {
diff --git a/Presenter/AbstractPresenter.php b/Presenter/AbstractPresenter.php
index 96b708e3..dfd3e169 100644
--- a/Presenter/AbstractPresenter.php
+++ b/Presenter/AbstractPresenter.php
@@ -1,45 +1,45 @@
 <?php
 
-namespace Flasher\Prime\TestsPresenter;
+namespace Flasher\Prime\Presenter;
 
-use Notify\Config\ConfigInterface;
-use Notify\Envelope;
-use Flasher\Prime\TestsFilter\FilterManager;
-use Flasher\Prime\TestsRenderer\HasOptionsInterface;
-use Flasher\Prime\TestsRenderer\HasScriptsInterface;
-use Flasher\Prime\TestsRenderer\HasStylesInterface;
-use Flasher\Prime\TestsRenderer\RendererManager;
-use Flasher\Prime\TestsStorage\StorageInterface;
+use Flasher\Prime\Config\ConfigInterface;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Filter\FilterManager;
+use Flasher\Prime\Renderer\HasOptionsInterface;
+use Flasher\Prime\Renderer\HasScriptsInterface;
+use Flasher\Prime\Renderer\HasStylesInterface;
+use Flasher\Prime\Renderer\RendererManager;
+use Flasher\Prime\Storage\StorageInterface;
 
 abstract class AbstractPresenter implements PresenterInterface
 {
     /**
-     * @var \Notify\Config\ConfigInterface
+     * @var ConfigInterface
      */
     protected $config;
 
     /**
-     * @var \Flasher\Prime\TestsStorage\StorageInterface
+     * @var Flasher\Prime\Storage\StorageInterface
      */
     protected $storage;
 
     /**
-     * @var \Flasher\Prime\TestsFilter\FilterManager
+     * @var \Flasher\Prime\Filter\FilterManager
      */
     protected $filterManager;
 
     /**
-     * @var \Flasher\Prime\TestsRenderer\RendererManager
+     * @var \Flasher\Prime\Renderer\RendererManager
      */
     protected $rendererManager;
 
     /**
      * AbstractPresenter constructor.
      *
-     * @param \Notify\Config\ConfigInterface   $config
-     * @param \Flasher\Prime\TestsStorage\StorageInterface $storage
-     * @param \Flasher\Prime\TestsFilter\FilterManager     $filterManager
-     * @param \Flasher\Prime\TestsRenderer\RendererManager $rendererManager
+     * @param Flasher\Prime\Config\ConfigInterface   $config
+     * @param \Flasher\Prime\Storage\StorageInterface $storage
+     * @param \Flasher\Prime\Filter\FilterManager     $filterManager
+     * @param \Flasher\Prime\Renderer\RendererManager $rendererManager
      */
     public function __construct(
         ConfigInterface $config,
@@ -69,7 +69,7 @@ abstract class AbstractPresenter implements PresenterInterface
         return array_filter(
             $envelopes,
             static function (Envelope $envelope) {
-                $lifeStamp = $envelope->get('Flasher\Prime\TestsStamp\ReplayStamp');
+                $lifeStamp = $envelope->get('Flasher\Prime\Stamp\HopsStamp');
 
                 return $lifeStamp->getLife() > 0;
             }
@@ -87,7 +87,7 @@ abstract class AbstractPresenter implements PresenterInterface
         $renderers = array();
 
         foreach ($envelopes as $envelope) {
-            $rendererStamp = $envelope->get('Flasher\Prime\TestsStamp\HandlerStamp');
+            $rendererStamp = $envelope->get('Flasher\Prime\Stamp\HandlerStamp');
             if (in_array($rendererStamp->getHandler(), $renderers)) {
                 continue;
             }
@@ -115,7 +115,7 @@ abstract class AbstractPresenter implements PresenterInterface
         $renderers = array();
 
         foreach ($envelopes as $envelope) {
-            $rendererStamp = $envelope->get('Flasher\Prime\TestsStamp\HandlerStamp');
+            $rendererStamp = $envelope->get('Flasher\Prime\Stamp\HandlerStamp');
             if (in_array($rendererStamp->getHandler(), $renderers)) {
                 continue;
             }
@@ -143,7 +143,7 @@ abstract class AbstractPresenter implements PresenterInterface
         $renderers = array();
 
         foreach ($envelopes as $envelope) {
-            $rendererStamp = $envelope->get('Flasher\Prime\TestsStamp\HandlerStamp');
+            $rendererStamp = $envelope->get('Flasher\Prime\Stamp\HandlerStamp');
             if (in_array($rendererStamp->getHandler(), $renderers)) {
                 continue;
             }
@@ -159,4 +159,9 @@ abstract class AbstractPresenter implements PresenterInterface
 
         return array_values(array_filter(array_unique($options)));
     }
+
+    public function hasNotifications()
+    {
+
+    }
 }
diff --git a/Presenter/Adapter/HtmlPresenter.php b/Presenter/Adapter/HtmlPresenter.php
index 45245f61..7c16a0a7 100644
--- a/Presenter/Adapter/HtmlPresenter.php
+++ b/Presenter/Adapter/HtmlPresenter.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flasher\Prime\TestsPresenter\Adapter;
+namespace Flasher\Prime\Presenter\Adapter;
 
-use Flasher\Prime\TestsPresenter\AbstractPresenter;
+use Flasher\Prime\Presenter\AbstractPresenter;
 
 final class HtmlPresenter extends AbstractPresenter
 {
@@ -53,7 +53,7 @@ HTML;
     }
 
     /**
-     * @param \Notify\Envelope[] $envelopes
+     * @param \Flasher\Prime\Envelope[] $envelopes
      *
      * @return string
      */
@@ -62,7 +62,7 @@ HTML;
         $html = '';
 
         foreach ($envelopes as $envelope) {
-            $rendererStamp = $envelope->get('Flasher\Prime\TestsStamp\HandlerStamp');
+            $rendererStamp = $envelope->get('Flasher\Prime\Stamp\HandlerStamp');
             $renderer      = $this->rendererManager->make($rendererStamp->getHandler());
 
             $html .= $renderer->render($envelope).PHP_EOL;
@@ -72,7 +72,7 @@ HTML;
     }
 
     /**
-     * @param \Notify\Envelope[] $envelopes
+     * @param \Flasher\Prime\Envelope[] $envelopes
      *
      * @return string
      */
@@ -88,7 +88,7 @@ HTML;
     }
 
     /**
-     * @param \Notify\Envelope[] $envelopes
+     * @param \Flasher\Prime\Envelope[] $envelopes
      *
      * @return string
      */
diff --git a/Presenter/Adapter/JsonPresenter.php b/Presenter/Adapter/JsonPresenter.php
index bdb77d42..7fe4280e 100644
--- a/Presenter/Adapter/JsonPresenter.php
+++ b/Presenter/Adapter/JsonPresenter.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flasher\Prime\TestsPresenter\Adapter;
+namespace Flasher\Prime\Presenter\Adapter;
 
-use Flasher\Prime\TestsPresenter\AbstractPresenter;
+use Flasher\Prime\Presenter\AbstractPresenter;
 
 final class JsonPresenter extends AbstractPresenter
 {
@@ -39,7 +39,7 @@ final class JsonPresenter extends AbstractPresenter
     }
 
     /**
-     * @param \Notify\Envelope[] $envelopes
+     * @param \Flasher\Prime\Envelope[] $envelopes
      *
      * @return array
      */
@@ -48,7 +48,7 @@ final class JsonPresenter extends AbstractPresenter
         $notifications = array();
 
         foreach ($envelopes as $envelope) {
-            $rendererStamp = $envelope->get('Flasher\Prime\TestsStamp\HandlerStamp');
+            $rendererStamp = $envelope->get('Flasher\Prime\Stamp\HandlerStamp');
             $renderer      = $this->rendererManager->make($rendererStamp->getHandler());
 
             $notifications[] = array(
diff --git a/Presenter/PresenterInterface.php b/Presenter/PresenterInterface.php
index 43c69c2c..7cbc47a8 100644
--- a/Presenter/PresenterInterface.php
+++ b/Presenter/PresenterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsPresenter;
+namespace Flasher\Prime\Presenter;
 
 interface PresenterInterface
 {
diff --git a/Presenter/PresenterManager.php b/Presenter/PresenterManager.php
index 1c271b37..e7c1ccb3 100644
--- a/Presenter/PresenterManager.php
+++ b/Presenter/PresenterManager.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Flasher\Prime\TestsPresenter;
+namespace Flasher\Prime\Presenter;
 
-use Flasher\Prime\TestsManager\AbstractManager;
+use Flasher\Prime\Manager\AbstractManager;
 
 /**
- * @method \Flasher\Prime\TestsPresenter\PresenterInterface make($name = null, array $context = array())
+ * @method PresenterInterface make($name = null, array $context = array())
  */
 final class PresenterManager extends AbstractManager
 {
diff --git a/Renderer/HasOptionsInterface.php b/Renderer/HasOptionsInterface.php
index f6d6ffcf..6ebf8274 100644
--- a/Renderer/HasOptionsInterface.php
+++ b/Renderer/HasOptionsInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsRenderer;
+namespace Flasher\Prime\Renderer;
 
 interface HasOptionsInterface
 {
diff --git a/Renderer/HasScriptsInterface.php b/Renderer/HasScriptsInterface.php
index 9ea90979..e690e78c 100644
--- a/Renderer/HasScriptsInterface.php
+++ b/Renderer/HasScriptsInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsRenderer;
+namespace Flasher\Prime\Renderer;
 
 interface HasScriptsInterface
 {
diff --git a/Renderer/HasStylesInterface.php b/Renderer/HasStylesInterface.php
index 7a0ed503..a27b2f97 100644
--- a/Renderer/HasStylesInterface.php
+++ b/Renderer/HasStylesInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsRenderer;
+namespace Flasher\Prime\Renderer;
 
 interface HasStylesInterface
 {
diff --git a/Renderer/RendererInterface.php b/Renderer/RendererInterface.php
index 64284818..851c3bf1 100644
--- a/Renderer/RendererInterface.php
+++ b/Renderer/RendererInterface.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Flasher\Prime\TestsRenderer;
+namespace Flasher\Prime\Renderer;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 
 interface RendererInterface
 {
     /**
-     * @param \Notify\Envelope $envelope
+     * @param Envelope $envelope
      *
      * @return string
      */
diff --git a/Renderer/RendererManager.php b/Renderer/RendererManager.php
index b6567b84..70dd68f2 100644
--- a/Renderer/RendererManager.php
+++ b/Renderer/RendererManager.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Flasher\Prime\TestsRenderer;
+namespace Flasher\Prime\Renderer;
 
-use Flasher\Prime\TestsManager\AbstractManager;
+use Flasher\Prime\Manager\AbstractManager;
 
 /**
- * @method \Flasher\Prime\TestsRenderer\RendererInterface make($name = null, array $context = array())
+ * @method RendererInterface make($name = null, array $context = array())
  */
 class RendererManager extends AbstractManager
 {
diff --git a/Stamp/CreatedAtStamp.php b/Stamp/CreatedAtStamp.php
index 9b331fdb..9effc0f9 100644
--- a/Stamp/CreatedAtStamp.php
+++ b/Stamp/CreatedAtStamp.php
@@ -1,26 +1,30 @@
 <?php
 
-namespace Flasher\Prime\TestsStamp;
+namespace Flasher\Prime\Stamp;
+
+use DateTime;
+use DateTimeZone;
+use Exception;
 
 final class CreatedAtStamp implements StampInterface, OrderableStampInterface
 {
     /**
-     * @param \DateTime
+     * @param DateTime
      */
     private $createdAt;
 
     /**
-     * @param \DateTime|null $createdAt
+     * @param DateTime|null $createdAt
      *
-     * @throws \Exception
+     * @throws Exception
      */
-    public function __construct(\DateTime $createdAt = null)
+    public function __construct(DateTime $createdAt = null)
     {
-        $this->createdAt = $createdAt ?: new \DateTime('now', new \DateTimeZone('Africa/Casablanca'));
+        $this->createdAt = $createdAt ?: new DateTime('now', new DateTimeZone('Africa/Casablanca'));
     }
 
     /**
-     * @return \DateTime
+     * @return DateTime
      */
     public function getCreatedAt()
     {
@@ -28,7 +32,7 @@ final class CreatedAtStamp implements StampInterface, OrderableStampInterface
     }
 
     /**
-     * @param \Flasher\Prime\TestsStamp\OrderableStampInterface $orderable
+     * @param OrderableStampInterface $orderable
      *
      * @return int
      */
diff --git a/Stamp/HandlerStamp.php b/Stamp/HandlerStamp.php
index 7e2252bd..f9c2d667 100644
--- a/Stamp/HandlerStamp.php
+++ b/Stamp/HandlerStamp.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsStamp;
+namespace Flasher\Prime\Stamp;
 
 final class HandlerStamp implements StampInterface
 {
diff --git a/Stamp/ReplayStamp.php b/Stamp/HopsStamp.php
similarity index 77%
rename from Stamp/ReplayStamp.php
rename to Stamp/HopsStamp.php
index 41848252..a52b2eb6 100644
--- a/Stamp/ReplayStamp.php
+++ b/Stamp/HopsStamp.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flasher\Prime\TestsStamp;
+namespace Flasher\Prime\Stamp;
 
-final class ReplayStamp implements StampInterface
+final class HopsStamp implements StampInterface
 {
     /**
      * @var int
diff --git a/Stamp/OrderableStampInterface.php b/Stamp/OrderableStampInterface.php
index ccbfa670..5c186f8c 100644
--- a/Stamp/OrderableStampInterface.php
+++ b/Stamp/OrderableStampInterface.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Flasher\Prime\TestsStamp;
+namespace Flasher\Prime\Stamp;
 
 interface OrderableStampInterface
 {
     /**
-     * @param \Flasher\Prime\TestsStamp\OrderableStampInterface $orderable
+     * @param OrderableStampInterface $orderable
      *
      * @return int
      */
diff --git a/Stamp/PriorityStamp.php b/Stamp/PriorityStamp.php
index e4c7a1ca..9dd0c9b1 100644
--- a/Stamp/PriorityStamp.php
+++ b/Stamp/PriorityStamp.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsStamp;
+namespace Flasher\Prime\Stamp;
 
 final class PriorityStamp implements StampInterface, OrderableStampInterface
 {
@@ -26,7 +26,7 @@ final class PriorityStamp implements StampInterface, OrderableStampInterface
     }
 
     /**
-     * @param \Flasher\Prime\TestsStamp\OrderableStampInterface $orderable
+     * @param OrderableStampInterface $orderable
      *
      * @return int
      */
diff --git a/Stamp/RenderedAtStamp.php b/Stamp/RenderedAtStamp.php
index 049f090e..696435da 100644
--- a/Stamp/RenderedAtStamp.php
+++ b/Stamp/RenderedAtStamp.php
@@ -1,26 +1,30 @@
 <?php
 
-namespace Flasher\Prime\TestsStamp;
+namespace Flasher\Prime\Stamp;
+
+use DateTime;
+use DateTimeZone;
+use Exception;
 
 final class RenderedAtStamp implements StampInterface
 {
     /**
-     * @param \DateTime
+     * @param DateTime
      */
     private $renderedAt;
 
     /**
-     * @param \DateTime|null $renderedAt
+     * @param DateTime|null $renderedAt
      *
-     * @throws \Exception
+     * @throws Exception
      */
-    public function __construct(\DateTime $renderedAt = null)
+    public function __construct(DateTime $renderedAt = null)
     {
-        $this->renderedAt = $renderedAt ?: new \DateTime('now', new \DateTimeZone('Africa/Casablanca'));
+        $this->renderedAt = $renderedAt ?: new DateTime('now', new DateTimeZone('Africa/Casablanca'));
     }
 
     /**
-     * @return \DateTime
+     * @return DateTime
      */
     public function getRenderedAt()
     {
diff --git a/Stamp/StampInterface.php b/Stamp/StampInterface.php
index e87df488..1788bc60 100644
--- a/Stamp/StampInterface.php
+++ b/Stamp/StampInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flasher\Prime\TestsStamp;
+namespace Flasher\Prime\Stamp;
 
 interface StampInterface
 {
diff --git a/Stamp/UuidStamp.php b/Stamp/UuidStamp.php
index 9bdeca1f..b28a4885 100644
--- a/Stamp/UuidStamp.php
+++ b/Stamp/UuidStamp.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Flasher\Prime\TestsStamp;
+namespace Flasher\Prime\Stamp;
+
+use Flasher\Prime\Envelope;
 
 final class UuidStamp implements StampInterface
 {
@@ -28,9 +30,9 @@ final class UuidStamp implements StampInterface
     }
 
     /**
-     * @param \Notify\Envelope|\Notify\Envelope[] $envelopes
+     * @param Envelope|Envelope[] $envelopes
      *
-     * @return array<string, \Notify\Envelope>
+     * @return array<string, Envelope>
      */
     public static function indexWithUuid($envelopes)
     {
@@ -39,7 +41,7 @@ final class UuidStamp implements StampInterface
         $map = array();
 
         foreach ($envelopes as $envelope) {
-            $uuid = $envelope->get('Flasher\Prime\TestsStamp\UuidStamp')->getUuid();
+            $uuid = $envelope->get('Flasher\Prime\Stamp\UuidStamp')->getUuid();
 
             $map[$uuid] = $envelope;
         }
diff --git a/Storage/ArrayStorage.php b/Storage/ArrayStorage.php
index 8c51fde3..46c1d98e 100644
--- a/Storage/ArrayStorage.php
+++ b/Storage/ArrayStorage.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Flasher\Prime\TestsStorage;
+namespace Flasher\Prime\Storage;
 
-use Notify\Envelope;
-use Flasher\Prime\TestsStamp\UuidStamp;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Stamp\UuidStamp;
 
 final class ArrayStorage implements StorageInterface
 {
@@ -28,7 +28,7 @@ final class ArrayStorage implements StorageInterface
         $envelopes = is_array($envelopes) ? $envelopes : func_get_args();
 
         foreach ($envelopes as $envelope) {
-            if (null === $envelope->get('Flasher\Prime\TestsStamp\UuidStamp')) {
+            if (null === $envelope->get('Flasher\Prime\Stamp\UuidStamp')) {
                 $envelope->withStamp(new UuidStamp());
             }
 
@@ -37,7 +37,7 @@ final class ArrayStorage implements StorageInterface
     }
 
     /**
-     * @param \Notify\Envelope[] $envelopes
+     * @param Envelope[] $envelopes
      */
     public function remove($envelopes)
     {
@@ -48,7 +48,7 @@ final class ArrayStorage implements StorageInterface
         $this->envelopes = array_filter(
             $this->envelopes,
             function (Envelope $envelope) use ($map) {
-                $uuid = $envelope->get('Flasher\Prime\TestsStamp\UuidStamp')->getUuid();
+                $uuid = $envelope->get('Flasher\Prime\Stamp\UuidStamp')->getUuid();
 
                 return !isset($map[$uuid]);
             }
diff --git a/Storage/StorageInterface.php b/Storage/StorageInterface.php
index 349f6b68..714ac135 100644
--- a/Storage/StorageInterface.php
+++ b/Storage/StorageInterface.php
@@ -1,21 +1,23 @@
 <?php
 
-namespace Flasher\Prime\TestsStorage;
+namespace Flasher\Prime\Storage;
+
+use Flasher\Prime\Envelope;
 
 interface StorageInterface
 {
     /**
-     * @return \Notify\Envelope[]
+     * @return Envelope[]
      */
     public function all();
 
     /**
-     * @param \Notify\Envelope|\Notify\Envelope[] $envelopes
+     * @param Envelope|Envelope[] $envelopes
      */
     public function add($envelopes);
 
     /**
-     * @param \Notify\Envelope|\Notify\Envelope[] $envelopes
+     * @param Envelope|Envelope[] $envelopes
      */
     public function remove($envelopes);
 
diff --git a/Storage/StorageManager.php b/Storage/StorageManager.php
index eafb97a4..57f61287 100644
--- a/Storage/StorageManager.php
+++ b/Storage/StorageManager.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Flasher\Prime\TestsStorage;
+namespace Flasher\Prime\Storage;
 
-use Notify\Envelope;
-use Flasher\Prime\TestsStamp\ReplayStamp;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Stamp\HopsStamp;
 
 final class StorageManager implements StorageManagerInterface
 {
     /**
-     * @var \Flasher\Prime\TestsStorage\StorageInterface
+     * @var StorageInterface
      */
     private $storage;
 
     /**
-     * @param \Flasher\Prime\TestsStorage\StorageInterface $storage
+     * @param StorageInterface $storage
      */
     public function __construct(StorageInterface $storage)
     {
@@ -30,14 +30,14 @@ final class StorageManager implements StorageManagerInterface
         $this->storage->remove($envelopes);
 
         foreach ($envelopes as $envelope) {
-            $replayStamp = $envelope->get('Flasher\Prime\TestsStamp\ReplayStamp');
+            $replayStamp = $envelope->get('Flasher\Prime\Stamp\HopsStamp');
             $replayCount = null === $replayStamp ? 0 : $replayStamp->getCount() - 1;
 
             if (1 > $replayCount) {
                 continue;
             }
 
-            $envelope->with(new ReplayStamp($replayCount));
+            $envelope->with(new HopsStamp($replayCount));
             $this->storage->add($envelope);
         }
     }
diff --git a/Storage/StorageManagerInterface.php b/Storage/StorageManagerInterface.php
index 62acb8cd..f75e62ed 100644
--- a/Storage/StorageManagerInterface.php
+++ b/Storage/StorageManagerInterface.php
@@ -1,28 +1,28 @@
 <?php
 
-namespace Flasher\Prime\TestsStorage;
+namespace Flasher\Prime\Storage;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 
 interface StorageManagerInterface
 {
     /**
-     * @param \Notify\Envelope[] $envelopes
+     * @param Envelope[] $envelopes
      */
     public function flush($envelopes);
 
     /**
-     * @return \Notify\Envelope[]
+     * @return Envelope[]
      */
     public function all();
 
     /**
-     * @param \Notify\Envelope $envelope
+     * @param Envelope $envelope
      */
     public function add(Envelope $envelope);
 
     /**
-     * @param \Notify\Envelope[] $envelopes
+     * @param Envelope[] $envelopes
      */
     public function remove($envelopes);
 
diff --git a/Tests/Envelope/EnvelopeTest.php b/Tests/Envelope/EnvelopeTest.php
index a51a17db..426b3e5e 100644
--- a/Tests/Envelope/EnvelopeTest.php
+++ b/Tests/Envelope/EnvelopeTest.php
@@ -2,15 +2,15 @@
 
 namespace Flasher\Prime\Tests\Envelope;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 use PHPUnit\Framework\TestCase;
 
 final class EnvelopeTest extends TestCase
 {
     public function testConstruct()
     {
-        $notification = $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock();
-        $stamp        = $this->getMockBuilder('Flasher\Prime\TestsStamp\StampInterface')->getMock();
+        $notification = $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock();
+        $stamp        = $this->getMockBuilder('Flasher\Prime\Stamp\StampInterface')->getMock();
 
         $envelope = new Envelope($notification, array($stamp));
 
@@ -20,9 +20,9 @@ final class EnvelopeTest extends TestCase
 
     public function testWith()
     {
-        $notification = $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock();
-        $stamp1       = $this->getMockBuilder('Flasher\Prime\TestsStamp\StampInterface')->getMock();
-        $stamp2       = $this->getMockBuilder('Flasher\Prime\TestsStamp\StampInterface')->getMock();
+        $notification = $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock();
+        $stamp1       = $this->getMockBuilder('Flasher\Prime\Stamp\StampInterface')->getMock();
+        $stamp2       = $this->getMockBuilder('Flasher\Prime\Stamp\StampInterface')->getMock();
 
         $envelope = new Envelope($notification);
         $envelope->with($stamp1, $stamp2);
@@ -33,8 +33,8 @@ final class EnvelopeTest extends TestCase
 
     public function testWrap()
     {
-        $notification = $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock();
-        $stamp        = $this->getMockBuilder('Flasher\Prime\TestsStamp\StampInterface')->getMock();
+        $notification = $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock();
+        $stamp        = $this->getMockBuilder('Flasher\Prime\Stamp\StampInterface')->getMock();
 
         $envelope = Envelope::wrap($notification, array($stamp));
 
@@ -44,12 +44,12 @@ final class EnvelopeTest extends TestCase
 
     public function testAll()
     {
-        $notification = $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock();
+        $notification = $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock();
         $stamps       = array(
-            $this->getMockBuilder('Flasher\Prime\TestsStamp\StampInterface')->getMock(),
-            $this->getMockBuilder('Flasher\Prime\TestsStamp\StampInterface')->getMock(),
-            $this->getMockBuilder('Flasher\Prime\TestsStamp\StampInterface')->getMock(),
-            $this->getMockBuilder('Flasher\Prime\TestsStamp\StampInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Stamp\StampInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Stamp\StampInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Stamp\StampInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Stamp\StampInterface')->getMock(),
         );
 
         $envelope = new Envelope($notification, $stamps);
@@ -60,14 +60,14 @@ final class EnvelopeTest extends TestCase
 
     public function testGet()
     {
-        $notification = $this->getMockBuilder('\Flasher\Prime\TestsNotification\NotificationInterface')->getMock();
+        $notification = $this->getMockBuilder('\Flasher\Prime\Notification\NotificationInterface')->getMock();
         $stamps       = array(
-            $this->getMockBuilder('Flasher\Prime\TestsStamp\StampInterface')->getMock(),
-            $this->getMockBuilder('Flasher\Prime\TestsStamp\StampInterface')->getMock(),
-            $this->getMockBuilder('Flasher\Prime\TestsStamp\StampInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Stamp\StampInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Stamp\StampInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Stamp\StampInterface')->getMock(),
         );
 
-        $envelope = new \Notify\Envelope($notification, $stamps);
+        $envelope = new \Flasher\Prime\Envelope($notification, $stamps);
 
         $this->assertSame($notification, $envelope->getNotification());
 
diff --git a/Tests/Envelope/Stamp/CreatedAtStampTest.php b/Tests/Envelope/Stamp/CreatedAtStampTest.php
index e1eb5b92..4c340e65 100644
--- a/Tests/Envelope/Stamp/CreatedAtStampTest.php
+++ b/Tests/Envelope/Stamp/CreatedAtStampTest.php
@@ -2,30 +2,30 @@
 
 namespace Flasher\Prime\Tests\Envelope\Stamp;
 
-use Notify\Envelope;
-use Flasher\Prime\TestsStamp\CreatedAtStamp;
-use Flasher\Prime\TestsStamp\ReplayStamp;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Stamp\CreatedAtStamp;
+use Flasher\Prime\Stamp\HopsStamp;
 use PHPUnit\Framework\TestCase;
 
 final class CreatedAtStampTest extends TestCase
 {
     public function testConstruct()
     {
-        $notification = $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock();
+        $notification = $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock();
         $stamp        = new CreatedAtStamp();
 
         $envelop = new Envelope($notification, array($stamp));
 
-        $this->assertSame($stamp, $envelop->get('Flasher\Prime\TestsStamp\CreatedAtStamp'));
-        $this->assertInstanceOf('Flasher\Prime\TestsStamp\StampInterface', $stamp);
+        $this->assertSame($stamp, $envelop->get('Flasher\Prime\Stamp\CreatedAtStamp'));
+        $this->assertInstanceOf('Flasher\Prime\Stamp\StampInterface', $stamp);
     }
 
     public function testCompare()
     {
-        $createdAt1 = new \Flasher\Prime\TestsStamp\CreatedAtStamp(new \DateTime('+2 h'));
-        $createdAt2 = new \Flasher\Prime\TestsStamp\CreatedAtStamp(new \DateTime('+1 h'));
+        $createdAt1 = new \Flasher\Prime\Stamp\CreatedAtStamp(new \DateTime('+2 h'));
+        $createdAt2 = new \Flasher\Prime\Stamp\CreatedAtStamp(new \DateTime('+1 h'));
 
         $this->assertFalse($createdAt1->compare($createdAt2));
-        $this->assertSame(0, $createdAt1->compare(new ReplayStamp(1)));
+        $this->assertSame(0, $createdAt1->compare(new HopsStamp(1)));
     }
 }
diff --git a/Tests/Envelope/Stamp/LifeStampTest.php b/Tests/Envelope/Stamp/LifeStampTest.php
index 13ae149a..d8b42a2f 100644
--- a/Tests/Envelope/Stamp/LifeStampTest.php
+++ b/Tests/Envelope/Stamp/LifeStampTest.php
@@ -2,20 +2,20 @@
 
 namespace Flasher\Prime\Tests\Envelope\Stamp;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 use PHPUnit\Framework\TestCase;
 
 final class LifeStampTest extends TestCase
 {
     public function testConstruct()
     {
-        $notification = $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock();
-        $stamp        = new \Flasher\Prime\TestsStamp\ReplayStamp(5);
+        $notification = $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock();
+        $stamp        = new \Flasher\Prime\Stamp\HopsStamp(5);
 
         $envelop = new Envelope($notification, array($stamp));
 
-        $this->assertSame($stamp, $envelop->get('Flasher\Prime\TestsStamp\ReplayStamp'));
-        $this->assertInstanceOf('Flasher\Prime\TestsStamp\ReplayStamp', $stamp);
+        $this->assertSame($stamp, $envelop->get('Flasher\Prime\Stamp\HopsStamp'));
+        $this->assertInstanceOf('Flasher\Prime\Stamp\HopsStamp', $stamp);
         $this->assertSame(5, $stamp->getCount());
     }
 }
diff --git a/Tests/Envelope/Stamp/PriorityStampTest.php b/Tests/Envelope/Stamp/PriorityStampTest.php
index bc73f7e7..92ba7a7a 100644
--- a/Tests/Envelope/Stamp/PriorityStampTest.php
+++ b/Tests/Envelope/Stamp/PriorityStampTest.php
@@ -2,30 +2,30 @@
 
 namespace Flasher\Prime\Tests\Envelope\Stamp;
 
-use Notify\Envelope;
-use Flasher\Prime\TestsStamp\PriorityStamp;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Stamp\PriorityStamp;
 use PHPUnit\Framework\TestCase;
 
 final class PriorityStampTest extends TestCase
 {
     public function testConstruct()
     {
-        $notification = $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock();
+        $notification = $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock();
         $stamp        = new PriorityStamp(5);
 
         $envelop = new Envelope($notification, array($stamp));
 
-        $this->assertSame($stamp, $envelop->get('Flasher\Prime\TestsStamp\PriorityStamp'));
-        $this->assertInstanceOf('Flasher\Prime\TestsStamp\StampInterface', $stamp);
+        $this->assertSame($stamp, $envelop->get('Flasher\Prime\Stamp\PriorityStamp'));
+        $this->assertInstanceOf('Flasher\Prime\Stamp\StampInterface', $stamp);
         $this->assertSame(5, $stamp->getPriority());
     }
 
     public function testCompare()
     {
         $stamp1 = new PriorityStamp(1);
-        $stamp2 = new \Flasher\Prime\TestsStamp\PriorityStamp(2);
+        $stamp2 = new \Flasher\Prime\Stamp\PriorityStamp(2);
 
         $this->assertFalse($stamp1->compare($stamp2));
-        $this->assertSame(0, $stamp1->compare(new \Flasher\Prime\TestsStamp\ReplayStamp(1)));
+        $this->assertSame(0, $stamp1->compare(new \Flasher\Prime\Stamp\HopsStamp(1)));
     }
 }
diff --git a/Tests/Envelope/Stamp/RendererStampTest.php b/Tests/Envelope/Stamp/RendererStampTest.php
index 712d47cc..d5661546 100644
--- a/Tests/Envelope/Stamp/RendererStampTest.php
+++ b/Tests/Envelope/Stamp/RendererStampTest.php
@@ -2,20 +2,20 @@
 
 namespace Flasher\Prime\Tests\Envelope\Stamp;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 use PHPUnit\Framework\TestCase;
 
 final class RendererStampTest extends TestCase
 {
     public function testConstruct()
     {
-        $notification = $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock();
-        $stamp        = new \Flasher\Prime\TestsStamp\HandlerStamp('toastr');
+        $notification = $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock();
+        $stamp        = new \Flasher\Prime\Stamp\HandlerStamp('toastr');
 
         $envelop = new Envelope($notification, array($stamp));
 
-        $this->assertSame($stamp, $envelop->get('Flasher\Prime\TestsStamp\HandlerStamp'));
-        $this->assertInstanceOf('Flasher\Prime\TestsStamp\HandlerStamp', $stamp);
+        $this->assertSame($stamp, $envelop->get('Flasher\Prime\Stamp\HandlerStamp'));
+        $this->assertInstanceOf('Flasher\Prime\Stamp\HandlerStamp', $stamp);
         $this->assertSame('toastr', $stamp->getHandler());
     }
 }
diff --git a/Tests/Envelope/Stamp/UuidStampTest.php b/Tests/Envelope/Stamp/UuidStampTest.php
index f96cda32..b1a2ef3c 100644
--- a/Tests/Envelope/Stamp/UuidStampTest.php
+++ b/Tests/Envelope/Stamp/UuidStampTest.php
@@ -2,20 +2,20 @@
 
 namespace Flasher\Prime\Tests\Envelope\Stamp;
 
-use Notify\Envelope;
+use Flasher\Prime\Envelope;
 use PHPUnit\Framework\TestCase;
 
 final class UuidStampTest extends TestCase
 {
     public function testConstruct()
     {
-        $notification = $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock();
-        $stamp        = new \Flasher\Prime\TestsStamp\UuidStamp();
+        $notification = $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock();
+        $stamp        = new \Flasher\Prime\Stamp\UuidStamp();
 
         $envelop = new Envelope($notification, array($stamp));
 
-        $this->assertSame($stamp, $envelop->get('Flasher\Prime\TestsStamp\UuidStamp'));
-        $this->assertInstanceOf('Flasher\Prime\TestsStamp\UuidStamp', $stamp);
+        $this->assertSame($stamp, $envelop->get('Flasher\Prime\Stamp\UuidStamp'));
+        $this->assertInstanceOf('Flasher\Prime\Stamp\UuidStamp', $stamp);
         $this->assertNotEmpty($stamp->getUuid());
     }
 }
diff --git a/Tests/Filter/CriteriaBuilderTest.php b/Tests/Filter/CriteriaBuilderTest.php
index 9cc5f07a..a661b648 100644
--- a/Tests/Filter/CriteriaBuilderTest.php
+++ b/Tests/Filter/CriteriaBuilderTest.php
@@ -2,8 +2,8 @@
 
 namespace Flasher\Prime\Tests\Filter;
 
-use Flasher\Prime\TestsFilter\CriteriaBuilder;
-use Flasher\Prime\TestsFilter\FilterBuilder;
+use Flasher\Prime\Filter\CriteriaBuilder;
+use Flasher\Prime\Filter\FilterBuilder;
 use Flasher\Prime\Tests\TestCase;
 
 final class CriteriaBuilderTest extends TestCase
@@ -12,14 +12,14 @@ final class CriteriaBuilderTest extends TestCase
     {
         $criteria = new CriteriaBuilder(
             new FilterBuilder(), array(
-            'priority' => 1,
-            'life'     => 2,
-            'limit'    => 2,
-            'order_by' => 'Flasher\Prime\TestsStamp\ReplayStamp',
+                                   'priority' => 1,
+                                   'life'     => 2,
+                                   'limit'    => 2,
+                                   'order_by' => 'Flasher\Prime\Stamp\HopsStamp',
         )
         );
 
-        $this->assertInstanceOf('Flasher\Prime\TestsFilter\FilterBuilder', $criteria->build());
+        $this->assertInstanceOf('Flasher\Prime\Filter\FilterBuilder', $criteria->build());
         $this->assertNotEmpty($criteria->build()->getSpecification());
     }
 
@@ -27,7 +27,7 @@ final class CriteriaBuilderTest extends TestCase
     {
         $criteria = new CriteriaBuilder(new FilterBuilder(), array());
 
-        $this->assertInstanceOf('Flasher\Prime\TestsFilter\FilterBuilder', $criteria->build());
+        $this->assertInstanceOf('Flasher\Prime\Filter\FilterBuilder', $criteria->build());
         $this->assertEmpty($criteria->build()->getSpecification());
     }
 }
diff --git a/Tests/Filter/DefaultFilterTest.php b/Tests/Filter/DefaultFilterTest.php
index f192a292..bbe974fd 100644
--- a/Tests/Filter/DefaultFilterTest.php
+++ b/Tests/Filter/DefaultFilterTest.php
@@ -3,10 +3,10 @@
 namespace Flasher\Prime\Tests\Filter;
 
 use Notify\Config\Config;
-use Notify\Envelope;
-use Flasher\Prime\TestsMiddleware\AddCreatedAtStampMiddleware;
-use Flasher\Prime\TestsMiddleware\AddPriorityStampMiddleware;
-use Flasher\Prime\TestsStamp\PriorityStamp;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Middleware\AddCreatedAtStampMiddleware;
+use Flasher\Prime\Middleware\AddPriorityStampMiddleware;
+use Flasher\Prime\Stamp\PriorityStamp;
 use Flasher\Prime\Tests\TestCase;
 
 final class DefaultFilterTest extends TestCase
@@ -14,23 +14,23 @@ final class DefaultFilterTest extends TestCase
     public function testWithCriteria()
     {
         $notifications = array(
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
         );
 
         $notifications[3] = new Envelope(
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
             array(new PriorityStamp(5))
         );
 
         $notifications[4] = new Envelope(
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
             array(new PriorityStamp(-1))
         );
 
         $notifications[5] = new Envelope(
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
             array(new PriorityStamp(1))
         );
 
diff --git a/Tests/Filter/FilterManagerTest.php b/Tests/Filter/FilterManagerTest.php
index 6d5004c2..29ef137c 100644
--- a/Tests/Filter/FilterManagerTest.php
+++ b/Tests/Filter/FilterManagerTest.php
@@ -3,13 +3,13 @@
 namespace Flasher\Prime\Tests\Filter;
 
 use Notify\Config\Config;
-use Notify\Envelope;
-use Flasher\Prime\TestsFilter\FilterBuilder;
-use Flasher\Prime\TestsFilter\Specification\PrioritySpecification;
-use Flasher\Prime\TestsMiddleware\AddCreatedAtStampMiddleware;
-use Flasher\Prime\TestsMiddleware\AddPriorityStampMiddleware;
-use Flasher\Prime\TestsMiddleware\NotifyBus;
-use Flasher\Prime\TestsStamp\PriorityStamp;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Filter\FilterBuilder;
+use Flasher\Prime\Filter\Specification\PrioritySpecification;
+use Flasher\Prime\Middleware\AddCreatedAtStampMiddleware;
+use Flasher\Prime\Middleware\AddPriorityStampMiddleware;
+use Flasher\Prime\MiddlewareFlasher\PrimeBus;
+use Flasher\Prime\Stamp\PriorityStamp;
 use PHPUnit\Framework\TestCase;
 
 final class FilterManagerTest extends TestCase
@@ -17,23 +17,23 @@ final class FilterManagerTest extends TestCase
     public function testFilterWhere()
     {
         $notifications = array(
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
         );
 
         $notifications[3] = new Envelope(
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
             array(new PriorityStamp(5))
         );
 
         $notifications[4] = new Envelope(
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
             array(new PriorityStamp(-1))
         );
 
         $notifications[5] = new Envelope(
-            $this->getMockBuilder('Flasher\Prime\TestsNotification\NotificationInterface')->getMock(),
+            $this->getMockBuilder('Flasher\Prime\Notification\NotificationInterface')->getMock(),
             array(new PriorityStamp(1))
         );
 
@@ -68,7 +68,7 @@ final class FilterManagerTest extends TestCase
             ->andWhere(new PrioritySpecification(1, 5))
             ->orderBy(
                 array(
-                    'Flasher\Prime\TestsStamp\PriorityStamp' => 'ASC'
+                    'Flasher\Prime\Stamp\PriorityStamp' => 'ASC'
                 )
             )
             ->setMaxResults(2)
@@ -83,8 +83,8 @@ final class FilterManagerTest extends TestCase
             ->orWhere(new PrioritySpecification(1, 5))
             ->orderBy(
                 array(
-                    'Flasher\Prime\TestsStamp\PriorityStamp'      => 'ASC',
-                    'Notify\Envelope\Stamp\NotExists' => 'ASC',
+                    'Flasher\Prime\Stamp\PriorityStamp'      => 'ASC',
+                    'Flasher\Prime\Envelope\Stamp\NotExists' => 'ASC',
                 )
             )
             ->setMaxResults(2)
diff --git a/Tests/Manager/ManagerTest.php b/Tests/Manager/ManagerTest.php
index 97eafcd1..d37b1677 100644
--- a/Tests/Manager/ManagerTest.php
+++ b/Tests/Manager/ManagerTest.php
@@ -2,7 +2,7 @@
 
 namespace Flasher\Prime\Tests\Manager;
 
-use Notify\Notify;
+use NotifyFlasher\Prime;
 use Flasher\Prime\Tests\TestCase;
 
 final class ManagerTest extends TestCase
@@ -27,7 +27,7 @@ final class ManagerTest extends TestCase
 
         $manager = new Notify($config);
 
-        $producer = $this->getMockBuilder('Notify\NotifyFactory')->getMock();
+        $producer = $this->getMockBuilder('NotifyFlasher\PrimeFactory')->getMock();
         $producer->method('supports')->willReturn(true);
         $manager->addDriver($producer);
 
@@ -45,7 +45,7 @@ final class ManagerTest extends TestCase
 
         $manager = new Notify($config);
 
-        $producer = $this->getMockBuilder('Notify\NotifyFactory')->getMock();
+        $producer = $this->getMockBuilder('NotifyFlasher\PrimeFactory')->getMock();
         $manager->addDriver($producer);
 
         $manager->make('test_driver');
diff --git a/Tests/Notification/NotificationTest.php b/Tests/Notification/NotificationTest.php
index bdbfdbe9..4e82f2cf 100644
--- a/Tests/Notification/NotificationTest.php
+++ b/Tests/Notification/NotificationTest.php
@@ -2,7 +2,7 @@
 
 namespace Flasher\Prime\Tests\Notification;
 
-use Flasher\Prime\TestsNotification\Notification;
+use Flasher\Prime\Notification\Notification;
 use Flasher\Prime\Tests\TestCase;
 
 final class NotificationTest extends TestCase
diff --git a/Tests/Producer/ProducerManagerTest.php b/Tests/Producer/ProducerManagerTest.php
index 7ce0382e..e015d61f 100644
--- a/Tests/Producer/ProducerManagerTest.php
+++ b/Tests/Producer/ProducerManagerTest.php
@@ -10,9 +10,9 @@ final class ProducerManagerTest extends TestCase
     public function testExtendToAddMoreNotifiersFactory()
     {
         $config  = $this->getMockBuilder('Notify\Config\ConfigInterface')->getMock();
-        $manager = new \Notify\Notify($config);
+        $manager = new Flasher\PrimeFlasher\Prime($config);
 
-        $producer = $this->getMockBuilder('Notify\NotifyFactory')->getMock();
+        $producer = $this->getMockBuilder('NotifyFlasher\PrimeFactory')->getMock();
         $producer->method('supports')->willReturn(true);
         $manager->addDriver($producer);
 
@@ -34,9 +34,9 @@ final class ProducerManagerTest extends TestCase
         $config = $this->getMockBuilder('Notify\Config\ConfigInterface')->getMock();
         $config->method('get')->willReturn(null);
 
-        $manager = new \Notify\Notify($config);
+        $manager = new Flasher\PrimeFlasher\Prime($config);
 
-        $producer = $this->getMockBuilder('Notify\NotifyFactory')->getMock();
+        $producer = $this->getMockBuilder('NotifyFlasher\PrimeFactory')->getMock();
         $manager->addDriver($producer);
 
         $this->assertSame($producer, $manager->make());
@@ -47,9 +47,9 @@ final class ProducerManagerTest extends TestCase
         $this->setExpectedException('InvalidArgumentException', 'Driver [not_supported] not supported.');
 
         $config  = $this->getMockBuilder('Notify\Config\ConfigInterface')->getMock();
-        $manager = new \Notify\Notify($config);
+        $manager = new Flasher\PrimeFlasher\Prime($config);
 
-        $producer = $this->getMockBuilder('Notify\NotifyFactory')->getMock();
+        $producer = $this->getMockBuilder('NotifyFlasher\PrimeFactory')->getMock();
         $manager->addDriver($producer);
 
         $this->assertSame($producer, $manager->make('not_supported'));
diff --git a/Tests/Storage/ArrayStorageTest.php b/Tests/Storage/ArrayStorageTest.php
index 54896f2d..97e797fc 100644
--- a/Tests/Storage/ArrayStorageTest.php
+++ b/Tests/Storage/ArrayStorageTest.php
@@ -2,10 +2,10 @@
 
 namespace Flasher\Prime\Tests\Storage;
 
-use Notify\Envelope;
-use Flasher\Prime\TestsNotification\Notification;
-use Flasher\Prime\TestsStamp\UuidStamp;
-use Flasher\Prime\TestsStorage\ArrayStorage;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Notification\Notification;
+use Flasher\Prime\Stamp\UuidStamp;
+use Flasher\Prime\Storage\ArrayStorage;
 use Flasher\Prime\Tests\TestCase;
 
 final class ArrayStorageTest extends TestCase
@@ -32,7 +32,7 @@ final class ArrayStorageTest extends TestCase
 
         $this->assertCount(1, $envelopes);
 
-        $uuid = $envelopes[0]->get('Flasher\Prime\TestsStamp\UuidStamp');
+        $uuid = $envelopes[0]->get('Flasher\Prime\Stamp\UuidStamp');
         $this->assertNotNull($uuid);
     }
 
diff --git a/Tests/Storage/StorageManagerTest.php b/Tests/Storage/StorageManagerTest.php
index b3dddd65..9ef22b1f 100644
--- a/Tests/Storage/StorageManagerTest.php
+++ b/Tests/Storage/StorageManagerTest.php
@@ -2,12 +2,12 @@
 
 namespace Flasher\Prime\Tests\Storage;
 
-use Notify\Envelope;
-use Flasher\Prime\TestsNotification\Notification;
-use Flasher\Prime\TestsStamp\ReplayStamp;
-use Flasher\Prime\TestsStamp\UuidStamp;
-use Flasher\Prime\TestsStorage\ArrayStorage;
-use Flasher\Prime\TestsStorage\StorageManager;
+use Flasher\Prime\Envelope;
+use Flasher\Prime\Notification\Notification;
+use Flasher\Prime\Stamp\HopsStamp;
+use Flasher\Prime\Stamp\UuidStamp;
+use Flasher\Prime\Storage\ArrayStorage;
+use Flasher\Prime\Storage\StorageManager;
 use PHPUnit\Framework\TestCase;
 
 class StorageManagerTest extends TestCase
@@ -49,7 +49,7 @@ class StorageManagerTest extends TestCase
 
         $this->assertCount(1, $envelopes);
 
-        $uuid = $envelopes[0]->get('Flasher\Prime\TestsStamp\UuidStamp');
+        $uuid = $envelopes[0]->get('Flasher\Prime\Stamp\UuidStamp');
         $this->assertNotNull($uuid);
     }
 
@@ -59,7 +59,7 @@ class StorageManagerTest extends TestCase
 
         $envelope = new Envelope(
             new Notification('error message', 'error'),
-            new ReplayStamp(2),
+            new HopsStamp(2),
             new UuidStamp('fake-uuid')
         );
         $storageManager->add($envelope);
diff --git a/Translator/TranslatorInterface.php b/Translator/TranslatorInterface.php
new file mode 100644
index 00000000..620f7bdf
--- /dev/null
+++ b/Translator/TranslatorInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Flasher\Prime\Translator;
+
+interface TranslatorInterface
+{
+
+}