diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java
index db86347acc..608aaa38f6 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java
@@ -24,7 +24,6 @@ import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.core.MessagingException;
 import org.springframework.integration.endpoint.MessageEndpoint;
-import org.springframework.integration.endpoint.MessagingGateway;
 import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
index 18817cf264..cf54263534 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
@@ -40,7 +40,6 @@ import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.config.xml.MessageBusParser;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.MessagingGateway;
 import org.springframework.integration.message.MethodParameterMessageMapper;
 import org.springframework.integration.scheduling.TaskScheduler;
 import org.springframework.util.Assert;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessagingGateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGateway.java
similarity index 95%
rename from org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessagingGateway.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGateway.java
index c9540189f0..4f5cf7b64d 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessagingGateway.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGateway.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.endpoint;
+package org.springframework.integration.gateway;
 
 import org.springframework.integration.core.Message;