diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandlingSourceAdapter.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandlingSourceAdapter.java
index 8edd41db2b..168adfd500 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandlingSourceAdapter.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandlingSourceAdapter.java
@@ -22,7 +22,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.channel.RequestReplyTemplate;
+import org.springframework.integration.gateway.RequestReplyTemplate;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.Message;
 import org.springframework.util.Assert;
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParserTests.java
index 4d9c591f95..6ba862fdd7 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParserTests.java
+++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParserTests.java
@@ -25,7 +25,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.adapter.httpinvoker.HttpInvokerSourceAdapter;
 import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.channel.RequestReplyTemplate;
+import org.springframework.integration.gateway.RequestReplyTemplate;
 
 /**
  * @author Mark Fisher
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParserTests.java
index b90542a291..b516079218 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParserTests.java
+++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParserTests.java
@@ -26,7 +26,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.adapter.rmi.RmiSourceAdapter;
 import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.channel.RequestReplyTemplate;
+import org.springframework.integration.gateway.RequestReplyTemplate;
 
 /**
  * @author Mark Fisher
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 ce25a86dcf..49e2b85f51 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,6 @@
 package org.springframework.integration.gateway;
 
 import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.channel.RequestReplyTemplate;
 
 /**
  * A convenient base class providing access to a {@link RequestReplyTemplate} and exposing setter methods for
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/RequestReplyTemplate.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/RequestReplyTemplate.java
similarity index 97%
rename from org.springframework.integration/src/main/java/org/springframework/integration/channel/RequestReplyTemplate.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/gateway/RequestReplyTemplate.java
index 425b97aff6..0a7efa58a9 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/RequestReplyTemplate.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/RequestReplyTemplate.java
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.channel;
+package org.springframework.integration.gateway;
 
 import java.util.List;
 
 import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.bus.MessageBusAware;
+import org.springframework.integration.channel.DispatcherPolicy;
+import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.channel.RendezvousChannel;
 import org.springframework.integration.endpoint.EndpointRegistry;
 import org.springframework.integration.endpoint.HandlerEndpoint;
 import org.springframework.integration.handler.ReplyHandler;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/RequestReplyTemplateTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/RequestReplyTemplateTests.java
similarity index 96%
rename from org.springframework.integration/src/test/java/org/springframework/integration/channel/RequestReplyTemplateTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/gateway/RequestReplyTemplateTests.java
index d100a73f20..00feb50bbb 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/RequestReplyTemplateTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/RequestReplyTemplateTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.channel;
+package org.springframework.integration.gateway;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 
 import org.springframework.integration.bus.MessageBus;
+import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.handler.ReplyHandler;
 import org.springframework.integration.message.Message;