diff --git a/README.md b/README.md
index 03a72b5..741f963 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-# Potter Framework Component Template
+# Potter Framework Event Dispatcher Implementation
 
 Hello World
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 88f10f4..3e12d2c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
-    "name": "potter/template",
-    "description": "Potter Framework Component Template",
+    "name": "potter/event",
+    "description": "Potter Framework Event Dispatcher Implementation",
     "version": "1.0.0",
     "type": "library",
-    "homepage": "https://gitpotter.com/Potter/Template",
+    "homepage": "https://gitpotter.com/Potter/Event",
     "license": "MIT",
     "authors": [
         {
@@ -14,11 +14,14 @@
     ],
     "autoload": {
         "psr-4": {
-            "Potter\\Template\\": "src/Potter/Template/"
+            "Potter\\Event\\": "src/Potter/Event/"
         }
     },
     "minimum-stability": "stable",
     "require": {
-        "php": "^8.3"
+        "php": "^8.3",
+        "psr/event-dispatcher": "^1.0",
+        "league/event": "^3.0",
+        "potter/aware": "^1.0"
     }
 }
diff --git a/src/Potter/Event/AbstractDispatcher.php b/src/Potter/Event/AbstractDispatcher.php
new file mode 100644
index 0000000..cc2574a
--- /dev/null
+++ b/src/Potter/Event/AbstractDispatcher.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Potter\Event;
+
+use \League\Event\EventDispatcher as BaseDispatcher;
+
+abstract class AbstractDispatcher extends BaseDispatcher implements DispatcherInterface
+{ }
diff --git a/src/Potter/Event/Dispatcher.php b/src/Potter/Event/Dispatcher.php
new file mode 100644
index 0000000..151934a
--- /dev/null
+++ b/src/Potter/Event/Dispatcher.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Potter\Event;
+
+final class Dispatcher extends AbstractDispatcher
+{
+    use DispatcherTrait;
+}
diff --git a/src/Potter/Event/DispatcherAwareInterface.php b/src/Potter/Event/DispatcherAwareInterface.php
new file mode 100644
index 0000000..bb3fbfc
--- /dev/null
+++ b/src/Potter/Event/DispatcherAwareInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Potter\Event;
+
+use \League\Event\EventDispatcher as BaseDispatcher;
+use \League\Event\EventDispatcherAware as BaseDispatcherAwareInterface;
+use \Potter\Aware\AwareInterface;
+
+interface DispatcherAwareInterface extends BaseDispatcherAwareInterface, AwareInterface
+{
+    public function useEventDispatcher(BaseDispatcher $dispatcher): void;
+    public function eventDispatcher(): BaseDispatcher;
+}
diff --git a/src/Potter/Event/DispatcherAwareTrait.php b/src/Potter/Event/DispatcherAwareTrait.php
new file mode 100644
index 0000000..0cbe8bd
--- /dev/null
+++ b/src/Potter/Event/DispatcherAwareTrait.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Potter\Event;
+
+trait DispatcherAwareTrait 
+{ }
diff --git a/src/Potter/Event/DispatcherInterface.php b/src/Potter/Event/DispatcherInterface.php
new file mode 100644
index 0000000..4dd69bb
--- /dev/null
+++ b/src/Potter/Event/DispatcherInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Potter\Event;
+
+use \League\Event\EventDispatchingListenerRegistry as BaseDispatcherInterface;
+use \Psr\EventDispatcher\EventDispatcherInterface as PsrDispatcherInterface;
+
+interface DispatcherInterface extends BaseDispatcherInterface, PsrDispatcherInterface
+{
+    public function dispatch(object $event): object;
+}
diff --git a/src/Potter/Event/DispatcherTrait.php b/src/Potter/Event/DispatcherTrait.php
new file mode 100644
index 0000000..79e5784
--- /dev/null
+++ b/src/Potter/Event/DispatcherTrait.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Potter\Event;
+
+trait DispatcherTrait 
+{ }
diff --git a/src/Potter/Template/TemplateInterface.php b/src/Potter/Template/TemplateInterface.php
deleted file mode 100644
index c91046e..0000000
--- a/src/Potter/Template/TemplateInterface.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Potter\Template;
-
-interface TemplateInterface 
-{ }
diff --git a/src/Potter/Template/TemplateTrait.php b/src/Potter/Template/TemplateTrait.php
deleted file mode 100644
index 9e1d15f..0000000
--- a/src/Potter/Template/TemplateTrait.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Potter\Template;
-
-trait TemplateTrait 
-{ }