diff --git a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
index 9f48b40..3540fc7 100644
--- a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
+++ b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
@@ -60,12 +60,12 @@
 import org.apache.qpid.server.protocol.v0_10.transport.DeliveryProperties;
 import org.apache.qpid.server.protocol.v0_10.transport.MessageDeliveryMode;
 import org.apache.qpid.server.protocol.v0_10.transport.ReplyTo;
-import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 import org.apache.qpid.server.store.StoredMessage;
 import org.apache.qpid.test.utils.UnitTestBase;
 
 public class PropertyConverter_Internal_to_v0_10Test extends UnitTestBase
 {
+    private static final int AMQP_0_8_SHORT_STRING_MAX_LENGTH = 255;
     private MessageConverter_Internal_to_v0_10 _messageConverter;
     private NamedAddressSpace _addressSpace;
 
@@ -674,7 +674,7 @@
 
     private String generateLongString()
     {
-        return generateLongString(AMQShortString.MAX_LENGTH + 1);
+        return generateLongString(AMQP_0_8_SHORT_STRING_MAX_LENGTH + 1);
     }
 
     private String generateLongString(long stringLength)
diff --git a/broker-core/src/main/java/org/apache/qpid/server/AMQException.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/AMQException.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/AMQException.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/AMQException.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/QpidException.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/QpidException.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/QpidException.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/QpidException.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQFrameDecodingException.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQFrameDecodingException.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQFrameDecodingException.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQFrameDecodingException.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPInvalidClassException.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPInvalidClassException.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPInvalidClassException.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPInvalidClassException.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypeMap.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypeMap.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypeMap.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypeMap.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldArray.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldArray.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldArray.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldArray.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
similarity index 100%
rename from broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java
similarity index 97%
rename from broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java
rename to broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java
index bc2ab8b..b0a53dc 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java
@@ -14,9 +14,9 @@
  *  "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.    
+ *  under the License.
  *
- * 
+ *
  */
 package org.apache.qpid.server.protocol.v0_8;
 
diff --git a/broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/QpidExceptionTest.java
similarity index 100%
rename from broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java
rename to broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/QpidExceptionTest.java
diff --git a/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java
similarity index 100%
rename from broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java
rename to broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java
diff --git a/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQTypeTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQTypeTest.java
similarity index 100%
rename from broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQTypeTest.java
rename to broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQTypeTest.java
diff --git a/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/EncodingUtilsTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/EncodingUtilsTest.java
similarity index 100%
rename from broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/EncodingUtilsTest.java
rename to broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/EncodingUtilsTest.java
diff --git a/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java
similarity index 100%
rename from broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java
rename to broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java
diff --git a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameTransport.java b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameTransport.java
index 8bf7bc4..3b7849c 100644
--- a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameTransport.java
+++ b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameTransport.java
@@ -22,7 +22,6 @@
 
 import java.net.InetSocketAddress;
 
-import org.apache.qpid.server.protocol.ProtocolVersion;
 import org.apache.qpid.server.protocol.v0_10.ProtocolEngineCreator_0_10;
 import org.apache.qpid.tests.protocol.AbstractFrameTransport;
 
diff --git a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/protocoltimeout/ProtocolHeaderTimeoutTest.java b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/protocoltimeout/ProtocolHeaderTimeoutTest.java
index 6402ad0..54e89a8 100644
--- a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/protocoltimeout/ProtocolHeaderTimeoutTest.java
+++ b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/protocoltimeout/ProtocolHeaderTimeoutTest.java
@@ -19,29 +19,17 @@
  */
 package org.apache.qpid.tests.protocol.v0_8.extension.protocoltimeout;
 
-import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assume.assumeThat;
 
-import java.lang.reflect.Array;
 import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 
-import com.google.common.io.CharStreams;
 import org.junit.Before;
 import org.junit.Test;
 
 import org.apache.qpid.server.model.port.AmqpPort;
-import org.apache.qpid.server.protocol.ProtocolVersion;
-import org.apache.qpid.server.protocol.v0_8.transport.AMQBody;
-import org.apache.qpid.server.protocol.v0_8.transport.AMQVersionAwareProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.transport.ConnectionStartBody;
-import org.apache.qpid.server.transport.ByteBufferSender;
-import org.apache.qpid.tests.protocol.SpecificationTest;
 import org.apache.qpid.tests.protocol.v0_8.FrameTransport;
-import org.apache.qpid.tests.protocol.v0_8.Interaction;
 import org.apache.qpid.tests.utils.BrokerAdmin;
 import org.apache.qpid.tests.utils.BrokerAdminUsingTestBase;
 import org.apache.qpid.tests.utils.ConfigItem;