diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/DirectChannel.java
similarity index 92%
rename from org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannel.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/DirectChannel.java
index 8065c9beaf..6d640a3372 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannel.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/DirectChannel.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.channel;
 
-import org.springframework.integration.channel.AbstractMessageChannel;
+import org.springframework.integration.dispatcher.SimpleDispatcher;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.SubscribableSource;
 import org.springframework.integration.message.MessageTarget;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PublishSubscribeChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java
similarity index 93%
rename from org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PublishSubscribeChannel.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java
index f9e340f896..e0cc1289c3 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PublishSubscribeChannel.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.channel;
 
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.integration.channel.AbstractMessageChannel;
+import org.springframework.integration.dispatcher.BroadcastingDispatcher;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.message.SubscribableSource;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannelFactory.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DirectChannelFactory.java
similarity index 82%
rename from org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannelFactory.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DirectChannelFactory.java
index 707e136d88..71944c7c70 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannelFactory.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DirectChannelFactory.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.channel.factory;
 
 import org.springframework.integration.channel.AbstractMessageChannel;
-import org.springframework.integration.channel.factory.AbstractChannelFactory;
-import org.springframework.integration.channel.factory.ChannelFactory;
+import org.springframework.integration.channel.DirectChannel;
 
 /**
  * A {@link ChannelFactory} for creating {@link DirectChannel} instances.
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/DirectChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/DirectChannelParser.java
index 29248d6f99..1109c8d28c 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/DirectChannelParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/DirectChannelParser.java
@@ -18,7 +18,7 @@ package org.springframework.integration.config;
 
 import org.w3c.dom.Element;
 
-import org.springframework.integration.dispatcher.DirectChannel;
+import org.springframework.integration.channel.DirectChannel;
 
 /**
  * Parser for the <direct-channel> element.
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java
index 860025471c..56c6f33424 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java
@@ -19,7 +19,7 @@ package org.springframework.integration.config;
 import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.integration.dispatcher.PublishSubscribeChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java
index 66811a4b8c..1b106d4503 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java
@@ -31,8 +31,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.channel.PollableChannelAdapter;
+import org.springframework.integration.channel.PublishSubscribeChannel;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.dispatcher.PublishSubscribeChannel;
 import org.springframework.integration.endpoint.DefaultEndpoint;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.ErrorMessage;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java
index 91550663bf..65f925bbc6 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java
@@ -23,11 +23,11 @@ import org.junit.Test;
 
 import org.springframework.integration.annotation.Handler;
 import org.springframework.integration.annotation.MessageEndpoint;
+import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.channel.ThreadLocalChannel;
 import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor;
-import org.springframework.integration.dispatcher.DirectChannel;
 import org.springframework.integration.endpoint.DefaultEndpoint;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.Message;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelParserTests.java
similarity index 91%
rename from org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelParserTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelParserTests.java
index 4fbf5c8ce3..467c752afb 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelParserTests.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.channel;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.integration.channel.DirectChannel;
 
 /**
  * @author Mark Fisher
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelTests.java
similarity index 95%
rename from org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelTests.java
index d8915f9897..5e84a93b13 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.channel;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
+import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.message.StringMessage;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
index 5b36c9122d..59f37c3f0b 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
@@ -32,9 +32,9 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.config.TestChannelInterceptor;
-import org.springframework.integration.dispatcher.PublishSubscribeChannel;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageBuilder;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/directChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml
similarity index 100%
rename from org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/directChannelParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
index cb5a838f0c..199946c814 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
@@ -33,6 +33,7 @@ import org.springframework.integration.bus.DefaultChannelFactoryBean;
 import org.springframework.integration.bus.DefaultMessageBus;
 import org.springframework.integration.channel.AbstractMessageChannel;
 import org.springframework.integration.channel.ChannelInterceptor;
+import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PriorityChannel;
 import org.springframework.integration.channel.QueueChannel;
@@ -40,8 +41,6 @@ import org.springframework.integration.channel.RendezvousChannel;
 import org.springframework.integration.channel.ThreadLocalChannel;
 import org.springframework.integration.channel.config.ChannelParserTests;
 import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter;
-import org.springframework.integration.dispatcher.DirectChannel;
-import org.springframework.integration.dispatcher.DirectChannelFactory;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageBuilder;
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
index 05ccf1f294..08223740a4 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
@@ -37,10 +37,10 @@ import org.springframework.integration.bus.MessageBusInterceptorTests;
 import org.springframework.integration.bus.TestMessageBusAwareImpl;
 import org.springframework.integration.bus.TestMessageBusStartInterceptor;
 import org.springframework.integration.bus.TestMessageBusStopInterceptor;
+import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.channel.config.ChannelParserTests;
-import org.springframework.integration.dispatcher.DirectChannel;
 import org.springframework.integration.endpoint.DefaultEndpoint;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.handler.TestHandlers;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java
index d1e8dc41c8..6373923ea2 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java
@@ -27,8 +27,8 @@ import org.junit.Test;
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.task.TaskExecutor;
+import org.springframework.integration.channel.PublishSubscribeChannel;
 import org.springframework.integration.dispatcher.BroadcastingDispatcher;
-import org.springframework.integration.dispatcher.PublishSubscribeChannel;
 
 /**
  * @author Mark Fisher
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithChannelFactory.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithChannelFactory.xml
index 43526f3992..523b5d3b1f 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithChannelFactory.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithChannelFactory.xml
@@ -9,7 +9,7 @@
 
 	<message-bus channel-factory="directChannelFactory"/>
 
-	<beans:bean id="directChannelFactory" class="org.springframework.integration.dispatcher.DirectChannelFactory"/>	
+	<beans:bean id="directChannelFactory" class="org.springframework.integration.channel.factory.DirectChannelFactory"/>	
 
     <channel id="defaultTypeChannel"/>