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 cc8fb06732..692bbe6ef1 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.AbstractReplyProducingMessageConsumer;
+import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
-import org.springframework.integration.endpoint.ReplyMessageHolder;
 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/ApplicationEventPublishingMessageConsumer.java b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumer.java
index d340b86f29..f4fb67c003 100644
--- a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumer.java
+++ b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumer.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.AbstractMessageConsumer;
 import org.springframework.integration.core.Message;
-import org.springframework.integration.endpoint.AbstractMessageConsumer;
 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 fe0cbf4a23..cd2c40d287 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.AbstractReplyProducingMessageConsumer;
+import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
-import org.springframework.integration.endpoint.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 14fb5a77ab..6a0923c97f 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.AbstractReplyProducingMessageConsumer;
+import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
-import org.springframework.integration.endpoint.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/AbstractMessageBarrierConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java
index 2e221ea896..37b4aabbfe 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.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.AbstractMessageConsumer;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.AbstractMessageConsumer;
 import org.springframework.integration.message.MessageConsumer;
 import org.springframework.integration.message.MessageHandlingException;
 import org.springframework.integration.message.MessageProducer;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerFactoryBean.java
index 70469b5d25..ce394bfc8f 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerFactoryBean.java
@@ -17,8 +17,8 @@
 package org.springframework.integration.config;
 
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.integration.consumer.AbstractReplyProducingMessageConsumer;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
 import org.springframework.integration.message.MessageConsumer;
 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 4dede6bc83..9ae9b3405d 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.MethodInvokingConsumer;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.endpoint.MessageEndpoint;
 import org.springframework.integration.endpoint.PollingConsumerEndpoint;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
-import org.springframework.integration.message.MethodInvokingConsumer;
 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 ea44539da0..0952281daf 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.endpoint.ServiceActivatingConsumer;
