diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BrokerEvent.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/BrokerEvent.java
similarity index 97%
rename from spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BrokerEvent.java
rename to spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/BrokerEvent.java
index ff66798f..ea20dddf 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BrokerEvent.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/BrokerEvent.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.amqp.rabbit.listener;
+package org.springframework.amqp.rabbit.core;
 
 import java.util.Map;
 
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BrokerEventListener.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/BrokerEventListener.java
similarity index 97%
rename from spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BrokerEventListener.java
rename to spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/BrokerEventListener.java
index 377f88ae..3d54c7ae 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BrokerEventListener.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/BrokerEventListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.amqp.rabbit.listener;
+package org.springframework.amqp.rabbit.core;
 
 import java.util.Arrays;
 
@@ -32,7 +32,8 @@ import org.springframework.amqp.core.TopicExchange;
 import org.springframework.amqp.rabbit.connection.Connection;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionListener;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
+import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
+import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.SmartLifecycle;
diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/BrokerEventListenerTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/BrokerEventListenerTests.java
index c25b340a..41c4e2e4 100644
--- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/BrokerEventListenerTests.java
+++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/BrokerEventListenerTests.java
@@ -29,6 +29,8 @@ import org.springframework.amqp.core.AnonymousQueue;
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.BrokerEvent;
+import org.springframework.amqp.rabbit.core.BrokerEventListener;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.junit.RabbitAvailable;
 import org.springframework.amqp.rabbit.junit.RabbitAvailableCondition;