diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
index 97cacb48db..fd8e0964e7 100644
--- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
+++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
@@ -35,7 +35,6 @@ import org.apache.qpid.proton.type.messaging.Released;
 import org.apache.qpid.proton.type.transaction.*;
 import org.apache.qpid.proton.type.transport.DeliveryState;
 import org.apache.qpid.proton.type.transport.SenderSettleMode;
-import org.apache.qpid.proton.type.transport.Source;
 import org.fusesource.hawtbuf.Buffer;
 import org.fusesource.hawtbuf.ByteArrayOutputStream;
 import org.slf4j.Logger;
diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpTransportFilter.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpTransportFilter.java
index 4b34babc74..03d4a0ce7d 100644
--- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpTransportFilter.java
+++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpTransportFilter.java
@@ -25,11 +25,9 @@ import org.apache.activemq.transport.amqp.transform.InboundTransformer;
 import org.apache.activemq.transport.tcp.SslTransport;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.wireformat.WireFormat;
-import org.fusesource.hawtbuf.Buffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jms.JMSException;
 import java.io.IOException;
 import java.security.cert.X509Certificate;
 
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java
index a95be4817a..a893555fc3 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java
@@ -16,10 +16,8 @@
  */
 package org.apache.activemq.transport.amqp;
 
-import junit.framework.TestCase;
 import org.apache.activemq.AutoFailTestSupport;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.SslContext;
 import org.apache.activemq.broker.TransportConnector;
 import org.apache.activemq.spring.SpringSslContext;
 import org.junit.After;
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java
index 2e92f476bb..83c598f1fe 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java
@@ -27,14 +27,11 @@ import org.apache.activemq.util.ByteSequence;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
-import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.impl.DefaultConsumer;
 import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.impl.DefaultProducer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
