diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetTests.java
index ffd1ea558d..e05c6de178 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetTests.java
+++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetTests.java
@@ -24,9 +24,9 @@ import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
 
+import org.springframework.integration.bus.PollingDispatcher;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.dispatcher.BroadcastingDispatcher;
-import org.springframework.integration.dispatcher.PollingDispatcher;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.scheduling.PollingSchedule;
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetTests.java
index 798096d429..3d3249e475 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetTests.java
+++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetTests.java
@@ -23,9 +23,9 @@ import java.io.StringWriter;
 import org.junit.Before;
 import org.junit.Test;
 
+import org.springframework.integration.bus.PollingDispatcher;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.dispatcher.BroadcastingDispatcher;
-import org.springframework.integration.dispatcher.PollingDispatcher;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.scheduling.PollingSchedule;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
index c3cbadb951..c0b02935d5 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
@@ -45,7 +45,6 @@ import org.springframework.integration.channel.DefaultChannelRegistry;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.factory.ChannelFactory;
 import org.springframework.integration.channel.factory.QueueChannelFactory;
-import org.springframework.integration.dispatcher.PollingDispatcher;
 import org.springframework.integration.endpoint.DefaultEndpointRegistry;
 import org.springframework.integration.endpoint.EndpointRegistry;
 import org.springframework.integration.endpoint.MessageEndpoint;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/PollingDispatcher.java
similarity index 96%
rename from org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/bus/PollingDispatcher.java
index cf25dde1bb..b770e73599 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/PollingDispatcher.java
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.bus;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.integration.dispatcher.MessageDispatcher;
+import org.springframework.integration.dispatcher.SimpleDispatcher;
 import org.springframework.integration.message.BlockingSource;
 import org.springframework.integration.message.BlockingTarget;
 import org.springframework.integration.message.MessageExchangeTemplate;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
index acf3d3da09..983aea80e6 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.core.Conventions;
-import org.springframework.integration.dispatcher.PollingDispatcher;
+import org.springframework.integration.bus.PollingDispatcher;
 import org.springframework.integration.dispatcher.SimpleDispatcher;
 import org.springframework.integration.message.AsyncMessageExchangeTemplate;
 import org.springframework.integration.message.MessageExchangeTemplate;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java
index 5add354fc5..de91bf9e0c 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java
@@ -29,10 +29,10 @@ import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.annotation.MessageEndpoint;
 import org.springframework.integration.annotation.Poller;
 import org.springframework.integration.bus.MessageBus;
+import org.springframework.integration.bus.PollingDispatcher;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
-import org.springframework.integration.dispatcher.PollingDispatcher;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.MessageTarget;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/PollingDispatcherTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/PollingDispatcherTests.java
similarity index 97%
rename from org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/PollingDispatcherTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/bus/PollingDispatcherTests.java
index 4dd067372e..7af179c3d5 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/PollingDispatcherTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/PollingDispatcherTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.bus;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -25,6 +25,7 @@ import static org.easymock.EasyMock.verify;
 import org.junit.Before;
 import org.junit.Test;
 
+import org.springframework.integration.dispatcher.MessageDispatcher;
 import org.springframework.integration.message.BlockingSource;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.scheduling.Schedule;