diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java
index e332a97e54..4279903cb5 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java
@@ -18,10 +18,10 @@ package org.springframework.integration.adapter;
 
 import java.io.Serializable;
 
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.ReplyMessageHolder;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageHandlingException;
 import org.springframework.remoting.RemoteAccessException;
diff --git a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandler.java b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandler.java
index 66d1f3b2bf..cf764dea3a 100644
--- a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandler.java
+++ b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandler.java
@@ -19,8 +19,8 @@ package org.springframework.integration.event;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
-import org.springframework.integration.consumer.AbstractMessageHandler;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
index 72f7757c4a..5e3b101473 100644
--- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
+++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
@@ -26,10 +26,10 @@ import javax.jms.QueueSession;
 import javax.jms.Session;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.ReplyMessageHolder;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.core.SessionCallback;
diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java
index b0781b8cec..76f45c98ff 100644
--- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java
+++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java
@@ -19,10 +19,10 @@ package org.springframework.integration.ws;
 import java.io.IOException;
 import java.net.URI;
 
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.ReplyMessageHolder;
 import org.springframework.util.Assert;
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.WebServiceMessageFactory;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierHandler.java
index c31ecf0a63..e53ba83a49 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierHandler.java
@@ -30,9 +30,9 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.channel.MessageChannelTemplate;
-import org.springframework.integration.consumer.AbstractMessageHandler;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
+import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.integration.message.MessageHandler;
 import org.springframework.integration.message.MessageHandlingException;
 import org.springframework.integration.scheduling.IntervalTrigger;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java
index ebf28dfe61..e755c7bb79 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java
@@ -17,8 +17,8 @@
 package org.springframework.integration.config;
 
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
 import org.springframework.integration.core.MessageChannel;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
 import org.springframework.integration.message.MessageHandler;
 import org.springframework.util.Assert;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java
index 7f147c6647..226cde4d12 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java
@@ -28,12 +28,12 @@ import org.springframework.integration.channel.ChannelResolver;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.channel.SubscribableChannel;
-import org.springframework.integration.consumer.MethodInvokingMessageHandler;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.endpoint.MessageEndpoint;
 import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
+import org.springframework.integration.handler.MethodInvokingMessageHandler;
 import org.springframework.integration.message.MethodInvokingSource;
 import org.springframework.integration.scheduling.IntervalTrigger;
 import org.springframework.integration.scheduling.Trigger;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ServiceActivatorAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ServiceActivatorAnnotationPostProcessor.java
index e859f39866..eb36346917 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ServiceActivatorAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ServiceActivatorAnnotationPostProcessor.java
@@ -20,7 +20,7 @@ import java.lang.reflect.Method;
 
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.integration.annotation.ServiceActivator;
-import org.springframework.integration.consumer.ServiceActivatingHandler;
+import org.springframework.integration.handler.ServiceActivatingHandler;
 import org.springframework.integration.message.MessageHandler;
 import org.springframework.util.StringUtils;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParser.java
index 1e027cc1f0..4c3c745278 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParser.java
@@ -22,7 +22,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.consumer.MethodInvokingMessageHandler;
+import org.springframework.integration.handler.MethodInvokingMessageHandler;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java
index bd1a36f288..5e8794d54b 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java
@@ -20,7 +20,7 @@ import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.consumer.ServiceActivatingHandler;
+import org.springframework.integration.handler.ServiceActivatingHandler;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java
index fac3664f86..f27c52638e 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java
@@ -16,9 +16,9 @@
 
 package org.springframework.integration.filter;
 
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.ReplyMessageHolder;
 import org.springframework.integration.selector.MessageSelector;
 import org.springframework.util.Assert;
 
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 d67634765c..db86347acc 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
@@ -20,8 +20,6 @@ import org.springframework.context.Lifecycle;
 import org.springframework.integration.channel.MessageChannelTemplate;
 import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.channel.SubscribableChannel;
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.core.MessagingException;
@@ -29,6 +27,8 @@ 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;
+import org.springframework.integration.handler.ReplyMessageHolder;
 import org.springframework.integration.message.ErrorMessage;
 import org.springframework.integration.message.MessageHandler;
 import org.springframework.integration.message.MessageDeliveryException;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
similarity index 97%
rename from org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractMessageHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
index 79085a2c32..71a1a0e8be 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractMessageHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.consumer;
+package org.springframework.integration.handler;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractReplyProducingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java
similarity index 99%
rename from org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractReplyProducingMessageHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java
index 5719a7283f..150956c5c0 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractReplyProducingMessageHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.consumer;
+package org.springframework.integration.handler;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/MethodInvokingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java
similarity index 97%
rename from org.springframework.integration/src/main/java/org/springframework/integration/consumer/MethodInvokingMessageHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java
index 5e5c112501..69fe4dc139 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/MethodInvokingMessageHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.consumer;
+package org.springframework.integration.handler;
 
 import java.lang.reflect.Method;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/ReplyMessageHolder.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageHolder.java