new file mode 100755
index 0000000000..067cafd9a2
--- /dev/null
+++ b/activemq-client/pom.xml
@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.activemq</groupId>
+    <artifactId>activemq-parent</artifactId>
+    <version>5.8-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>activemq-client</artifactId>
+  <packaging>jar</packaging>
+  <name>ActiveMQ :: Client</name>
+  <description>The ActiveMQ Client implementation</description>
+
+  <properties>
+    <surefire.argLine>-Xmx512M</surefire.argLine>
+  </properties>
+
+  <dependencies>
+    <!-- =============================== -->
+    <!-- Required Dependencies -->
+    <!-- =============================== -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activeio-core</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq.protobuf</groupId>
+      <artifactId>activemq-protobuf</artifactId>
+      <optional>false</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.fusesource.mqtt-client</groupId>
+      <artifactId>mqtt-client</artifactId>
+    </dependency>
+
+    <!-- =============================== -->
+    <!-- Optional Dependencies           -->
+    <!-- =============================== -->
+
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-jaas</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jacc_1.1_spec</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
+      <artifactId>xstream</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+        <groupId>org.codehaus.jettison</groupId>
+        <artifactId>jettison</artifactId>
+        <optional>true</optional>
+    </dependency>
+
+    <!-- for XML parsing -->
+    <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+    </dependency>
+
+    <!-- not really a dependency at all - just added optionally to get the generator working -->
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-openwire-generator</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <!-- =============================== -->
+    <!-- Testing Dependencies            -->
+    <!-- =============================== -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jms</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.jmdns</groupId>
+      <artifactId>jmdns</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.jasypt</groupId>
+      <artifactId>jasypt</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jasypt</groupId>
+      <artifactId>jasypt-spring3</artifactId>
+      <version>${jasypt-version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>6.1.26</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <!-- database testing -->
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-primitives</groupId>
+      <artifactId>commons-primitives</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>axion</groupId>
+      <artifactId>axion</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!--  Joram JMS conformance tests -->
+    <dependency>
+      <groupId>org.fusesource.joram-jms-tests</groupId>
+      <artifactId>joram-jms-tests</artifactId>
+      <version>1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <!-- using it for Jetty's JNDI context to work /w Joram tests. -->
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-all-server</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!--  LDAP tests -->
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-integ</artifactId>
+      <version>${directory-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-integ</artifactId>
+      <version>${directory-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock-legacy</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <version>${ftpserver-version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <links>
+            <link>${javase-javadoc-url}</link>
+            <link>${javaee-javadoc-url}</link>
+            <link>${slf4j-javadoc-url}</link>
+            <link>http://junit.sourceforge.net/javadoc/</link>
+          </links>
+          <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
+          <linksource>true</linksource>
+          <maxmemory>256m</maxmemory>
+          <source>${source-version}</source>
+          <groups>
+            <group>
+              <title>JMS Client</title>
+              <packages>org.apache.activemq:org.apache.activemq.command</packages>
+            </group>
+            <group>
+              <title>JMS Client support classes for working with BLOBs and JNDI</title>
+              <packages>org.apache.activemq.blob:org.apache.activemq.jndi</packages>
+            </group>
+            <group>
+              <title>Enterprise Integration Pattern support via Camel</title>
+              <packages>org.apache.activemq.camel:org.apache.activemq.camel.*</packages>
+            </group>
+            <group>
+              <title>Spring support</title>
+              <packages>org.apache.activemq.spring:org.apache.activemq.xbean:org.apache.activemq.pool</packages>
+            </group>
+            <group>
+              <title>JMS Client Implementation classes</title>
+              <packages>org.apache.activemq.filter:org.apache.activemq.management:org.apache.activemq.selector:org.apache.activemq.thread</packages>
+            </group>
+            <group>
+              <title>Broker implementation</title>
+              <packages>org.apache.activemq.advisory:org.apache.activemq.broker:org.apache.activemq.broker.*:org.apache.activemq.state:org.apache.activemq.security:org.apache.activemq.transaction</packages>
+            </group>
+            <group>
+              <title>Broker Persistent Store</title>
+              <packages>org.apache.activemq.store:org.apache.activemq.store.*</packages>
+            </group>
+            <group>
+              <title>Kaha fast file based storage</title>
+              <packages>org.apache.activemq.kaha:org.apache.activemq.kaha.*</packages>
+            </group>
+            <group>
+              <title>Transports</title>
+              <packages>org.apache.activemq.transport:org.apache.activemq.transport.*</packages>
+            </group>
+            <group>
+              <title>Memory handling</title>
+              <packages>org.apache.activemq.memory:org.apache.activemq.memory.*</packages>
+            </group>
+            <group>
+              <title>Networks of Brokers</title>
+              <packages>org.apache.activemq.network:org.apache.activemq.network.*</packages>
+            </group>
+            <group>
+              <title>OpenWire support</title>
+              <packages>org.apache.activemq.openwire:org.apache.activemq.openwire.*</packages>
+            </group>
+            <group>
+              <title>Utility classes</title>
+              <packages>org.apache.activemq.util:org.apache.activemq.wireformat:org.apache.activemq.proxy</packages>
+            </group>
+          </groups>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>${findbugs-maven-plugin-version}</version>
+        <configuration>
+          <threshold>Normal</threshold>
+          <effort>Default</effort>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>${project.basedir}/src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${project.basedir}/src/main/filtered-resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+    </resources>
+
+    <pluginManagement>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only.
+            It has no influence on the Maven build itself.-->
+        <!-- <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.activemq.protobuf</groupId>
+                    <artifactId>activemq-protobuf</artifactId>
+                    <versionRange>[0.0.0,)</versionRange>
+                    <goals>
+                      <goal>compile</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore />
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin> -->
+      </plugins>
+    </pluginManagement>
+    
+    <plugins>
+
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>always</forkMode>
+          <argLine>${surefire.argLine}</argLine>
+          <runOrder>alphabetical</runOrder>
+
+           <systemProperties>
+            <property>
+              <name>org.apache.activemq.default.directory.prefix</name>
+              <value>target/</value>
+            </property>
+            <!-- Uncomment the following if you want to configure custom logging (using src/test/resources/log4j.properties)
+                 while running mvn:test
+                 Note: if you want to see log messages on the console window remove
+                       "redirectTestOutputToFile" from the parent pom
+            -->
+            <!--
+            <property>
+              <name>log4j.configuration</name>
+              <value>file:target/test-classes/log4j.properties</value>
+            </property>
+            -->
+           </systemProperties>
+           <includes>
+             <include>**/*Test.*</include>
+           </includes>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>javacc-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <configuration>
+              <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
+              <outputDirectory>${basedir}/target/generated-javacc</outputDirectory>
+              <packageName>org.apache.activemq.selector</packageName>
+            </configuration>
+            <goals>
+              <goal>javacc</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <configuration>
+      <check>
+            <branchRate>50</branchRate>
+            <lineRate>50</lineRate>
+            <haltOnFailure>true</haltOnFailure>
+            <totalBranchRate>50</totalBranchRate>
+            <totalLineRate>50</totalLineRate>
+          </check>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+    <profiles>
+    <profile>
+      <id>openwire-generate</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>activemq-openwire-generator</artifactId>
+          <version>${project.version}</version>
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default</id>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <tasks>
+                    <echo>Running OpenWire Generator</echo>
+                    <taskdef name="generate" classname="org.apache.activemq.openwire.tool.JavaGeneratorTask" classpathref="maven.compile.classpath" />
+                    <generate version="9" basedir="${basedir}" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/activemq-core/src/main/grammar/SelectorParser.jj b/activemq-client/src/main/grammar/SelectorParser.jj
similarity index 100%
rename from activemq-core/src/main/grammar/SelectorParser.jj
rename to activemq-client/src/main/grammar/SelectorParser.jj
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
similarity index 99%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
index 3d8844bf34..994f4a97a8 100755
--- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
@@ -1135,7 +1135,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
      * Sets the amount of time between scheduled sends of any outstanding Message Acks for consumers that
      * have been configured with optimizeAcknowledge enabled.
      *
-     * @param scheduledOptimizedAckInterval the scheduledOptimizedAckInterval to set
+     * @param optimizedAckScheduledAckInterval the scheduledOptimizedAckInterval to set
      */
     public void setOptimizedAckScheduledAckInterval(long optimizedAckScheduledAckInterval) {
         this.optimizedAckScheduledAckInterval = optimizedAckScheduledAckInterval;
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQDispatcher.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQDispatcher.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQInputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQInputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageAudit.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAudit.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageAudit.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAudit.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQOutputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQOutputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSender.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSender.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnection.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnection.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASession.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java
rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQXASession.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java b/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java
rename to activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java b/activemq-client/src/main/java/org/apache/activemq/AlreadyClosedException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java
rename to activemq-client/src/main/java/org/apache/activemq/AlreadyClosedException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/AsyncCallback.java b/activemq-client/src/main/java/org/apache/activemq/AsyncCallback.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/AsyncCallback.java
rename to activemq-client/src/main/java/org/apache/activemq/AsyncCallback.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/BlobMessage.java b/activemq-client/src/main/java/org/apache/activemq/BlobMessage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/BlobMessage.java
rename to activemq-client/src/main/java/org/apache/activemq/BlobMessage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java b/activemq-client/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java
rename to activemq-client/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/Closeable.java b/activemq-client/src/main/java/org/apache/activemq/Closeable.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/Closeable.java
rename to activemq-client/src/main/java/org/apache/activemq/Closeable.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java b/activemq-client/src/main/java/org/apache/activemq/ConfigurationException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java
rename to activemq-client/src/main/java/org/apache/activemq/ConfigurationException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ConnectionAudit.java b/activemq-client/src/main/java/org/apache/activemq/ConnectionAudit.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ConnectionAudit.java
rename to activemq-client/src/main/java/org/apache/activemq/ConnectionAudit.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java b/activemq-client/src/main/java/org/apache/activemq/ConnectionClosedException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java
rename to activemq-client/src/main/java/org/apache/activemq/ConnectionClosedException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java b/activemq-client/src/main/java/org/apache/activemq/ConnectionFailedException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java
rename to activemq-client/src/main/java/org/apache/activemq/ConnectionFailedException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/CustomDestination.java b/activemq-client/src/main/java/org/apache/activemq/CustomDestination.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/CustomDestination.java
rename to activemq-client/src/main/java/org/apache/activemq/CustomDestination.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/Disposable.java b/activemq-client/src/main/java/org/apache/activemq/Disposable.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/Disposable.java
rename to activemq-client/src/main/java/org/apache/activemq/Disposable.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/EnhancedConnection.java b/activemq-client/src/main/java/org/apache/activemq/EnhancedConnection.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/EnhancedConnection.java
rename to activemq-client/src/main/java/org/apache/activemq/EnhancedConnection.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/FifoMessageDispatchChannel.java b/activemq-client/src/main/java/org/apache/activemq/FifoMessageDispatchChannel.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/FifoMessageDispatchChannel.java
rename to activemq-client/src/main/java/org/apache/activemq/FifoMessageDispatchChannel.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java b/activemq-client/src/main/java/org/apache/activemq/LocalTransactionEventListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java
rename to activemq-client/src/main/java/org/apache/activemq/LocalTransactionEventListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/Message.java b/activemq-client/src/main/java/org/apache/activemq/Message.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/Message.java
rename to activemq-client/src/main/java/org/apache/activemq/Message.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java b/activemq-client/src/main/java/org/apache/activemq/MessageAvailableConsumer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java
rename to activemq-client/src/main/java/org/apache/activemq/MessageAvailableConsumer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java b/activemq-client/src/main/java/org/apache/activemq/MessageAvailableListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java
rename to activemq-client/src/main/java/org/apache/activemq/MessageAvailableListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java b/activemq-client/src/main/java/org/apache/activemq/MessageDispatchChannel.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java
rename to activemq-client/src/main/java/org/apache/activemq/MessageDispatchChannel.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/MessageTransformer.java b/activemq-client/src/main/java/org/apache/activemq/MessageTransformer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/MessageTransformer.java
rename to activemq-client/src/main/java/org/apache/activemq/MessageTransformer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/MessageTransformerSupport.java b/activemq-client/src/main/java/org/apache/activemq/MessageTransformerSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/MessageTransformerSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/MessageTransformerSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/NotStartedException.java b/activemq-client/src/main/java/org/apache/activemq/NotStartedException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/NotStartedException.java
rename to activemq-client/src/main/java/org/apache/activemq/NotStartedException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java b/activemq-client/src/main/java/org/apache/activemq/RedeliveryPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java
rename to activemq-client/src/main/java/org/apache/activemq/RedeliveryPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ScheduledMessage.java b/activemq-client/src/main/java/org/apache/activemq/ScheduledMessage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ScheduledMessage.java
rename to activemq-client/src/main/java/org/apache/activemq/ScheduledMessage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/Service.java b/activemq-client/src/main/java/org/apache/activemq/Service.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/Service.java
rename to activemq-client/src/main/java/org/apache/activemq/Service.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java b/activemq-client/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java
rename to activemq-client/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java b/activemq-client/src/main/java/org/apache/activemq/StreamConnection.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/StreamConnection.java
rename to activemq-client/src/main/java/org/apache/activemq/StreamConnection.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java b/activemq-client/src/main/java/org/apache/activemq/ThreadPriorities.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java
rename to activemq-client/src/main/java/org/apache/activemq/ThreadPriorities.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java b/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/TransactionContext.java
rename to activemq-client/src/main/java/org/apache/activemq/TransactionContext.java
diff --git a/activemq-client/src/main/java/org/apache/activemq/TransportLoggerSupport.java b/activemq-client/src/main/java/org/apache/activemq/TransportLoggerSupport.java
new file mode 100644
index 0000000000..d56f641e6f
--- /dev/null
+++ b/activemq-client/src/main/java/org/apache/activemq/TransportLoggerSupport.java
@@ -0,0 +1,63 @@
+/**
+ * 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;
+
+import org.apache.activemq.transport.Transport;
+
+import java.io.IOException;
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class TransportLoggerSupport {
+
+    public static String defaultLogWriterName = "default";
+
+    public static interface SPI {
+        public Transport createTransportLogger(Transport transport) throws IOException;
+        public Transport createTransportLogger(Transport transport, String logWriterName, boolean dynamicManagement, boolean startLogging, int jmxPort) throws IOException;
+    }
+
+    final static public SPI spi;
+    static {
+        SPI temp;
+        try {
+            temp = (SPI) TransportLoggerSupport.class.getClassLoader().loadClass("org.apache.activemq.transport.TransportLoggerFactorySPI").newInstance();
+        } catch (Throwable e) {
+            temp = null;
+            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+        }
+        spi = temp;
+    }
+
+    public static Transport createTransportLogger(Transport transport) throws IOException {
+        if( spi!=null ) {
+            return spi.createTransportLogger(transport);
+        } else {
+            return transport;
+        }
+    }
+
+    public static Transport createTransportLogger(Transport transport, String logWriterName, boolean dynamicManagement, boolean startLogging, int jmxPort) throws IOException {
+        if( spi!=null ) {
+            return spi.createTransportLogger(transport, logWriterName, dynamicManagement, startLogging, jmxPort);
+        } else {
+            return transport;
+        }
+    }
+
+}
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java b/activemq-client/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationEvent.java
similarity index 96%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/DestinationEvent.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/DestinationEvent.java
index e46350e4d9..df0dbc5df9 100644
--- a/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationEvent.java
+++ b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationEvent.java
@@ -18,9 +18,6 @@ package org.apache.activemq.advisory;
 
 import java.util.EventObject;
 
-import javax.jms.Destination;
-
-import org.apache.activemq.command.ConsumerId;
 import org.apache.activemq.command.DestinationInfo;
 import org.apache.activemq.command.ActiveMQDestination;
 
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationListener.java b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/DestinationListener.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/DestinationListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationSource.java b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java
similarity index 99%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/DestinationSource.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java
index 41fece5530..3d11fcab97 100644
--- a/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationSource.java
+++ b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java
@@ -27,7 +27,6 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
 import javax.jms.Session;
 
-import org.apache.activemq.Service;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQQueue;
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEvent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEvent.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEvent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerListener.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/ProducerListener.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/ProducerListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerStartedEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerStartedEvent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/ProducerStartedEvent.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/ProducerStartedEvent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerStoppedEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerStoppedEvent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/ProducerStoppedEvent.java
rename to activemq-client/src/main/java/org/apache/activemq/advisory/ProducerStoppedEvent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/package.html b/activemq-client/src/main/java/org/apache/activemq/advisory/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/advisory/package.html
rename to activemq-client/src/main/java/org/apache/activemq/advisory/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/BlobDownloader.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloader.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/BlobDownloader.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloader.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/BlobTransferPolicy.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobTransferPolicy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/BlobTransferPolicy.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/BlobTransferPolicy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/BlobUploader.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploader.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/BlobUploader.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/BlobUploader.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/DefaultStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/DefaultStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/DefaultStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/FTPBlobDownloadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/FTPBlobDownloadStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/FTPBlobDownloadStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/FTPBlobDownloadStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/FTPBlobUploadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/FTPBlobUploadStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/FTPBlobUploadStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/FTPBlobUploadStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/FTPStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/FTPStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/FTPStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/FTPStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/package.html b/activemq-client/src/main/java/org/apache/activemq/blob/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/blob/package.html
rename to activemq-client/src/main/java/org/apache/activemq/blob/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/SslContext.java b/activemq-client/src/main/java/org/apache/activemq/broker/SslContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/SslContext.java
rename to activemq-client/src/main/java/org/apache/activemq/broker/SslContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java b/activemq-client/src/main/java/org/apache/activemq/broker/region/MessageReference.java
similarity index 97%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java
rename to activemq-client/src/main/java/org/apache/activemq/broker/region/MessageReference.java
index 76dfbe63ff..64c91fa0a1 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java
+++ b/activemq-client/src/main/java/org/apache/activemq/broker/region/MessageReference.java
@@ -34,7 +34,7 @@ public interface MessageReference {
     Message getMessage();
     boolean isPersistent();
     
-    Destination getRegionDestination();
+    Message.MessageDestination getRegionDestination();
     
     int getRedeliveryCounter();
     void incrementRedeliveryCounter();
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RedeliveryPolicyMap.java b/activemq-client/src/main/java/org/apache/activemq/broker/region/policy/RedeliveryPolicyMap.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RedeliveryPolicyMap.java
rename to activemq-client/src/main/java/org/apache/activemq/broker/region/policy/RedeliveryPolicyMap.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java b/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java
rename to activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQDestination.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQQueue.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQQueue.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQQueue.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQQueue.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTopic.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTopic.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTopic.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTopic.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/BaseCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/BaseCommand.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/BaseCommand.java
rename to activemq-client/src/main/java/org/apache/activemq/command/BaseCommand.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/BaseEndpoint.java b/activemq-client/src/main/java/org/apache/activemq/command/BaseEndpoint.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/BaseEndpoint.java
rename to activemq-client/src/main/java/org/apache/activemq/command/BaseEndpoint.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/BrokerId.java b/activemq-client/src/main/java/org/apache/activemq/command/BrokerId.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/BrokerId.java
rename to activemq-client/src/main/java/org/apache/activemq/command/BrokerId.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/BrokerInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/BrokerInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/BrokerInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/BrokerInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/Command.java b/activemq-client/src/main/java/org/apache/activemq/command/Command.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/Command.java
rename to activemq-client/src/main/java/org/apache/activemq/command/Command.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java b/activemq-client/src/main/java/org/apache/activemq/command/CommandTypes.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java
rename to activemq-client/src/main/java/org/apache/activemq/command/CommandTypes.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConnectionControl.java b/activemq-client/src/main/java/org/apache/activemq/command/ConnectionControl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ConnectionControl.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ConnectionControl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConnectionError.java b/activemq-client/src/main/java/org/apache/activemq/command/ConnectionError.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ConnectionError.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ConnectionError.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConnectionId.java b/activemq-client/src/main/java/org/apache/activemq/command/ConnectionId.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ConnectionId.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ConnectionId.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/ConnectionInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ConnectionInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConsumerControl.java b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerControl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ConsumerControl.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ConsumerControl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConsumerId.java b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerId.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ConsumerId.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ConsumerId.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ControlCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/ControlCommand.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ControlCommand.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ControlCommand.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DataArrayResponse.java b/activemq-client/src/main/java/org/apache/activemq/command/DataArrayResponse.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/DataArrayResponse.java
rename to activemq-client/src/main/java/org/apache/activemq/command/DataArrayResponse.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DataResponse.java b/activemq-client/src/main/java/org/apache/activemq/command/DataResponse.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/DataResponse.java
rename to activemq-client/src/main/java/org/apache/activemq/command/DataResponse.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DataStructure.java b/activemq-client/src/main/java/org/apache/activemq/command/DataStructure.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/DataStructure.java
rename to activemq-client/src/main/java/org/apache/activemq/command/DataStructure.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java b/activemq-client/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java
rename to activemq-client/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DestinationInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/DestinationInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/DestinationInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/DestinationInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DiscoveryEvent.java b/activemq-client/src/main/java/org/apache/activemq/command/DiscoveryEvent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/DiscoveryEvent.java
rename to activemq-client/src/main/java/org/apache/activemq/command/DiscoveryEvent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/Endpoint.java b/activemq-client/src/main/java/org/apache/activemq/command/Endpoint.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/Endpoint.java
rename to activemq-client/src/main/java/org/apache/activemq/command/Endpoint.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ExceptionResponse.java b/activemq-client/src/main/java/org/apache/activemq/command/ExceptionResponse.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ExceptionResponse.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ExceptionResponse.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/FlushCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/FlushCommand.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/FlushCommand.java
rename to activemq-client/src/main/java/org/apache/activemq/command/FlushCommand.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/IntegerResponse.java b/activemq-client/src/main/java/org/apache/activemq/command/IntegerResponse.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/IntegerResponse.java
rename to activemq-client/src/main/java/org/apache/activemq/command/IntegerResponse.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/JournalQueueAck.java b/activemq-client/src/main/java/org/apache/activemq/command/JournalQueueAck.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/JournalQueueAck.java
rename to activemq-client/src/main/java/org/apache/activemq/command/JournalQueueAck.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/JournalTopicAck.java b/activemq-client/src/main/java/org/apache/activemq/command/JournalTopicAck.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/JournalTopicAck.java
rename to activemq-client/src/main/java/org/apache/activemq/command/JournalTopicAck.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/JournalTrace.java b/activemq-client/src/main/java/org/apache/activemq/command/JournalTrace.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/JournalTrace.java
rename to activemq-client/src/main/java/org/apache/activemq/command/JournalTrace.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/JournalTransaction.java b/activemq-client/src/main/java/org/apache/activemq/command/JournalTransaction.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/JournalTransaction.java
rename to activemq-client/src/main/java/org/apache/activemq/command/JournalTransaction.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/KeepAliveInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/KeepAliveInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/KeepAliveInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/KeepAliveInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/LastPartialCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/LastPartialCommand.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/LastPartialCommand.java
rename to activemq-client/src/main/java/org/apache/activemq/command/LastPartialCommand.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/LocalTransactionId.java b/activemq-client/src/main/java/org/apache/activemq/command/LocalTransactionId.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/LocalTransactionId.java
rename to activemq-client/src/main/java/org/apache/activemq/command/LocalTransactionId.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java b/activemq-client/src/main/java/org/apache/activemq/command/MarshallAware.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java
rename to activemq-client/src/main/java/org/apache/activemq/command/MarshallAware.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/Message.java b/activemq-client/src/main/java/org/apache/activemq/command/Message.java
similarity index 97%
rename from activemq-core/src/main/java/org/apache/activemq/command/Message.java
rename to activemq-client/src/main/java/org/apache/activemq/command/Message.java
index 65e4397e2f..4e8590e133 100755
--- a/activemq-core/src/main/java/org/apache/activemq/command/Message.java
+++ b/activemq-client/src/main/java/org/apache/activemq/command/Message.java
@@ -29,9 +29,7 @@ import javax.jms.JMSException;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.advisory.AdvisorySupport;
-import org.apache.activemq.broker.region.Destination;
 import org.apache.activemq.broker.region.MessageReference;
-import org.apache.activemq.broker.region.RegionBroker;
 import org.apache.activemq.usage.MemoryUsage;
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.apache.activemq.util.ByteArrayOutputStream;
@@ -46,6 +44,7 @@ import org.apache.activemq.wireformat.WireFormat;
  *
  */
 public abstract class Message extends BaseCommand implements MarshallAware, MessageReference {
+    public static final String ORIGINAL_EXPIRATION = "originalExpiration";
 
     /**
      * The default minimum amount of memory a message is assumed to use
@@ -90,12 +89,17 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess
 
     private transient short referenceCount;
     private transient ActiveMQConnection connection;
-    private transient org.apache.activemq.broker.region.Destination regionDestination;
-    private transient MemoryUsage memoryUsage;
+    transient MessageDestination regionDestination;
+    transient MemoryUsage memoryUsage;
 
     private BrokerId[] brokerPath;
     private BrokerId[] cluster;
 
+    public static interface MessageDestination {
+        int getMinimumMessageSize();
+        MemoryUsage getMemoryUsage();
+    }
+
     public abstract Message copy();
     public abstract void clearBody() throws JMSException;
     public abstract void storeContent();
@@ -130,7 +134,7 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess
             copy.properties = new HashMap<String, Object>(properties);
 
             // The new message hasn't expired, so remove this feild.
-            copy.properties.remove(RegionBroker.ORIGINAL_EXPIRATION);
+            copy.properties.remove(ORIGINAL_EXPIRATION);
         } else {
             copy.properties = properties;
         }
@@ -588,17 +592,17 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess
         return this;
     }
 
-    public org.apache.activemq.broker.region.Destination getRegionDestination() {
-        return regionDestination;
-    }
-
-    public void setRegionDestination(org.apache.activemq.broker.region.Destination destination) {
+    public void setRegionDestination(MessageDestination destination) {
         this.regionDestination = destination;
         if(this.memoryUsage==null) {
-            this.memoryUsage=regionDestination.getMemoryUsage();
+            this.memoryUsage=destination.getMemoryUsage();
         }
     }
 
+    public MessageDestination getRegionDestination() {
+        return regionDestination;
+    }
+
     public MemoryUsage getMemoryUsage() {
         return this.memoryUsage;
     }
@@ -666,7 +670,7 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess
     protected int getMinimumMessageSize() {
         int result = DEFAULT_MINIMUM_MESSAGE_SIZE;
         //let destination override
-        Destination dest = regionDestination;
+        MessageDestination dest = regionDestination;
         if (dest != null) {
             result=dest.getMinimumMessageSize();
         }
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java b/activemq-client/src/main/java/org/apache/activemq/command/MessageAck.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java
rename to activemq-client/src/main/java/org/apache/activemq/command/MessageAck.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java b/activemq-client/src/main/java/org/apache/activemq/command/MessageDispatch.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java
rename to activemq-client/src/main/java/org/apache/activemq/command/MessageDispatch.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatchNotification.java b/activemq-client/src/main/java/org/apache/activemq/command/MessageDispatchNotification.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/MessageDispatchNotification.java
rename to activemq-client/src/main/java/org/apache/activemq/command/MessageDispatchNotification.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MessageId.java b/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/MessageId.java
rename to activemq-client/src/main/java/org/apache/activemq/command/MessageId.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MessagePull.java b/activemq-client/src/main/java/org/apache/activemq/command/MessagePull.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/MessagePull.java
rename to activemq-client/src/main/java/org/apache/activemq/command/MessagePull.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java b/activemq-client/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java
rename to activemq-client/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/PartialCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/PartialCommand.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/PartialCommand.java
rename to activemq-client/src/main/java/org/apache/activemq/command/PartialCommand.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ProducerAck.java b/activemq-client/src/main/java/org/apache/activemq/command/ProducerAck.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ProducerAck.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ProducerAck.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ProducerId.java b/activemq-client/src/main/java/org/apache/activemq/command/ProducerId.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ProducerId.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ProducerId.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ProducerInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/ProducerInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ProducerInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ProducerInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/RemoveInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/RemoveInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/RemoveInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/RemoveInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ReplayCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/ReplayCommand.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ReplayCommand.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ReplayCommand.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/Response.java b/activemq-client/src/main/java/org/apache/activemq/command/Response.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/Response.java
rename to activemq-client/src/main/java/org/apache/activemq/command/Response.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/SessionId.java b/activemq-client/src/main/java/org/apache/activemq/command/SessionId.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/SessionId.java
rename to activemq-client/src/main/java/org/apache/activemq/command/SessionId.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/SessionInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/SessionInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/ShutdownInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/ShutdownInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/SubscriptionInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/SubscriptionInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/TransactionId.java b/activemq-client/src/main/java/org/apache/activemq/command/TransactionId.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/TransactionId.java
rename to activemq-client/src/main/java/org/apache/activemq/command/TransactionId.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/TransactionInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/TransactionInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java b/activemq-client/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java
rename to activemq-client/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/WireFormatInfo.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
rename to activemq-client/src/main/java/org/apache/activemq/command/WireFormatInfo.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java b/activemq-client/src/main/java/org/apache/activemq/command/XATransactionId.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java
rename to activemq-client/src/main/java/org/apache/activemq/command/XATransactionId.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/package.html b/activemq-client/src/main/java/org/apache/activemq/command/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/command/package.html
rename to activemq-client/src/main/java/org/apache/activemq/command/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java b/activemq-client/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/AnyDestination.java b/activemq-client/src/main/java/org/apache/activemq/filter/AnyDestination.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/AnyDestination.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/AnyDestination.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/BinaryExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/BinaryExpression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/BinaryExpression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/BinaryExpression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/BooleanExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/BooleanExpression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/BooleanExpression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/BooleanExpression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/ComparisonExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/ComparisonExpression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/ComparisonExpression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/ComparisonExpression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java b/activemq-client/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/ConstantExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/ConstantExpression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/ConstantExpression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/ConstantExpression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DefaultDestinationMapEntry.java b/activemq-client/src/main/java/org/apache/activemq/filter/DefaultDestinationMapEntry.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/DefaultDestinationMapEntry.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/DefaultDestinationMapEntry.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationFilter.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationFilter.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMap.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMap.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationMap.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationMap.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapNode.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapNode.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapNode.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapNode.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationNode.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationNode.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationNode.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationNode.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationPath.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationPath.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationPath.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationPath.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/Expression.java b/activemq-client/src/main/java/org/apache/activemq/filter/Expression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/Expression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/Expression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/LogicExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/LogicExpression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/LogicExpression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/LogicExpression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java b/activemq-client/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java b/activemq-client/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/NoLocalExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/NoLocalExpression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/NoLocalExpression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/NoLocalExpression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/NonCachedMessageEvaluationContext.java b/activemq-client/src/main/java/org/apache/activemq/filter/NonCachedMessageEvaluationContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/NonCachedMessageEvaluationContext.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/NonCachedMessageEvaluationContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java b/activemq-client/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/PropertyExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/PropertyExpression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java b/activemq-client/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/UnaryExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/UnaryExpression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/UnaryExpression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/UnaryExpression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java b/activemq-client/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/XQueryExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/XQueryExpression.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/XQueryExpression.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/XQueryExpression.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java b/activemq-client/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
similarity index 99%
rename from activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
rename to activemq-client/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
index 421ad5601f..ffb96fa185 100755
--- a/activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
+++ b/activemq-client/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
@@ -24,7 +24,6 @@ import javax.jms.JMSException;
 import javax.jms.TextMessage;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.traversal.NodeIterator;
diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/package.html b/activemq-client/src/main/java/org/apache/activemq/filter/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/filter/package.html
rename to activemq-client/src/main/java/org/apache/activemq/filter/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java b/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java b/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/JNDIBaseStorable.java b/activemq-client/src/main/java/org/apache/activemq/jndi/JNDIBaseStorable.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/jndi/JNDIBaseStorable.java
rename to activemq-client/src/main/java/org/apache/activemq/jndi/JNDIBaseStorable.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java b/activemq-client/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/JNDIStorableInterface.java b/activemq-client/src/main/java/org/apache/activemq/jndi/JNDIStorableInterface.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/jndi/JNDIStorableInterface.java
rename to activemq-client/src/main/java/org/apache/activemq/jndi/JNDIStorableInterface.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java b/activemq-client/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java
rename to activemq-client/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/NameParserImpl.java b/activemq-client/src/main/java/org/apache/activemq/jndi/NameParserImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/jndi/NameParserImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/jndi/NameParserImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java b/activemq-client/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java
rename to activemq-client/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/package.html b/activemq-client/src/main/java/org/apache/activemq/jndi/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/jndi/package.html
rename to activemq-client/src/main/java/org/apache/activemq/jndi/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/CountStatisticImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/CountStatisticImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JCAStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JCAStatsImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/JCAStatsImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/JCAStatsImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSStatsImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/JMSStatsImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/JMSStatsImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/Resettable.java b/activemq-client/src/main/java/org/apache/activemq/management/Resettable.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/Resettable.java
rename to activemq-client/src/main/java/org/apache/activemq/management/Resettable.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/StatisticImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/StatisticImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/StatsCapable.java b/activemq-client/src/main/java/org/apache/activemq/management/StatsCapable.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/StatsCapable.java
rename to activemq-client/src/main/java/org/apache/activemq/management/StatsCapable.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/StatsImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/StatsImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java
rename to activemq-client/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/management/package.html b/activemq-client/src/main/java/org/apache/activemq/management/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/management/package.html
rename to activemq-client/src/main/java/org/apache/activemq/management/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java b/activemq-client/src/main/java/org/apache/activemq/openwire/BooleanStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/BooleanStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/CommandIdComparator.java b/activemq-client/src/main/java/org/apache/activemq/openwire/CommandIdComparator.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/CommandIdComparator.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/CommandIdComparator.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java b/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMapMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMapMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMapMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/DestinationInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/DestinationInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/DestinationInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MarshallerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MarshallerFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MarshallerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBlobMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBlobMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBlobMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBytesMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBytesMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBytesMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMapMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMapMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMapMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQObjectMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQObjectMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQObjectMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQStreamMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQStreamMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQStreamMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTextMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTextMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTextMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/BaseCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/BaseCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/BaseCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/BrokerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/BrokerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/BrokerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/BrokerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/BrokerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/BrokerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionErrorMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionErrorMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionErrorMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ControlCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ControlCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ControlCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/DataArrayResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/DataArrayResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/DataArrayResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/DataResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/DataResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/DataResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/DestinationInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/DestinationInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/DestinationInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/DiscoveryEventMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/DiscoveryEventMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/DiscoveryEventMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ExceptionResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ExceptionResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ExceptionResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/FlushCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/FlushCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/FlushCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/IntegerResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/IntegerResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/IntegerResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalQueueAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalQueueAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalQueueAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTopicAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTopicAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTopicAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTraceMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTraceMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTraceMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTransactionMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTransactionMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTransactionMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/KeepAliveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/KeepAliveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/KeepAliveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/LastPartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/LastPartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/LastPartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/LocalTransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/LocalTransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/LocalTransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MarshallerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MarshallerFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MarshallerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchNotificationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchNotificationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchNotificationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessagePullMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessagePullMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessagePullMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/NetworkBridgeFilterMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/NetworkBridgeFilterMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/NetworkBridgeFilterMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/PartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/PartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/PartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/RemoveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/RemoveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ReplayCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ReplayCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ReplayCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/SessionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/SessionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/SessionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/SessionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/SessionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/SessionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ShutdownInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ShutdownInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ShutdownInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/TransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/TransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/TransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/TransactionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/TransactionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/TransactionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/WireFormatInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/WireFormatInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/WireFormatInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/XATransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/XATransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/XATransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBlobMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBlobMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBlobMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBytesMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBytesMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBytesMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMapMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMapMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMapMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQObjectMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQObjectMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQObjectMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQStreamMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQStreamMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQStreamMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTextMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTextMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTextMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/BaseCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/BaseCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/BaseCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/BrokerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/BrokerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/BrokerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/BrokerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/BrokerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/BrokerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionErrorMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionErrorMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionErrorMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ControlCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ControlCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ControlCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/DataArrayResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/DataArrayResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/DataArrayResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/DataResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/DataResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/DataResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/DestinationInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/DestinationInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/DestinationInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/DiscoveryEventMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/DiscoveryEventMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/DiscoveryEventMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ExceptionResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ExceptionResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ExceptionResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/FlushCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/FlushCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/FlushCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/IntegerResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/IntegerResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/IntegerResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalQueueAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalQueueAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalQueueAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTopicAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTopicAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTopicAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTraceMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTraceMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTraceMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTransactionMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTransactionMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTransactionMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/KeepAliveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/KeepAliveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/KeepAliveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/LastPartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/LastPartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/LastPartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/LocalTransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/LocalTransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/LocalTransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MarshallerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MarshallerFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MarshallerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchNotificationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchNotificationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchNotificationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessagePullMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessagePullMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessagePullMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/NetworkBridgeFilterMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/NetworkBridgeFilterMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/NetworkBridgeFilterMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/PartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/PartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/PartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/RemoveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/RemoveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ReplayCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ReplayCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ReplayCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/SessionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/SessionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/SessionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/SessionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/SessionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/SessionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ShutdownInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ShutdownInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ShutdownInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/TransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/TransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/TransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/TransactionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/TransactionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/TransactionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/WireFormatInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/WireFormatInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/WireFormatInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/XATransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/XATransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/XATransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBlobMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBlobMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBlobMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBytesMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBytesMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBytesMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMapMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMapMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMapMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQObjectMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQObjectMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQObjectMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQStreamMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQStreamMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQStreamMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTextMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTextMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTextMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/BaseCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/BaseCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/BaseCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/BaseDataStreamMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/BaseDataStreamMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/BaseDataStreamMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/BrokerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/BrokerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/BrokerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/BrokerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/BrokerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/BrokerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionErrorMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionErrorMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionErrorMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ControlCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ControlCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ControlCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/DataArrayResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/DataArrayResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/DataArrayResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/DataResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/DataResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/DataResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/DestinationInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/DestinationInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/DestinationInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/DiscoveryEventMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/DiscoveryEventMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/DiscoveryEventMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ExceptionResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ExceptionResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ExceptionResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/FlushCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/FlushCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/FlushCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/IntegerResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/IntegerResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/IntegerResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalQueueAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalQueueAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalQueueAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTopicAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTopicAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTopicAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTraceMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTraceMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTraceMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTransactionMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTransactionMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTransactionMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/KeepAliveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/KeepAliveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/KeepAliveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/LastPartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/LastPartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/LastPartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/LocalTransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/LocalTransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/LocalTransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MarshallerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MarshallerFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MarshallerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchNotificationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchNotificationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchNotificationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessagePullMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessagePullMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessagePullMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/NetworkBridgeFilterMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/NetworkBridgeFilterMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/NetworkBridgeFilterMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/PartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/PartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/PartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/RemoveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/RemoveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/RemoveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/RemoveSubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/RemoveSubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/RemoveSubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ReplayCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ReplayCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ReplayCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/SessionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/SessionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/SessionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/SessionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/SessionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/SessionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ShutdownInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ShutdownInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ShutdownInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/SubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/SubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/SubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/TransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/TransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/TransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/TransactionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/TransactionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/TransactionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/WireFormatInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/WireFormatInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/WireFormatInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/XATransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/XATransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/XATransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTextMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTextMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTextMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/BaseCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/BaseCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/BaseCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/BaseDataStreamMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/BaseDataStreamMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/BaseDataStreamMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/BrokerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/BrokerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/BrokerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/BrokerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/BrokerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/BrokerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionErrorMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionErrorMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionErrorMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ControlCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ControlCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ControlCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/DataArrayResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/DataArrayResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/DataArrayResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/DataResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/DataResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/DataResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/DestinationInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/DestinationInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/DestinationInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/DiscoveryEventMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/DiscoveryEventMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/DiscoveryEventMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ExceptionResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ExceptionResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ExceptionResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/FlushCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/FlushCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/FlushCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/IntegerResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/IntegerResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/IntegerResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalQueueAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalQueueAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalQueueAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTopicAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTopicAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTopicAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTraceMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTraceMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTraceMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTransactionMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTransactionMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTransactionMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/KeepAliveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/KeepAliveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/KeepAliveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/LastPartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/LastPartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/LastPartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/LocalTransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/LocalTransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/LocalTransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MarshallerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MarshallerFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MarshallerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchNotificationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchNotificationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchNotificationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessagePullMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessagePullMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessagePullMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/NetworkBridgeFilterMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/NetworkBridgeFilterMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/NetworkBridgeFilterMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/RemoveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/RemoveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/RemoveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/RemoveSubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/RemoveSubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/RemoveSubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ReplayCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ReplayCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ReplayCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/SessionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/SessionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/SessionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/SessionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/SessionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/SessionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ShutdownInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ShutdownInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ShutdownInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/SubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/SubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/SubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/TransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/TransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/TransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/TransactionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/TransactionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/TransactionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBlobMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBlobMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBlobMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBytesMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBytesMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBytesMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMapMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMapMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMapMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQObjectMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQObjectMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQObjectMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQStreamMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQStreamMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQStreamMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTextMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTextMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTextMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/BaseCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/BaseCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/BaseCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/BaseDataStreamMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/BaseDataStreamMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/BaseDataStreamMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/BrokerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/BrokerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/BrokerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/BrokerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/BrokerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/BrokerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionErrorMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionErrorMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionErrorMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ControlCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ControlCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ControlCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/DataArrayResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/DataArrayResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/DataArrayResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/DataResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/DataResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/DataResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/DestinationInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/DestinationInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/DestinationInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/DiscoveryEventMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/DiscoveryEventMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/DiscoveryEventMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ExceptionResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ExceptionResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ExceptionResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/FlushCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/FlushCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/FlushCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/IntegerResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/IntegerResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/IntegerResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalQueueAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalQueueAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalQueueAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTopicAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTopicAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTopicAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTraceMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTraceMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTraceMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTransactionMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTransactionMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTransactionMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/KeepAliveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/KeepAliveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/KeepAliveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/LastPartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/LastPartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/LastPartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/LocalTransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/LocalTransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/LocalTransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MarshallerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MarshallerFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MarshallerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchNotificationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchNotificationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchNotificationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessagePullMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessagePullMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessagePullMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/NetworkBridgeFilterMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/NetworkBridgeFilterMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/NetworkBridgeFilterMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/RemoveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/RemoveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/RemoveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/RemoveSubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/RemoveSubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/RemoveSubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ReplayCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ReplayCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ReplayCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/SessionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/SessionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/SessionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/SessionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/SessionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/SessionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ShutdownInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ShutdownInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ShutdownInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/SubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/SubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/SubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/TransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/TransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/TransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/TransactionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/TransactionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/TransactionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBlobMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBlobMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBlobMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBytesMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBytesMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBytesMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMapMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMapMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMapMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQObjectMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQObjectMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQObjectMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQStreamMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQStreamMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQStreamMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempDestinationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempDestinationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempDestinationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempQueueMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempQueueMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempQueueMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTextMessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTextMessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTextMessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTopicMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTopicMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTopicMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/BaseCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/BaseCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/BaseCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/BaseDataStreamMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/BaseDataStreamMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/BaseDataStreamMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/BrokerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/BrokerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/BrokerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/BrokerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/BrokerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/BrokerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionErrorMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionErrorMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionErrorMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerControlMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerControlMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerControlMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ControlCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ControlCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ControlCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/DataArrayResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/DataArrayResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/DataArrayResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/DataResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/DataResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/DataResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/DestinationInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/DestinationInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/DestinationInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/DiscoveryEventMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/DiscoveryEventMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/DiscoveryEventMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ExceptionResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ExceptionResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ExceptionResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/FlushCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/FlushCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/FlushCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/IntegerResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/IntegerResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/IntegerResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalQueueAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalQueueAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalQueueAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTopicAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTopicAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTopicAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTraceMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTraceMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTraceMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTransactionMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTransactionMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTransactionMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/KeepAliveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/KeepAliveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/KeepAliveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/LastPartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/LastPartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/LastPartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/LocalTransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/LocalTransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/LocalTransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MarshallerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MarshallerFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MarshallerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchNotificationMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchNotificationMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchNotificationMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessagePullMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessagePullMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessagePullMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/NetworkBridgeFilterMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/NetworkBridgeFilterMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/NetworkBridgeFilterMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerAckMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerAckMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerAckMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/RemoveInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/RemoveInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/RemoveInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/RemoveSubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/RemoveSubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/RemoveSubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ReplayCommandMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ReplayCommandMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ReplayCommandMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ResponseMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ResponseMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ResponseMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/SessionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/SessionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/SessionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/SessionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/SessionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/SessionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ShutdownInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ShutdownInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ShutdownInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/SubscriptionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/SubscriptionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/SubscriptionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/TransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/TransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/TransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/TransactionInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/TransactionInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/TransactionInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/package.html b/activemq-client/src/main/java/org/apache/activemq/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/package.html
rename to activemq-client/src/main/java/org/apache/activemq/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java b/activemq-client/src/main/java/org/apache/activemq/state/CommandVisitor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java
rename to activemq-client/src/main/java/org/apache/activemq/state/CommandVisitor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitorAdapter.java b/activemq-client/src/main/java/org/apache/activemq/state/CommandVisitorAdapter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/state/CommandVisitorAdapter.java
rename to activemq-client/src/main/java/org/apache/activemq/state/CommandVisitorAdapter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java b/activemq-client/src/main/java/org/apache/activemq/state/ConnectionState.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java
rename to activemq-client/src/main/java/org/apache/activemq/state/ConnectionState.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java b/activemq-client/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java
rename to activemq-client/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/state/ConsumerState.java b/activemq-client/src/main/java/org/apache/activemq/state/ConsumerState.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/state/ConsumerState.java
rename to activemq-client/src/main/java/org/apache/activemq/state/ConsumerState.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java b/activemq-client/src/main/java/org/apache/activemq/state/ProducerState.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java
rename to activemq-client/src/main/java/org/apache/activemq/state/ProducerState.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/state/ResponseHandler.java b/activemq-client/src/main/java/org/apache/activemq/state/ResponseHandler.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/state/ResponseHandler.java
rename to activemq-client/src/main/java/org/apache/activemq/state/ResponseHandler.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/state/SessionState.java b/activemq-client/src/main/java/org/apache/activemq/state/SessionState.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/state/SessionState.java
rename to activemq-client/src/main/java/org/apache/activemq/state/SessionState.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/state/Tracked.java b/activemq-client/src/main/java/org/apache/activemq/state/Tracked.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/state/Tracked.java
rename to activemq-client/src/main/java/org/apache/activemq/state/Tracked.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/state/TransactionState.java b/activemq-client/src/main/java/org/apache/activemq/state/TransactionState.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/state/TransactionState.java
rename to activemq-client/src/main/java/org/apache/activemq/state/TransactionState.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java b/activemq-client/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java
rename to activemq-client/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java b/activemq-client/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java
rename to activemq-client/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/DeterministicTaskRunner.java b/activemq-client/src/main/java/org/apache/activemq/thread/DeterministicTaskRunner.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/thread/DeterministicTaskRunner.java
rename to activemq-client/src/main/java/org/apache/activemq/thread/DeterministicTaskRunner.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/PooledTaskRunner.java b/activemq-client/src/main/java/org/apache/activemq/thread/PooledTaskRunner.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/thread/PooledTaskRunner.java
rename to activemq-client/src/main/java/org/apache/activemq/thread/PooledTaskRunner.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java b/activemq-client/src/main/java/org/apache/activemq/thread/Scheduler.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
rename to activemq-client/src/main/java/org/apache/activemq/thread/Scheduler.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/SchedulerTimerTask.java b/activemq-client/src/main/java/org/apache/activemq/thread/SchedulerTimerTask.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/thread/SchedulerTimerTask.java
rename to activemq-client/src/main/java/org/apache/activemq/thread/SchedulerTimerTask.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/Task.java b/activemq-client/src/main/java/org/apache/activemq/thread/Task.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/thread/Task.java
rename to activemq-client/src/main/java/org/apache/activemq/thread/Task.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunner.java b/activemq-client/src/main/java/org/apache/activemq/thread/TaskRunner.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/thread/TaskRunner.java
rename to activemq-client/src/main/java/org/apache/activemq/thread/TaskRunner.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java b/activemq-client/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java b/activemq-client/src/main/java/org/apache/activemq/transaction/Synchronization.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java
rename to activemq-client/src/main/java/org/apache/activemq/transaction/Synchronization.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java b/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java b/activemq-client/src/main/java/org/apache/activemq/transport/CommandJoiner.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/CommandJoiner.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/CompositeTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/CompositeTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/CompositeTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/CompositeTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java b/activemq-client/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java b/activemq-client/src/main/java/org/apache/activemq/transport/FutureResponse.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/FutureResponse.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/InactivityIOException.java b/activemq-client/src/main/java/org/apache/activemq/transport/InactivityIOException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/InactivityIOException.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/InactivityIOException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java b/activemq-client/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/LogWriter.java b/activemq-client/src/main/java/org/apache/activemq/transport/LogWriter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/LogWriter.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/LogWriter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java b/activemq-client/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/MutexTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/MutexTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/MutexTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/MutexTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/RequestTimedOutIOException.java b/activemq-client/src/main/java/org/apache/activemq/transport/RequestTimedOutIOException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/RequestTimedOutIOException.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/RequestTimedOutIOException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/ResponseCallback.java b/activemq-client/src/main/java/org/apache/activemq/transport/ResponseCallback.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/ResponseCallback.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/ResponseCallback.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java b/activemq-client/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/ThreadNameFilter.java b/activemq-client/src/main/java/org/apache/activemq/transport/ThreadNameFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/ThreadNameFilter.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/ThreadNameFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/Transport.java b/activemq-client/src/main/java/org/apache/activemq/transport/Transport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/Transport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/Transport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportDisposedIOException.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportDisposedIOException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportDisposedIOException.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportDisposedIOException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportFactory.java
similarity index 92%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportFactory.java
index b99ae14039..d68ffc430b 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/TransportFactory.java
@@ -16,6 +16,13 @@
  */
 package org.apache.activemq.transport;
 
+import org.apache.activemq.util.FactoryFinder;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.util.URISupport;
+import org.apache.activemq.wireformat.WireFormat;
+import org.apache.activemq.wireformat.WireFormatFactory;
+
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -26,16 +33,6 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.BrokerServiceAware;
-import org.apache.activemq.broker.SslContext;
-import org.apache.activemq.util.FactoryFinder;
-import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.activemq.util.IntrospectionSupport;
-import org.apache.activemq.util.URISupport;
-import org.apache.activemq.wireformat.WireFormat;
-import org.apache.activemq.wireformat.WireFormatFactory;
-
 public abstract class TransportFactory {
 
     private static final FactoryFinder TRANSPORT_FACTORY_FINDER = new FactoryFinder("META-INF/services/org/apache/activemq/transport/");
@@ -112,21 +109,6 @@ public abstract class TransportFactory {
         return tf.doBind(location);
     }
 
-    public static TransportServer bind(BrokerService brokerService, URI location) throws IOException {
-        TransportFactory tf = findTransportFactory(location);
-        if( brokerService!=null && tf instanceof BrokerServiceAware ) {
-            ((BrokerServiceAware)tf).setBrokerService(brokerService);
-        }
-        try {
-            if( brokerService!=null ) {
-                SslContext.setCurrentSslContext(brokerService.getSslContext());
-            }
-            return tf.doBind(location);
-        } finally {
-            SslContext.setCurrentSslContext(null);
-        }
-    }
-
     public Transport doConnect(URI location) throws Exception {
         try {
             Map<String, String> options = new HashMap<String, String>(URISupport.parseParameters(location));
@@ -181,7 +163,7 @@ public abstract class TransportFactory {
      * @return
      * @throws IOException
      */
-    private static TransportFactory findTransportFactory(URI location) throws IOException {
+    public static TransportFactory findTransportFactory(URI location) throws IOException {
         String scheme = location.getScheme();
         if (scheme == null) {
             throw new IOException("Transport not scheme specified: [" + location + "]");
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportFilter.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportFilter.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportListener.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportListener.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportServer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportServer.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportServer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerFilter.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportServerFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportServerFilter.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportServerFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerSupport.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportServerSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportServerSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportServerSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java b/activemq-client/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java b/activemq-client/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgent.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgentFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgentFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgentFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgentFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/failover/BackupTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/failover/BackupTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/failover/BackupTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/failover/BackupTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/failover/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/failover/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/failover/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/failover/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/fanout/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/fanout/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/fanout/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/fanout/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/mock/MockTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/mock/MockTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/mock/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/mock/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/mock/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/mock/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastDatagramHeaderMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastDatagramHeaderMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastDatagramHeaderMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastDatagramHeaderMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/multicast/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/multicast/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/multicast/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/multicast/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOBufferedInputStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOBufferedInputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOBufferedInputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOBufferedInputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOInputStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOInputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOInputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOInputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportServer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportServer.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportServer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOTransportFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransportFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOTransportFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayStrategy.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ExceptionIfDroppedReplayStrategy.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/ExceptionIfDroppedReplayStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/ExceptionIfDroppedReplayStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/ExceptionIfDroppedReplayStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayBuffer.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayBuffer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayBuffer.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayBuffer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayBufferListener.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayBufferListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayBufferListener.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayBufferListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayStrategy.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayStrategy.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayStrategy.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayStrategy.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/Replayer.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/Replayer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/Replayer.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/Replayer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/QualityOfServiceUtils.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/QualityOfServiceUtils.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/QualityOfServiceUtils.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/QualityOfServiceUtils.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
similarity index 98%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
index a0ff42d9ed..4a22e6b29f 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
@@ -16,30 +16,10 @@ gxfdgvdfg * Licensed to the Apache Software Foundation (ASF) under one or more
  */
 package org.apache.activemq.transport.tcp;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.net.URI;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.net.SocketFactory;
-
 import org.apache.activemq.Service;
+import org.apache.activemq.TransportLoggerSupport;
 import org.apache.activemq.thread.TaskRunnerFactory;
 import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportLoggerFactory;
 import org.apache.activemq.transport.TransportThreadSupport;
 import org.apache.activemq.util.InetAddressUtil;
 import org.apache.activemq.util.IntrospectionSupport;
@@ -48,6 +28,18 @@ import org.apache.activemq.wireformat.WireFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.net.SocketFactory;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * An implementation of the {@link Transport} interface using raw tcp/ip
  *
@@ -99,7 +91,7 @@ public class TcpTransport extends TransportThreadSupport implements Transport, S
      * Names are mapped to classes in the resources/META-INF/services/org/apache/activemq/transport/logwriters directory.
      * This parameter is most probably set in Connection or TransportConnector URIs.
      */
-    protected String logWriterName = TransportLoggerFactory.defaultLogWriterName;
+    protected String logWriterName = TransportLoggerSupport.defaultLogWriterName;
     /**
      * Specifies if the TransportLogger will be manageable by JMX or not.
      * Also, as long as there is at least 1 TransportLogger which is manageable,
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
similarity index 91%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
index 3d87fab7c1..9dc50f934f 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
@@ -26,13 +26,9 @@ import java.util.Map;
 import javax.net.ServerSocketFactory;
 import javax.net.SocketFactory;
 
+import org.apache.activemq.TransportLoggerSupport;
 import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.transport.InactivityMonitor;
-import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportFactory;
-import org.apache.activemq.transport.TransportLoggerFactory;
-import org.apache.activemq.transport.TransportServer;
-import org.apache.activemq.transport.WireFormatNegotiator;
+import org.apache.activemq.transport.*;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.IntrospectionSupport;
 import org.apache.activemq.util.URISupport;
@@ -90,8 +86,7 @@ public class TcpTransportFactory extends TransportFactory {
 
         if (tcpTransport.isTrace()) {
             try {
-                transport = TransportLoggerFactory.getInstance().createTransportLogger(transport, tcpTransport.getLogWriterName(),
-                        tcpTransport.isDynamicManagement(), tcpTransport.isStartLogging(), tcpTransport.getJmxPort());
+                transport = TransportLoggerSupport.createTransportLogger(transport, tcpTransport.getLogWriterName(), tcpTransport.isDynamicManagement(), tcpTransport.isStartLogging(), tcpTransport.getJmxPort());
             } catch (Throwable e) {
                 LOG.error("Could not create TransportLogger object for: " + tcpTransport.getLogWriterName() + ", reason: " + e, e);
             }
@@ -111,6 +106,7 @@ public class TcpTransportFactory extends TransportFactory {
         return super.compositeConfigure(transport, format, options);
     }
 
+
     /**
      * Returns true if the inactivity monitor should be used on the transport
      */
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
similarity index 99%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
index 99bca8361f..490252af90 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
@@ -35,10 +35,10 @@ import javax.net.ServerSocketFactory;
 
 import org.apache.activemq.Service;
 import org.apache.activemq.ThreadPriorities;
+import org.apache.activemq.TransportLoggerSupport;
 import org.apache.activemq.command.BrokerInfo;
 import org.apache.activemq.openwire.OpenWireFormatFactory;
 import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportLoggerFactory;
 import org.apache.activemq.transport.TransportServer;
 import org.apache.activemq.transport.TransportServerThreadSupport;
 import org.apache.activemq.util.IOExceptionSupport;
@@ -90,7 +90,7 @@ public class TcpTransportServer extends TransportServerThreadSupport implements
      * Names are mapped to classes in the resources/META-INF/services/org/apache/activemq/transport/logwriters directory.
      * This parameter is most probably set in Connection or TransportConnector URIs.
      */
-    protected String logWriterName = TransportLoggerFactory.defaultLogWriterName;
+    protected String logWriterName = TransportLoggerSupport.defaultLogWriterName;
     /**
      * Specifies if the TransportLogger will be manageable by JMX or not.
      * Also, as long as there is at least 1 TransportLogger which is manageable,
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TimeStampStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TimeStampStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TimeStampStream.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TimeStampStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/ByteBufferPool.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/ByteBufferPool.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/ByteBufferPool.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/ByteBufferPool.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandChannel.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandChannel.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandChannel.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandChannel.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandChannelSupport.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandChannelSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandChannelSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandChannelSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/DatagramEndpoint.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/DatagramEndpoint.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/DatagramEndpoint.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/DatagramEndpoint.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/DatagramHeaderMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/DatagramHeaderMarshaller.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/DatagramHeaderMarshaller.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/DatagramHeaderMarshaller.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/DefaultBufferPool.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/DefaultBufferPool.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/DefaultBufferPool.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/DefaultBufferPool.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/ResponseRedirectInterceptor.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/ResponseRedirectInterceptor.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/ResponseRedirectInterceptor.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/ResponseRedirectInterceptor.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/SimpleBufferPool.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/SimpleBufferPool.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/SimpleBufferPool.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/SimpleBufferPool.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java
similarity index 86%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java
index 115b3a5496..5c6edbd55f 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java
@@ -16,6 +16,18 @@
  */
 package org.apache.activemq.transport.udp;
 
+import org.apache.activemq.TransportLoggerSupport;
+import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.transport.*;
+import org.apache.activemq.transport.reliable.*;
+import org.apache.activemq.transport.tcp.TcpTransportFactory;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.util.URISupport;
+import org.apache.activemq.wireformat.WireFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -23,27 +35,6 @@ import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.transport.CommandJoiner;
-import org.apache.activemq.transport.InactivityMonitor;
-import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportFactory;
-import org.apache.activemq.transport.TransportLoggerFactory;
-import org.apache.activemq.transport.TransportServer;
-import org.apache.activemq.transport.reliable.DefaultReplayStrategy;
-import org.apache.activemq.transport.reliable.ExceptionIfDroppedReplayStrategy;
-import org.apache.activemq.transport.reliable.ReliableTransport;
-import org.apache.activemq.transport.reliable.ReplayStrategy;
-import org.apache.activemq.transport.reliable.Replayer;
-import org.apache.activemq.transport.tcp.TcpTransportFactory;
-import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.activemq.util.IntSequenceGenerator;
-import org.apache.activemq.util.IntrospectionSupport;
-import org.apache.activemq.util.URISupport;
-import org.apache.activemq.wireformat.WireFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * @author David Martin Clavo david(dot)martin(dot)clavo(at)gmail.com (logging improvement modifications)
  * 
@@ -86,9 +77,9 @@ public class UdpTransportFactory extends TransportFactory {
 
         if (udpTransport.isTrace()) {
             try {
-                transport = TransportLoggerFactory.getInstance().createTransportLogger(transport);
+                transport = TransportLoggerSupport.createTransportLogger(transport);
             } catch (Throwable e) {
-                log.error("Could not create TransportLogger object for: " + TransportLoggerFactory.defaultLogWriterName + ", reason: " + e, e);
+                log.error("Could not create TransportLogger, reason: " + e, e);
             }
         }
 
@@ -126,7 +117,7 @@ public class UdpTransportFactory extends TransportFactory {
         OpenWireFormat openWireFormat = asOpenWireFormat(format);
 
         if (udpTransport.isTrace()) {
-            transport = TransportLoggerFactory.getInstance().createTransportLogger(transport);
+            transport = TransportLoggerSupport.createTransportLogger(transport);
         }
 
         transport = new InactivityMonitor(transport, format);
@@ -157,6 +148,7 @@ public class UdpTransportFactory extends TransportFactory {
         }
     }
 
+
     protected ReplayStrategy createReplayStrategy(Replayer replayer) {
         if (replayer != null) {
             return new DefaultReplayStrategy(5);
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/udp/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/package.html
rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/package.html
diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/DefaultUsageCapacity.java b/activemq-client/src/main/java/org/apache/activemq/usage/DefaultUsageCapacity.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/usage/DefaultUsageCapacity.java
rename to activemq-client/src/main/java/org/apache/activemq/usage/DefaultUsageCapacity.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/MemoryUsage.java b/activemq-client/src/main/java/org/apache/activemq/usage/MemoryUsage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/usage/MemoryUsage.java
rename to activemq-client/src/main/java/org/apache/activemq/usage/MemoryUsage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java b/activemq-client/src/main/java/org/apache/activemq/usage/Usage.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/usage/Usage.java
rename to activemq-client/src/main/java/org/apache/activemq/usage/Usage.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/UsageCapacity.java b/activemq-client/src/main/java/org/apache/activemq/usage/UsageCapacity.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/usage/UsageCapacity.java
rename to activemq-client/src/main/java/org/apache/activemq/usage/UsageCapacity.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/UsageListener.java b/activemq-client/src/main/java/org/apache/activemq/usage/UsageListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/usage/UsageListener.java
rename to activemq-client/src/main/java/org/apache/activemq/usage/UsageListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/BitArray.java b/activemq-client/src/main/java/org/apache/activemq/util/BitArray.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/BitArray.java
rename to activemq-client/src/main/java/org/apache/activemq/util/BitArray.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/BitArrayBin.java b/activemq-client/src/main/java/org/apache/activemq/util/BitArrayBin.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/BitArrayBin.java
rename to activemq-client/src/main/java/org/apache/activemq/util/BitArrayBin.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ByteArrayInputStream.java b/activemq-client/src/main/java/org/apache/activemq/util/ByteArrayInputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/ByteArrayInputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/util/ByteArrayInputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ByteArrayOutputStream.java b/activemq-client/src/main/java/org/apache/activemq/util/ByteArrayOutputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/ByteArrayOutputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/util/ByteArrayOutputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ByteSequence.java b/activemq-client/src/main/java/org/apache/activemq/util/ByteSequence.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/ByteSequence.java
rename to activemq-client/src/main/java/org/apache/activemq/util/ByteSequence.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ByteSequenceData.java b/activemq-client/src/main/java/org/apache/activemq/util/ByteSequenceData.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/ByteSequenceData.java
rename to activemq-client/src/main/java/org/apache/activemq/util/ByteSequenceData.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/Callback.java b/activemq-client/src/main/java/org/apache/activemq/util/Callback.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/Callback.java
rename to activemq-client/src/main/java/org/apache/activemq/util/Callback.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java b/activemq-client/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java b/activemq-client/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java b/activemq-client/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java
rename to activemq-client/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/FactoryFinder.java b/activemq-client/src/main/java/org/apache/activemq/util/FactoryFinder.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/FactoryFinder.java
rename to activemq-client/src/main/java/org/apache/activemq/util/FactoryFinder.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IOExceptionSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/IOExceptionSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/IOExceptionSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/util/IOExceptionSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java b/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java
rename to activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IndentPrinter.java b/activemq-client/src/main/java/org/apache/activemq/util/IndentPrinter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/IndentPrinter.java
rename to activemq-client/src/main/java/org/apache/activemq/util/IndentPrinter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/InetAddressUtil.java b/activemq-client/src/main/java/org/apache/activemq/util/InetAddressUtil.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/InetAddressUtil.java
rename to activemq-client/src/main/java/org/apache/activemq/util/InetAddressUtil.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IntSequenceGenerator.java b/activemq-client/src/main/java/org/apache/activemq/util/IntSequenceGenerator.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/IntSequenceGenerator.java
rename to activemq-client/src/main/java/org/apache/activemq/util/IntSequenceGenerator.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/IntrospectionSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/util/IntrospectionSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/LRUCache.java b/activemq-client/src/main/java/org/apache/activemq/util/LRUCache.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/LRUCache.java
rename to activemq-client/src/main/java/org/apache/activemq/util/LRUCache.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java b/activemq-client/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java
rename to activemq-client/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/MapHelper.java b/activemq-client/src/main/java/org/apache/activemq/util/MapHelper.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/MapHelper.java
rename to activemq-client/src/main/java/org/apache/activemq/util/MapHelper.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ServiceListener.java b/activemq-client/src/main/java/org/apache/activemq/util/ServiceListener.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/ServiceListener.java
rename to activemq-client/src/main/java/org/apache/activemq/util/ServiceListener.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java b/activemq-client/src/main/java/org/apache/activemq/util/ServiceStopper.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java
rename to activemq-client/src/main/java/org/apache/activemq/util/ServiceStopper.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/ServiceSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/util/ServiceSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/StopWatch.java b/activemq-client/src/main/java/org/apache/activemq/util/StopWatch.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/StopWatch.java
rename to activemq-client/src/main/java/org/apache/activemq/util/StopWatch.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/StringArrayConverter.java b/activemq-client/src/main/java/org/apache/activemq/util/StringArrayConverter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/StringArrayConverter.java
rename to activemq-client/src/main/java/org/apache/activemq/util/StringArrayConverter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java b/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java
rename to activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java b/activemq-client/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java
rename to activemq-client/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/TimeUtils.java b/activemq-client/src/main/java/org/apache/activemq/util/TimeUtils.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/TimeUtils.java
rename to activemq-client/src/main/java/org/apache/activemq/util/TimeUtils.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/TypeConversionSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/TypeConversionSupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/TypeConversionSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/util/TypeConversionSupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/URISupport.java b/activemq-client/src/main/java/org/apache/activemq/util/URISupport.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/util/URISupport.java
rename to activemq-client/src/main/java/org/apache/activemq/util/URISupport.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java b/activemq-client/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java
rename to activemq-client/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java b/activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormat.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java
rename to activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormat.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java b/activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java
rename to activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java
diff --git a/activemq-core/src/main/java/org/apache/activemq/wireformat/package.html b/activemq-client/src/main/java/org/apache/activemq/wireformat/package.html
similarity index 100%
rename from activemq-core/src/main/java/org/apache/activemq/wireformat/package.html
rename to activemq-client/src/main/java/org/apache/activemq/wireformat/package.html
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/failover b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/failover
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/failover
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/failover
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/mock b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/mock
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/mock
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/mock
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio+ssl b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio+ssl
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio+ssl
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio+ssl
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/udp b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/udp
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/udp
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/udp
diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default
similarity index 100%
rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default
rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java b/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java
rename to activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/util/BitArrayBinTest.java b/activemq-client/src/test/java/org/apache/activemq/util/BitArrayBinTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/util/BitArrayBinTest.java
rename to activemq-client/src/test/java/org/apache/activemq/util/BitArrayBinTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java b/activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java
rename to activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java b/activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java
rename to activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/util/LRUCacheTest.java b/activemq-client/src/test/java/org/apache/activemq/util/LRUCacheTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/util/LRUCacheTest.java
rename to activemq-client/src/test/java/org/apache/activemq/util/LRUCacheTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java b/activemq-client/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java
rename to activemq-client/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java
diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java b/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java
index 150e469319..14e81970b3 100644
--- a/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java
+++ b/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java
@@ -17,7 +17,6 @@
 package org.apache.activemq.console.command.store.amq.reader;
 
 import java.util.Iterator;
-import javax.jms.InvalidSelectorException;
 import javax.jms.Message;
 import org.apache.activemq.broker.region.MessageReference;
 import org.apache.activemq.filter.BooleanExpression;
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 0a41ebbc13..ecc3de2a7d 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -95,6 +95,10 @@
       <groupId>org.fusesource.mqtt-client</groupId>
       <artifactId>mqtt-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-client</artifactId>
+    </dependency>
 
     <!-- =============================== -->
     <!-- Optional Dependencies           -->
@@ -551,57 +555,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>javacc-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <configuration>
-              <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
-              <outputDirectory>${basedir}/target/generated-javacc</outputDirectory>
-              <packageName>org.apache.activemq.selector</packageName>
-            </configuration>
-            <goals>
-              <goal>javacc</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- disabled until the xbean 3.11.2 plugin is released -->
-      <!--
-      <plugin>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>maven-xbean-plugin</artifactId>
-        <version>${xbean-version}</version>
-        <executions>
-          <execution>
-          <phase>process-classes</phase>
-            <configuration>
-              <includes>
-                <include>${basedir}/../activemq-leveldb/src/main/scala</include>
-              </includes>
-              <strictXsdOrder>false</strictXsdOrder>
-              <namespace>http://activemq.apache.org/schema/core</namespace>
-              <schema>${basedir}/target/classes/activemq.xsd</schema>
-              <outputDir>${basedir}/target/classes</outputDir>
-              <generateSpringSchemasFile>false</generateSpringSchemasFile>
-              <excludedClasses>org.apache.activemq.broker.jmx.AnnotatedMBean,org.apache.activemq.broker.jmx.DestinationViewMBean</excludedClasses>
-            </configuration>
-            <goals>
-              <goal>mapping</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>com.thoughtworks.qdox</groupId>
-            <artifactId>qdox</artifactId>
-            <version>1.12</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java b/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java
index bda5e936cc..8a56e87d93 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java
@@ -16,7 +16,6 @@
  */
 package org.apache.activemq.broker;
 
-import org.apache.activemq.broker.Locker;
 import org.apache.activemq.util.ServiceSupport;
 
 import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
index ea473fb4f6..bc0d4725f8 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -48,7 +48,7 @@ import org.apache.activemq.store.PersistenceAdapterFactory;
 import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
 import org.apache.activemq.thread.Scheduler;
 import org.apache.activemq.thread.TaskRunnerFactory;
-import org.apache.activemq.transport.TransportFactory;
+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;
@@ -2203,7 +2203,7 @@ public class BrokerService implements Service {
     }
 
     protected TransportConnector createTransportConnector(URI brokerURI) throws Exception {
-        TransportServer transport = TransportFactory.bind(this, brokerURI);
+        TransportServer transport = TransportFactorySupport.bind(this, brokerURI);
         return new TransportConnector(transport);
     }
 
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java
index 0e7b831111..834f663e14 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java
@@ -26,6 +26,7 @@ import javax.net.ssl.KeyManager;
 import javax.net.ssl.TrustManager;
 
 import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.transport.TransportFactorySupport;
 import org.apache.activemq.transport.TransportServer;
 import org.apache.activemq.transport.tcp.SslTransportFactory;
 
@@ -101,7 +102,7 @@ public class SslBrokerService extends BrokerService {
             
         } else {
             // Else, business as usual.
-            return TransportFactory.bind(this, brokerURI);
+            return TransportFactorySupport.bind(this, brokerURI);
         }
     }
 }
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
index 88f4579b62..2cfb7e0df9 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
@@ -33,10 +33,7 @@ import org.apache.activemq.command.BrokerInfo;
 import org.apache.activemq.command.ConnectionControl;
 import org.apache.activemq.security.MessageAuthorizationPolicy;
 import org.apache.activemq.thread.TaskRunnerFactory;
-import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportAcceptListener;
-import org.apache.activemq.transport.TransportFactory;
-import org.apache.activemq.transport.TransportServer;
+import org.apache.activemq.transport.*;
 import org.apache.activemq.transport.discovery.DiscoveryAgent;
 import org.apache.activemq.transport.discovery.DiscoveryAgentFactory;
 import org.apache.activemq.util.ServiceStopper;
@@ -307,7 +304,7 @@ public class TransportConnector implements Connector, BrokerServiceAware {
             throw new IllegalArgumentException(
                     "You must specify the brokerService property. Maybe this connector should be added to a broker?");
         }
-        return TransportFactory.bind(brokerService, uri);
+        return TransportFactorySupport.bind(brokerService, uri);
     }
 
     public DiscoveryAgent getDiscoveryAgent() throws IOException {
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
index 581784e8fc..e0b3c5c4c1 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
@@ -176,7 +176,8 @@ public abstract class AbstractSubscription implements Subscription {
         boolean result = false;
         MessageEvaluationContext msgContext = context.getMessageEvaluationContext();
         try {
-            msgContext.setDestination(message.getRegionDestination().getActiveMQDestination());
+            Destination regionDestination = (Destination) message.getRegionDestination();
+            msgContext.setDestination(regionDestination.getActiveMQDestination());
             msgContext.setMessageReference(message);
             result = matches(message, msgContext);
             if (result) {
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java
index 55e2c6ef94..66f106c004 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java
@@ -37,7 +37,7 @@ import org.apache.activemq.usage.Usage;
 /**
  *
  */
-public interface Destination extends Service, Task {
+public interface Destination extends Service, Task, Message.MessageDestination {
 
     public static final DeadLetterStrategy DEFAULT_DEAD_LETTER_STRATEGY = new SharedDeadLetterStrategy();
     public static final long DEFAULT_BLOCKED_PRODUCER_WARNING_INTERVAL = 30000;
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
index 9039525b79..0c042d924f 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
@@ -91,7 +91,8 @@ public class DurableTopicSubscription extends PrefetchSubscription implements Us
         MessageAck ack = new MessageAck();
         ack.setAckType(MessageAck.UNMATCHED_ACK_TYPE);
         ack.setMessageID(node.getMessageId());
-        node.getRegionDestination().acknowledge(this.getContext(), this, ack, node);
+        Destination regionDestination = (Destination) node.getRegionDestination();
+        regionDestination.acknowledge(this.getContext(), this, ack, node);
     }
 
     @Override
@@ -284,7 +285,8 @@ public class DurableTopicSubscription extends PrefetchSubscription implements Us
     }
 
     protected void acknowledge(ConnectionContext context, MessageAck ack, MessageReference node) throws IOException {
-        node.getRegionDestination().acknowledge(context, this, ack, node);
+        Destination regionDestination = (Destination) node.getRegionDestination();
+        regionDestination.acknowledge(context, this, ack, node);
         redeliveredMessages.remove(node.getMessageId());
         node.decrementReferenceCount();
     }
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java
index 131974c621..d698e35fa3 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java
@@ -114,7 +114,7 @@ public class IndirectMessageReference implements QueueMessageReference {
         return message.getMessageId();
     }
 
-    public Destination getRegionDestination() {
+    public Message.MessageDestination getRegionDestination() {
         return message.getRegionDestination();
     }
 
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
index 530e0a833e..cd88a6a0af 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
@@ -220,7 +220,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                         // Don't remove the nodes until we are committed.
                         if (!context.isInTransaction()) {
                             dequeueCounter++;
-                            node.getRegionDestination().getDestinationStatistics().getInflight().decrement();
+                            ((Destination)node.getRegionDestination()).getDestinationStatistics().getInflight().decrement();
                             removeList.add(node);
                         } else {
                             registerRemoveSync(context, node);
@@ -248,7 +248,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                                     }
                                 }
                             }
-                            destination = node.getRegionDestination();
+                            destination = (Destination) node.getRegionDestination();
                             callDispatchMatched = true;
                             break;
                         }
@@ -272,7 +272,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                         // Don't remove the nodes until we are committed - immediateAck option
                         if (!context.isInTransaction()) {
                             dequeueCounter++;
-                            node.getRegionDestination().getDestinationStatistics().getInflight().decrement();
+                            ((Destination)node.getRegionDestination()).getDestinationStatistics().getInflight().decrement();
                             dispatched.remove(node);
                         } else {
                             registerRemoveSync(context, node);
@@ -287,7 +287,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                             }
                         }
                         acknowledge(context, ack, node);
-                        destination = node.getRegionDestination();
+                        destination = (Destination) node.getRegionDestination();
                         callDispatchMatched = true;
                         break;
                     }
@@ -298,12 +298,14 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                 int index = 0;
                 for (Iterator<MessageReference> iter = dispatched.iterator(); iter.hasNext(); index++) {
                     final MessageReference node = iter.next();
+                    Destination nodeDest = (Destination) node.getRegionDestination();
                     if (node.isExpired()) {
                         if (broker.isExpired(node)) {
-                            node.getRegionDestination().messageExpired(context, this, node);
+                            Destination regionDestination = (Destination) nodeDest;
+                            regionDestination.messageExpired(context, this, node);
                         }
                         iter.remove();
-                        node.getRegionDestination().getDestinationStatistics().getInflight().decrement();
+                        nodeDest.getDestinationStatistics().getInflight().decrement();
                     }
                     if (ack.getLastMessageId().equals(node.getMessageId())) {
                         if (usePrefetchExtension) {
@@ -315,7 +317,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                                 }
                             }
                         }
-                        destination = node.getRegionDestination();
+                        destination = nodeDest;
                         callDispatchMatched = true;
                         break;
                     }
@@ -337,7 +339,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                     }
                     if (inAckRange) {
                         if (ack.getLastMessageId().equals(messageId)) {
-                            destination = node.getRegionDestination();
+                            destination = (Destination) node.getRegionDestination();
                             callDispatchMatched = true;
                             break;
                         }
@@ -371,7 +373,8 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                                     ack.getPoisonCause().toString());
                         }
                         sendToDLQ(context, node);
-                        node.getRegionDestination().getDestinationStatistics()
+                        Destination nodeDest = (Destination) node.getRegionDestination();
+                        nodeDest.getDestinationStatistics()
                                 .getInflight().decrement();
                         removeList.add(node);
                         dequeueCounter++;
@@ -385,7 +388,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                                     break;
                                 }
                             }
-                            destination = node.getRegionDestination();
+                            destination = nodeDest;
                             callDispatchMatched = true;
                             break;
                         }
@@ -426,12 +429,13 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                     @Override
                     public void afterCommit()
                             throws Exception {
+                        Destination nodeDest = (Destination) node.getRegionDestination();
                         synchronized(dispatchLock) {
                             dequeueCounter++;
                             dispatched.remove(node);
-                            node.getRegionDestination().getDestinationStatistics().getInflight().decrement();
+                            nodeDest.getDestinationStatistics().getInflight().decrement();
                         }
-                        node.getRegionDestination().wakeup();
+                        nodeDest.wakeup();
                         dispatchPending();
                     }
 
@@ -439,7 +443,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                     public void afterRollback() throws Exception {
                         synchronized(dispatchLock) {
                             if (isSlave()) {
-                                node.getRegionDestination().getDestinationStatistics().getInflight().decrement();
+                                ((Destination)node.getRegionDestination()).getDestinationStatistics().getInflight().decrement();
                             } else {
                                 // poisionAck will decrement - otherwise still inflight on client
                             }
@@ -637,7 +641,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                                         //increment number to dispatch
                                         numberToDispatch++;
                                         if (broker.isExpired(node)) {
-                                            node.getRegionDestination().messageExpired(context, this, node);
+                                            ((Destination)node.getRegionDestination()).messageExpired(context, this, node);
                                         }
                                         continue;
                                     }
@@ -712,10 +716,11 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
     }
 
     protected void onDispatch(final MessageReference node, final Message message) {
-        if (node.getRegionDestination() != null) {
+        Destination nodeDest = (Destination) node.getRegionDestination();
+        if (nodeDest != null) {
             if (node != QueueMessageReference.NULL_MESSAGE) {
-                node.getRegionDestination().getDestinationStatistics().getDispatched().increment();
-                node.getRegionDestination().getDestinationStatistics().getInflight().increment();
+                nodeDest.getDestinationStatistics().getDispatched().increment();
+                nodeDest.getDestinationStatistics().getInflight().increment();
                 if (LOG.isTraceEnabled()) {
                     LOG.trace(info.getConsumerId() + " dispatched: " + message.getMessageId() + " - "
                             + message.getDestination()  + ", dispatched: " + dispatchCounter + ", inflight: " + dispatched.size());
@@ -759,7 +764,8 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
             md.setMessage(null);
             md.setDestination(null);
         } else {
-            md.setDestination(node.getRegionDestination().getActiveMQDestination());
+            Destination regionDestination = (Destination) node.getRegionDestination();
+            md.setDestination(regionDestination.getActiveMQDestination());
             md.setMessage(message);
             md.setRedeliveryCounter(node.getRedeliveryCounter());
         }
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java
index 4b9d030a11..c73d9601e4 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java
@@ -16,17 +16,8 @@
  */
 package org.apache.activemq.broker.region;
 
-import java.io.IOException;
-import java.util.List;
-
-import javax.jms.JMSException;
-
-import org.apache.activemq.broker.region.group.MessageGroupMap;
 import org.apache.activemq.broker.region.policy.SimpleDispatchSelector;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQMessage;
-import org.apache.activemq.command.ConsumerId;
-import org.apache.activemq.command.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
index 40a4f70e1f..0bb9ade652 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
@@ -45,7 +45,7 @@ public class QueueSubscription extends PrefetchSubscription implements LockOwner
      * @throws IOException
      */
     protected void acknowledge(final ConnectionContext context, final MessageAck ack, final MessageReference n) throws IOException {
-        final Destination q = n.getRegionDestination();
+        final Destination q = (Destination) n.getRegionDestination();
         final QueueMessageReference node = (QueueMessageReference)n;
         final Queue queue = (Queue)q;
         
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
index e521d4b11f..e89856f6f0 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
@@ -665,7 +665,7 @@ public class RegionBroker extends EmptyBroker {
             message.setBrokerOutTime(endTime);
             if (getBrokerService().isEnableStatistics()) {
                 long totalTime = endTime - message.getBrokerInTime();
-                message.getRegionDestination().getDestinationStatistics().getProcessTime().addTime(totalTime);
+                ((Destination)message.getRegionDestination()).getDestinationStatistics().getProcessTime().addTime(totalTime);
             }
         }
     }
@@ -805,8 +805,8 @@ public class RegionBroker extends EmptyBroker {
             if(node!=null){
                 Message message=node.getMessage();
                 if(message!=null && node.getRegionDestination()!=null){
-                    DeadLetterStrategy deadLetterStrategy=node
-                            .getRegionDestination().getDeadLetterStrategy();
+                    DeadLetterStrategy deadLetterStrategy=((Destination)node
+                            .getRegionDestination()).getDeadLetterStrategy();
                     if(deadLetterStrategy!=null){
                         if(deadLetterStrategy.isSendToDeadLetterQueue(message)){
                             // message may be inflight to other subscriptions so do not modify
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
index 17e934ff21..413e1e0d52 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
@@ -223,7 +223,7 @@ public class TopicSubscription extends AbstractSubscription {
                     matched.remove();
                     dispatchedCounter.incrementAndGet();
                     node.decrementReferenceCount();
-                    node.getRegionDestination().getDestinationStatistics().getExpired().increment();
+                    ((Destination)node.getRegionDestination()).getDestinationStatistics().getExpired().increment();
                     broker.messageExpired(getContext(), node, this);
                     break;
                 }
@@ -549,12 +549,12 @@ public class TopicSubscription extends AbstractSubscription {
         md.setMessage(message);
         md.setConsumerId(info.getConsumerId());
         if (node != null) {
-            md.setDestination(node.getRegionDestination().getActiveMQDestination());
+            md.setDestination(((Destination)node.getRegionDestination()).getActiveMQDestination());
             dispatchedCounter.incrementAndGet();
             // Keep track if this subscription is receiving messages from a single destination.
             if (singleDestination) {
                 if (destination == null) {
-                    destination = node.getRegionDestination();
+                    destination = (Destination)node.getRegionDestination();
                 } else {
                     if (destination != node.getRegionDestination()) {
                         singleDestination = false;
@@ -567,8 +567,9 @@ public class TopicSubscription extends AbstractSubscription {
                 md.setTransmitCallback(new Runnable() {
                     @Override
                     public void run() {
-                        node.getRegionDestination().getDestinationStatistics().getDispatched().increment();
-                        node.getRegionDestination().getDestinationStatistics().getInflight().increment();
+                        Destination regionDestination = (Destination) node.getRegionDestination();
+                        regionDestination.getDestinationStatistics().getDispatched().increment();
+                        regionDestination.getDestinationStatistics().getInflight().increment();
                         node.decrementReferenceCount();
                     }
                 });
@@ -577,8 +578,9 @@ public class TopicSubscription extends AbstractSubscription {
         } else {
             context.getConnection().dispatchSync(md);
             if (node != null) {
-                node.getRegionDestination().getDestinationStatistics().getDispatched().increment();
-                node.getRegionDestination().getDestinationStatistics().getInflight().increment();
+                Destination regionDestination = (Destination) node.getRegionDestination();
+                regionDestination.getDestinationStatistics().getDispatched().increment();
+                regionDestination.getDestinationStatistics().getInflight().increment();
                 node.decrementReferenceCount();
             }
         }
@@ -594,7 +596,7 @@ public class TopicSubscription extends AbstractSubscription {
         if (LOG.isDebugEnabled()) {
             LOG.debug(this + ", discarding message " + message);
         }
-        Destination dest = message.getRegionDestination();
+        Destination dest = (Destination) message.getRegionDestination();
         if (dest != null) {
             dest.messageDiscarded(getContext(), this, message);
         }
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
index 6b1dc5a46c..927c230c2b 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
@@ -206,7 +206,7 @@ public class FilePendingMessageCursor extends AbstractPendingMessageCursor imple
     public synchronized boolean tryAddMessageLast(MessageReference node, long maxWaitTime) throws Exception {
         if (!node.isExpired()) {
             try {
-                regionDestination = node.getMessage().getRegionDestination();
+                regionDestination = (Destination) node.getMessage().getRegionDestination();
                 if (isDiskListEmpty()) {
                     if (hasSpace() || this.store == null) {
                         memoryList.addMessageLast(node);
@@ -254,7 +254,7 @@ public class FilePendingMessageCursor extends AbstractPendingMessageCursor imple
     public synchronized void addMessageFirst(MessageReference node) {
         if (!node.isExpired()) {
             try {
-                regionDestination = node.getMessage().getRegionDestination();
+                regionDestination = (Destination) node.getMessage().getRegionDestination();
                 if (isDiskListEmpty()) {
                     if (hasSpace()) {
                         memoryList.addMessageFirst(node);
@@ -473,7 +473,7 @@ public class FilePendingMessageCursor extends AbstractPendingMessageCursor imple
         if (broker.isExpired(reference)) {
             ConnectionContext context = new ConnectionContext(new NonCachedMessageEvaluationContext());
             context.setBroker(broker);
-            reference.getRegionDestination().messageExpired(context, null, new IndirectMessageReference(reference.getMessage()));
+            ((Destination)reference.getRegionDestination()).messageExpired(context, null, new IndirectMessageReference(reference.getMessage()));
         }
     }
 
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
index 11d0d00cd3..608b88123b 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
@@ -192,7 +192,7 @@ public class StoreDurableSubscriberCursor extends AbstractPendingMessageCursor {
                 }
             }
             if (msg.isPersistent()) {
-                Destination dest = msg.getRegionDestination();
+                Destination dest = (Destination) msg.getRegionDestination();
                 TopicStorePrefetch tsp = topics.get(dest);
                 if (tsp != null) {
                     tsp.addMessageLast(node);
@@ -225,7 +225,7 @@ public class StoreDurableSubscriberCursor extends AbstractPendingMessageCursor {
             if (!msg.isPersistent()) {
                 nonPersistent.addMessageFirst(node);
             } else {
-                Destination dest = msg.getRegionDestination();
+                Destination dest = (Destination) msg.getRegionDestination();
                 TopicStorePrefetch tsp = topics.get(dest);
                 if (tsp != null) {
                     tsp.addMessageFirst(node);
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java
index f41b19932c..b2595a1bee 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java
@@ -17,9 +17,6 @@
 package org.apache.activemq.broker.region.policy;
 
 import org.apache.activemq.ActiveMQMessageAudit;
-import org.apache.activemq.broker.region.MessageReference;
-import org.apache.activemq.broker.region.Subscription;
-import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java
index 806aaae1ed..c624330707 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java
@@ -16,7 +16,6 @@
  */
 package org.apache.activemq.broker.region.policy;
 
-import org.apache.activemq.broker.region.MessageReference;
 import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java
index c3e1b79ddc..7b5dd77173 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java
@@ -16,6 +16,7 @@
  */
 package org.apache.activemq.broker.region.policy;
 
+import org.apache.activemq.broker.region.Destination;
 import org.apache.activemq.broker.region.DurableTopicSubscription;
 import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.command.ActiveMQDestination;
@@ -142,11 +143,12 @@ public class IndividualDeadLetterStrategy extends AbstractDeadLetterStrategy {
                                                     Subscription subscription ) {
         String name = null;
 
-        if (message.getRegionDestination() != null
-                && message.getRegionDestination().getActiveMQDestination() != null
-                && message.getRegionDestination().getActiveMQDestination().getPhysicalName() != null
-                && !message.getRegionDestination().getActiveMQDestination().getPhysicalName().isEmpty()){
-            name = prefix + message.getRegionDestination().getActiveMQDestination().getPhysicalName();
+        Destination regionDestination = (Destination) message.getRegionDestination();
+        if (regionDestination != null
+                && regionDestination.getActiveMQDestination() != null
+                && regionDestination.getActiveMQDestination().getPhysicalName() != null
+                && !regionDestination.getActiveMQDestination().getPhysicalName().isEmpty()){
+            name = prefix + regionDestination.getActiveMQDestination().getPhysicalName();
         } else {
             name = prefix + message.getDestination().getPhysicalName();
         }
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java
index dd41e0a9ea..cb044e5a26 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java
@@ -21,7 +21,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java b/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
index 0da5990591..59b7857bf5 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
@@ -28,7 +28,6 @@ import javax.jms.Session;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.Service;
 import org.apache.activemq.advisory.AdvisorySupport;
-import org.apache.activemq.util.ServiceStopper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java b/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java
index 04244b548b..0bcb9ff3ac 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java
@@ -23,6 +23,7 @@ import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerPluginSupport;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.broker.ProducerBrokerExchange;
+import org.apache.activemq.broker.region.Destination;
 import org.apache.activemq.broker.region.MessageReference;
 import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.broker.region.policy.RedeliveryPolicyMap;
@@ -33,7 +34,6 @@ import org.apache.activemq.command.Message;
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.filter.AnyDestination;
 import org.apache.activemq.state.ProducerState;
-import org.apache.activemq.util.BrokerSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -132,7 +132,8 @@ public class RedeliveryPlugin extends BrokerPluginSupport {
             super.sendToDeadLetterQueue(context, messageReference, subscription);
         } else {
             try {
-                final RedeliveryPolicy redeliveryPolicy = redeliveryPolicyMap.getEntryFor(messageReference.getRegionDestination().getActiveMQDestination());
+                Destination regionDestination = (Destination) messageReference.getRegionDestination();
+                final RedeliveryPolicy redeliveryPolicy = redeliveryPolicyMap.getEntryFor(regionDestination.getActiveMQDestination());
                 if (redeliveryPolicy != null) {
                     int redeliveryCount = messageReference.getRedeliveryCounter();
                     if (redeliveryCount < redeliveryPolicy.getMaximumRedeliveries()) {
@@ -150,7 +151,7 @@ public class RedeliveryPlugin extends BrokerPluginSupport {
                 } else if (isFallbackToDeadLetter()) {
                     super.sendToDeadLetterQueue(context, messageReference, subscription);
                 } else {
-                    LOG.debug("Ignoring dlq request for:" + messageReference.getMessageId()  + ", RedeliveryPolicy not found (and no fallback) for: " + messageReference.getRegionDestination().getActiveMQDestination());
+                    LOG.debug("Ignoring dlq request for:" + messageReference.getMessageId() + ", RedeliveryPolicy not found (and no fallback) for: " + regionDestination.getActiveMQDestination());
                 }
             } catch (Exception exception) {
                 // abort the ack, will be effective if client use transactions or individual ack with sync send
@@ -163,8 +164,9 @@ public class RedeliveryPlugin extends BrokerPluginSupport {
 
     private void scheduleRedelivery(ConnectionContext context, MessageReference messageReference, long delay, int redeliveryCount) throws Exception {
         if (LOG.isTraceEnabled()) {
+            Destination regionDestination = (Destination) messageReference.getRegionDestination();
             LOG.trace("redelivery #" + redeliveryCount + " of: " + messageReference.getMessageId() + " with delay: "
-                    + delay + ", dest: " + messageReference.getRegionDestination().getActiveMQDestination());
+                    + delay + ", dest: " + regionDestination.getActiveMQDestination());
         }
         final Message old = messageReference.getMessage();
         Message message = old.copy();
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java b/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java
index abba376bef..372b8fde5f 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java
@@ -18,6 +18,7 @@ package org.apache.activemq.broker.util;
 
 import org.apache.activemq.broker.BrokerPluginSupport;
 import org.apache.activemq.broker.ProducerBrokerExchange;
+import org.apache.activemq.broker.region.Destination;
 import org.apache.activemq.broker.region.policy.DeadLetterStrategy;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
@@ -136,13 +137,14 @@ public class TimeStampingBrokerPlugin extends BrokerPluginSupport {
         DeadLetterStrategy deadLetterStrategy;
         Message tmp;
 
-        if (message != null && message.getRegionDestination() != null) {
-            deadLetterStrategy = message.getRegionDestination().getDeadLetterStrategy();
+        Destination regionDestination = (Destination) message.getRegionDestination();
+        if (message != null && regionDestination != null) {
+            deadLetterStrategy = regionDestination.getDeadLetterStrategy();
             if (deadLetterStrategy != null) {
                 // Cheap copy, since we only need two fields
                 tmp = new ActiveMQMessage();
                 tmp.setDestination(message.getOriginalDestination());
-                tmp.setRegionDestination(message.getRegionDestination());
+                tmp.setRegionDestination(regionDestination);
 
                 // Determine if we are headed for a DLQ
                 ActiveMQDestination deadLetterDestination = deadLetterStrategy.getDeadLetterQueueFor(tmp, null);
diff --git a/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java b/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java
index cbc167499c..0c67a7ce06 100644
--- a/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java
+++ b/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java
@@ -23,8 +23,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.activemq.thread.Scheduler;
-import org.apache.activemq.util.ByteSequence;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java b/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java
index fbeaea8e96..c0db3e329f 100644
--- a/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java
+++ b/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java
@@ -18,6 +18,7 @@ package org.apache.activemq.network;
 
 import java.util.List;
 
+import org.apache.activemq.broker.region.Destination;
 import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.command.BrokerId;
 import org.apache.activemq.command.ConsumerInfo;
@@ -131,7 +132,8 @@ public class ConditionalNetworkBridgeFilterFactory implements NetworkBridgeFilte
         }
 
         private boolean hasNoLocalConsumers(final Message message, final MessageEvaluationContext mec) {
-            List<Subscription> consumers = mec.getMessageReference().getRegionDestination().getConsumers();
+            Destination regionDestination = (Destination) mec.getMessageReference().getRegionDestination();
+            List<Subscription> consumers = regionDestination.getConsumers();
             for (Subscription sub : consumers) {
                 if (!sub.getConsumerInfo().isNetworkSubscription() && !sub.getConsumerInfo().isBrowser()) {
                     if (LOG.isTraceEnabled()) {
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java
index 21402df81d..2e41ad1e6f 100644
--- a/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java
@@ -21,7 +21,6 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileLock;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
index d4e7f42042..08276d3789 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
@@ -40,7 +40,6 @@ import org.apache.activemq.store.PersistenceAdapter;
 import org.apache.activemq.store.AbstractMessageStore;
 import org.apache.activemq.transaction.Synchronization;
 import org.apache.activemq.usage.MemoryUsage;
-import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.util.Callback;
 import org.apache.activemq.util.TransactionTemplate;
 import org.slf4j.Logger;
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
index a239721a7d..7fc10bd174 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
@@ -25,10 +25,7 @@ import org.apache.activemq.command.MessageId;
 import org.apache.activemq.kaha.MapContainer;
 import org.apache.activemq.kaha.StoreEntry;
 import org.apache.activemq.store.MessageRecoveryListener;
-import org.apache.activemq.store.MessageStore;
 import org.apache.activemq.store.AbstractMessageStore;
-import org.apache.activemq.usage.MemoryUsage;
-import org.apache.activemq.usage.SystemUsage;
 
 /**
  * An implementation of {@link org.apache.activemq.store.MessageStore} which
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java
index 46c9929190..ae291a32cb 100644
--- a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java
@@ -16,10 +16,6 @@
  */
 package org.apache.activemq.store.kahadb.scheduler;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 import org.apache.activemq.broker.scheduler.Job;
 import org.apache.activemq.broker.scheduler.JobSupport;
 import org.apache.activemq.util.ByteSequence;
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
index db6d0dc696..5ad6a32007 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
@@ -29,10 +29,7 @@ import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.command.MessageId;
 import org.apache.activemq.store.MessageRecoveryListener;
-import org.apache.activemq.store.MessageStore;
 import org.apache.activemq.store.AbstractMessageStore;
-import org.apache.activemq.usage.MemoryUsage;
-import org.apache.activemq.usage.SystemUsage;
 
 /**
  * An implementation of {@link org.apache.activemq.store.MessageStore} which
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java
new file mode 100644
index 0000000000..f88b670225
--- /dev/null
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java
@@ -0,0 +1,30 @@
+package org.apache.activemq.transport;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerServiceAware;
+import org.apache.activemq.broker.SslContext;
+
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class TransportFactorySupport {
+
+    public static TransportServer bind(BrokerService brokerService, URI location) throws IOException {
+        TransportFactory tf = TransportFactory.findTransportFactory(location);
+        if( brokerService!=null && tf instanceof BrokerServiceAware) {
+            ((BrokerServiceAware)tf).setBrokerService(brokerService);
+        }
+        try {
+            if( brokerService!=null ) {
+                SslContext.setCurrentSslContext(brokerService.getSslContext());
+            }
+            return tf.doBind(location);
+        } finally {
+            SslContext.setCurrentSslContext(null);
+        }
+    }
+
+}
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java
new file mode 100644
index 0000000000..0c40262c3d
--- /dev/null
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java
@@ -0,0 +1,20 @@
+package org.apache.activemq.transport;
+
+import org.apache.activemq.TransportLoggerSupport;
+
+import java.io.IOException;
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class TransportLoggerFactorySPI implements TransportLoggerSupport.SPI {
+    @Override
+    public Transport createTransportLogger(Transport transport) throws IOException {
+        return TransportLoggerFactory.getInstance().createTransportLogger(transport);
+    }
+
+    @Override
+    public Transport createTransportLogger(Transport transport, String logWriterName, boolean dynamicManagement, boolean startLogging, int jmxPort) throws IOException {
+        return TransportLoggerFactory.getInstance().createTransportLogger(transport, logWriterName, dynamicManagement, startLogging, jmxPort);
+    }
+}
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java
index b034e085df..9abee5de74 100644
--- a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author David Martin Clavo david(dot)martin(dot)clavo(at)gmail.com
  *  
- * @see TransportLoggerViewMBean.
+ * @see TransportLoggerViewMBean
  */
 public class TransportLoggerView implements TransportLoggerViewMBean {
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java b/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java
index 292470feaf..2c0f688890 100644
--- a/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java
@@ -28,7 +28,6 @@ import javax.jms.Topic;
 import javax.jms.TextMessage;
 import javax.management.ObjectName;
 
-import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.advisory.DestinationSource;
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
diff --git a/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java b/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java
index 4d6875ec9b..72da777c85 100644
--- a/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java
@@ -28,7 +28,6 @@ import javax.jms.MessageListener;
 import javax.jms.Session;
 
 import org.apache.activemq.EmbeddedBrokerTestSupport;
-import org.apache.activemq.ReconnectWithSameClientIDTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/Main.java b/activemq-core/src/test/java/org/apache/activemq/broker/Main.java
index d73b85000d..9e1fa5e878 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/Main.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/Main.java
@@ -17,7 +17,6 @@
 package org.apache.activemq.broker;
 
 import javax.jms.Connection;
-import javax.jms.MessageConsumer;
 import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java
index 4bb6a7c624..c65dc53931 100755
--- a/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java
@@ -30,10 +30,6 @@ import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.RemoveInfo;
 import org.apache.activemq.command.SessionInfo;
 
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-
 public class AdvisoryBrokerTest extends BrokerTestSupport {
      
     public void testConnectionAdvisories() throws Exception {
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java
index 90d7283566..1cf318dce5 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java
@@ -16,12 +16,10 @@
  */
 package org.apache.activemq.broker.advisory;
 
-import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.EmbeddedBrokerTestSupport;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.jmx.BrokerViewMBean;
 import org.apache.activemq.broker.jmx.ManagementContext;
-import org.apache.activemq.broker.jmx.QueueViewMBean;
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.DestinationInfo;
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java
index bbc87a5bd6..7c5373099f 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java
@@ -32,7 +32,6 @@ import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQQueue;
 
 /**
  * 
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
index 22609f6627..4ac6bcdd7b 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
@@ -47,7 +47,6 @@ import org.apache.activemq.filter.MessageEvaluationContext;
 import org.apache.activemq.state.ProducerState;
 import org.apache.activemq.store.MessageStore;
 import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.thread.TaskRunnerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java
index bf9d8ef2e5..0db12d98fc 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java
@@ -25,8 +25,6 @@ import org.apache.activemq.broker.Connection;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.broker.Connector;
 import org.apache.activemq.broker.ProducerBrokerExchange;
-import org.apache.activemq.broker.region.DestinationStatistics;
-import org.apache.activemq.broker.region.Queue;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.apache.activemq.command.Command;
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTestSupport.java
index 5a82b533c8..7c8951bb2c 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTestSupport.java
@@ -17,18 +17,9 @@
 package org.apache.activemq.broker.region.cursors;
 
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.region.Destination;
-import org.apache.activemq.broker.region.DestinationStatistics;
-import org.apache.activemq.broker.region.IndirectMessageReference;
-import org.apache.activemq.broker.region.MessageReference;
-import org.apache.activemq.broker.region.Queue;
 import org.apache.activemq.broker.region.QueueMessageReference;
-import org.apache.activemq.command.ActiveMQMessage;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.MessageId;
 import org.apache.activemq.store.PList;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.activemq.store.kahadb.disk.page.PageFile;
 import org.apache.activemq.util.ByteSequence;
 import org.junit.After;
 import org.junit.Test;
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java
index 05be4d8093..23b9e80356 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java
@@ -38,8 +38,6 @@ import javax.jms.TextMessage;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
-import junit.framework.TestCase;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.AutoFailTestSupport;
 import org.apache.activemq.broker.BrokerService;
diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
index 4f9c641fe4..6b961cd759 100644
--- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
@@ -33,8 +33,6 @@ import javax.jms.Session;
 import javax.jms.Topic;
 import javax.jms.TransactionRolledBackException;
 
-import junit.framework.TestCase;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.AutoFailTestSupport;
 import org.apache.activemq.broker.BrokerService;
diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java
index 42aed75e8f..dcd5064c6c 100644
--- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java
@@ -30,10 +30,7 @@ import org.apache.activemq.network.DiscoveryNetworkConnector;
 import org.apache.activemq.thread.Task;
 import org.apache.activemq.thread.TaskRunner;
 import org.apache.activemq.thread.TaskRunnerFactory;
-import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportFactory;
-import org.apache.activemq.transport.TransportListener;
-import org.apache.activemq.transport.TransportServer;
+import org.apache.activemq.transport.*;
 import org.apache.activemq.transport.discovery.simple.SimpleDiscoveryAgent;
 import org.junit.After;
 import org.junit.Assert;
@@ -61,7 +58,7 @@ public class AMQ3014Test {
         @Override
         protected TransportConnector createTransportConnector(URI brokerURI)
                 throws Exception {
-            TransportServer transport = TransportFactory.bind(this, brokerURI);
+            TransportServer transport = TransportFactorySupport.bind(this, brokerURI);
             return new TransportConnector(transport) {
                 @Override
                 protected Connection createConnection(Transport transport)
diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3903Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3903Test.java
index 746897022d..90ec0a3f79 100644
--- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3903Test.java
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3903Test.java
@@ -29,12 +29,9 @@ import javax.jms.Topic;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.advisory.AdvisorySupport;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.region.DestinationInterceptor;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
-import org.apache.activemq.broker.region.virtual.MirroredQueue;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.util.Wait;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java b/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java
index bab93090d9..ec81800d0a 100755
--- a/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java
@@ -20,7 +20,6 @@ import java.io.IOException;
 
 import junit.framework.Test;
 
-import org.apache.activemq.JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest;
 import org.apache.activemq.util.ByteSequence;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalImplTest.java b/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalImplTest.java
index c12a5e62d7..a1bde8d127 100644
--- a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalImplTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalImplTest.java
@@ -27,7 +27,6 @@ import org.apache.activeio.journal.RecordLocation;
 import org.apache.activeio.packet.ByteArrayPacket;
 import org.apache.activeio.packet.Packet;
 import org.apache.activemq.kaha.impl.async.JournalFacade.RecordLocationFacade;
-import org.apache.activemq.kaha.impl.async.ReadOnlyAsyncDataManager;
 import org.apache.activemq.util.ByteSequence;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
index 60b31a06bf..1ed11fc0bc 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
@@ -36,7 +36,6 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.apache.activemq.command.BrokerId;
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java
index 5761a101b5..037375cbb4 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java
@@ -17,7 +17,6 @@
 package org.apache.activemq.openwire.v1;
 
 import java.io.DataOutputStream;
-import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java
index 07ef2ce2a5..f45b80c7d4 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java
@@ -17,11 +17,6 @@
  */
 package org.apache.activemq.openwire.v4;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java
index 811e555f43..e5bfe05728 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java
@@ -17,11 +17,6 @@
  */
 package org.apache.activemq.openwire.v5;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v6/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v6/MessageTestSupport.java
index fd2f608e59..863ee595c3 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v6/MessageTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v6/MessageTestSupport.java
@@ -17,11 +17,6 @@
  */
 package org.apache.activemq.openwire.v6;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageTestSupport.java
index e4cb89451a..a5d4f3b52c 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageTestSupport.java
@@ -1 +1 @@
-/**
 *
 * 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.openwire.v7;

import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;


/**
 * Test case for the OpenWire marshalling for Message
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public abstract class MessageTestSupport extends BaseCommandTestSupport {


    protected void populateObject(Object object) throws Exception {
        super.populateObject(object);
        Message info = (Message) object;

        info.setProducerId(createProducerId("ProducerId:1"));
        info.setDestination(createActiveMQDestination("Destination:2"));
        info.setTransactionId(createTransactionId("TransactionId:3"));
        info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4"));
        info.setMessageId(createMessageId("MessageId:5"));
        info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6"));
        info.setGroupID("GroupID:7");
        info.setGroupSequence(1);
        info.setCorrelationId("CorrelationId:8");
        info.setPersistent(true);
        info.setExpiration(1);
        info.setPriority((byte) 1);
        info.setReplyTo(createActiveMQDestination("ReplyTo:9"));
        info.setTimestamp(2);
        info.setType("Type:10");
        {
            byte data[] = "Content:11".getBytes();
            info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        {
            byte data[] = "MarshalledProperties:12".getBytes();
            info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        info.setDataStructure(createDataStructure("DataStructure:13"));
        info.setTargetConsumerId(createConsumerId("TargetConsumerId:14"));
        info.setCompressed(false);
        info.setRedeliveryCounter(2);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("BrokerPath:15");
            }
            info.setBrokerPath(value);
        }
        info.setArrival(3);
        info.setUserID("UserID:16");
        info.setRecievedByDFBridge(true);
        info.setDroppable(false);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("Cluster:17");
            }
            info.setCluster(value);
        }
        info.setBrokerInTime(4);
        info.setBrokerOutTime(5);
    }
}
\ No newline at end of file
+/**
 *
 * 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.openwire.v7;

import org.apache.activemq.command.*;


/**
 * Test case for the OpenWire marshalling for Message
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public abstract class MessageTestSupport extends BaseCommandTestSupport {


    protected void populateObject(Object object) throws Exception {
        super.populateObject(object);
        Message info = (Message) object;

        info.setProducerId(createProducerId("ProducerId:1"));
        info.setDestination(createActiveMQDestination("Destination:2"));
        info.setTransactionId(createTransactionId("TransactionId:3"));
        info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4"));
        info.setMessageId(createMessageId("MessageId:5"));
        info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6"));
        info.setGroupID("GroupID:7");
        info.setGroupSequence(1);
        info.setCorrelationId("CorrelationId:8");
        info.setPersistent(true);
        info.setExpiration(1);
        info.setPriority((byte) 1);
        info.setReplyTo(createActiveMQDestination("ReplyTo:9"));
        info.setTimestamp(2);
        info.setType("Type:10");
        {
            byte data[] = "Content:11".getBytes();
            info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        {
            byte data[] = "MarshalledProperties:12".getBytes();
            info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        info.setDataStructure(createDataStructure("DataStructure:13"));
        info.setTargetConsumerId(createConsumerId("TargetConsumerId:14"));
        info.setCompressed(false);
        info.setRedeliveryCounter(2);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("BrokerPath:15");
            }
            info.setBrokerPath(value);
        }
        info.setArrival(3);
        info.setUserID("UserID:16");
        info.setRecievedByDFBridge(true);
        info.setDroppable(false);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("Cluster:17");
            }
            info.setCluster(value);
        }
        info.setBrokerInTime(4);
        info.setBrokerOutTime(5);
    }
}
\ No newline at end of file
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v8/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v8/MessageTestSupport.java
index 7a52a48fc7..0e3b269b50 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v8/MessageTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v8/MessageTestSupport.java
@@ -1 +1 @@
-/**
 *
 * 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.openwire.v8;

import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;


/**
 * Test case for the OpenWire marshalling for Message
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public abstract class MessageTestSupport extends BaseCommandTestSupport {


    protected void populateObject(Object object) throws Exception {
        super.populateObject(object);
        Message info = (Message) object;

        info.setProducerId(createProducerId("ProducerId:1"));
        info.setDestination(createActiveMQDestination("Destination:2"));
        info.setTransactionId(createTransactionId("TransactionId:3"));
        info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4"));
        info.setMessageId(createMessageId("MessageId:5"));
        info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6"));
        info.setGroupID("GroupID:7");
        info.setGroupSequence(1);
        info.setCorrelationId("CorrelationId:8");
        info.setPersistent(true);
        info.setExpiration(1);
        info.setPriority((byte) 1);
        info.setReplyTo(createActiveMQDestination("ReplyTo:9"));
        info.setTimestamp(2);
        info.setType("Type:10");
        {
            byte data[] = "Content:11".getBytes();
            info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        {
            byte data[] = "MarshalledProperties:12".getBytes();
            info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        info.setDataStructure(createDataStructure("DataStructure:13"));
        info.setTargetConsumerId(createConsumerId("TargetConsumerId:14"));
        info.setCompressed(false);
        info.setRedeliveryCounter(2);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("BrokerPath:15");
            }
            info.setBrokerPath(value);
        }
        info.setArrival(3);
        info.setUserID("UserID:16");
        info.setRecievedByDFBridge(true);
        info.setDroppable(false);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("Cluster:17");
            }
            info.setCluster(value);
        }
        info.setBrokerInTime(4);
        info.setBrokerOutTime(5);
    }
}
\ No newline at end of file
+/**
 *
 * 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.openwire.v8;

import org.apache.activemq.command.*;


/**
 * Test case for the OpenWire marshalling for Message
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public abstract class MessageTestSupport extends BaseCommandTestSupport {


    protected void populateObject(Object object) throws Exception {
        super.populateObject(object);
        Message info = (Message) object;

        info.setProducerId(createProducerId("ProducerId:1"));
        info.setDestination(createActiveMQDestination("Destination:2"));
        info.setTransactionId(createTransactionId("TransactionId:3"));
        info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4"));
        info.setMessageId(createMessageId("MessageId:5"));
        info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6"));
        info.setGroupID("GroupID:7");
        info.setGroupSequence(1);
        info.setCorrelationId("CorrelationId:8");
        info.setPersistent(true);
        info.setExpiration(1);
        info.setPriority((byte) 1);
        info.setReplyTo(createActiveMQDestination("ReplyTo:9"));
        info.setTimestamp(2);
        info.setType("Type:10");
        {
            byte data[] = "Content:11".getBytes();
            info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        {
            byte data[] = "MarshalledProperties:12".getBytes();
            info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        info.setDataStructure(createDataStructure("DataStructure:13"));
        info.setTargetConsumerId(createConsumerId("TargetConsumerId:14"));
        info.setCompressed(false);
        info.setRedeliveryCounter(2);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("BrokerPath:15");
            }
            info.setBrokerPath(value);
        }
        info.setArrival(3);
        info.setUserID("UserID:16");
        info.setRecievedByDFBridge(true);
        info.setDroppable(false);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("Cluster:17");
            }
            info.setCluster(value);
        }
        info.setBrokerInTime(4);
        info.setBrokerOutTime(5);
    }
}
\ No newline at end of file
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v9/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v9/MessageTestSupport.java
index 9b41eb0da3..3557528dee 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v9/MessageTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v9/MessageTestSupport.java
@@ -1 +1 @@
-/**
 *
 * 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.openwire.v9;

import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;


/**
 * Test case for the OpenWire marshalling for Message
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public abstract class MessageTestSupport extends BaseCommandTestSupport {


    protected void populateObject(Object object) throws Exception {
        super.populateObject(object);
        Message info = (Message) object;

        info.setProducerId(createProducerId("ProducerId:1"));
        info.setDestination(createActiveMQDestination("Destination:2"));
        info.setTransactionId(createTransactionId("TransactionId:3"));
        info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4"));
        info.setMessageId(createMessageId("MessageId:5"));
        info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6"));
        info.setGroupID("GroupID:7");
        info.setGroupSequence(1);
        info.setCorrelationId("CorrelationId:8");
        info.setPersistent(true);
        info.setExpiration(1);
        info.setPriority((byte) 1);
        info.setReplyTo(createActiveMQDestination("ReplyTo:9"));
        info.setTimestamp(2);
        info.setType("Type:10");
        {
            byte data[] = "Content:11".getBytes();
            info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        {
            byte data[] = "MarshalledProperties:12".getBytes();
            info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        info.setDataStructure(createDataStructure("DataStructure:13"));
        info.setTargetConsumerId(createConsumerId("TargetConsumerId:14"));
        info.setCompressed(false);
        info.setRedeliveryCounter(2);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("BrokerPath:15");
            }
            info.setBrokerPath(value);
        }
        info.setArrival(3);
        info.setUserID("UserID:16");
        info.setRecievedByDFBridge(true);
        info.setDroppable(false);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("Cluster:17");
            }
            info.setCluster(value);
        }
        info.setBrokerInTime(4);
        info.setBrokerOutTime(5);
    }
}
\ No newline at end of file
+/**
 *
 * 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.openwire.v9;

import org.apache.activemq.command.*;


/**
 * Test case for the OpenWire marshalling for Message
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public abstract class MessageTestSupport extends BaseCommandTestSupport {


    protected void populateObject(Object object) throws Exception {
        super.populateObject(object);
        Message info = (Message) object;

        info.setProducerId(createProducerId("ProducerId:1"));
        info.setDestination(createActiveMQDestination("Destination:2"));
        info.setTransactionId(createTransactionId("TransactionId:3"));
        info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4"));
        info.setMessageId(createMessageId("MessageId:5"));
        info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6"));
        info.setGroupID("GroupID:7");
        info.setGroupSequence(1);
        info.setCorrelationId("CorrelationId:8");
        info.setPersistent(true);
        info.setExpiration(1);
        info.setPriority((byte) 1);
        info.setReplyTo(createActiveMQDestination("ReplyTo:9"));
        info.setTimestamp(2);
        info.setType("Type:10");
        {
            byte data[] = "Content:11".getBytes();
            info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        {
            byte data[] = "MarshalledProperties:12".getBytes();
            info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length));
}
        info.setDataStructure(createDataStructure("DataStructure:13"));
        info.setTargetConsumerId(createConsumerId("TargetConsumerId:14"));
        info.setCompressed(false);
        info.setRedeliveryCounter(2);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("BrokerPath:15");
            }
            info.setBrokerPath(value);
        }
        info.setArrival(3);
        info.setUserID("UserID:16");
        info.setRecievedByDFBridge(true);
        info.setDroppable(false);
        {
            BrokerId value[] = new BrokerId[2];
            for( int i=0; i < 2; i++ ) {
                value[i] = createBrokerId("Cluster:17");
            }
            info.setCluster(value);
        }
        info.setBrokerInTime(4);
        info.setBrokerOutTime(5);
    }
}
\ No newline at end of file
diff --git a/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java b/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java
index ddbe9a19ab..97e4057f3b 100755
--- a/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java
@@ -16,14 +16,11 @@
  */
 package org.apache.activemq.security;
 
-import junit.framework.TestCase;
 import org.apache.activemq.advisory.AdvisorySupport;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.ActiveMQTempQueue;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.jaas.GroupPrincipal;
-import org.apache.activemq.spring.ActiveMQConnectionFactory;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.java b/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.java
index 4c562091c4..c252cbaa93 100644
--- a/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.java
@@ -17,14 +17,11 @@
 
 package org.apache.activemq.store.jdbc;
 
-import java.io.IOException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.util.Properties;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;
-import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
@@ -32,9 +29,7 @@ import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter;
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.wireformat.WireFormat;
 import org.slf4j.Logger;
diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
index 262ba6d39a..1188188814 100755
--- a/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
@@ -26,7 +26,6 @@ import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.jmx.AnnotatedMBean;
 import org.apache.activemq.broker.jmx.ManagementContext;
 import org.apache.activemq.transport.discovery.multicast.MulticastDiscoveryAgentFactory;
 import org.apache.activemq.util.SocketProxy;
diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransport.java b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransport.java
index b3783b51d9..176934fae5 100755
--- a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransport.java
@@ -17,19 +17,11 @@
 package org.apache.activemq.transport.tcp;
 
 import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 
 import org.apache.activemq.Service;
 import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.tcp.TcpTransport;
 
 import org.apache.activemq.wireformat.WireFormat;
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java
index 9044b70427..592f2fb6f5 100755
--- a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java
@@ -26,13 +26,8 @@ import java.util.Map;
 import javax.net.ServerSocketFactory;
 import javax.net.SocketFactory;
 
-import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.transport.InactivityMonitor;
 import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportFactory;
-import org.apache.activemq.transport.TransportLoggerFactory;
 import org.apache.activemq.transport.TransportServer;
-import org.apache.activemq.transport.WireFormatNegotiator;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.IntrospectionSupport;
 import org.apache.activemq.util.URISupport;
@@ -40,12 +35,6 @@ import org.apache.activemq.wireformat.WireFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.Socket;
-import java.net.ServerSocket;
-import java.net.InetAddress;
-
-import org.apache.activemq.transport.tcp.ServerSocketTstFactory;
-
 /**
  * Automatically generated socket.close() calls to simulate network faults
  */
diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportServer.java b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportServer.java
index 50494ca5d2..36c0fd54d2 100755
--- a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportServer.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportServer.java
@@ -17,18 +17,10 @@
 package org.apache.activemq.transport.tcp;
 
 import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.UnknownHostException;
 
 import org.apache.activemq.util.ServiceListener;
-import org.apache.activemq.transport.tcp.TcpTransportServer;
 
 import javax.net.ServerSocketFactory;
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportServerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportServerTest.java
index 67e659f187..46db53f15f 100644
--- a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportServerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportServerTest.java
@@ -19,7 +19,6 @@ package org.apache.activemq.transport.tcp;
 import junit.framework.TestCase;
 import org.apache.activemq.transport.*;
 
-import javax.net.ServerSocketFactory;
 import java.net.Socket;
 import java.net.URI;
 import java.util.HashMap;
diff --git a/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion1/db-1.log b/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion1/db-1.log
index 37d28a6f22..0318aa9796 100644
Binary files a/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion1/db-1.log and b/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion1/db-1.log differ
diff --git a/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion2/db-1.log b/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion2/db-1.log
index 82461ce08d..43acd91e91 100644
Binary files a/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion2/db-1.log and b/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion2/db-1.log differ
diff --git a/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion3/db-1.log b/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion3/db-1.log
index 75ab195243..dbfd3f475d 100644
Binary files a/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion3/db-1.log and b/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion3/db-1.log differ
diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java
index c8691ad833..78c4fd7744 100644
--- a/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java
+++ b/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java
@@ -49,8 +49,6 @@ import javax.transaction.xa.Xid;
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.advisory.AdvisorySupport;
-import org.apache.activemq.broker.BrokerRegistry;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ConsumerInfo;
diff --git a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java
index 90431f5d0d..863b81d11f 100644
--- a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java
+++ b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java
@@ -39,8 +39,6 @@ import javax.xml.stream.events.Attribute;
 import javax.xml.stream.events.StartElement;
 import javax.xml.stream.events.XMLEvent;
 
-import ietf.params.xml.ns.xmpp_sasl.Mechanisms;
-
 import org.apache.activemq.command.BrokerInfo;
 import org.apache.activemq.command.Command;
 import org.apache.activemq.transport.tcp.TcpBufferedInputStream;
diff --git a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java
index c6ef4085ce..8c666cdd25 100644
--- a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java
+++ b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java
@@ -26,8 +26,6 @@ import org.apache.activemq.util.ByteArrayInputStream;
 import org.apache.activemq.util.ByteArrayOutputStream;
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.wireformat.WireFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A wire format which uses XMPP format of messages
diff --git a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
index 649998f713..faf572b130 100755
--- a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
+++ b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
@@ -24,14 +24,11 @@ import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 import javax.jms.Connection;
-import javax.jms.JMSException;
 
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerContext;
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.TransportConnection;
 import org.apache.activemq.broker.TransportConnector;
 import org.apache.activemq.transport.stomp.StompConnection;
 import org.apache.activemq.util.URISupport;
diff --git a/pom.xml b/pom.xml
index 75ce0e1c8c..eccd6d0ae4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -198,6 +198,7 @@
     <module>activemq-all</module>
     <module>activemq-camel</module>
     <module>activemq-console</module>
+    <module>activemq-client</module>
     <module>activemq-core</module>
     <module>activemq-fileserver</module>
     <module>activemq-jaas</module>
@@ -231,6 +232,11 @@
       <!-- =============================== -->
       <!-- Internal ActiveMQ Dependencies -->
       <!-- =============================== -->
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-client</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-all</artifactId>