diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java
index 37a6d5a0c8..7dae7b84ae 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java
@@ -19,7 +19,7 @@ package org.springframework.integration.filter;
 import java.lang.reflect.Method;
 
 import org.springframework.integration.core.Message;
-import org.springframework.integration.message.MessageMappingMethodInvoker;
+import org.springframework.integration.handler.MessageMappingMethodInvoker;
 import org.springframework.integration.selector.MessageSelector;
 import org.springframework.util.Assert;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingMethodInvoker.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageMappingMethodInvoker.java
similarity index 96%
rename from org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingMethodInvoker.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageMappingMethodInvoker.java
index 4564b3aa50..8960c0b7cd 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingMethodInvoker.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageMappingMethodInvoker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.handler;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
@@ -27,6 +27,9 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.message.MessageHandlingException;
+import org.springframework.integration.message.MethodParameterMessageMapper;
+import org.springframework.integration.message.OutboundMessageMapper;
 import org.springframework.integration.util.DefaultMethodInvoker;
 import org.springframework.integration.util.DefaultMethodResolver;
 import org.springframework.integration.util.MethodInvoker;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java
index 69fe4dc139..85cedddc71 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java
@@ -21,7 +21,6 @@ import java.lang.reflect.Method;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
 import org.springframework.integration.message.MessageHandler;
-import org.springframework.integration.message.MessageMappingMethodInvoker;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java
index 4c10575871..d7d7671586 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java
@@ -22,7 +22,6 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.message.MessageHandlingException;
-import org.springframework.integration.message.MessageMappingMethodInvoker;
 import org.springframework.integration.util.MethodInvoker;
 
 /**
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java
index b939deb0e4..db5eba532e 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java
@@ -28,7 +28,7 @@ import org.springframework.integration.channel.ChannelResolver;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.core.MessagingException;
-import org.springframework.integration.message.MessageMappingMethodInvoker;
+import org.springframework.integration.handler.MessageMappingMethodInvoker;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/MethodInvokingSplitter.java b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/MethodInvokingSplitter.java
index f91fe61af9..7cb9b979be 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/MethodInvokingSplitter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/MethodInvokingSplitter.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Method;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.annotation.Splitter;
 import org.springframework.integration.core.Message;
-import org.springframework.integration.message.MessageMappingMethodInvoker;
+import org.springframework.integration.handler.MessageMappingMethodInvoker;
 
 /**
  * A Message Splitter implementation that invokes the specified method
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java
index 1eb42d6bd1..5fbe491afb 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java
@@ -21,9 +21,9 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.springframework.integration.core.Message;
+import org.springframework.integration.handler.MessageMappingMethodInvoker;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageHandlingException;
-import org.springframework.integration.message.MessageMappingMethodInvoker;
 
 /**
  * @author Mark Fisher
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MessageMappingMethodInvokerTests.java
similarity index 98%
rename from org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/MessageMappingMethodInvokerTests.java
index 6baea8ff4c..c13c7c9dc6 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MessageMappingMethodInvokerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.handler;
 
 import static org.junit.Assert.assertEquals;
 
@@ -28,7 +28,6 @@ import org.springframework.integration.annotation.Header;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.MessageBuilder;
-import org.springframework.integration.message.MessageMappingMethodInvoker;
 import org.springframework.integration.message.StringMessage;
 
 /**