diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
index 39c954903f8e..51b239e4867e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="debug.event_dispatcher.class">Symfony\Component\EventDispatcher\ContainerAwareTraceableEventDispatcher</parameter>
+        <parameter key="debug.event_dispatcher.class">Symfony\Component\HttpKernel\Debug\ContainerAwareTraceableEventDispatcher</parameter>
         <parameter key="debug.stopwatch.class">Symfony\Component\HttpKernel\Debug\Stopwatch</parameter>
         <parameter key="debug.container.dump">%kernel.cache_dir%/%kernel.container_class%.xml</parameter>
         <parameter key="debug.controller_resolver.class">Symfony\Bundle\FrameworkBundle\Controller\TraceableControllerResolver</parameter>
diff --git a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
similarity index 92%
rename from src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcherInterface.php
rename to src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
index 622acd652a4d..0a538765bd35 100644
--- a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcherInterface.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\HttpKernel\Debug;
+namespace Symfony\Component\EventDispatcher\Debug;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
index 66f7bf8358f5..406f1df02fa3 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcherInterface;
+use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
diff --git a/src/Symfony/Component/EventDispatcher/ContainerAwareTraceableEventDispatcher.php b/src/Symfony/Component/HttpKernel/Debug/ContainerAwareTraceableEventDispatcher.php
similarity index 98%
rename from src/Symfony/Component/EventDispatcher/ContainerAwareTraceableEventDispatcher.php
rename to src/Symfony/Component/HttpKernel/Debug/ContainerAwareTraceableEventDispatcher.php
index 82ba3b4bfe07..e9b1d8fe657e 100644
--- a/src/Symfony/Component/EventDispatcher/ContainerAwareTraceableEventDispatcher.php
+++ b/src/Symfony/Component/HttpKernel/Debug/ContainerAwareTraceableEventDispatcher.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\EventDispatcher;
+namespace Symfony\Component\HttpKernel\Debug;
 
 use Symfony\Component\HttpKernel\Debug\Stopwatch;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
-use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcherInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
+use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
 
 /**
  * Extends the ContainerAwareEventDispatcher to add some debugging tools.
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/EventDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/EventDataCollectorTest.php
index baf6fce1bc9a..21f7804ab4ae 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/EventDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/EventDataCollectorTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\HttpKernel\DataCollector\EventDataCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcherInterface;
+use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpKernel\Tests\Fixtures\TestEventDispatcher;
 
diff --git a/src/Symfony/Component/EventDispatcher/Tests/ContainerAwareTraceableEventDispatcherTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/ContainerAwareTraceableEventDispatcherTest.php
similarity index 93%
rename from src/Symfony/Component/EventDispatcher/Tests/ContainerAwareTraceableEventDispatcherTest.php
rename to src/Symfony/Component/HttpKernel/Tests/Debug/ContainerAwareTraceableEventDispatcherTest.php
index 49a1126c02e1..b7d3d74bd25a 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/ContainerAwareTraceableEventDispatcherTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Debug/ContainerAwareTraceableEventDispatcherTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\EventDispatcher\Tests;
+namespace Symfony\Component\HttpKernel\Tests\Debug;
 
-use Symfony\Component\EventDispatcher\ContainerAwareTraceableEventDispatcher;
+use Symfony\Component\HttpKernel\Debug\ContainerAwareTraceableEventDispatcher;
 use Symfony\Component\HttpKernel\Debug\Stopwatch;
 
 class ContainerAwareTraceableEventDispatcherTest extends \PHPUnit_Framework_TestCase
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php
index 0505319def52..f27737877fe6 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Fixtures;
 
-use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcherInterface;
+use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class TestEventDispatcher extends EventDispatcher implements TraceableEventDispatcherInterface