diff --git a/src/EventListener/ControllerSubscriber.php b/src/EventSubscriber/ControllerSubscriber.php
similarity index 97%
rename from src/EventListener/ControllerSubscriber.php
rename to src/EventSubscriber/ControllerSubscriber.php
index 1c64407..965ff0f 100644
--- a/src/EventListener/ControllerSubscriber.php
+++ b/src/EventSubscriber/ControllerSubscriber.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Setono\SyliusRedirectPlugin\EventListener;
+namespace Setono\SyliusRedirectPlugin\EventSubscriber;
 
 use Doctrine\Persistence\ObjectManager;
 use Setono\SyliusRedirectPlugin\Resolver\RedirectionPathResolverInterface;
diff --git a/src/EventListener/NotFoundSubscriber.php b/src/EventSubscriber/NotFoundSubscriber.php
similarity index 97%
rename from src/EventListener/NotFoundSubscriber.php
rename to src/EventSubscriber/NotFoundSubscriber.php
index 69687a9..d6fcd6e 100644
--- a/src/EventListener/NotFoundSubscriber.php
+++ b/src/EventSubscriber/NotFoundSubscriber.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Setono\SyliusRedirectPlugin\EventListener;
+namespace Setono\SyliusRedirectPlugin\EventSubscriber;
 
 use Doctrine\Persistence\ObjectManager;
 use Setono\SyliusRedirectPlugin\Resolver\RedirectionPathResolverInterface;
diff --git a/src/EventListener/RedirectResponseTrait.php b/src/EventSubscriber/RedirectResponseTrait.php
similarity index 93%
rename from src/EventListener/RedirectResponseTrait.php
rename to src/EventSubscriber/RedirectResponseTrait.php
index 321dee7..b1000c3 100644
--- a/src/EventListener/RedirectResponseTrait.php
+++ b/src/EventSubscriber/RedirectResponseTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Setono\SyliusRedirectPlugin\EventListener;
+namespace Setono\SyliusRedirectPlugin\EventSubscriber;
 
 use League\Uri\Uri;
 use League\Uri\UriModifier;
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index bf1fe60..6f25ed5 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -5,7 +5,6 @@
     <imports>
         <import resource="services/command.xml"/>
         <import resource="services/constraint.xml"/>
-        <import resource="services/event_listener.xml"/>
         <import resource="services/event_subscriber.xml"/>
         <import resource="services/factory.xml"/>
         <import resource="services/finder.xml"/>
diff --git a/src/Resources/config/services/event_listener.xml b/src/Resources/config/services/event_listener.xml
deleted file mode 100644
index d96bdd2..0000000
--- a/src/Resources/config/services/event_listener.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
->
-    <services>
-        <service id="setono_sylius_redirect.event_listener.controller"
-                 class="Setono\SyliusRedirectPlugin\EventListener\ControllerSubscriber">
-            <argument type="service" id="setono_sylius_redirect.manager.redirect"/>
-            <argument type="service" id="sylius.context.channel"/>
-            <argument type="service" id="setono_sylius_redirect.resolver.redirection_path"/>
-            <tag name="kernel.event_subscriber"/>
-        </service>
-
-        <service id="setono_sylius_redirect.event_listener.not_found"
-                 class="Setono\SyliusRedirectPlugin\EventListener\NotFoundSubscriber">
-            <argument type="service" id="setono_sylius_redirect.manager.redirect"/>
-            <argument type="service" id="sylius.context.channel"/>
-            <argument type="service" id="setono_sylius_redirect.resolver.redirection_path"/>
-            <tag name="kernel.event_subscriber"/>
-        </service>
-    </services>
-</container>
diff --git a/src/Resources/config/services/event_subscriber.xml b/src/Resources/config/services/event_subscriber.xml
index 1990c07..aa1f69e 100644
--- a/src/Resources/config/services/event_subscriber.xml
+++ b/src/Resources/config/services/event_subscriber.xml
@@ -8,5 +8,21 @@
                  class="Setono\SyliusRedirectPlugin\EventSubscriber\AdminMenuSubscriber">
             <tag name="kernel.event_subscriber"/>
         </service>
+
+        <service id="setono_sylius_redirect.event_listener.controller"
+                 class="Setono\SyliusRedirectPlugin\EventSubscriber\ControllerSubscriber">
+            <argument type="service" id="setono_sylius_redirect.manager.redirect"/>
+            <argument type="service" id="sylius.context.channel"/>
+            <argument type="service" id="setono_sylius_redirect.resolver.redirection_path"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
+        <service id="setono_sylius_redirect.event_listener.not_found"
+                 class="Setono\SyliusRedirectPlugin\EventSubscriber\NotFoundSubscriber">
+            <argument type="service" id="setono_sylius_redirect.manager.redirect"/>
+            <argument type="service" id="sylius.context.channel"/>
+            <argument type="service" id="setono_sylius_redirect.resolver.redirection_path"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
     </services>
 </container>