diff --git a/src/com/microsoft/azure/servicebus/primitives/MessageLockLostException.java b/azure-servicebus/src/com/microsoft/azure/servicebus/primitives/MessageLockLostException.java
similarity index 100%
rename from src/com/microsoft/azure/servicebus/primitives/MessageLockLostException.java
rename to azure-servicebus/src/com/microsoft/azure/servicebus/primitives/MessageLockLostException.java
diff --git a/src/com/microsoft/azure/servicebus/primitives/MessageNotFoundException.java b/azure-servicebus/src/com/microsoft/azure/servicebus/primitives/MessageNotFoundException.java
similarity index 100%
rename from src/com/microsoft/azure/servicebus/primitives/MessageNotFoundException.java
rename to azure-servicebus/src/com/microsoft/azure/servicebus/primitives/MessageNotFoundException.java
diff --git a/src/com/microsoft/azure/servicebus/primitives/MessagingEntityDisabledException.java b/azure-servicebus/src/com/microsoft/azure/servicebus/primitives/MessagingEntityDisabledException.java
similarity index 100%
rename from src/com/microsoft/azure/servicebus/primitives/MessagingEntityDisabledException.java
rename to azure-servicebus/src/com/microsoft/azure/servicebus/primitives/MessagingEntityDisabledException.java
diff --git a/src/com/microsoft/azure/servicebus/primitives/MessagingEntityNotFoundException.java b/azure-servicebus/src/com/microsoft/azure/servicebus/primitives/MessagingEntityNotFoundException.java
similarity index 100%
rename from src/com/microsoft/azure/servicebus/primitives/MessagingEntityNotFoundException.java
rename to azure-servicebus/src/com/microsoft/azure/servicebus/primitives/MessagingEntityNotFoundException.java
diff --git a/src/com/microsoft/azure/servicebus/primitives/Pair.java b/azure-servicebus/src/com/microsoft/azure/servicebus/primitives/Pair.java
similarity index 100%
rename from src/com/microsoft/azure/servicebus/primitives/Pair.java
rename to azure-servicebus/src/com/microsoft/azure/servicebus/primitives/Pair.java
diff --git a/src/com/microsoft/azure/servicebus/primitives/QuotaExceededException.java b/azure-servicebus/src/com/microsoft/azure/servicebus/primitives/QuotaExceededException.java
similarity index 100%
rename from src/com/microsoft/azure/servicebus/primitives/QuotaExceededException.java
rename to azure-servicebus/src/com/microsoft/azure/servicebus/primitives/QuotaExceededException.java
diff --git a/src/com/microsoft/azure/servicebus/primitives/RequestResponseLink.java b/azure-servicebus/src/com/microsoft/azure/servicebus/primitives/RequestResponseLink.java
similarity index 100%
rename from src/com/microsoft/azure/servicebus/primitives/RequestResponseLink.java
rename to azure-servicebus/src/com/microsoft/azure/servicebus/primitives/RequestResponseLink.java
diff --git a/src/com/microsoft/azure/servicebus/primitives/RequestResponseUtils.java b/azure-servicebus/src/com/microsoft/azure/servicebus/primitives/RequestResponseUtils.java
similarity index 100%
rename from src/com/microsoft/azure/servicebus/primitives/RequestResponseUtils.java
rename to azure-servicebus/src/com/microsoft/azure/servicebus/primitives/RequestResponseUtils.java
diff --git a/src/com/microsoft/azure/servicebus/primitives/RequestResponseWorkItem.java b/azure-servicebus/src/com/microsoft/azure/servicebus/primitives/RequestResponseWorkItem.java
similarity index 100%
rename from src/com/microsoft/azure/servicebus/primitives/RequestResponseWorkItem.java
rename to azure-servicebus/src/com/microsoft/azure/servicebus/primitives/RequestResponseWorkItem.java
diff --git a/src/com/microsoft/azure/servicebus/primitives/SessionCannotBeLockedException.java b/azure-servicebus/src/com/microsoft/azure/servicebus/primitives/SessionCannotBeLockedException.java
similarity index 100%
rename from src/com/microsoft/azure/servicebus/primitives/SessionCannotBeLockedException.java
rename to azure-servicebus/src/com/microsoft/azure/servicebus/primitives/SessionCannotBeLockedException.java
diff --git a/src/com/microsoft/azure/servicebus/primitives/SessionLockLostException.java b/azure-servicebus/src/com/microsoft/azure/servicebus/primitives/SessionLockLostException.java
similarity index 100%
rename from src/com/microsoft/azure/servicebus/primitives/SessionLockLostException.java
rename to azure-servicebus/src/com/microsoft/azure/servicebus/primitives/SessionLockLostException.java