diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageCorrelator.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/ReplyMessageCorrelator.java
similarity index 97%
rename from org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageCorrelator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/gateway/ReplyMessageCorrelator.java
index f1c6c1725d..653b2b3085 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageCorrelator.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/ReplyMessageCorrelator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler;
+package org.springframework.integration.gateway;
 
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.endpoint.AbstractMessageHandlingEndpoint;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
index b00f703bb4..0029143c3c 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
@@ -23,7 +23,6 @@ import org.springframework.integration.bus.MessageBusAware;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.endpoint.MessagingGateway;
-import org.springframework.integration.handler.ReplyMessageCorrelator;
 import org.springframework.integration.message.DefaultMessageCreator;
 import org.springframework.integration.message.DefaultMessageMapper;
 import org.springframework.integration.message.Message;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/ReplyMessageCorrelatorTests.java
similarity index 92%
rename from org.springframework.integration/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/gateway/ReplyMessageCorrelatorTests.java
index 3ae50646d4..5a623207fb 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/ReplyMessageCorrelatorTests.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler;
+package org.springframework.integration.gateway;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.gateway.ReplyMessageCorrelator;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageBuilder;