diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
index 2541e0a469..0d6faad35c 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
@@ -39,7 +39,6 @@ import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.SimpleApplicationEventMulticaster;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.integration.ConfigurationException;
-import org.springframework.integration.bus.interceptor.MessageBusInterceptor;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.DefaultChannelRegistry;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/interceptor/MessageBusInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusInterceptor.java
similarity index 89%
rename from org.springframework.integration/src/main/java/org/springframework/integration/bus/interceptor/MessageBusInterceptor.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusInterceptor.java
index 12617a1a4e..74ebc9c561 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/interceptor/MessageBusInterceptor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusInterceptor.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.bus.interceptor;
+package org.springframework.integration.bus;
 
-import org.springframework.integration.bus.MessageBus;
 
 /**
  * Interface for interceptors that are able be notified of the
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/interceptor/MessageBusInterceptorAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusInterceptorAdapter.java
similarity index 90%
rename from org.springframework.integration/src/main/java/org/springframework/integration/bus/interceptor/MessageBusInterceptorAdapter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusInterceptorAdapter.java
index a0d3f6d649..912081cbdf 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/interceptor/MessageBusInterceptorAdapter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusInterceptorAdapter.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.bus.interceptor;
+package org.springframework.integration.bus;
 
-import org.springframework.integration.bus.MessageBus;
 
 /**
  * No-op implementation of a {@link MessageBusInterceptor}. Subclasses shall
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/MessageBusInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusInterceptorTests.java
similarity index 97%
rename from org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/MessageBusInterceptorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusInterceptorTests.java
index 1b6750a114..01e02962fe 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/MessageBusInterceptorTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusInterceptorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.bus.interceptor;
+package org.springframework.integration.bus;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/TestMessageBusStartInterceptor.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/TestMessageBusStartInterceptor.java
similarity index 92%
rename from org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/TestMessageBusStartInterceptor.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/bus/TestMessageBusStartInterceptor.java
index c9a609e61c..ae4aa8c176 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/TestMessageBusStartInterceptor.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/TestMessageBusStartInterceptor.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.bus.interceptor;
+package org.springframework.integration.bus;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.springframework.integration.bus.MessageBus;
+import org.springframework.integration.bus.MessageBusInterceptorAdapter;
 
 /**
  * @author Marius Bogoevici
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/TestMessageBusStopInterceptor.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/TestMessageBusStopInterceptor.java
similarity index 92%
rename from org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/TestMessageBusStopInterceptor.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/bus/TestMessageBusStopInterceptor.java
index 90c715fa68..4e8ecabd16 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/TestMessageBusStopInterceptor.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/TestMessageBusStopInterceptor.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.bus.interceptor;
+package org.springframework.integration.bus;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.springframework.integration.bus.MessageBus;
+import org.springframework.integration.bus.MessageBusInterceptorAdapter;
 
 /**
  * @author Marius Bogoevici