diff --git a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParserTests.java b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParserTests.java
index 1c66ad26a5..4b833cca6f 100644
--- a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParserTests.java
+++ b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParserTests.java
@@ -24,8 +24,8 @@ import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.channel.MessageChannelTemplate;
 import org.springframework.integration.httpinvoker.HttpInvokerInboundGateway;
-import org.springframework.integration.message.MessageChannelTemplate;
 
 /**
  * @author Mark Fisher
diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java
index 2dc5a6e877..c60074c4cf 100644
--- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java
+++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java
@@ -19,9 +19,9 @@ package org.springframework.integration.jms;
 import javax.jms.MessageListener;
 
 import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.channel.MessageChannelTemplate;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageDeliveryException;
-import org.springframework.integration.message.MessageChannelTemplate;
 import org.springframework.integration.message.MessagingException;
 import org.springframework.jms.support.converter.MessageConverter;
 import org.springframework.util.Assert;
diff --git a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java
index 34819c6877..5dfa12b97a 100644
--- a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java
+++ b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java
@@ -25,7 +25,7 @@ import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.message.MessageChannelTemplate;
+import org.springframework.integration.channel.MessageChannelTemplate;
 import org.springframework.integration.rmi.RmiInboundGateway;
 
 /**
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/AsyncMessageChannelTemplate.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AsyncMessageChannelTemplate.java
similarity index 93%
rename from org.springframework.integration/src/main/java/org/springframework/integration/message/AsyncMessageChannelTemplate.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/AsyncMessageChannelTemplate.java
index 1fcb27519a..aef21d6228 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/AsyncMessageChannelTemplate.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AsyncMessageChannelTemplate.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.channel;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
 
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.message.AsyncMessage;
+import org.springframework.integration.message.Message;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageChannelTemplate.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java
similarity index 97%
rename from org.springframework.integration/src/main/java/org/springframework/integration/message/MessageChannelTemplate.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java
index c983af1ad6..dd0bbe797d 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageChannelTemplate.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.channel;
 
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -24,9 +24,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.integration.channel.BlockingChannel;
-import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.message.Message;
+import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.selector.MessageSelector;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
index fe2c0eaa4d..e9ef2e4d23 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.ChannelRegistryAware;
-import org.springframework.integration.message.MessageChannelTemplate;
+import org.springframework.integration.channel.MessageChannelTemplate;
 import org.springframework.integration.message.MessagingException;
 import org.springframework.integration.scheduling.TaskScheduler;
 import org.springframework.integration.scheduling.TaskSchedulerAware;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
index 5d46faf399..58882e54f4 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
@@ -17,7 +17,7 @@
 package org.springframework.integration.gateway;
 
 import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.message.MessageChannelTemplate;
+import org.springframework.integration.channel.MessageChannelTemplate;
 
 /**
  * A convenient base class providing access to a {@link MessageChannelTemplate} and exposing setter methods for
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageChannelTemplateTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java
similarity index 93%
rename from org.springframework.integration/src/test/java/org/springframework/integration/message/MessageChannelTemplateTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java
index de91acf629..33362f17fc 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageChannelTemplateTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.channel;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -29,9 +29,10 @@ import org.junit.Test;
 
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.integration.bus.DefaultMessageBus;
-import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.endpoint.AbstractMessageHandlingEndpoint;
+import org.springframework.integration.message.Message;
+import org.springframework.integration.message.MessageBuilder;
+import org.springframework.integration.message.StringMessage;
 
 /**
  * @author Mark Fisher