+import org.springframework.integration.consumer.ServiceActivatingConsumer;
 import org.springframework.integration.message.MessageConsumer;
 
 /**
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 1eef215d57..8fddee01d0 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.message.MethodInvokingConsumer;
+import org.springframework.integration.consumer.MethodInvokingConsumer;
 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 e58928444b..67679c1585 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.endpoint.ServiceActivatingConsumer;
+import org.springframework.integration.consumer.ServiceActivatingConsumer;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractMessageConsumer.java
similarity index 97%
rename from org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumer.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractMessageConsumer.java
index 4f6dc2d350..5bb2448398 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumer.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractMessageConsumer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.endpoint;
+package org.springframework.integration.consumer;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractReplyProducingMessageConsumer.java
similarity index 99%
rename from org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractReplyProducingMessageConsumer.java
index 1d150921d3..995ef3b91d 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractReplyProducingMessageConsumer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.endpoint;
+package org.springframework.integration.consumer;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/MethodInvokingConsumer.java
similarity index 89%
rename from org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/consumer/MethodInvokingConsumer.java
index f368f9e066..86f1f753d5 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/MethodInvokingConsumer.java
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.consumer;
 
 import java.lang.reflect.Method;
 
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
+import org.springframework.integration.message.MessageConsumer;
+import org.springframework.integration.message.MessageMappingMethodInvoker;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ReplyMessageHolder.java b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/ReplyMessageHolder.java
similarity index 97%
rename from org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ReplyMessageHolder.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/consumer/ReplyMessageHolder.java
index 080592cd54..3b240d86bf 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ReplyMessageHolder.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/ReplyMessageHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.endpoint;
+package org.springframework.integration.consumer;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ServiceActivatingConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/ServiceActivatingConsumer.java
similarity index 98%
rename from org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ServiceActivatingConsumer.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/consumer/ServiceActivatingConsumer.java
index 6e7102bde8..6825809443 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ServiceActivatingConsumer.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/ServiceActivatingConsumer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.endpoint;
+package org.springframework.integration.consumer;
 
 import java.lang.reflect.Method;
 
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 958314bfad..b92b81657c 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.AbstractReplyProducingMessageConsumer;
+import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
-import org.springframework.integration.endpoint.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 4052ffee08..62f5779a7e 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
@@ -21,14 +21,14 @@ import org.springframework.integration.bus.MessageBusAware;
 import org.springframework.integration.channel.MessageChannelTemplate;
 import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.channel.SubscribableChannel;
+import org.springframework.integration.consumer.AbstractReplyProducingMessageConsumer;
+import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.core.MessagingException;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
 import org.springframework.integration.endpoint.MessageEndpoint;
 import org.springframework.integration.endpoint.MessagingGateway;
 import org.springframework.integration.endpoint.PollingConsumerEndpoint;
-import org.springframework.integration.endpoint.ReplyMessageHolder;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.message.ErrorMessage;
 import org.springframework.integration.message.MessageConsumer;
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 b1830b48dd..81d434daac 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.AbstractMessageConsumer;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.AbstractMessageConsumer;
 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 a9761de86d..6f81ed314f 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.AbstractReplyProducingMessageConsumer;
+import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
-import org.springframework.integration.endpoint.ReplyMessageHolder;
 
 /**
  * Base class for Message-splitting consumers.
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformationException.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformationException.java
new file mode 100644
index 0000000000..211296553a
--- /dev/null
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformationException.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.transformer;
+
+import org.springframework.integration.core.Message;
+import org.springframework.integration.core.MessagingException;
+
+/**
+ * Base Exception type for Message transformation errors.
+ * 
+ * @author Mark Fisher
+ */
+public class MessageTransformationException extends MessagingException {
+
+	public MessageTransformationException(Message<?> message, String description, Throwable cause) {
+		super(message, description, cause);
+	}
+
+	public MessageTransformationException(Message<?> message, String description) {
+		super(message, description);
+	}
+
+	public MessageTransformationException(Message<?> message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public MessageTransformationException(String description, Throwable cause) {
+		super(description, cause);
+	}
+
+	public MessageTransformationException(String description) {
+		super(description);
+	}
+
+}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingConsumer.java
index 42a2f24d9f..326e1373d3 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingConsumer.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingConsumer.java
@@ -16,9 +16,9 @@
 
 package org.springframework.integration.transformer;
 
+import org.springframework.integration.consumer.AbstractReplyProducingMessageConsumer;
+import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
-import org.springframework.integration.endpoint.ReplyMessageHolder;
 import org.springframework.util.Assert;
 
 /**
@@ -45,9 +45,17 @@ public class MessageTransformingConsumer extends AbstractReplyProducingMessageCo
 
 	@Override
 	protected void onMessage(Message<?> message, ReplyMessageHolder replyHolder) {
-		Message<?> result = transformer.transform(message);
-		if (result != null) {
-			replyHolder.set(result);
+		try {
+			Message<?> result = transformer.transform(message);
+			if (result != null) {
+				replyHolder.set(result);
+			}
+		}
+		catch (Exception e) {
+			if (e instanceof MessageTransformationException) {
+				throw (MessageTransformationException) e;
+			}
+			throw new MessageTransformationException(message, e);
 		}
 	}
 
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 28bd80ed36..a226cb025e 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
@@ -34,11 +34,11 @@ 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.AbstractReplyProducingMessageConsumer;
+import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
 import org.springframework.integration.endpoint.PollingConsumerEndpoint;
-import org.springframework.integration.endpoint.ReplyMessageHolder;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.message.ErrorMessage;
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 d1f194405b..8285483f8f 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,11 +29,11 @@ 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.AbstractReplyProducingMessageConsumer;
+import org.springframework.integration.consumer.ReplyMessageHolder;
+import org.springframework.integration.consumer.ServiceActivatingConsumer;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
-import org.springframework.integration.endpoint.ReplyMessageHolder;
-import org.springframework.integration.endpoint.ServiceActivatingConsumer;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 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 fce8d6085e..4dd8035451 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="sourceChannel"/>
 	</bean>
 
-	<bean id="serviceActivator" class="org.springframework.integration.endpoint.ServiceActivatingConsumer">
+	<bean id="serviceActivator" class="org.springframework.integration.consumer.ServiceActivatingConsumer">
 		<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 020299b88e..f045b8b818 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.AbstractReplyProducingMessageConsumer;
+import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
 import org.springframework.integration.endpoint.PollingConsumerEndpoint;
-import org.springframework.integration.endpoint.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 4176cdbc4d..effbc8123a 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.AbstractReplyProducingMessageConsumer;
+import org.springframework.integration.consumer.ServiceActivatingConsumer;
 import org.springframework.integration.core.Message;
-import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
-import org.springframework.integration.endpoint.ServiceActivatingConsumer;
 import org.springframework.integration.message.MessageConsumer;
 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 0c69cba22f..19033b5d7a 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,6 +23,7 @@ import org.junit.Test;
 
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.consumer.ServiceActivatingConsumer;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.StringMessage;
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 f58dcf6661..bfd91e499e 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,6 +30,7 @@ import org.junit.Test;
 
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.channel.TestChannelResolver;
+import org.springframework.integration.consumer.ServiceActivatingConsumer;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
 import org.springframework.integration.message.MessageBuilder;
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 4f2c243c4b..2460c18806 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,6 +22,7 @@ import org.junit.Test;
 
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.consumer.ServiceActivatingConsumer;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.message.StringMessage;
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java
index 018ba843ed..12476fd89f 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java
@@ -29,6 +29,7 @@ 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.MethodInvokingConsumer;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
 import org.springframework.integration.endpoint.PollingConsumerEndpoint;
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 7d4b1a10f7..ff247b9644 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,7 +32,7 @@ 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.endpoint.ServiceActivatingConsumer;
+import org.springframework.integration.consumer.ServiceActivatingConsumer;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.message.StringMessage;