diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java b/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/AbstractLocker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/AbstractLocker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/Broker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerContext.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerContext.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerContextAware.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerContextAware.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerContextAware.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerContextAware.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactoryHandler.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactoryHandler.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactoryHandler.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactoryHandler.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerPluginSupport.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerPluginSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerPluginSupport.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerPluginSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerRegistry.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerRegistry.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
similarity index 99%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
index bc0d4725f8..db066f2f23 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -50,7 +50,6 @@ import org.apache.activemq.thread.Scheduler;
 import org.apache.activemq.thread.TaskRunnerFactory;
 import org.apache.activemq.transport.TransportFactorySupport;
 import org.apache.activemq.transport.TransportServer;
-import org.apache.activemq.transport.stomp.ProtocolConverter;
 import org.apache.activemq.transport.vm.VMTransportFactory;
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.util.*;
@@ -200,7 +199,7 @@ public class BrokerService implements Service {
 
         InputStream in = null;
         String version = null;
-        if ((in = ProtocolConverter.class.getResourceAsStream("/org/apache/activemq/version.txt")) != null) {
+        if ((in = BrokerService.class.getResourceAsStream("/org/apache/activemq/version.txt")) != null) {
             BufferedReader reader = new BufferedReader(new InputStreamReader(in));
             try {
                 version = reader.readLine();
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerStoppedException.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerStoppedException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/BrokerStoppedException.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/BrokerStoppedException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/Connection.java b/activemq-broker/src/main/java/org/apache/activemq/broker/Connection.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/Connection.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/Connection.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java b/activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/Connector.java b/activemq-broker/src/main/java/org/apache/activemq/broker/Connector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/Connector.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/Connector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/ConsumerBrokerExchange.java b/activemq-broker/src/main/java/org/apache/activemq/broker/ConsumerBrokerExchange.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/ConsumerBrokerExchange.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/ConsumerBrokerExchange.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java b/activemq-broker/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/DestinationAlreadyExistsException.java b/activemq-broker/src/main/java/org/apache/activemq/broker/DestinationAlreadyExistsException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/DestinationAlreadyExistsException.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/DestinationAlreadyExistsException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/ErrorBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/ErrorBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/InsertableMutableBrokerFilter.java b/activemq-broker/src/main/java/org/apache/activemq/broker/InsertableMutableBrokerFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/InsertableMutableBrokerFilter.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/InsertableMutableBrokerFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/Lockable.java b/activemq-broker/src/main/java/org/apache/activemq/broker/Lockable.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/Lockable.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/Lockable.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java b/activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/Locker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/Locker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/Locker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/Locker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/MapTransportConnectionStateRegister.java b/activemq-broker/src/main/java/org/apache/activemq/broker/MapTransportConnectionStateRegister.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/MapTransportConnectionStateRegister.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/MapTransportConnectionStateRegister.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java b/activemq-broker/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/ProducerBrokerExchange.java b/activemq-broker/src/main/java/org/apache/activemq/broker/ProducerBrokerExchange.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/ProducerBrokerExchange.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/ProducerBrokerExchange.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/PropertiesBrokerFactory.java b/activemq-broker/src/main/java/org/apache/activemq/broker/PropertiesBrokerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/PropertiesBrokerFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/PropertiesBrokerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/SingleTransportConnectionStateRegister.java b/activemq-broker/src/main/java/org/apache/activemq/broker/SingleTransportConnectionStateRegister.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/SingleTransportConnectionStateRegister.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/SingleTransportConnectionStateRegister.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/SslBrokerService.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/SslBrokerService.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/TransactionBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/TransactionBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnectionState.java b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnectionState.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/TransportConnectionState.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnectionState.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnectionStateRegister.java b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnectionStateRegister.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/TransportConnectionStateRegister.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnectionStateRegister.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/UserIDBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/UserIDBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/cluster/ConnectionSplitBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/cluster/ConnectionSplitBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/cluster/ConnectionSplitBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/cluster/ConnectionSplitBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterConnector.java b/activemq-broker/src/main/java/org/apache/activemq/broker/ft/MasterConnector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterConnector.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/ft/MasterConnector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/ft/package.html b/activemq-broker/src/main/java/org/apache/activemq/broker/ft/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/ft/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/broker/ft/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AsyncAnnotatedMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AsyncAnnotatedMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/AsyncAnnotatedMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AsyncAnnotatedMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/CompositeDataConstants.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/CompositeDataConstants.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/CompositeDataConstants.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/CompositeDataConstants.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/CompositeDataHelper.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/CompositeDataHelper.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/CompositeDataHelper.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/CompositeDataHelper.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/FTConnectorView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/FTConnectorView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/FTConnectorView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/FTConnectorView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/FTConnectorViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/FTConnectorViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/FTConnectorViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/FTConnectorViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/JmsConnectorView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JmsConnectorView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/JmsConnectorView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JmsConnectorView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/JmsConnectorViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JmsConnectorViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/JmsConnectorViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JmsConnectorViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/MBeanInfo.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/MBeanInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/MBeanInfo.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/MBeanInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProducerView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ProducerView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProducerView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ProducerView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProducerViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ProducerViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProducerViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ProducerViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/QueueView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/QueueView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/QueueViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/QueueViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/RecoveredXATransactionView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/RecoveredXATransactionView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/RecoveredXATransactionView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/RecoveredXATransactionView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/RecoveredXATransactionViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/RecoveredXATransactionViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/RecoveredXATransactionViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/RecoveredXATransactionViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicSubscriptionView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/TopicSubscriptionView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicSubscriptionView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/TopicSubscriptionView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicSubscriptionViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/TopicSubscriptionViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicSubscriptionViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/TopicSubscriptionViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/TopicView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicView.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/TopicView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/TopicViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/TopicViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/package.html b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/jmx/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/broker/jmx/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/package.html b/activemq-broker/src/main/java/org/apache/activemq/broker/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/broker/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractTempRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractTempRegion.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractTempRegion.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractTempRegion.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/CompositeDestinationInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/CompositeDestinationInterceptor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/CompositeDestinationInterceptor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/CompositeDestinationInterceptor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Destination.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/Destination.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationFactory.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationFactoryImpl.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationFactoryImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationFactoryImpl.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationFactoryImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationFilter.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationFilter.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationInterceptor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationInterceptor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationInterceptor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/LockOwner.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/LockOwner.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/LockOwner.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/LockOwner.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReferenceFilter.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/MessageReferenceFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReferenceFilter.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/MessageReferenceFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/NullMessageReference.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/NullMessageReference.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/NullMessageReference.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/NullMessageReference.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueMessageReference.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueMessageReference.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/QueueMessageReference.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueMessageReference.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueRegion.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/QueueRegion.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueRegion.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/Region.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Region.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/Region.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/Region.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/SubscriptionRecovery.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/SubscriptionRecovery.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/SubscriptionRecovery.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/SubscriptionRecovery.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueue.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueue.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueue.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueue.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempTopic.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopic.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/TempTopic.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/OrderedPendingList.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/OrderedPendingList.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/OrderedPendingList.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/OrderedPendingList.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/PendingList.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PendingList.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/PendingList.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PendingList.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/PendingMessageCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PendingMessageCursor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/PendingMessageCursor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PendingMessageCursor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/PendingNode.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PendingNode.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/PendingNode.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PendingNode.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingList.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingList.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingList.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingList.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/QueueStorePrefetch.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/QueueStorePrefetch.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/QueueStorePrefetch.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/QueueStorePrefetch.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreQueueCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreQueueCursor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreQueueCursor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreQueueCursor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/VMPendingMessageCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/VMPendingMessageCursor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/VMPendingMessageCursor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/VMPendingMessageCursor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/package.html b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/group/EmptyMessageGroupSet.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/group/EmptyMessageGroupSet.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/group/EmptyMessageGroupSet.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/group/EmptyMessageGroupSet.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/group/MessageGroupHashBucket.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/group/MessageGroupHashBucket.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/group/MessageGroupHashBucket.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/group/MessageGroupHashBucket.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketFactory.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/group/MessageGroupMap.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/group/MessageGroupMap.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/group/MessageGroupMap.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/group/MessageGroupMap.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/group/MessageGroupMapFactory.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/group/MessageGroupMapFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/group/MessageGroupMapFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/group/MessageGroupMapFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/group/MessageGroupSet.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/group/MessageGroupSet.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/group/MessageGroupSet.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/group/MessageGroupSet.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupMap.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupMap.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupMap.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupMap.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupMapFactory.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupMapFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupMapFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupMapFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupSet.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupSet.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupSet.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupSet.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/group/package.html b/activemq-broker/src/main/java/org/apache/activemq/broker/region/group/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/group/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/group/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/package.html b/activemq-broker/src/main/java/org/apache/activemq/broker/region/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowConsumerStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowConsumerStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowConsumerStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowConsumerStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/ConstantPendingMessageLimitStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/ConstantPendingMessageLimitStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/ConstantPendingMessageLimitStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/ConstantPendingMessageLimitStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchSelector.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DispatchSelector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchSelector.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DispatchSelector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FilePendingDurableSubscriberMessageStoragePolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FilePendingDurableSubscriberMessageStoragePolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FilePendingDurableSubscriberMessageStoragePolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FilePendingDurableSubscriberMessageStoragePolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FilePendingQueueMessageStoragePolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FilePendingQueueMessageStoragePolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FilePendingQueueMessageStoragePolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FilePendingQueueMessageStoragePolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FilePendingSubscriberMessageStoragePolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FilePendingSubscriberMessageStoragePolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FilePendingSubscriberMessageStoragePolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FilePendingSubscriberMessageStoragePolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/MessageEvictionStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/MessageEvictionStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/MessageEvictionStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/MessageEvictionStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/MessageEvictionStrategySupport.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/MessageEvictionStrategySupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/MessageEvictionStrategySupport.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/MessageEvictionStrategySupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/MessageQuery.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/MessageQuery.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/MessageQuery.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/MessageQuery.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/OldestMessageEvictionStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/OldestMessageEvictionStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/OldestMessageEvictionStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/OldestMessageEvictionStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/OldestMessageWithLowestPriorityEvictionStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/OldestMessageWithLowestPriorityEvictionStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/OldestMessageWithLowestPriorityEvictionStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/OldestMessageWithLowestPriorityEvictionStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingDurableSubscriberMessageStoragePolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PendingDurableSubscriberMessageStoragePolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingDurableSubscriberMessageStoragePolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PendingDurableSubscriberMessageStoragePolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingMessageLimitStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PendingMessageLimitStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingMessageLimitStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PendingMessageLimitStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingQueueMessageStoragePolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PendingQueueMessageStoragePolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingQueueMessageStoragePolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PendingQueueMessageStoragePolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingSubscriberMessageStoragePolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PendingSubscriberMessageStoragePolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingSubscriberMessageStoragePolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PendingSubscriberMessageStoragePolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PrefetchRatePendingMessageLimitStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PrefetchRatePendingMessageLimitStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PrefetchRatePendingMessageLimitStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PrefetchRatePendingMessageLimitStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PriorityNetworkDispatchPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PriorityNetworkDispatchPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PriorityNetworkDispatchPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PriorityNetworkDispatchPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SharedDeadLetterStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SharedDeadLetterStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SharedDeadLetterStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SharedDeadLetterStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchSelector.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchSelector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchSelector.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchSelector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SlowConsumerEntry.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SlowConsumerEntry.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SlowConsumerEntry.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SlowConsumerEntry.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SlowConsumerStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SlowConsumerStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SlowConsumerStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SlowConsumerStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StorePendingDurableSubscriberMessageStoragePolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/StorePendingDurableSubscriberMessageStoragePolicy.java
similarity index 96%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StorePendingDurableSubscriberMessageStoragePolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/StorePendingDurableSubscriberMessageStoragePolicy.java
index 94144023d0..726e296294 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StorePendingDurableSubscriberMessageStoragePolicy.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/StorePendingDurableSubscriberMessageStoragePolicy.java
@@ -18,10 +18,8 @@ package org.apache.activemq.broker.region.policy;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.region.DurableTopicSubscription;
-import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.broker.region.cursors.PendingMessageCursor;
 import org.apache.activemq.broker.region.cursors.StoreDurableSubscriberCursor;
-import org.apache.activemq.kaha.Store;
 
 /**
  * Creates a PendingMessageCursor that access the persistent store to retrieve
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StorePendingQueueMessageStoragePolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/StorePendingQueueMessageStoragePolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StorePendingQueueMessageStoragePolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/StorePendingQueueMessageStoragePolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/VMPendingDurableSubscriberMessageStoragePolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/VMPendingDurableSubscriberMessageStoragePolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/VMPendingDurableSubscriberMessageStoragePolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/VMPendingDurableSubscriberMessageStoragePolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/VMPendingQueueMessageStoragePolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/VMPendingQueueMessageStoragePolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/VMPendingQueueMessageStoragePolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/VMPendingQueueMessageStoragePolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/VMPendingSubscriberMessageStoragePolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/VMPendingSubscriberMessageStoragePolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/VMPendingSubscriberMessageStoragePolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/VMPendingSubscriberMessageStoragePolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/package.html b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestination.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestination.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestination.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestination.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestinationFilter.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestinationFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestinationFilter.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestinationFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/CompositeQueue.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeQueue.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/CompositeQueue.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeQueue.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/CompositeTopic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeTopic.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/CompositeTopic.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeTopic.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/FilteredDestination.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/FilteredDestination.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/FilteredDestination.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/FilteredDestination.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/SelectorAwareVirtualTopicInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/SelectorAwareVirtualTopicInterceptor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/SelectorAwareVirtualTopicInterceptor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/SelectorAwareVirtualTopicInterceptor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/VirtualDestination.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualDestination.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/VirtualDestination.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualDestination.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/VirtualDestinationInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualDestinationInterceptor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/VirtualDestinationInterceptor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualDestinationInterceptor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopic.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopic.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopic.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/package.html b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/Job.java b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/Job.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/scheduler/Job.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/Job.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobListener.java b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/JobListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobListener.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/JobListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobScheduler.java b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/JobScheduler.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobScheduler.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/JobScheduler.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerFacade.java b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerFacade.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerFacade.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerFacade.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSupport.java b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/JobSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSupport.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/JobSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/AuditLog.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/AuditLog.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/AuditLog.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/AuditLog.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/AuditLogEntry.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/AuditLogEntry.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/AuditLogEntry.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/AuditLogEntry.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/AuditLogFactory.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/AuditLogFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/AuditLogFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/AuditLogFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/AuditLogService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/AuditLogService.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/AuditLogService.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/AuditLogService.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandHandler.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/CommandHandler.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/CommandHandler.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/CommandHandler.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandMessageListener.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/CommandMessageListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/CommandMessageListener.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/CommandMessageListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/DefaultAuditLog.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/DefaultAuditLog.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/DefaultAuditLog.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/DefaultAuditLog.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/DefaultAuditLogFactory.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/DefaultAuditLogFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/DefaultAuditLogFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/DefaultAuditLogFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/InsertionCountList.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/InsertionCountList.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/InsertionCountList.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/InsertionCountList.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/JMXAuditLogEntry.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/JMXAuditLogEntry.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/JMXAuditLogEntry.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/JMXAuditLogEntry.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/MulticastTraceBrokerPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/MulticastTraceBrokerPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/MulticastTraceBrokerPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/MulticastTraceBrokerPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/TraceBrokerPathPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/TraceBrokerPathPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/TraceBrokerPathPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/TraceBrokerPathPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/UDPTraceBrokerPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/UDPTraceBrokerPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/UDPTraceBrokerPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/UDPTraceBrokerPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/package.html b/activemq-broker/src/main/java/org/apache/activemq/broker/util/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/util/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/broker/util/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/view/ConnectionDotFileInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/view/ConnectionDotFileInterceptor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/view/ConnectionDotFileInterceptor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/view/ConnectionDotFileInterceptor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/view/ConnectionDotFilePlugin.java b/activemq-broker/src/main/java/org/apache/activemq/broker/view/ConnectionDotFilePlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/view/ConnectionDotFilePlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/view/ConnectionDotFilePlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/view/DestinationDotFileInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/view/DestinationDotFileInterceptor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/view/DestinationDotFileInterceptor.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/view/DestinationDotFileInterceptor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/view/DestinationDotFilePlugin.java b/activemq-broker/src/main/java/org/apache/activemq/broker/view/DestinationDotFilePlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/view/DestinationDotFilePlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/view/DestinationDotFilePlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/view/DotFileInterceptorSupport.java b/activemq-broker/src/main/java/org/apache/activemq/broker/view/DotFileInterceptorSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/view/DotFileInterceptorSupport.java
rename to activemq-broker/src/main/java/org/apache/activemq/broker/view/DotFileInterceptorSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/view/package.html b/activemq-broker/src/main/java/org/apache/activemq/broker/view/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/view/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/broker/view/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/Cache.java b/activemq-broker/src/main/java/org/apache/activemq/memory/Cache.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/Cache.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/Cache.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/CacheEntry.java b/activemq-broker/src/main/java/org/apache/activemq/memory/CacheEntry.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/CacheEntry.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/CacheEntry.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/CacheEntryList.java b/activemq-broker/src/main/java/org/apache/activemq/memory/CacheEntryList.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/CacheEntryList.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/CacheEntryList.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java b/activemq-broker/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictor.java b/activemq-broker/src/main/java/org/apache/activemq/memory/CacheEvictor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictor.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/CacheEvictor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/CacheFilter.java b/activemq-broker/src/main/java/org/apache/activemq/memory/CacheFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/CacheFilter.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/CacheFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/LRUMap.java b/activemq-broker/src/main/java/org/apache/activemq/memory/LRUMap.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/LRUMap.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/LRUMap.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/MapCache.java b/activemq-broker/src/main/java/org/apache/activemq/memory/MapCache.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/MapCache.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/MapCache.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/UsageManagerCacheFilter.java b/activemq-broker/src/main/java/org/apache/activemq/memory/UsageManagerCacheFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/UsageManagerCacheFilter.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/UsageManagerCacheFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageBuffer.java b/activemq-broker/src/main/java/org/apache/activemq/memory/buffer/MessageBuffer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageBuffer.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/buffer/MessageBuffer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageQueue.java b/activemq-broker/src/main/java/org/apache/activemq/memory/buffer/MessageQueue.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageQueue.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/buffer/MessageQueue.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/buffer/OrderBasedMessageBuffer.java b/activemq-broker/src/main/java/org/apache/activemq/memory/buffer/OrderBasedMessageBuffer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/buffer/OrderBasedMessageBuffer.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/buffer/OrderBasedMessageBuffer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/buffer/SizeBasedMessageBuffer.java b/activemq-broker/src/main/java/org/apache/activemq/memory/buffer/SizeBasedMessageBuffer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/buffer/SizeBasedMessageBuffer.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/buffer/SizeBasedMessageBuffer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/list/DestinationBasedMessageList.java b/activemq-broker/src/main/java/org/apache/activemq/memory/list/DestinationBasedMessageList.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/list/DestinationBasedMessageList.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/list/DestinationBasedMessageList.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/list/MessageList.java b/activemq-broker/src/main/java/org/apache/activemq/memory/list/MessageList.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/list/MessageList.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/list/MessageList.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java b/activemq-broker/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java
rename to activemq-broker/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java b/activemq-broker/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/ConnectionFilter.java b/activemq-broker/src/main/java/org/apache/activemq/network/ConnectionFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/ConnectionFilter.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/ConnectionFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DefaultNetworkBridgeFilterFactory.java b/activemq-broker/src/main/java/org/apache/activemq/network/DefaultNetworkBridgeFilterFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/DefaultNetworkBridgeFilterFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/DefaultNetworkBridgeFilterFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/network/DemandSubscription.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/DemandSubscription.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/ForwardingBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/ForwardingBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java b/activemq-broker/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/MulticastNetworkConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/MulticastNetworkConnector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/MulticastNetworkConnector.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/MulticastNetworkConnector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/NetworkBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/NetworkBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeConfiguration.java b/activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeConfiguration.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeConfiguration.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeConfiguration.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeFactory.java b/activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeFilterFactory.java b/activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeFilterFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeFilterFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeFilterFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeListener.java b/activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeListener.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/NetworkConnector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/NetworkConnector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/QueueBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/QueueBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/QueueBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/QueueBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/ReconnectionPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/ReconnectionPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/ReconnectionPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/ReconnectionPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/TopicBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/TopicBridge.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/TopicBridge.java
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/TopicBridge.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/package.html b/activemq-broker/src/main/java/org/apache/activemq/network/jms/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/jms/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/network/jms/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/package.html b/activemq-broker/src/main/java/org/apache/activemq/network/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/network/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/network/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBroker.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/DiscardingDLQBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/plugin/DiscardingDLQBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBrokerPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/DiscardingDLQBrokerPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBrokerPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/plugin/DiscardingDLQBrokerPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBroker.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBrokerPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBrokerPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBrokerPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBrokerPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBrokerPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBrokerPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBrokerPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBrokerPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBrokerPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBrokerPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBrokerPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBrokerPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java b/activemq-broker/src/main/java/org/apache/activemq/proxy/ProxyConnection.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java
rename to activemq-broker/src/main/java/org/apache/activemq/proxy/ProxyConnection.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java b/activemq-broker/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
rename to activemq-broker/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/AuthenticationUser.java b/activemq-broker/src/main/java/org/apache/activemq/security/AuthenticationUser.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/AuthenticationUser.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/AuthenticationUser.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationEntry.java b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationMap.java b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationMap.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/AuthorizationMap.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationMap.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/AuthorizationPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java b/activemq-broker/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java b/activemq-broker/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/security/JaasAuthenticationPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/JaasAuthenticationPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateSecurityContext.java b/activemq-broker/src/main/java/org/apache/activemq/security/JaasCertificateSecurityContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateSecurityContext.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/JaasCertificateSecurityContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/JaasDualAuthenticationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/security/JaasDualAuthenticationBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/JaasDualAuthenticationBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/JaasDualAuthenticationBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/JaasDualAuthenticationPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/security/JaasDualAuthenticationPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/JaasDualAuthenticationPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/JaasDualAuthenticationPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java b/activemq-broker/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/MessageAuthorizationPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/security/MessageAuthorizationPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/MessageAuthorizationPolicy.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/MessageAuthorizationPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/SecurityAdminMBean.java b/activemq-broker/src/main/java/org/apache/activemq/security/SecurityAdminMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/SecurityAdminMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/SecurityAdminMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/SecurityContext.java b/activemq-broker/src/main/java/org/apache/activemq/security/SecurityContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/SecurityContext.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/SecurityContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/security/SimpleAuthenticationPlugin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationPlugin.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/SimpleAuthenticationPlugin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthorizationMap.java b/activemq-broker/src/main/java/org/apache/activemq/security/SimpleAuthorizationMap.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthorizationMap.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/SimpleAuthorizationMap.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/TempDestinationAuthorizationEntry.java b/activemq-broker/src/main/java/org/apache/activemq/security/TempDestinationAuthorizationEntry.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/TempDestinationAuthorizationEntry.java
rename to activemq-broker/src/main/java/org/apache/activemq/security/TempDestinationAuthorizationEntry.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/security/package.html b/activemq-broker/src/main/java/org/apache/activemq/security/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/security/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/security/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java b/activemq-broker/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java
rename to activemq-broker/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/spring/SpringSslContext.java b/activemq-broker/src/main/java/org/apache/activemq/spring/SpringSslContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/spring/SpringSslContext.java
rename to activemq-broker/src/main/java/org/apache/activemq/spring/SpringSslContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/spring/Utils.java b/activemq-broker/src/main/java/org/apache/activemq/spring/Utils.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/spring/Utils.java
rename to activemq-broker/src/main/java/org/apache/activemq/spring/Utils.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/AbstractMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/AbstractMessageStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/AbstractMessageStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/AbstractMessageStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/JournaledStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/JournaledStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/JournaledStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/JournaledStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java b/activemq-broker/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/PList.java b/activemq-broker/src/main/java/org/apache/activemq/store/PList.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/PList.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/PList.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/PListEntry.java b/activemq-broker/src/main/java/org/apache/activemq/store/PListEntry.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/PListEntry.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/PListEntry.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/PListStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/PListStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/PListStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/PListStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapter.java b/activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapter.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactory.java b/activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapterFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapterFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/ProxyMessageStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/ProxyMessageStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/ReferenceStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/ReferenceStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/ReferenceStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/ReferenceStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/TopicReferenceStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/TopicReferenceStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/TopicReferenceStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/TopicReferenceStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/TransactionRecoveryListener.java b/activemq-broker/src/main/java/org/apache/activemq/store/TransactionRecoveryListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/TransactionRecoveryListener.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/TransactionRecoveryListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/TransactionStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/TransactionStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/TransactionStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/TransactionStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicSub.java b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicSub.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicSub.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicSub.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java
similarity index 99%
rename from activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java
rename to activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java
index ab057c1b67..a5de7fa20e 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java
@@ -30,7 +30,6 @@ import org.apache.activemq.store.ProxyTopicMessageStore;
 import org.apache.activemq.store.TopicMessageStore;
 import org.apache.activemq.store.TransactionRecoveryListener;
 import org.apache.activemq.store.TransactionStore;
-import org.apache.activemq.store.jdbc.JDBCMessageStore;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/memory/package.html b/activemq-broker/src/main/java/org/apache/activemq/store/memory/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/memory/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/store/memory/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/package.html b/activemq-broker/src/main/java/org/apache/activemq/store/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/store/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/store/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java b/activemq-broker/src/main/java/org/apache/activemq/transaction/LocalTransaction.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java
rename to activemq-broker/src/main/java/org/apache/activemq/transaction/LocalTransaction.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java b/activemq-broker/src/main/java/org/apache/activemq/transaction/Transaction.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java
rename to activemq-broker/src/main/java/org/apache/activemq/transaction/Transaction.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java b/activemq-broker/src/main/java/org/apache/activemq/transaction/XATransaction.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java
rename to activemq-broker/src/main/java/org/apache/activemq/transaction/XATransaction.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java b/activemq-broker/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java b/activemq-broker/src/main/java/org/apache/activemq/transport/TransportLogger.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/TransportLogger.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerControl.java b/activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerControl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerControl.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerControl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerControlMBean.java b/activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerControlMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerControlMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerControlMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactory.java b/activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java b/activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java b/activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerView.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerView.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerViewMBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerViewMBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/TransportLoggerViewMBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/logwriters/CustomLogWriter.java b/activemq-broker/src/main/java/org/apache/activemq/transport/logwriters/CustomLogWriter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/logwriters/CustomLogWriter.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/logwriters/CustomLogWriter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/logwriters/DefaultLogWriter.java b/activemq-broker/src/main/java/org/apache/activemq/transport/logwriters/DefaultLogWriter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/logwriters/DefaultLogWriter.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/logwriters/DefaultLogWriter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java b/activemq-broker/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/peer/package.html b/activemq-broker/src/main/java/org/apache/activemq/transport/peer/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/peer/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/transport/peer/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransport.java b/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransport.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java b/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java b/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java
rename to activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/vm/package.html b/activemq-broker/src/main/java/org/apache/activemq/transport/vm/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/vm/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/transport/vm/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/StoreUsage.java b/activemq-broker/src/main/java/org/apache/activemq/usage/StoreUsage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/usage/StoreUsage.java
rename to activemq-broker/src/main/java/org/apache/activemq/usage/StoreUsage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/SystemUsage.java b/activemq-broker/src/main/java/org/apache/activemq/usage/SystemUsage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/usage/SystemUsage.java
rename to activemq-broker/src/main/java/org/apache/activemq/usage/SystemUsage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/TempUsage.java b/activemq-broker/src/main/java/org/apache/activemq/usage/TempUsage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/usage/TempUsage.java
rename to activemq-broker/src/main/java/org/apache/activemq/usage/TempUsage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/BooleanEditor.java b/activemq-broker/src/main/java/org/apache/activemq/util/BooleanEditor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/BooleanEditor.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/BooleanEditor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/BrokerSupport.java b/activemq-broker/src/main/java/org/apache/activemq/util/BrokerSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/BrokerSupport.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/BrokerSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java b/activemq-broker/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/HexSupport.java b/activemq-broker/src/main/java/org/apache/activemq/util/HexSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/HexSupport.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/HexSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IOExceptionHandler.java b/activemq-broker/src/main/java/org/apache/activemq/util/IOExceptionHandler.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/IOExceptionHandler.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/IOExceptionHandler.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java b/activemq-broker/src/main/java/org/apache/activemq/util/IOHelper.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/IOHelper.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/JMXSupport.java b/activemq-broker/src/main/java/org/apache/activemq/util/JMXSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/JMXSupport.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/JMXSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/LinkedNode.java b/activemq-broker/src/main/java/org/apache/activemq/util/LinkedNode.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/LinkedNode.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/LinkedNode.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/LockFile.java b/activemq-broker/src/main/java/org/apache/activemq/util/LockFile.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/LockFile.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/LockFile.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/LogWriterFinder.java b/activemq-broker/src/main/java/org/apache/activemq/util/LogWriterFinder.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/LogWriterFinder.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/LogWriterFinder.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java b/activemq-broker/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java b/activemq-broker/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java b/activemq-broker/src/main/java/org/apache/activemq/util/SubscriptionKey.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/SubscriptionKey.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ThreadTracker.java b/activemq-broker/src/main/java/org/apache/activemq/util/ThreadTracker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/ThreadTracker.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/ThreadTracker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/TransactionTemplate.java b/activemq-broker/src/main/java/org/apache/activemq/util/TransactionTemplate.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/TransactionTemplate.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/TransactionTemplate.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/WrappedException.java b/activemq-broker/src/main/java/org/apache/activemq/util/WrappedException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/WrappedException.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/WrappedException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java b/activemq-broker/src/main/java/org/apache/activemq/util/osgi/Activator.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java
rename to activemq-broker/src/main/java/org/apache/activemq/util/osgi/Activator.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java b/activemq-broker/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java
rename to activemq-broker/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java b/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
rename to activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
rename to activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/xbean/package.html b/activemq-broker/src/main/java/org/apache/activemq/xbean/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/xbean/package.html
rename to activemq-broker/src/main/java/org/apache/activemq/xbean/package.html
diff --git a/activemq-core/src/main/filtered-resources/org/apache/activemq/version.txt b/activemq-client/src/main/filtered-resources/org/apache/activemq/version.txt
similarity index 100%
rename from activemq-core/src/main/filtered-resources/org/apache/activemq/version.txt
rename to activemq-client/src/main/filtered-resources/org/apache/activemq/version.txt
diff --git a/activemq-core/src/main/java/org/apache/activemq/selector/package.html b/activemq-client/src/main/java/org/apache/activemq/selector/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/selector/package.html
rename to activemq-client/src/main/java/org/apache/activemq/selector/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java b/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java
rename to activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/spring/package.html b/activemq-client/src/main/java/org/apache/activemq/spring/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/spring/package.html
rename to activemq-client/src/main/java/org/apache/activemq/spring/package.html
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index ecc3de2a7d..b7e69af75b 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -97,7 +97,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-client</artifactId>
+      <artifactId>activemq-broker</artifactId>
     </dependency>
 
     <!-- =============================== -->
diff --git a/activemq-core/src/main/java/org/apache/activemq/kaha/ContainerId.java b/activemq-core/src/main/java/org/apache/activemq/kaha/ContainerId.java
index 20b397b286..52cc90cae0 100644
--- a/activemq-core/src/main/java/org/apache/activemq/kaha/ContainerId.java
+++ b/activemq-core/src/main/java/org/apache/activemq/kaha/ContainerId.java
@@ -21,8 +21,6 @@ import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-import org.apache.activemq.util.IOHelper;
-
 /**
  * Used by RootContainers
  * 
diff --git a/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyDataFile.java b/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyDataFile.java
index 9eac7c1ad5..7add293ee7 100644
--- a/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyDataFile.java
+++ b/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyDataFile.java
@@ -20,8 +20,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import org.apache.activemq.util.IOHelper;
-
 /**
  * Allows you to open a data file in read only mode.  Useful when working with 
  * archived data files.
diff --git a/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java b/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java
index 7544baf2fd..2856bb0bf2 100755
--- a/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java
+++ b/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java
@@ -39,7 +39,6 @@ import org.apache.activemq.kaha.impl.index.IndexLinkedList;
 import org.apache.activemq.kaha.impl.index.IndexManager;
 import org.apache.activemq.kaha.impl.index.VMIndex;
 import org.apache.activemq.kaha.impl.index.hash.HashIndex;
-import org.apache.activemq.util.IOHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ActiveMQMessageUtils.java b/activemq-core/src/main/java/org/apache/activemq/util/ActiveMQMessageUtils.java
deleted file mode 100644
index 42f39ee289..0000000000
--- a/activemq-core/src/main/java/org/apache/activemq/util/ActiveMQMessageUtils.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.util;
-
-import org.apache.activemq.command.ActiveMQMessage;
-
-/**
- * Message utilities
- *
- */
-public class ActiveMQMessageUtils {
-    
-    /**
-     * Determine the size on the wire for a message
-     * @param message
-     * @return
-     */
-    public static int getWireSize(ActiveMQMessage message) {
-        int size =0;
-        if (message.getMarshalledProperties() != null) {
-            size += message.getMarshalledProperties().getLength();
-        }
-        if (message.getContent() != null) {
-            size += message.getContent().getLength();
-        }
-        return size;
-    }
-}
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java
index 0fda0e8825..a25b07174b 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java
@@ -19,9 +19,7 @@ package org.apache.activemq.broker;
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
-import org.apache.activemq.broker.region.policy.PolicyEntry;
-import org.apache.activemq.broker.region.policy.PolicyMap;
-import org.apache.activemq.store.PersistenceAdapter;
+
 import org.apache.activemq.util.IOHelper;
 
 public class BrokerRestartTestSupport extends BrokerTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java
index 2687b1cc20..4cc57ba27c 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java
@@ -18,29 +18,13 @@ package org.apache.activemq.broker;
 
 import java.util.LinkedList;
 import java.util.List;
-import javax.jms.JMSException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
+
 import junit.framework.Test;
-import org.apache.activemq.broker.jmx.RecoveredXATransactionViewMBean;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.ConnectionInfo;
-import org.apache.activemq.command.ConsumerInfo;
-import org.apache.activemq.command.DataArrayResponse;
-import org.apache.activemq.command.Message;
-import org.apache.activemq.command.MessageAck;
-import org.apache.activemq.command.ProducerInfo;
-import org.apache.activemq.command.Response;
-import org.apache.activemq.command.SessionInfo;
-import org.apache.activemq.command.TransactionId;
-import org.apache.activemq.command.TransactionInfo;
-import org.apache.activemq.command.XATransactionId;
 import org.apache.activemq.store.kahadb.FilteredKahaDBPersistenceAdapter;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
 import org.apache.activemq.store.kahadb.MultiKahaDBPersistenceAdapter;
-import org.apache.activemq.util.JMXSupport;
 
 public class mKahaDBXARecoveryBrokerTest extends XARecoveryBrokerTest {
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java b/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java
index 5438b2d54f..449a563e66 100755
--- a/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java
@@ -48,7 +48,6 @@ import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.CombinationTestSupport;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.jmx.BrokerView;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQTopic;
diff --git a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/IndexBenchmark.java b/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/IndexBenchmark.java
index 7197bcc352..5e3cd57ab9 100755
--- a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/IndexBenchmark.java
+++ b/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/IndexBenchmark.java
@@ -18,8 +18,6 @@ package org.apache.activemq.kaha.impl.index;
 
 import java.io.File;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java b/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java
index 558fb2aec9..fa3bd6f827 100644
--- a/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java
@@ -19,7 +19,6 @@ package org.apache.activemq.store.jdbc;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Vector;
@@ -38,7 +37,6 @@ import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.store.MessagePriorityTest;
 import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.util.ThreadTracker;
 import org.apache.activemq.util.Wait;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBVersionTest.java b/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBVersionTest.java
index 25f10623fb..14e0729d12 100644
--- a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBVersionTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBVersionTest.java
@@ -19,16 +19,12 @@ package org.apache.activemq.store.kahadb;
 import junit.framework.TestCase;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.util.IOHelper;
 
 import javax.jms.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.io.FileNotFoundException;
 
 /**
  * @author chirino
diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java
index 67ec57d083..a0354e25cc 100644
--- a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java
@@ -17,7 +17,6 @@
 package org.apache.activemq.usecases;
 
 import java.io.File;
-import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/pom.xml b/pom.xml
index eccd6d0ae4..0bfe49bf91 100755
--- a/pom.xml
+++ b/pom.xml
@@ -196,6 +196,7 @@
 
   <modules>
     <module>activemq-all</module>
+    <module>activemq-broker</module>
     <module>activemq-camel</module>
     <module>activemq-console</module>
     <module>activemq-client</module>
@@ -237,6 +238,11 @@
         <artifactId>activemq-client</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-broker</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-all</artifactId>