similarity index 97%
rename from org.springframework.integration/src/main/java/org/springframework/integration/consumer/ReplyMessageHolder.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageHolder.java
index 3b240d86bf..4534fd0c70 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/ReplyMessageHolder.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.consumer;
+package org.springframework.integration.handler;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/ServiceActivatingHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java
similarity index 98%
rename from org.springframework.integration/src/main/java/org/springframework/integration/consumer/ServiceActivatingHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java
index b551340424..77c28c2fd3 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/ServiceActivatingHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.consumer;
+package org.springframework.integration.handler;
 
 import java.lang.reflect.Method;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java
index 5b9d3880cf..a87ce23812 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java
@@ -19,9 +19,9 @@ package org.springframework.integration.router;
 import java.util.Collection;
 
 import org.springframework.integration.channel.MessageChannelTemplate;
-import org.springframework.integration.consumer.AbstractMessageHandler;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
+import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.integration.message.MessageDeliveryException;
 
 /**
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java
index 224deaf241..d07fbb33b7 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java
@@ -18,9 +18,9 @@ package org.springframework.integration.splitter;
 
 import java.util.Collection;
 
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.ReplyMessageHolder;
 
 /**
  * Base class for Message-splitting handlers.
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java
index e522b31957..42b5d2ea84 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java
@@ -16,9 +16,9 @@
 
 package org.springframework.integration.transformer;
 
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.ReplyMessageHolder;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java
index be8b8e2e29..d2cc9c4f53 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java
@@ -37,12 +37,12 @@ import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.channel.PublishSubscribeChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.config.xml.MessageBusParser;
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.ReplyMessageHolder;
 import org.springframework.integration.message.ErrorMessage;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.MessageBuilder;
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 4d651218c2..b7428d06f9 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
@@ -29,12 +29,12 @@ import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.channel.ThreadLocalChannel;
 import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor;
 import org.springframework.integration.config.xml.MessageBusParser;
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.consumer.ReplyMessageHolder;
-import org.springframework.integration.consumer.ServiceActivatingHandler;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.ReplyMessageHolder;
+import org.springframework.integration.handler.ServiceActivatingHandler;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.util.TestUtils;
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml
index 6e6cb98622..bbd695a2ba 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml
@@ -22,7 +22,7 @@
 		<constructor-arg ref="serviceActivator"/>
 	</bean>
 
-	<bean id="serviceActivator" class="org.springframework.integration.consumer.ServiceActivatingHandler">
+	<bean id="serviceActivator" class="org.springframework.integration.handler.ServiceActivatingHandler">
 		<constructor-arg ref="handler"/>
 		<property name="outputChannel" ref="targetChannel"/>
 	</bean>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java
index 81108fd7d6..cef324ca90 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java
@@ -31,11 +31,11 @@ import org.junit.Test;
 
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.integration.bus.ApplicationContextMessageBus;
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.endpoint.PollingConsumer;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.ReplyMessageHolder;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.util.TestUtils;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
index 3631dbf149..3aa8bdfa4c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
@@ -26,9 +26,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
 
-import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.consumer.ServiceActivatingHandler;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.ServiceActivatingHandler;
 import org.springframework.integration.message.MessageHandler;
 import org.springframework.integration.message.MessageDeliveryException;
 import org.springframework.integration.message.MessageRejectedException;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java
index c6262ad702..d2e75db601 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java
@@ -23,8 +23,8 @@ import org.junit.Test;
 
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.consumer.ServiceActivatingHandler;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.handler.ServiceActivatingHandler;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.splitter.MethodInvokingSplitter;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java
index eb0a9296f9..5966e9dddd 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java
@@ -30,9 +30,9 @@ import org.junit.Test;
 
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.channel.TestChannelResolver;
-import org.springframework.integration.consumer.ServiceActivatingHandler;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
+import org.springframework.integration.handler.ServiceActivatingHandler;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageHandlingException;
 import org.springframework.integration.message.MessageRejectedException;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java
index c240198ee7..5c42c2da83 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java
@@ -22,8 +22,8 @@ import org.junit.Test;
 
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.consumer.ServiceActivatingHandler;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.handler.ServiceActivatingHandler;
 import org.springframework.integration.message.StringMessage;
 
 /**
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java
index f729dc59ff..4180b9df4b 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java
@@ -29,10 +29,10 @@ import org.junit.Test;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.integration.bus.ApplicationContextMessageBus;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.consumer.MethodInvokingMessageHandler;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
 import org.springframework.integration.endpoint.PollingConsumer;
+import org.springframework.integration.handler.MethodInvokingMessageHandler;
 import org.springframework.integration.util.TestUtils;
 
 /**
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/util/DefaultMethodResolverTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/util/DefaultMethodResolverTests.java
index e5337907dd..1a8093f6da 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/util/DefaultMethodResolverTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/util/DefaultMethodResolverTests.java
@@ -32,8 +32,8 @@ import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.consumer.ServiceActivatingHandler;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
+import org.springframework.integration.handler.ServiceActivatingHandler;
 import org.springframework.integration.message.StringMessage;
 
 /**