diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java
index aaafd2e55f..e2d508018e 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java
@@ -52,8 +52,8 @@ import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.handler.MessageHandlerChain;
 import org.springframework.integration.handler.config.DefaultMessageHandlerCreator;
 import org.springframework.integration.handler.config.MessageHandlerCreator;
-import org.springframework.integration.handler.config.RouterMessageHandlerCreator;
-import org.springframework.integration.handler.config.SplitterMessageHandlerCreator;
+import org.springframework.integration.router.config.RouterMessageHandlerCreator;
+import org.springframework.integration.router.config.SplitterMessageHandlerCreator;
 import org.springframework.integration.scheduling.PollingSchedule;
 import org.springframework.integration.scheduling.Schedule;
 import org.springframework.integration.scheduling.Subscription;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/config/RouterMessageHandlerCreator.java b/spring-integration-core/src/main/java/org/springframework/integration/router/config/RouterMessageHandlerCreator.java
similarity index 89%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/config/RouterMessageHandlerCreator.java
rename to spring-integration-core/src/main/java/org/springframework/integration/router/config/RouterMessageHandlerCreator.java
index 1813a08c70..596f61a191 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/config/RouterMessageHandlerCreator.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/router/config/RouterMessageHandlerCreator.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler.config;
+package org.springframework.integration.router.config;
 
 import java.lang.reflect.Method;
 import java.util.Map;
 
 import org.springframework.integration.handler.MessageHandler;
+import org.springframework.integration.handler.config.AbstractMessageHandlerCreator;
 import org.springframework.integration.router.RouterMessageHandlerAdapter;
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/config/SplitterMessageHandlerCreator.java b/spring-integration-core/src/main/java/org/springframework/integration/router/config/SplitterMessageHandlerCreator.java
similarity index 89%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/config/SplitterMessageHandlerCreator.java
rename to spring-integration-core/src/main/java/org/springframework/integration/router/config/SplitterMessageHandlerCreator.java
index e5c34f873a..3ddfdba875 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/config/SplitterMessageHandlerCreator.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/router/config/SplitterMessageHandlerCreator.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler.config;
+package org.springframework.integration.router.config;
 
 import java.lang.reflect.Method;
 import java.util.Map;
 
 import org.springframework.integration.handler.MessageHandler;
+import org.springframework.integration.handler.config.AbstractMessageHandlerCreator;
 import org.springframework.integration.router.SplitterMessageHandlerAdapter;
 
 /**