diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java
index a09691d038..1f4f17e0da 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.endpoint.OutboundChannelAdapter;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
-import org.springframework.integration.handler.MethodInvokingConsumer;
+import org.springframework.integration.message.MethodInvokingConsumer;
 import org.springframework.integration.message.MethodInvokingSource;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingOutboundChannelAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingOutboundChannelAdapterParser.java
index fd53fdc8dc..a1706fb5e7 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingOutboundChannelAdapterParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingOutboundChannelAdapterParser.java
@@ -21,7 +21,7 @@ import org.w3c.dom.Element;
 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.handler.MethodInvokingConsumer;
+import org.springframework.integration.message.MethodInvokingConsumer;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageFilter.java b/org.springframework.integration/src/main/java/org/springframework/integration/filter/FilterEndpoint.java
similarity index 88%
rename from org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageFilter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/filter/FilterEndpoint.java
index 17b79eaa9b..e388f4b88f 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageFilter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/filter/FilterEndpoint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler;
+package org.springframework.integration.filter;
 
 import org.springframework.integration.endpoint.AbstractMessageHandlingEndpoint;
 import org.springframework.integration.message.Message;
@@ -27,12 +27,12 @@ import org.springframework.util.Assert;
  * 
  * @author Mark Fisher
  */
-public class MessageFilter extends AbstractMessageHandlingEndpoint {
+public class FilterEndpoint extends AbstractMessageHandlingEndpoint {
 
 	private MessageSelector selector;
 
 
-	public MessageFilter(MessageSelector selector) {
+	public FilterEndpoint(MessageSelector selector) {
 		Assert.notNull(selector, "selector must not be null");
 		this.selector = selector;
 	}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java
similarity index 83%
rename from org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingConsumer.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java
index 7ce04ac565..d71861454a 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingConsumer.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java
@@ -14,14 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler;
+package org.springframework.integration.message;
 
 import java.lang.reflect.Method;
 
-import org.springframework.integration.message.Message;
-import org.springframework.integration.message.MessageConsumer;
-import org.springframework.integration.message.MessageMappingMethodInvoker;
-import org.springframework.integration.message.MessagingException;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MessageFilterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java
similarity index 87%
rename from org.springframework.integration/src/test/java/org/springframework/integration/handler/MessageFilterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java
index a43731576c..24b19791e5 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MessageFilterTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler;
+package org.springframework.integration.filter;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -25,6 +25,7 @@ import org.junit.Test;
 
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.filter.FilterEndpoint;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.message.selector.MessageSelector;
@@ -36,7 +37,7 @@ public class MessageFilterTests {
 
 	@Test
 	public void filterAcceptsMessage() {
-		MessageFilter filter = new MessageFilter(new MessageSelector() {
+		FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
 			public boolean accept(Message<?> message) {
 				return true;
 			}
@@ -47,7 +48,7 @@ public class MessageFilterTests {
 
 	@Test
 	public void filterRejectsMessage() {
-		MessageFilter filter = new MessageFilter(new MessageSelector() {
+		FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
 			public boolean accept(Message<?> message) {
 				return false;
 			}
@@ -59,7 +60,7 @@ public class MessageFilterTests {
 	public void filterAcceptsWithChannels() {
 		DirectChannel inputChannel = new DirectChannel();
 		QueueChannel outputChannel = new QueueChannel();
-		MessageFilter filter = new MessageFilter(new MessageSelector() {
+		FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
 			public boolean accept(Message<?> message) {
 				return true;
 			}
@@ -78,7 +79,7 @@ public class MessageFilterTests {
 	public void filterRejectsWithChannels() {
 		DirectChannel inputChannel = new DirectChannel();
 		QueueChannel outputChannel = new QueueChannel();
-		MessageFilter filter = new MessageFilter(new MessageSelector() {
+		FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
 			public boolean accept(Message<?> message) {
 				return false;
 			}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingConsumerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java
similarity index 95%
rename from org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingConsumerTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java
index 8a201dd58a..7e2066563a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingConsumerTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler;
+package org.springframework.integration.message;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -31,9 +31,11 @@ import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.bus.DefaultMessageBus;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.endpoint.ServiceActivatorEndpoint;
+import org.springframework.integration.handler.TestSink;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessagingException;
+import org.springframework.integration.message.MethodInvokingConsumer;
 import org.springframework.integration.message.StringMessage;
 
 /**