diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fd7d9df
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+composer.lock
+vendor/
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 9a1c147..6551f55 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,10 @@
 {
     "name": "snapshotpl/zf-snap-event-debugger",
-    "description": "Event Debugger for Zend Framework 2",
+    "description": "Event Debugger for Zend Framework 2 & 3",
     "type": "library",
     "keywords": [
         "zf2",
+        "zf3",
         "events",
         "debug"
     ],
@@ -16,12 +17,12 @@
         }
     ],
     "require": {
-        "php": ">=5.3",
+        "php": "^5.5 || ^7.0",
         "zendframework/zend-developer-tools": "^1.0",
-        "zendframework/zend-eventmanager": "^2.0"
+        "zendframework/zend-eventmanager": "^2.0 || ^3.0"
     },
     "autoload": {
-        "psr-0": {
+        "psr-4": {
             "ZfSnapEventDebugger": "src/"
         }
     }
diff --git a/src/ZfSnapEventDebugger/Collector.php b/src/Collector.php
similarity index 99%
rename from src/ZfSnapEventDebugger/Collector.php
rename to src/Collector.php
index fdda7b8..2520bf4 100644
--- a/src/ZfSnapEventDebugger/Collector.php
+++ b/src/Collector.php
@@ -12,7 +12,6 @@
  */
 class Collector extends AbstractCollector
 {
-
     /**
      * @param MvcEvent $mvcEvent
      */
diff --git a/src/ZfSnapEventDebugger/Entity/Event.php b/src/Entity/Event.php
similarity index 100%
rename from src/ZfSnapEventDebugger/Entity/Event.php
rename to src/Entity/Event.php
diff --git a/src/ZfSnapEventDebugger/Entity/Listener.php b/src/Entity/Listener.php
similarity index 100%
rename from src/ZfSnapEventDebugger/Entity/Listener.php
rename to src/Entity/Listener.php
diff --git a/src/ZfSnapEventDebugger/Entity/TriggerSource.php b/src/Entity/TriggerSource.php
similarity index 100%
rename from src/ZfSnapEventDebugger/Entity/TriggerSource.php
rename to src/Entity/TriggerSource.php
diff --git a/src/ZfSnapEventDebugger/Module.php b/src/Module.php
similarity index 77%
rename from src/ZfSnapEventDebugger/Module.php
rename to src/Module.php
index 69ae5fd..14bb8f2 100644
--- a/src/ZfSnapEventDebugger/Module.php
+++ b/src/Module.php
@@ -5,6 +5,7 @@
 use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
 use Zend\ModuleManager\Feature\ConfigProviderInterface;
 use Zend\ModuleManager\Feature\InitProviderInterface;
+use Zend\ModuleManager\ModuleManager;
 use Zend\ModuleManager\ModuleManagerInterface;
 
 /**
@@ -19,10 +20,16 @@ class Module implements InitProviderInterface, ConfigProviderInterface, Autoload
      */
     public function init(ModuleManagerInterface $manager)
     {
-        $listener = new TriggerEventListener();
+        $moduleManagerEventManager = $manager->getEventManager();
+
+        if (!$moduleManagerEventManager instanceof ModuleManager) {
+            return;
+        }
 
-        $sharedManager = $manager->getEventManager()->getSharedManager();
-        $sharedManager->attachAggregate($listener);
+        $sharedManager = $moduleManagerEventManager->getSharedManager();
+
+        $listener = new TriggerEventListener();
+        $listener->attachShared($sharedManager);
 
         $manager->loadModule('ZendDeveloperTools');
     }
diff --git a/src/ZfSnapEventDebugger/TriggerEventListener.php b/src/TriggerEventListener.php
similarity index 98%
rename from src/ZfSnapEventDebugger/TriggerEventListener.php
rename to src/TriggerEventListener.php
index 3db97f7..18ac67c 100644
--- a/src/ZfSnapEventDebugger/TriggerEventListener.php
+++ b/src/TriggerEventListener.php
@@ -6,7 +6,6 @@
 use Zend\EventManager\EventManager;
 use Zend\EventManager\EventsCapableInterface;
 use Zend\EventManager\SharedEventManagerInterface;
-use Zend\EventManager\SharedListenerAggregateInterface;
 use Zend\Mvc\MvcEvent;
 use Zend\Stdlib\CallbackHandler;
 use Zend\Stdlib\PriorityQueue;
@@ -16,7 +15,7 @@
  *
  * @author Witold Wasiczko <witold@wasiczko.pl>
  */
-class TriggerEventListener implements SharedListenerAggregateInterface
+class TriggerEventListener
 {
     const SELF_PARAM_NAME = __CLASS__;
     const NUMBER_STACK_FRAME = 5;