diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DefaultChannelFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultChannelFactoryBean.java
similarity index 92%
rename from org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DefaultChannelFactoryBean.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultChannelFactoryBean.java
index b04baafd53..97083a6b1b 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DefaultChannelFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultChannelFactoryBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.channel.factory;
+package org.springframework.integration.bus;
 
 import java.util.List;
 import java.util.Map;
@@ -22,10 +22,11 @@ import java.util.Map;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.channel.ChannelInterceptor;
 import org.springframework.integration.channel.DispatcherPolicy;
 import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.channel.factory.ChannelFactory;
+import org.springframework.integration.channel.factory.QueueChannelFactory;
 import org.springframework.util.Assert;
 
 /**
@@ -37,7 +38,7 @@ import org.springframework.util.Assert;
  * 
  * @author Marius Bogoevici
  */
-public class DefaultChannelFactoryBean implements ApplicationContextAware, FactoryBean{
+public class DefaultChannelFactoryBean implements ApplicationContextAware, FactoryBean {
 
 	private volatile ChannelFactory channelFactory;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/DefaultChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultChannelParser.java
similarity index 86%
rename from org.springframework.integration/src/main/java/org/springframework/integration/channel/config/DefaultChannelParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultChannelParser.java
index 57cc1e02f4..b2b332cd1c 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/DefaultChannelParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultChannelParser.java
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.channel.config;
+package org.springframework.integration.config;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.integration.bus.DefaultChannelFactoryBean;
 import org.springframework.integration.channel.DispatcherPolicy;
-import org.springframework.integration.channel.factory.DefaultChannelFactoryBean;
+import org.springframework.integration.channel.config.AbstractChannelParser;
+
 import org.w3c.dom.Element;
 
 /**
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
index 574592b612..884bdf666d 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
@@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
-import org.springframework.integration.channel.config.DefaultChannelParser;
 import org.springframework.integration.channel.config.DirectChannelParser;
 import org.springframework.integration.channel.config.PriorityChannelParser;
 import org.springframework.integration.channel.config.QueueChannelParser;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
index b6f1ef110b..2e310d2af8 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
@@ -29,6 +29,7 @@ import org.junit.Test;
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.context.support.StaticApplicationContext;
+import org.springframework.integration.bus.DefaultChannelFactoryBean;
 import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.channel.AbstractMessageChannel;
 import org.springframework.integration.channel.ChannelInterceptor;