diff --git a/module/Core/config/event_dispatcher.config.php b/module/Core/config/event_dispatcher.config.php
index d47cc128..e1342ebf 100644
--- a/module/Core/config/event_dispatcher.config.php
+++ b/module/Core/config/event_dispatcher.config.php
@@ -22,11 +22,15 @@ return [
         ],
         'async' => [
             EventDispatcher\Event\VisitLocated::class => [
-                EventDispatcher\NotifyVisitToMercure::class,
-                EventDispatcher\NotifyVisitToRabbitMq::class,
+                EventDispatcher\Mercure\NotifyVisitToMercure::class,
+                EventDispatcher\RabbitMq\NotifyVisitToRabbitMq::class,
                 EventDispatcher\NotifyVisitToWebHooks::class,
                 EventDispatcher\UpdateGeoLiteDb::class,
             ],
+//            EventDispatcher\Event\ShortUrlCreated::class => [
+//                EventDispatcher\Mercure\NotifyNewShortUrlToMercure::class,
+//                EventDispatcher\RabbitMq\NotifyNewShortUrlToRabbitMq::class,
+//            ],
         ],
     ],
 
@@ -34,16 +38,16 @@ return [
         'factories' => [
             EventDispatcher\LocateVisit::class => ConfigAbstractFactory::class,
             EventDispatcher\NotifyVisitToWebHooks::class => ConfigAbstractFactory::class,
-            EventDispatcher\NotifyVisitToMercure::class => ConfigAbstractFactory::class,
-            EventDispatcher\NotifyVisitToRabbitMq::class => ConfigAbstractFactory::class,
+            EventDispatcher\Mercure\NotifyVisitToMercure::class => ConfigAbstractFactory::class,
+            EventDispatcher\RabbitMq\NotifyVisitToRabbitMq::class => ConfigAbstractFactory::class,
             EventDispatcher\UpdateGeoLiteDb::class => ConfigAbstractFactory::class,
         ],
 
         'delegators' => [
-            EventDispatcher\NotifyVisitToMercure::class => [
+            EventDispatcher\Mercure\NotifyVisitToMercure::class => [
                 EventDispatcher\CloseDbConnectionEventListenerDelegator::class,
             ],
-            EventDispatcher\NotifyVisitToRabbitMq::class => [
+            EventDispatcher\RabbitMq\NotifyVisitToRabbitMq::class => [
                 EventDispatcher\CloseDbConnectionEventListenerDelegator::class,
             ],
             EventDispatcher\NotifyVisitToWebHooks::class => [
@@ -68,13 +72,13 @@ return [
             ShortUrl\Transformer\ShortUrlDataTransformer::class,
             Options\AppOptions::class,
         ],
-        EventDispatcher\NotifyVisitToMercure::class => [
+        EventDispatcher\Mercure\NotifyVisitToMercure::class => [
             Hub::class,
             Mercure\MercureUpdatesGenerator::class,
             'em',
             'Logger_Shlink',
         ],
-        EventDispatcher\NotifyVisitToRabbitMq::class => [
+        EventDispatcher\RabbitMq\NotifyVisitToRabbitMq::class => [
             AMQPStreamConnection::class,
             'em',
             'Logger_Shlink',
diff --git a/module/Core/src/EventDispatcher/Event/ShortUrlCreated.php b/module/Core/src/EventDispatcher/Event/ShortUrlCreated.php
new file mode 100644
index 00000000..9786808f
--- /dev/null
+++ b/module/Core/src/EventDispatcher/Event/ShortUrlCreated.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\EventDispatcher\Event;
+
+use JsonSerializable;
+
+final class ShortUrlCreated implements JsonSerializable
+{
+    public function __construct(public readonly string $shortUrlId)
+    {
+    }
+
+    public function jsonSerialize(): array
+    {
+        return [
+            'shortUrlId' => $this->shortUrlId,
+        ];
+    }
+}
diff --git a/module/Core/src/EventDispatcher/Mercure/NotifyNewShortUrlToMercure.php b/module/Core/src/EventDispatcher/Mercure/NotifyNewShortUrlToMercure.php
new file mode 100644
index 00000000..51fa3b58
--- /dev/null
+++ b/module/Core/src/EventDispatcher/Mercure/NotifyNewShortUrlToMercure.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\EventDispatcher\Mercure;
+
+use Shlinkio\Shlink\Core\EventDispatcher\Event\ShortUrlCreated;
+
+class NotifyNewShortUrlToMercure
+{
+    public function __invoke(ShortUrlCreated $shortUrlCreated)
+    {
+        // TODO: Implement __invoke() method.
+    }
+}
diff --git a/module/Core/src/EventDispatcher/NotifyVisitToMercure.php b/module/Core/src/EventDispatcher/Mercure/NotifyVisitToMercure.php
similarity index 97%
rename from module/Core/src/EventDispatcher/NotifyVisitToMercure.php
rename to module/Core/src/EventDispatcher/Mercure/NotifyVisitToMercure.php
index 096e7e65..fa520f08 100644
--- a/module/Core/src/EventDispatcher/NotifyVisitToMercure.php
+++ b/module/Core/src/EventDispatcher/Mercure/NotifyVisitToMercure.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Core\EventDispatcher;
+namespace Shlinkio\Shlink\Core\EventDispatcher\Mercure;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
diff --git a/module/Core/src/EventDispatcher/RabbitMq/NotifyNewShortUrlToRabbitMq.php b/module/Core/src/EventDispatcher/RabbitMq/NotifyNewShortUrlToRabbitMq.php
new file mode 100644
index 00000000..dfce8419
--- /dev/null
+++ b/module/Core/src/EventDispatcher/RabbitMq/NotifyNewShortUrlToRabbitMq.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\EventDispatcher\RabbitMq;
+
+use Shlinkio\Shlink\Core\EventDispatcher\Event\ShortUrlCreated;
+
+class NotifyNewShortUrlToRabbitMq
+{
+    public function __invoke(ShortUrlCreated $shortUrlCreated)
+    {
+        // TODO: Implement __invoke() method.
+    }
+}
diff --git a/module/Core/src/EventDispatcher/NotifyVisitToRabbitMq.php b/module/Core/src/EventDispatcher/RabbitMq/NotifyVisitToRabbitMq.php
similarity index 98%
rename from module/Core/src/EventDispatcher/NotifyVisitToRabbitMq.php
rename to module/Core/src/EventDispatcher/RabbitMq/NotifyVisitToRabbitMq.php
index a81f2cab..bec1ef94 100644
--- a/module/Core/src/EventDispatcher/NotifyVisitToRabbitMq.php
+++ b/module/Core/src/EventDispatcher/RabbitMq/NotifyVisitToRabbitMq.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Core\EventDispatcher;
+namespace Shlinkio\Shlink\Core\EventDispatcher\RabbitMq;
 
 use Doctrine\ORM\EntityManagerInterface;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
diff --git a/module/Core/test/EventDispatcher/NotifyVisitToMercureTest.php b/module/Core/test/EventDispatcher/Mercure/NotifyVisitToMercureTest.php
similarity index 98%
rename from module/Core/test/EventDispatcher/NotifyVisitToMercureTest.php
rename to module/Core/test/EventDispatcher/Mercure/NotifyVisitToMercureTest.php
index a06eaaa1..bdcb72a8 100644
--- a/module/Core/test/EventDispatcher/NotifyVisitToMercureTest.php
+++ b/module/Core/test/EventDispatcher/Mercure/NotifyVisitToMercureTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Core\EventDispatcher;
+namespace ShlinkioTest\Shlink\Core\EventDispatcher\Mercure;
 
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
@@ -14,7 +14,7 @@ use RuntimeException;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\EventDispatcher\Event\VisitLocated;
-use Shlinkio\Shlink\Core\EventDispatcher\NotifyVisitToMercure;
+use Shlinkio\Shlink\Core\EventDispatcher\Mercure\NotifyVisitToMercure;
 use Shlinkio\Shlink\Core\Mercure\MercureUpdatesGeneratorInterface;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Visit\Model\VisitType;
diff --git a/module/Core/test/EventDispatcher/NotifyVisitToRabbitMqTest.php b/module/Core/test/EventDispatcher/RabbitMq/NotifyVisitToRabbitMqTest.php
similarity index 96%
rename from module/Core/test/EventDispatcher/NotifyVisitToRabbitMqTest.php
rename to module/Core/test/EventDispatcher/RabbitMq/NotifyVisitToRabbitMqTest.php
index 778da889..c39407f8 100644
--- a/module/Core/test/EventDispatcher/NotifyVisitToRabbitMqTest.php
+++ b/module/Core/test/EventDispatcher/RabbitMq/NotifyVisitToRabbitMqTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Core\EventDispatcher;
+namespace ShlinkioTest\Shlink\Core\EventDispatcher\RabbitMq;
 
 use Doctrine\ORM\EntityManagerInterface;
 use DomainException;
@@ -18,7 +18,7 @@ use RuntimeException;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\EventDispatcher\Event\VisitLocated;
-use Shlinkio\Shlink\Core\EventDispatcher\NotifyVisitToRabbitMq;
+use Shlinkio\Shlink\Core\EventDispatcher\RabbitMq\NotifyVisitToRabbitMq;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Visit\Transformer\OrphanVisitDataTransformer;
@@ -61,7 +61,7 @@ class NotifyVisitToRabbitMqTest extends TestCase
     /** @test */
     public function doesNothingWhenTheFeatureIsNotEnabled(): void
     {
-        $listener = new NotifyVisitToRabbitMq(
+        $listener = new \Shlinkio\Shlink\Core\EventDispatcher\RabbitMq\NotifyVisitToRabbitMq(
             $this->connection->reveal(),
             $this->em->reveal(),
             $this->logger->reveal(),