From 89c2aa23a609666e89e0b25f13317de11299fe05 Mon Sep 17 00:00:00 2001
From: Sameeksha Vaity <sameeksha.v91@gmail.com>
Date: Fri, 12 Jul 2019 10:44:26 -0700
Subject: [PATCH 1/3] Eventhub annotations (#4313)

---
 sdk/eventhubs/azure-eventhubs/README.md       | 12 ++--
 ...ubClient.java => EventHubAsyncClient.java} | 53 +++++++++++++--
 .../eventhubs/EventHubClientBuilder.java      | 36 +++++-----
 .../messaging/eventhubs/EventHubConsumer.java | 12 ++--
 .../messaging/eventhubs/EventHubProducer.java | 10 ++-
 .../eventhubs/EventHubProperties.java         | 11 ++-
 .../EventHubSharedAccessKeyCredential.java    |  2 +
 .../eventhubs/PartitionProperties.java        |  3 +
 .../implementation/ConnectionOptions.java     |  2 +-
 .../{ => models}/EventHubConsumerOptions.java | 17 +++--
 .../{ => models}/EventHubProducerOptions.java | 10 ++-
 .../eventhubs/{ => models}/EventPosition.java | 68 +++++++++++--------
 .../{ => models}/ProxyAuthenticationType.java |  2 +-
 .../{ => models}/ProxyConfiguration.java      |  4 +-
 .../eventhubs/{ => models}/SendOptions.java   | 16 ++---
 .../eventhubs/models/package-info.java        |  7 ++
 .../messaging/eventhubs/package-info.java     |  2 +-
 .../src/samples/java/ConsumeEvent.java        | 12 ++--
 ...EventsFromKnownSequenceNumberPosition.java | 13 ++--
 .../src/samples/java/GetEventHubMetadata.java |  4 +-
 .../src/samples/java/PublishEvent.java        |  4 +-
 .../PublishEventsToSpecificPartition.java     |  6 +-
 .../java/PublishEventsWithCustomMetadata.java |  4 +-
 .../java/PublishEventsWithPartitionKey.java   |  6 +-
 ...entHubClientBuilderJavaDocCodeSamples.java | 12 ++--
 .../EventHubConsumerJavaDocCodeSamples.java   | 11 +--
 .../EventHubProducerJavaDocCodeSamples.java   |  6 +-
 .../messaging/eventhubs/BackCompatTest.java   |  8 ++-
 .../EventDataBatchIntegrationTest.java        |  8 ++-
 .../eventhubs/EventHubClientBuilderTest.java  |  4 +-
 .../EventHubClientIntegrationTest.java        | 19 +++---
 ...EventHubClientMetadataIntegrationTest.java |  9 +--
 .../EventHubConsumerIntegrationTest.java      | 12 ++--
 .../eventhubs/EventHubConsumerTest.java       |  1 +
 .../eventhubs/EventHubProducerTest.java       | 12 ++--
 .../EventPositionIntegrationTest.java         | 10 +--
 .../eventhubs/InteropAmqpPropertiesTest.java  |  8 ++-
 .../messaging/eventhubs/SendOptionsTest.java  | 27 ++++----
 .../eventhubs/SetPrefetchCountTest.java       | 14 ++--
 .../eventhubs/implementation/ApiTestBase.java |  2 +-
 .../implementation/ReactorConnectionTest.java |  2 +-
 .../EventHubConsumerOptionsTest.java          |  2 +-
 .../EventHubProducerOptionsTest.java          |  2 +-
 .../{ => models}/ProxyConfigurationTest.java  |  4 +-
 44 files changed, 301 insertions(+), 188 deletions(-)
 rename sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/{EventHubClient.java => EventHubAsyncClient.java} (85%)
 rename sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/{ => models}/EventHubConsumerOptions.java (94%)
 rename sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/{ => models}/EventHubProducerOptions.java (92%)
 rename sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/{ => models}/EventPosition.java (80%)
 rename sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/{ => models}/ProxyAuthenticationType.java (91%)
 rename sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/{ => models}/ProxyConfiguration.java (97%)
 rename sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/{ => models}/SendOptions.java (89%)
 create mode 100644 sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/package-info.java
 rename sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/{ => models}/EventHubConsumerOptionsTest.java (98%)
 rename sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/{ => models}/EventHubProducerOptionsTest.java (96%)
 rename sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/{ => models}/ProxyConfigurationTest.java (97%)

diff --git a/sdk/eventhubs/azure-eventhubs/README.md b/sdk/eventhubs/azure-eventhubs/README.md
index 68cddc513e8f5..adc20b3f2cf68 100644
--- a/sdk/eventhubs/azure-eventhubs/README.md
+++ b/sdk/eventhubs/azure-eventhubs/README.md
@@ -51,12 +51,12 @@ The easiest means for doing so is to use a connection string, which is created a
 Event Hubs namespace. If you aren't familiar with shared access policies in Azure, you may wish to follow the
 step-by-step guide to [get an Event Hubs connection string][event_hubs_connection_string].
 
-Once the connection string is obtained, create an `EventHubClient` using the `EventHubClientBuilder`:
+Once the connection string is obtained, create an `EventHubAsyncClient` using the `EventHubClientBuilder`:
 
 ```java
 String connectionString = "<< CONNECTION STRING FOR THE EVENT HUBS NAMESPACE >>";
 String eventHubPath = "<< NAME OF THE EVENT HUB >>";
-EventHubClient client = new EventHubClientBuilder()
+EventHubAsyncClient client = new EventHubClientBuilder()
     .connectionString(connectionString, eventHubPath)
     .buildAsyncClient();
 ```
@@ -91,7 +91,7 @@ ClientSecretCredential credential = new ClientSecretCredential()
 // {your-namespace}.servicebus.windows.net
 String host = "<< EVENT HUBS HOST >>"
 String eventHubPath = "<< NAME OF THE EVENT HUB >>";
-EventHubClient client = new EventHubClientBuilder()
+EventHubAsyncClient client = new EventHubClientBuilder()
     .credential(host, eventHubPath, credential)
     .buildAsyncClient();
 ```
@@ -143,7 +143,7 @@ you can also use the send method to send multiple events using a single call.
 
 #### Producer creation
 
-With an existing [EventHubClient][eventhubclient], developers can create a producer by calling `createProducer()` or
+With an existing [EventHubAsyncClient][eventhubasyncclient], developers can create a producer by calling `createProducer()` or
 `createProducer(EventHubProducerOptions)`.
 
 Creates a producer sends events to any partition, allowing Event Hubs service to route the event to an available
@@ -192,7 +192,7 @@ We are creating a consumer that receives events from `partitionID` and only list
 the partition.
 
 ```java
-EventHubConsumer consumer = client.createConsumer(EventHubClient.DEFAULT_CONSUMER_GROUP_NAME, partitionID,
+EventHubConsumer consumer = client.createConsumer(EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME, partitionID,
     EventPosition.latest());
 ```
 
@@ -305,7 +305,7 @@ Guidelines](./CONTRIBUTING.md) for more information.
 [event_hubs_messaging_exceptions]: https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-messaging-exceptions
 [event_hubs_product_docs]: https://docs.microsoft.com/en-us/azure/event-hubs/
 [event_hubs_quotas]: https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas
-[eventhubclient]: ./azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClient.java
+[eventhubasyncclient]: ./azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java
 [eventhubconsumer]: ./azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java
 [eventhubproduceroptions]: ./azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducerOptions.java
 [java_8_sdk_javadocs]: https://docs.oracle.com/javase/8/docs/api/java/util/logging/package-summary.html
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClient.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java
similarity index 85%
rename from sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClient.java
rename to sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java
index a9cd13f889fd0..b8fbd025a1bc9 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClient.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java
@@ -6,11 +6,15 @@
 import com.azure.core.amqp.AmqpConnection;
 import com.azure.core.amqp.exception.AmqpException;
 import com.azure.core.amqp.exception.ErrorContext;
+import com.azure.core.implementation.annotation.ReturnType;
+import com.azure.core.implementation.annotation.ServiceClient;
+import com.azure.core.implementation.annotation.ServiceMethod;
 import com.azure.core.implementation.util.ImplUtils;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.AmqpReceiveLink;
 import com.azure.messaging.eventhubs.implementation.AmqpResponseMapper;
 import com.azure.messaging.eventhubs.implementation.AmqpSendLink;
+import com.azure.messaging.eventhubs.implementation.AmqpConstants;
 import com.azure.messaging.eventhubs.implementation.ConnectionOptions;
 import com.azure.messaging.eventhubs.implementation.EventHubConnection;
 import com.azure.messaging.eventhubs.implementation.EventHubManagementNode;
@@ -20,6 +24,9 @@
 import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
 import com.azure.messaging.eventhubs.implementation.ReactorProvider;
 import com.azure.messaging.eventhubs.implementation.StringUtil;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -31,23 +38,28 @@
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static com.azure.core.amqp.MessageConstant.ENQUEUED_TIME_UTC_ANNOTATION_NAME;
+import static com.azure.core.amqp.MessageConstant.OFFSET_ANNOTATION_NAME;
+import static com.azure.core.amqp.MessageConstant.SEQUENCE_NUMBER_ANNOTATION_NAME;
+
 /**
  * The main point of interaction with Azure Event Hubs, the client offers a connection to a specific Event Hub within
  * the Event Hubs namespace and offers operations for sending event data, receiving events, and inspecting the connected
  * Event Hub.
  *
- * <p><strong>Creating an {@link EventHubClient} using Event Hubs namespace connection string</strong></p>
+ * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hubs namespace connection string</strong></p>
  *
  * {@codesnippet com.azure.messaging.eventhubs.eventhubclientbuilder.connectionString#string-string}
  *
- * <p><strong>Creating an {@link EventHubClient} using Event Hub instance connection string</strong></p>
+ * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hub instance connection string</strong></p>
  *
  * {@codesnippet com.azure.messaging.eventhubs.eventhubclientbuilder.connectionstring#string}
  *
  * @see EventHubClientBuilder
  * @see <a href="https://docs.microsoft.com/Azure/event-hubs/event-hubs-about">About Azure Event Hubs</a>
  */
-public class EventHubClient implements Closeable {
+@ServiceClient(builder = EventHubClientBuilder.class, isAsync = true)
+public class EventHubAsyncClient implements Closeable {
     /**
      * The name of the default consumer group in the Event Hubs service.
      */
@@ -56,7 +68,7 @@ public class EventHubClient implements Closeable {
     private static final String RECEIVER_ENTITY_PATH_FORMAT = "%s/ConsumerGroups/%s/Partitions/%s";
     private static final String SENDER_ENTITY_PATH_FORMAT = "%s/Partitions/%s";
 
-    private final ClientLogger logger = new ClientLogger(EventHubClient.class);
+    private final ClientLogger logger = new ClientLogger(EventHubAsyncClient.class);
     private final String connectionId;
     private final Mono<EventHubConnection> connectionMono;
     private final AtomicBoolean hasConnection = new AtomicBoolean(false);
@@ -65,7 +77,7 @@ public class EventHubClient implements Closeable {
     private final EventHubProducerOptions defaultProducerOptions;
     private final EventHubConsumerOptions defaultConsumerOptions;
 
-    EventHubClient(ConnectionOptions connectionOptions, ReactorProvider provider, ReactorHandlerProvider handlerProvider) {
+    EventHubAsyncClient(ConnectionOptions connectionOptions, ReactorProvider provider, ReactorHandlerProvider handlerProvider) {
         Objects.requireNonNull(connectionOptions);
         Objects.requireNonNull(provider);
         Objects.requireNonNull(handlerProvider);
@@ -91,6 +103,7 @@ public class EventHubClient implements Closeable {
      *
      * @return The set of information for the Event Hub that this client is associated with.
      */
+    @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<EventHubProperties> getProperties() {
         return connectionMono.flatMap(connection -> connection.getManagementNode().flatMap(EventHubManagementNode::getEventHubProperties));
     }
@@ -100,6 +113,7 @@ public Mono<EventHubProperties> getProperties() {
      *
      * @return A Flux of identifiers for the partitions of an Event Hub.
      */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
     public Flux<String> getPartitionIds() {
         return getProperties().flatMapMany(properties -> Flux.fromArray(properties.partitionIds()));
     }
@@ -111,6 +125,7 @@ public Flux<String> getPartitionIds() {
      * @param partitionId The unique identifier of a partition associated with the Event Hub.
      * @return The set of information for the requested partition under the Event Hub this client is associated with.
      */
+    @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<PartitionProperties> getPartitionProperties(String partitionId) {
         return connectionMono.flatMap(
             connection -> connection.getManagementNode().flatMap(node -> {
@@ -249,7 +264,7 @@ public EventHubConsumer createConsumer(String consumerGroup, String partitionId,
             return connection.createSession(entityPath).cast(EventHubSession.class);
         }).flatMap(session -> {
             logger.info("Creating consumer.");
-            return session.createConsumer(linkName, entityPath, eventPosition.getExpression(), connectionOptions.timeout(),
+            return session.createConsumer(linkName, entityPath, getExpression(eventPosition), connectionOptions.timeout(),
                 clonedOptions.retry(), options.ownerLevel(), options.identifier()).cast(AmqpReceiveLink.class);
         });
 
@@ -275,6 +290,32 @@ public void close() {
         }
     }
 
+    private static String getExpression(EventPosition eventPosition) {
+        final String isInclusiveFlag = eventPosition.isInclusive() ? "=" : "";
+
+        // order of preference
+        if (eventPosition.offset() != null) {
+            return String.format(AmqpConstants.AMQP_ANNOTATION_FORMAT, OFFSET_ANNOTATION_NAME.getValue(), isInclusiveFlag, eventPosition.offset());
+        }
+
+        if (eventPosition.sequenceNumber() != null) {
+            return String.format(AmqpConstants.AMQP_ANNOTATION_FORMAT, SEQUENCE_NUMBER_ANNOTATION_NAME.getValue(), isInclusiveFlag, eventPosition.sequenceNumber());
+        }
+
+        if (eventPosition.enqueuedDateTime() != null) {
+            String ms;
+            try {
+                ms = Long.toString(eventPosition.enqueuedDateTime().toEpochMilli());
+            } catch (ArithmeticException ex) {
+                ms = Long.toString(Long.MAX_VALUE);
+            }
+
+            return String.format(AmqpConstants.AMQP_ANNOTATION_FORMAT, ENQUEUED_TIME_UTC_ANNOTATION_NAME.getValue(), isInclusiveFlag, ms);
+        }
+
+        throw new IllegalArgumentException("No starting position was set.");
+    }
+
     private static class ResponseMapper implements AmqpResponseMapper {
         @Override
         public EventHubProperties toEventHubProperties(Map<?, ?> amqpBody) {
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java
index a336bd7774d43..a7152dd1e525a 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java
@@ -7,6 +7,7 @@
 import com.azure.core.amqp.TransportType;
 import com.azure.core.credentials.TokenCredential;
 import com.azure.core.exception.AzureException;
+import com.azure.core.implementation.annotation.ServiceClientBuilder;
 import com.azure.core.implementation.util.ImplUtils;
 import com.azure.core.util.configuration.BaseConfigurations;
 import com.azure.core.util.configuration.Configuration;
@@ -17,6 +18,8 @@
 import com.azure.messaging.eventhubs.implementation.ConnectionStringProperties;
 import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
 import com.azure.messaging.eventhubs.implementation.ReactorProvider;
+import com.azure.messaging.eventhubs.models.ProxyAuthenticationType;
+import com.azure.messaging.eventhubs.models.ProxyConfiguration;
 import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
 
@@ -30,29 +33,30 @@
 
 /**
  * This class provides a fluent builder API to help aid the configuration and instantiation of the {@link
- * EventHubClient}. Calling {@link #buildAsyncClient()} constructs an instant of the client.
+ * EventHubAsyncClient}. Calling {@link #buildAsyncClient()} constructs an instant of the client.
  *
  * <p>
  * The client requires credentials or a connection string to perform operations against Azure Event Hubs. Setting
  * credentials by using {@link #connectionString(String)}, {@link #connectionString(String, String)}, or {@link
- * #credential(String, String, TokenCredential)}, is required in order to construct an {@link EventHubClient}.
+ * #credential(String, String, TokenCredential)}, is required in order to construct an {@link EventHubAsyncClient}.
  * </p>
  *
- * <p><strong>Creating an {@link EventHubClient} using Event Hubs namespace connection string</strong></p>
+ * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hubs namespace connection string</strong></p>
  *
  * {@codesnippet com.azure.messaging.eventhubs.eventhubclientbuilder.connectionString#string-string}
  *
- * <p><strong>Creating an {@link EventHubClient} using Event Hub instance connection string</strong></p>
+ * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hub instance connection string</strong></p>
  *
  * {@codesnippet com.azure.messaging.eventhubs.eventhubclientbuilder.connectionstring#string}
  *
- * <p><strong>Creating an {@link EventHubClient} using Event Hub with no {@link Retry}, different timeout and new
+ * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hub with no {@link Retry}, different timeout and new
  * Scheduler</strong></p>
  *
  * {@codesnippet com.azure.messaging.eventhubs.eventhubclientbuilder.retry-timeout-scheduler}
  *
- * @see EventHubClient
+ * @see EventHubAsyncClient
  */
+@ServiceClientBuilder(serviceClients = EventHubAsyncClient.class)
 public class EventHubClientBuilder {
 
     private static final String AZURE_EVENT_HUBS_CONNECTION_STRING = "AZURE_EVENT_HUBS_CONNECTION_STRING";
@@ -151,10 +155,10 @@ public EventHubClientBuilder connectionString(String connectionString, String ev
     /**
      * Sets the configuration store that is used during construction of the service client.
      *
-     * If not specified, the default configuration store is used to configure the {@link EventHubClient}. Use {@link
+     * If not specified, the default configuration store is used to configure the {@link EventHubAsyncClient}. Use {@link
      * Configuration#NONE} to bypass using configuration settings during construction.
      *
-     * @param configuration The configuration store used to configure the {@link EventHubClient}.
+     * @param configuration The configuration store used to configure the {@link EventHubAsyncClient}.
      * @return The updated {@link EventHubClientBuilder} object.
      */
     public EventHubClientBuilder configuration(Configuration configuration) {
@@ -191,7 +195,7 @@ public EventHubClientBuilder credential(String host, String eventHubPath, TokenC
     }
 
     /**
-     * Sets the proxy configuration to use for {@link EventHubClient}. When a proxy is configured, {@link
+     * Sets the proxy configuration to use for {@link EventHubAsyncClient}. When a proxy is configured, {@link
      * TransportType#AMQP_WEB_SOCKETS} must be used for the transport type.
      *
      * @param proxyConfiguration The proxy configuration to use.
@@ -228,7 +232,7 @@ public EventHubClientBuilder transportType(TransportType transport) {
     }
 
     /**
-     * Sets the default operation timeout for operations performed using {@link EventHubClient} and {@link
+     * Sets the default operation timeout for operations performed using {@link EventHubAsyncClient} and {@link
      * EventHubConsumer} such as starting the communication link with the service and sending messages.
      *
      * @param timeout Duration for operation timeout.
@@ -240,7 +244,7 @@ public EventHubClientBuilder timeout(Duration timeout) {
     }
 
     /**
-     * Sets the retry policy for {@link EventHubClient}. If not specified, {@link Retry#getDefaultRetry()} is used.
+     * Sets the retry policy for {@link EventHubAsyncClient}. If not specified, {@link Retry#getDefaultRetry()} is used.
      *
      * @param retry The retry policy to use.
      * @return The updated {@link EventHubClientBuilder} object.
@@ -251,8 +255,8 @@ public EventHubClientBuilder retry(Retry retry) {
     }
 
     /**
-     * Creates a new {@link EventHubClient} based on options set on this builder. Every time {@code buildAsyncClient()}
-     * is invoked, a new instance of {@link EventHubClient} is created.
+     * Creates a new {@link EventHubAsyncClient} based on options set on this builder. Every time {@code buildAsyncClient()}
+     * is invoked, a new instance of {@link EventHubAsyncClient} is created.
      *
      * <p>
      * The following options are used if ones are not specified in the builder:
@@ -269,12 +273,12 @@ public EventHubClientBuilder retry(Retry retry) {
      * <li>If no scheduler is specified, an {@link Schedulers#elastic() elastic scheduler} is used.</li>
      * </ul>
      *
-     * @return A new {@link EventHubClient} instance with all the configured options.
+     * @return A new {@link EventHubAsyncClient} instance with all the configured options.
      * @throws IllegalArgumentException if the credentials have not been set using either {@link
      *         #connectionString(String)} or {@link #credential(String, String, TokenCredential)}. Or, if a proxy is
      *         specified but the transport type is not {@link TransportType#AMQP_WEB_SOCKETS web sockets}.
      */
-    public EventHubClient buildAsyncClient() {
+    public EventHubAsyncClient buildAsyncClient() {
         configuration = configuration == null ? ConfigurationManager.getConfiguration().clone() : configuration;
 
         if (credentials == null) {
@@ -320,7 +324,7 @@ public EventHubClient buildAsyncClient() {
         final ConnectionOptions parameters = new ConnectionOptions(host, eventHubPath, credentials,
             authorizationType, timeout, transport, retry, proxyConfiguration, scheduler);
 
-        return new EventHubClient(parameters, provider, handlerProvider);
+        return new EventHubAsyncClient(parameters, provider, handlerProvider);
     }
 
     private ProxyConfiguration getDefaultProxyConfiguration(Configuration configuration) {
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumer.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumer.java
index e66e509a26449..19bdefe5663c8 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumer.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumer.java
@@ -4,7 +4,10 @@
 package com.azure.messaging.eventhubs;
 
 import com.azure.core.util.logging.ClientLogger;
+import com.azure.core.implementation.annotation.Immutable;
 import com.azure.messaging.eventhubs.implementation.AmqpReceiveLink;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
 import reactor.core.publisher.BaseSubscriber;
 import reactor.core.publisher.EmitterProcessor;
 import reactor.core.publisher.Flux;
@@ -41,9 +44,10 @@
  *
  * {@codesnippet com.azure.messaging.eventhubs.eventhubconsumer.receiveBackpressure}
  *
- * @see EventHubClient#createConsumer(String, String, EventPosition)
- * @see EventHubClient#createConsumer(String, String, EventPosition, EventHubConsumerOptions)
+ * @see EventHubAsyncClient#createConsumer(String, String, EventPosition)
+ * @see EventHubAsyncClient#createConsumer(String, String, EventPosition, EventHubConsumerOptions)
  */
+@Immutable
 public class EventHubConsumer implements Closeable {
     private static final AtomicReferenceFieldUpdater<EventHubConsumer, AmqpReceiveLink> RECEIVE_LINK_FIELD_UPDATER =
         AtomicReferenceFieldUpdater.newUpdater(EventHubConsumer.class, AmqpReceiveLink.class, "receiveLink");
@@ -127,8 +131,8 @@ public void close() throws IOException {
     }
 
     /**
-     * Begin consuming events until there are no longer any subscribers, or the parent {@link EventHubClient#close()
-     * EventHubClient.close()} is called.
+     * Begin consuming events until there are no longer any subscribers, or the parent {@link EventHubAsyncClient#close()
+     * EventHubAsyncClient.close()} is called.
      *
      * <p><strong>Consuming events from Event Hub</strong></p>
      *
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java
index 03989de29869b..e15cbebd17675 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java
@@ -5,11 +5,14 @@
 
 import com.azure.core.amqp.exception.AmqpException;
 import com.azure.core.amqp.exception.ErrorCondition;
+import com.azure.core.implementation.annotation.Immutable;
 import com.azure.core.implementation.util.ImplUtils;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.AmqpSendLink;
 import com.azure.messaging.eventhubs.implementation.ErrorContextProvider;
 import com.azure.messaging.eventhubs.implementation.EventDataUtil;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.SendOptions;
 import org.apache.qpid.proton.message.Message;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
@@ -74,8 +77,9 @@
  *
  * {@codesnippet com.azure.messaging.eventhubs.eventhubproducer.send#publisher-sendOptions}
  *
- * @see EventHubClient#createProducer()
+ * @see EventHubAsyncClient#createProducer()
  */
+@Immutable
 public class EventHubProducer implements Closeable {
     /**
      * The default maximum allowable size, in bytes, for a batch to be sent.
@@ -276,11 +280,11 @@ private static class EventDataCollector implements Collector<EventData, List<Eve
 
         EventDataCollector(SendOptions options, Integer maxNumberOfBatches, ErrorContextProvider contextProvider) {
             this.maxNumberOfBatches = maxNumberOfBatches;
-            this.maxMessageSize = options.maximumSizeInBytes();
+            this.maxMessageSize = MAX_MESSAGE_LENGTH_BYTES;
             this.partitionKey = options.partitionKey();
             this.contextProvider = contextProvider;
 
-            currentBatch = new EventDataBatch(options.maximumSizeInBytes(), options.partitionKey(), contextProvider);
+            currentBatch = new EventDataBatch(MAX_MESSAGE_LENGTH_BYTES, options.partitionKey(), contextProvider);
         }
 
         @Override
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProperties.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProperties.java
index 6055fd75bbbee..ab49b0d810e0d 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProperties.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProperties.java
@@ -3,16 +3,21 @@
 
 package com.azure.messaging.eventhubs;
 
+import com.azure.core.implementation.annotation.Immutable;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
+
 import java.time.Instant;
 import java.util.Arrays;
 
 /**
  * Holds information about Event Hubs which can come handy while performing data-plane operations like
- * {@link EventHubClient#createConsumer(String, String, EventPosition)} and
- * {@link EventHubClient#createConsumer(String, String, EventPosition, EventHubConsumerOptions)}.
+ * {@link EventHubAsyncClient#createConsumer(String, String, EventPosition)} and
+ * {@link EventHubAsyncClient#createConsumer(String, String, EventPosition, EventHubConsumerOptions)}.
  *
- * @see EventHubClient
+ * @see EventHubAsyncClient
  */
+@Immutable
 public final class EventHubProperties {
     private final String path;
     private final Instant createdAt;
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubSharedAccessKeyCredential.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubSharedAccessKeyCredential.java
index 42222b70ba0f3..ae23b11a6eb35 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubSharedAccessKeyCredential.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubSharedAccessKeyCredential.java
@@ -5,6 +5,7 @@
 
 import com.azure.core.credentials.AccessToken;
 import com.azure.core.credentials.TokenCredential;
+import com.azure.core.implementation.annotation.Immutable;
 import com.azure.core.implementation.util.ImplUtils;
 import reactor.core.publisher.Mono;
 
@@ -27,6 +28,7 @@
  * Authorizes with Azure Event Hubs service using a shared access key from either an Event Hubs namespace or a specific
  * Event Hub.
  */
+@Immutable
 public class EventHubSharedAccessKeyCredential implements TokenCredential {
     private static final String SHARED_ACCESS_SIGNATURE_FORMAT = "SharedAccessSignature sr=%s&sig=%s&se=%s&skn=%s";
     private static final String HASH_ALGORITHM = "HMACSHA256";
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/PartitionProperties.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/PartitionProperties.java
index f9876021808d8..767a655e3f742 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/PartitionProperties.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/PartitionProperties.java
@@ -3,11 +3,14 @@
 
 package com.azure.messaging.eventhubs;
 
+import com.azure.core.implementation.annotation.Immutable;
+
 import java.time.Instant;
 
 /**
  * A set of information for a single partition of an Event Hub.
  */
+@Immutable
 public final class PartitionProperties {
     private final String eventHubPath;
     private final String id;
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/implementation/ConnectionOptions.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/implementation/ConnectionOptions.java
index 2f2d5745a820f..30fb025060974 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/implementation/ConnectionOptions.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/implementation/ConnectionOptions.java
@@ -6,7 +6,7 @@
 import com.azure.core.amqp.Retry;
 import com.azure.core.amqp.TransportType;
 import com.azure.core.credentials.TokenCredential;
-import com.azure.messaging.eventhubs.ProxyConfiguration;
+import com.azure.messaging.eventhubs.models.ProxyConfiguration;
 import reactor.core.scheduler.Scheduler;
 
 import java.time.Duration;
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumerOptions.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/EventHubConsumerOptions.java
similarity index 94%
rename from sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumerOptions.java
rename to sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/EventHubConsumerOptions.java
index 97bc0ebc8a135..5a75061dcf238 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumerOptions.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/EventHubConsumerOptions.java
@@ -1,24 +1,29 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.messaging.eventhubs;
+package com.azure.messaging.eventhubs.models;
 
 import com.azure.core.amqp.Retry;
 import com.azure.core.implementation.util.ImplUtils;
 import com.azure.core.util.logging.ClientLogger;
+import com.azure.messaging.eventhubs.EventHubAsyncClient;
+import com.azure.messaging.eventhubs.EventHubConsumer;
 import reactor.core.scheduler.Scheduler;
 
 import java.time.Duration;
 import java.util.Locale;
 import java.util.Optional;
 
+import com.azure.core.implementation.annotation.Fluent;
+
 /**
  * The baseline set of options that can be specified when creating a {@link EventHubConsumer} to configure its
  * behavior.
  *
  * @see EventHubConsumer
- * @see EventHubClient#createConsumer(String, String, EventPosition, EventHubConsumerOptions)
+ * @see EventHubAsyncClient#createConsumer(String, String, EventPosition, EventHubConsumerOptions)
  */
+@Fluent
 public class EventHubConsumerOptions implements Cloneable {
     private final ClientLogger logger = new ClientLogger(EventHubConsumerOptions.class);
 
@@ -99,7 +104,7 @@ public EventHubConsumerOptions ownerLevel(Long priority) {
 
     /**
      * Sets the retry policy used to govern retry attempts for receiving events. If not specified, the retry policy
-     * configured on the associated {@link EventHubClient} is used.
+     * configured on the associated {@link EventHubAsyncClient} is used.
      *
      * @param retry The retry policy to use when receiving events.
      * @return The updated {@link EventHubConsumerOptions} object.
@@ -135,7 +140,7 @@ public EventHubConsumerOptions prefetchCount(int prefetchCount) {
 
     /**
      * Sets the scheduler for receiving events from Event Hubs. If not specified, the scheduler configured with the
-     * associated {@link EventHubClient} is used.
+     * associated {@link EventHubAsyncClient} is used.
      *
      * @param scheduler The scheduler for receiving events.
      * @return The updated EventHubClientBuilder object.
@@ -157,7 +162,7 @@ public String identifier() {
 
     /**
      * Gets the retry policy when receiving events. If not specified, the retry policy configured on the associated
-     * {@link EventHubClient} is used.
+     * {@link EventHubAsyncClient} is used.
      *
      * @return The retry policy when receiving events.
      */
@@ -178,7 +183,7 @@ public Long ownerLevel() {
 
     /**
      * Gets the scheduler for reading events from Event Hubs. If not specified, the scheduler configured with the
-     * associated {@link EventHubClient} is used.
+     * associated {@link EventHubAsyncClient} is used.
      *
      * @return The scheduler for reading events.
      */
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducerOptions.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/EventHubProducerOptions.java
similarity index 92%
rename from sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducerOptions.java
rename to sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/EventHubProducerOptions.java
index 4b45fe7ffbac7..1895bb1113ade 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducerOptions.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/EventHubProducerOptions.java
@@ -1,10 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.messaging.eventhubs;
+package com.azure.messaging.eventhubs.models;
 
 import com.azure.core.amqp.Retry;
 import com.azure.core.util.logging.ClientLogger;
+import com.azure.core.implementation.annotation.Fluent;
+import com.azure.messaging.eventhubs.EventHubAsyncClient;
+import com.azure.messaging.eventhubs.EventHubProducer;
 
 import java.time.Duration;
 
@@ -12,8 +15,9 @@
  * The set of options that can be specified when creating an {@link EventHubProducer} to configure its behavior.
  *
  * @see EventHubProducer
- * @see EventHubClient#createProducer(EventHubProducerOptions)
+ * @see EventHubAsyncClient#createProducer(EventHubProducerOptions)
  */
+@Fluent
 public class EventHubProducerOptions implements Cloneable {
     private final ClientLogger logger = new ClientLogger(EventHubProducerOptions.class);
 
@@ -65,7 +69,7 @@ public EventHubProducerOptions timeout(Duration timeout) {
      * Gets the retry policy used to govern retry attempts when an issue is encountered while sending.
      *
      * @return the retry policy used to govern retry attempts when an issue is encountered while sending. If {@code
-     *         null}, then the retry policy configured on the associated {@link EventHubClient} is used.
+     *         null}, then the retry policy configured on the associated {@link EventHubAsyncClient} is used.
      */
     public Retry retry() {
         return retry;
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventPosition.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/EventPosition.java
similarity index 80%
rename from sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventPosition.java
rename to sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/EventPosition.java
index d12563c57a059..8896295a365ce 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventPosition.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/EventPosition.java
@@ -1,25 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.messaging.eventhubs;
+package com.azure.messaging.eventhubs.models;
 
+import com.azure.core.implementation.annotation.Immutable;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.messaging.eventhubs.implementation.AmqpConstants;
+import com.azure.messaging.eventhubs.EventData;
+import com.azure.messaging.eventhubs.EventHubConsumer;
 
 import java.time.Instant;
 import java.util.Locale;
 import java.util.Objects;
 
-import static com.azure.core.amqp.MessageConstant.ENQUEUED_TIME_UTC_ANNOTATION_NAME;
-import static com.azure.core.amqp.MessageConstant.OFFSET_ANNOTATION_NAME;
-import static com.azure.core.amqp.MessageConstant.SEQUENCE_NUMBER_ANNOTATION_NAME;
-
 /**
  * Defines a position of an {@link EventData} in the Event Hub partition. The position can be an offset, sequence
  * number, or enqueued time.
  *
  * @see EventHubConsumer
  */
+@Immutable
 public final class EventPosition {
     /**
      * This is a constant defined to represent the start of a partition stream in EventHub.
@@ -140,32 +139,43 @@ public static EventPosition fromSequenceNumber(long sequenceNumber, boolean isIn
         return position;
     }
 
-    String getExpression() {
-        final String isInclusiveFlag = isInclusive ? "=" : "";
-
-        // order of preference
-        if (this.offset != null) {
-            return String.format(AmqpConstants.AMQP_ANNOTATION_FORMAT, OFFSET_ANNOTATION_NAME.getValue(), isInclusiveFlag, this.offset);
-        }
+    /**
+     * Gets the boolean value of if the event is included. If true, the event with the {@code sequenceNumber} is included;
+     * otherwise, the next event will be received.
+     *
+     * @return The boolean if the event will be received.
+     */
+    public boolean isInclusive() {
+        return isInclusive;
+    }
 
-        if (this.sequenceNumber != null) {
-            return String.format(AmqpConstants.AMQP_ANNOTATION_FORMAT, SEQUENCE_NUMBER_ANNOTATION_NAME.getValue(), isInclusiveFlag, this.sequenceNumber);
-        }
+    /**
+     * Gets the relative position for event in the context of the stream. The offset should not be considered a stable
+     * value, as the same offset may refer to a different event as events reach the age limit for retention and are no
+     * longer visible within the stream.
+     *
+     * @return The offset of the event within that partition.
+     */
+    public String offset() {
+        return offset;
+    }
 
-        if (this.enqueuedDateTime != null) {
-            String ms;
-            try {
-                ms = Long.toString(this.enqueuedDateTime.toEpochMilli());
-            } catch (ArithmeticException ex) {
-                ms = Long.toString(Long.MAX_VALUE);
-                logger.warning(
-                    "Receiver not yet created, action[createReceiveLink], warning[starting receiver from epoch+Long.Max]");
-            }
-
-            return String.format(AmqpConstants.AMQP_ANNOTATION_FORMAT, ENQUEUED_TIME_UTC_ANNOTATION_NAME.getValue(), isInclusiveFlag, ms);
-        }
+    /**
+     * Gets the sequence number of the event.
+     *
+     * @return The sequence number of the event.
+     */
+    public Long sequenceNumber() {
+        return sequenceNumber;
+    }
 
-        throw new IllegalArgumentException("No starting position was set.");
+    /**
+     * Gets the instant, in UTC, from which the next available event should be chosen..
+     *
+     * @return The instant, in UTC, from which the next available event should be chosen..
+     */
+    public Instant enqueuedDateTime() {
+        return this.enqueuedDateTime;
     }
 
     @Override
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/ProxyAuthenticationType.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/ProxyAuthenticationType.java
similarity index 91%
rename from sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/ProxyAuthenticationType.java
rename to sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/ProxyAuthenticationType.java
index 9e3b77f462344..cfeb5e1551898 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/ProxyAuthenticationType.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/ProxyAuthenticationType.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.messaging.eventhubs;
+package com.azure.messaging.eventhubs.models;
 
 /**
  * Supported methods of proxy authentication
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/ProxyConfiguration.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/ProxyConfiguration.java
similarity index 97%
rename from sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/ProxyConfiguration.java
rename to sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/ProxyConfiguration.java
index 40a428a79e43b..3dce44b44b49d 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/ProxyConfiguration.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/ProxyConfiguration.java
@@ -1,9 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.messaging.eventhubs;
+package com.azure.messaging.eventhubs.models;
 
 import com.azure.core.util.logging.ClientLogger;
+import com.azure.core.implementation.annotation.Immutable;
 
 import java.net.PasswordAuthentication;
 import java.net.Proxy;
@@ -13,6 +14,7 @@
 /**
  * Properties for configuring proxies with Event Hubs.
  */
+@Immutable
 public class ProxyConfiguration implements AutoCloseable {
     /**
      * The configuration key for containing the username who authenticates with the proxy.
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/SendOptions.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/SendOptions.java
similarity index 89%
rename from sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/SendOptions.java
rename to sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/SendOptions.java
index 44d0fcac342bb..4bd54c701af6c 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/SendOptions.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/SendOptions.java
@@ -1,7 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.messaging.eventhubs;
+package com.azure.messaging.eventhubs.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.azure.messaging.eventhubs.EventHubProducer;
 
 /**
  * The set of options that can be specified when sending a set of events to influence the way in which events are sent
@@ -9,6 +12,7 @@
  *
  * @see EventHubProducer
  */
+@Fluent
 public class SendOptions implements Cloneable {
     private int maximumSizeInBytes;
     private String partitionKey;
@@ -32,16 +36,6 @@ SendOptions maximumSizeInBytes(int maximumSizeInBytes) {
         return this;
     }
 
-    /**
-     * Gets the maximum size to allow for a single batch of events, in bytes. If this size is exceeded, an exception
-     * will be thrown and the send operation will fail.
-     *
-     * @return The maximum size to allow for a single batch of events, in bytes.
-     */
-    int maximumSizeInBytes() {
-        return maximumSizeInBytes;
-    }
-
     /**
      * Sets a hashing key to be provided for the batch of events, which instructs the Event Hubs service map this key to
      * a specific partition but allowing the service to choose an arbitrary, partition for this batch of events and any
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/package-info.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/package-info.java
new file mode 100644
index 0000000000000..27181997903cc
--- /dev/null
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/models/package-info.java
@@ -0,0 +1,7 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+/**
+ * Package containing classes used for creating and configuring events that are being sent-to and received-from Azure
+ * Event Hubs service.
+ */
+package com.azure.messaging.eventhubs.models;
diff --git a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/package-info.java b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/package-info.java
index be66de93036af..3ef8e300da4eb 100644
--- a/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/package-info.java
+++ b/sdk/eventhubs/azure-eventhubs/src/main/java/com/azure/messaging/eventhubs/package-info.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 /**
- * Package containing classes for creating a {@link com.azure.messaging.eventhubs.EventHubClient} to
+ * Package containing classes for creating a {@link com.azure.messaging.eventhubs.EventHubAsyncClient} to
  * perform operations on Azure Event Hubs.
  */
 package com.azure.messaging.eventhubs;
diff --git a/sdk/eventhubs/azure-eventhubs/src/samples/java/ConsumeEvent.java b/sdk/eventhubs/azure-eventhubs/src/samples/java/ConsumeEvent.java
index 229d03892c057..71cbfb3219fc1 100644
--- a/sdk/eventhubs/azure-eventhubs/src/samples/java/ConsumeEvent.java
+++ b/sdk/eventhubs/azure-eventhubs/src/samples/java/ConsumeEvent.java
@@ -2,12 +2,12 @@
 // Licensed under the MIT License.
 
 import com.azure.messaging.eventhubs.EventData;
-import com.azure.messaging.eventhubs.EventHubClient;
+import com.azure.messaging.eventhubs.EventHubAsyncClient;
 import com.azure.messaging.eventhubs.EventHubClientBuilder;
 import com.azure.messaging.eventhubs.EventHubConsumer;
 import com.azure.messaging.eventhubs.EventHubProducer;
-import com.azure.messaging.eventhubs.EventHubProducerOptions;
-import com.azure.messaging.eventhubs.EventPosition;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 
@@ -31,7 +31,7 @@ public class ConsumeEvent {
      * @param args Unused arguments to the program.
      * @throws InterruptedException The countdown latch was interrupted while waiting for this sample to
      *         complete.
-     * @throws IOException If we were unable to dispose of the {@link EventHubClient}, {@link EventHubConsumer},
+     * @throws IOException If we were unable to dispose of the {@link EventHubAsyncClient}, {@link EventHubConsumer},
      *         or the {@link EventHubProducer}
      */
     public static void main(String[] args) throws InterruptedException, IOException {
@@ -45,7 +45,7 @@ public static void main(String[] args) throws InterruptedException, IOException
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};SharedAccessKey={sharedAccessKey};EntityPath={eventHubPath}";
 
         // Instantiate a client that will be used to call the service.
-        EventHubClient client = new EventHubClientBuilder()
+        EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString)
             .buildAsyncClient();
 
@@ -59,7 +59,7 @@ public static void main(String[] args) throws InterruptedException, IOException
         // The "$Default" consumer group is created by default. This value can be found by going to the Event Hub
         // instance you are connecting to, and selecting the "Consumer groups" page. EventPosition.latest() tells the
         // service we only want events that are sent to the partition after we begin listening.
-        EventHubConsumer consumer = client.createConsumer(EventHubClient.DEFAULT_CONSUMER_GROUP_NAME,
+        EventHubConsumer consumer = client.createConsumer(EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME,
             firstPartition, EventPosition.latest());
 
         // We start receiving any events that come from `firstPartition`, print out the contents, and decrement the
diff --git a/sdk/eventhubs/azure-eventhubs/src/samples/java/ConsumeEventsFromKnownSequenceNumberPosition.java b/sdk/eventhubs/azure-eventhubs/src/samples/java/ConsumeEventsFromKnownSequenceNumberPosition.java
index aa1dfa9fcb95f..ab803cf90d857 100644
--- a/sdk/eventhubs/azure-eventhubs/src/samples/java/ConsumeEventsFromKnownSequenceNumberPosition.java
+++ b/sdk/eventhubs/azure-eventhubs/src/samples/java/ConsumeEventsFromKnownSequenceNumberPosition.java
@@ -2,17 +2,16 @@
 // Licensed under the MIT License.
 
 import com.azure.messaging.eventhubs.EventData;
-import com.azure.messaging.eventhubs.EventHubClient;
+import com.azure.messaging.eventhubs.EventHubAsyncClient;
 import com.azure.messaging.eventhubs.EventHubClientBuilder;
 import com.azure.messaging.eventhubs.EventHubConsumer;
 import com.azure.messaging.eventhubs.EventHubProducer;
-import com.azure.messaging.eventhubs.EventHubProducerOptions;
-import com.azure.messaging.eventhubs.EventPosition;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
 import reactor.core.Disposable;
 
 import java.io.IOException;
 import java.time.Duration;
-
 import java.util.concurrent.Semaphore;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -31,7 +30,7 @@ public class ConsumeEventsFromKnownSequenceNumberPosition {
      * @param args Unused arguments to the program.
      * @throws InterruptedException The countdown latch was interrupted while waiting for this sample to
      *         complete.
-     * @throws IOException If we were unable to dispose of the {@link EventHubClient}, {@link EventHubConsumer},
+     * @throws IOException If we were unable to dispose of the {@link EventHubAsyncClient}, {@link EventHubConsumer},
      *         or the {@link EventHubProducer}
      */
     public static void main(String[] args) throws InterruptedException, IOException {
@@ -45,7 +44,7 @@ public static void main(String[] args) throws InterruptedException, IOException
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};SharedAccessKey={sharedAccessKey};EntityPath={eventHubPath}";
 
         // Instantiate a client that will be used to call the service.
-        EventHubClient client = new EventHubClientBuilder()
+        EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString)
             .buildAsyncClient();
 
@@ -79,7 +78,7 @@ public static void main(String[] args) throws InterruptedException, IOException
         // The "$Default" consumer group is created by default. This value can be found by going to the Event Hub
         // instance you are connecting to, and selecting the "Consumer groups" page. EventPosition.latest() tells the
         // service we only want events that are sent to the partition after we begin listening.
-        EventHubConsumer consumer = client.createConsumer(EventHubClient.DEFAULT_CONSUMER_GROUP_NAME,
+        EventHubConsumer consumer = client.createConsumer(EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME,
             lastEnqueuedSequencePartitionID, EventPosition.fromSequenceNumber(lastEnqueuedSequenceNumber, false));
 
         // We start receiving any events that come from `firstPartition`, print out the contents, and decrement the
diff --git a/sdk/eventhubs/azure-eventhubs/src/samples/java/GetEventHubMetadata.java b/sdk/eventhubs/azure-eventhubs/src/samples/java/GetEventHubMetadata.java
index f81a400160d4b..da3836fca2c77 100644
--- a/sdk/eventhubs/azure-eventhubs/src/samples/java/GetEventHubMetadata.java
+++ b/sdk/eventhubs/azure-eventhubs/src/samples/java/GetEventHubMetadata.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import com.azure.messaging.eventhubs.EventHubClient;
+import com.azure.messaging.eventhubs.EventHubAsyncClient;
 import com.azure.messaging.eventhubs.EventHubClientBuilder;
 
 import java.util.concurrent.Semaphore;
@@ -27,7 +27,7 @@ public static void main(String[] args) throws InterruptedException {
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};SharedAccessKey={sharedAccessKey};EntityPath={eventHubPath}";
 
         // Instantiate a client that will be used to call the service.
-        EventHubClient client = new EventHubClientBuilder()
+        EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString)
             .buildAsyncClient();
 
diff --git a/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEvent.java b/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEvent.java
index dcc7fea99638f..9a4436951ec6d 100644
--- a/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEvent.java
+++ b/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEvent.java
@@ -3,7 +3,7 @@
 
 import com.azure.core.amqp.exception.AmqpException;
 import com.azure.messaging.eventhubs.EventData;
-import com.azure.messaging.eventhubs.EventHubClient;
+import com.azure.messaging.eventhubs.EventHubAsyncClient;
 import com.azure.messaging.eventhubs.EventHubClientBuilder;
 import com.azure.messaging.eventhubs.EventHubProducer;
 
@@ -29,7 +29,7 @@ public static void main(String[] args) {
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};SharedAccessKey={sharedAccessKey};EntityPath={eventHubPath}";
 
         // Instantiate a client that will be used to call the service.
-        EventHubClient client = new EventHubClientBuilder()
+        EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString)
             .buildAsyncClient();
 
diff --git a/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsToSpecificPartition.java b/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsToSpecificPartition.java
index b86dba4b478be..ae2744b955da7 100644
--- a/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsToSpecificPartition.java
+++ b/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsToSpecificPartition.java
@@ -3,10 +3,10 @@
 
 import com.azure.core.amqp.exception.AmqpException;
 import com.azure.messaging.eventhubs.EventData;
-import com.azure.messaging.eventhubs.EventHubClient;
+import com.azure.messaging.eventhubs.EventHubAsyncClient;
 import com.azure.messaging.eventhubs.EventHubClientBuilder;
 import com.azure.messaging.eventhubs.EventHubProducer;
-import com.azure.messaging.eventhubs.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
 import reactor.core.publisher.Flux;
 
 import java.io.IOException;
@@ -35,7 +35,7 @@ public static void main(String[] args) {
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};SharedAccessKey={sharedAccessKey};EntityPath={eventHubPath}";
 
         // Instantiate a client that will be used to call the service.
-        EventHubClient client = new EventHubClientBuilder()
+        EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString)
             .buildAsyncClient();
 
diff --git a/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsWithCustomMetadata.java b/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsWithCustomMetadata.java
index e71a36f597936..9a58f589b738b 100644
--- a/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsWithCustomMetadata.java
+++ b/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsWithCustomMetadata.java
@@ -3,7 +3,7 @@
 
 import com.azure.core.amqp.exception.AmqpException;
 import com.azure.messaging.eventhubs.EventData;
-import com.azure.messaging.eventhubs.EventHubClient;
+import com.azure.messaging.eventhubs.EventHubAsyncClient;
 import com.azure.messaging.eventhubs.EventHubClientBuilder;
 import com.azure.messaging.eventhubs.EventHubProducer;
 import reactor.core.publisher.Flux;
@@ -33,7 +33,7 @@ public static void main(String[] args) {
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};SharedAccessKey={sharedAccessKey};EntityPath={eventHubPath}";
 
         // Instantiate a client that will be used to call the service.
-        EventHubClient client = new EventHubClientBuilder()
+        EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString)
             .buildAsyncClient();
 
diff --git a/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsWithPartitionKey.java b/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsWithPartitionKey.java
index cf36eeee194e4..450aeef65c565 100644
--- a/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsWithPartitionKey.java
+++ b/sdk/eventhubs/azure-eventhubs/src/samples/java/PublishEventsWithPartitionKey.java
@@ -3,10 +3,10 @@
 
 import com.azure.core.amqp.exception.AmqpException;
 import com.azure.messaging.eventhubs.EventData;
-import com.azure.messaging.eventhubs.EventHubClient;
+import com.azure.messaging.eventhubs.EventHubAsyncClient;
 import com.azure.messaging.eventhubs.EventHubClientBuilder;
 import com.azure.messaging.eventhubs.EventHubProducer;
-import com.azure.messaging.eventhubs.SendOptions;
+import com.azure.messaging.eventhubs.models.SendOptions;
 import reactor.core.publisher.Flux;
 
 import java.io.IOException;
@@ -33,7 +33,7 @@ public static void main(String[] args) {
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};SharedAccessKey={sharedAccessKey};EntityPath={eventHubPath}";
 
         // Instantiate a client that will be used to call the service.
-        EventHubClient client = new EventHubClientBuilder()
+        EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString)
             .buildAsyncClient();
 
diff --git a/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubClientBuilderJavaDocCodeSamples.java b/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubClientBuilderJavaDocCodeSamples.java
index 7d40b70ab17a7..e9c8a26a9d0f8 100644
--- a/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubClientBuilderJavaDocCodeSamples.java
+++ b/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubClientBuilderJavaDocCodeSamples.java
@@ -9,12 +9,12 @@
 import java.time.Duration;
 
 /**
- * Contains code snippets when generating javadocs through doclets for {@link EventHubClient}.
+ * Contains code snippets when generating javadocs through doclets for {@link EventHubAsyncClient}.
  */
 public class EventHubClientBuilderJavaDocCodeSamples {
 
     /**
-     * Creating an {@link EventHubClient} using an Event Hubs namespace connection string with an Event Hub name.
+     * Creating an {@link EventHubAsyncClient} using an Event Hubs namespace connection string with an Event Hub name.
      */
     public void instantiation() {
         // BEGIN: com.azure.messaging.eventhubs.eventhubclientbuilder.connectionString#string-string
@@ -22,7 +22,7 @@ public void instantiation() {
             + "SharedAccessKey={sharedAccessKey};EntityPath={eventHubPath}";
         String eventHubPath = "my-event-hub";
 
-        EventHubClient client = new EventHubClientBuilder()
+        EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString, eventHubPath)
             .buildAsyncClient();
         // END: com.azure.messaging.eventhubs.eventhubclientbuilder.connectionString#string-string
@@ -31,14 +31,14 @@ public void instantiation() {
     }
 
     /**
-     * Creating an {@link EventHubClient} using a connection string specific to an Event Hub instance.
+     * Creating an {@link EventHubAsyncClient} using a connection string specific to an Event Hub instance.
      */
     public void instantiationInstance() {
         // BEGIN: com.azure.messaging.eventhubs.eventhubclientbuilder.connectionstring#string
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};"
             + "SharedAccessKey={sharedAccessKey};EntityPath={eventHubPath}";
 
-        EventHubClient client = new EventHubClientBuilder()
+        EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString)
             .buildAsyncClient();
         // END: com.azure.messaging.eventhubs.eventhubclientbuilder.connectionstring#string
@@ -54,7 +54,7 @@ public void instantiationRetry() {
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};"
             + "SharedAccessKey={sharedAccessKey};EntityPath={eventHubPath}";
 
-        EventHubClient client = new EventHubClientBuilder()
+        EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString)
             .retry(Retry.getNoRetry())
             .timeout(Duration.ofSeconds(30))
diff --git a/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubConsumerJavaDocCodeSamples.java b/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubConsumerJavaDocCodeSamples.java
index d2b8a531453a7..18f0d79809bd2 100644
--- a/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubConsumerJavaDocCodeSamples.java
+++ b/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubConsumerJavaDocCodeSamples.java
@@ -3,6 +3,7 @@
 
 package com.azure.messaging.eventhubs;
 
+import com.azure.messaging.eventhubs.models.EventPosition;
 import org.reactivestreams.Subscription;
 import reactor.core.Disposable;
 import reactor.core.publisher.BaseSubscriber;
@@ -13,17 +14,17 @@
  * Code snippets demonstrating various {@link EventHubConsumer} scenarios.
  */
 public class EventHubConsumerJavaDocCodeSamples {
-    private final EventHubClient client = new EventHubClientBuilder().connectionString("fake-string").buildAsyncClient();
+    private final EventHubAsyncClient client = new EventHubClientBuilder().connectionString("fake-string").buildAsyncClient();
 
     /**
      * Receives event data
      */
     public void receive() {
         // BEGIN: com.azure.messaging.eventhubs.eventhubconsumer.receive
-        // Obtain partitionId from EventHubClient.getPartitionIds()
+        // Obtain partitionId from EventHubAsyncClient.getPartitionIds()
         String partitionId = "0";
 
-        EventHubConsumer consumer = client.createConsumer(EventHubClient.DEFAULT_CONSUMER_GROUP_NAME, partitionId,
+        EventHubConsumer consumer = client.createConsumer(EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME, partitionId,
             EventPosition.latest());
 
         // Keep a reference to `subscription`. When the program is finished receiving events, call
@@ -40,10 +41,10 @@ public void receive() {
      * Receives event data with back pressure.
      */
     public void receiveBackpressure() {
-        // Obtain partitionId from EventHubClient.getPartitionIds()
+        // Obtain partitionId from EventHubAsyncClient.getPartitionIds()
         String partitionId = "0";
 
-        EventHubConsumer consumer = client.createConsumer(EventHubClient.DEFAULT_CONSUMER_GROUP_NAME, partitionId,
+        EventHubConsumer consumer = client.createConsumer(EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME, partitionId,
             EventPosition.latest());
 
         // BEGIN: com.azure.messaging.eventhubs.eventhubconsumer.receiveBackpressure
diff --git a/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubProducerJavaDocCodeSamples.java b/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubProducerJavaDocCodeSamples.java
index 8004db7b4ea9a..f534d56f81ed4 100644
--- a/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubProducerJavaDocCodeSamples.java
+++ b/sdk/eventhubs/azure-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubProducerJavaDocCodeSamples.java
@@ -3,6 +3,8 @@
 
 package com.azure.messaging.eventhubs;
 
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.SendOptions;
 import reactor.core.publisher.Flux;
 
 import java.io.IOException;
@@ -14,7 +16,7 @@
  * Contains code snippets when generating javadocs through doclets for {@link EventHubProducer}.
  */
 public class EventHubProducerJavaDocCodeSamples {
-    private final EventHubClient client = new EventHubClientBuilder().connectionString("fake-string").buildAsyncClient();
+    private final EventHubAsyncClient client = new EventHubClientBuilder().connectionString("fake-string").buildAsyncClient();
 
     /**
      * Code snippet demonstrating how to create an EventHubProducer that automatically routes events to any partition.
@@ -23,7 +25,7 @@ public class EventHubProducerJavaDocCodeSamples {
      */
     public void instantiate() throws IOException {
         // BEGIN: com.azure.messaging.eventhubs.eventhubproducer.instantiate
-        EventHubClient client = new EventHubClientBuilder()
+        EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString("event-hubs-namespace-connection-string", "event-hub-name")
             .buildAsyncClient();
 
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/BackCompatTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/BackCompatTest.java
index bc00f40822335..3af52b01386e9 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/BackCompatTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/BackCompatTest.java
@@ -6,6 +6,8 @@
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.ApiTestBase;
 import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
 import org.apache.qpid.proton.Proton;
 import org.apache.qpid.proton.amqp.Binary;
 import org.apache.qpid.proton.amqp.messaging.ApplicationProperties;
@@ -34,7 +36,7 @@ public class BackCompatTest extends ApiTestBase {
     private static final String PARTITION_ID = "0";
     private static final String PAYLOAD = "test-message";
 
-    private EventHubClient client;
+    private EventHubAsyncClient client;
     private EventHubProducer producer;
     private EventHubConsumer consumer;
 
@@ -54,8 +56,8 @@ protected String testName() {
     protected void beforeTest() {
         final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
 
-        client = new EventHubClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
-        consumer = client.createConsumer(EventHubClient.DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID, EventPosition.latest());
+        client = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
+        consumer = client.createConsumer(EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID, EventPosition.latest());
 
         final EventHubProducerOptions producerOptions = new EventHubProducerOptions()
             .partitionId(PARTITION_ID);
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventDataBatchIntegrationTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventDataBatchIntegrationTest.java
index c1fb5c41fdeaf..58db29ba4a391 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventDataBatchIntegrationTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventDataBatchIntegrationTest.java
@@ -7,6 +7,8 @@
 import com.azure.messaging.eventhubs.implementation.ApiTestBase;
 import com.azure.messaging.eventhubs.implementation.ErrorContextProvider;
 import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
+import com.azure.messaging.eventhubs.models.EventPosition;
+import com.azure.messaging.eventhubs.models.SendOptions;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -31,7 +33,7 @@
 public class EventDataBatchIntegrationTest extends ApiTestBase {
     private static final String PARTITION_KEY = "PartitionIDCopyFromProducerOption";
 
-    private EventHubClient client;
+    private EventHubAsyncClient client;
     private EventHubProducer producer;
 
     @Mock
@@ -55,7 +57,7 @@ protected void beforeTest() {
 
         final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
 
-        client = new EventHubClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
+        client = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
         producer = client.createProducer();
     }
 
@@ -143,7 +145,7 @@ public void sendBatchPartitionKeyValidate() throws InterruptedException {
 
             // Creating consumers on all the partitions and subscribing to the receive event.
             consumers = client.getPartitionIds()
-                .map(id -> client.createConsumer(EventHubClient.DEFAULT_CONSUMER_GROUP_NAME, id, EventPosition.latest()));
+                .map(id -> client.createConsumer(EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME, id, EventPosition.latest()));
 
             final List<Disposable> consumerSubscriptions = consumers.map(consumer -> {
                 return consumer.receive().subscribe(event -> {
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientBuilderTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientBuilderTest.java
index 3070ed065883b..b8ab75b9237b2 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientBuilderTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientBuilderTest.java
@@ -5,6 +5,8 @@
 
 import com.azure.core.amqp.TransportType;
 import com.azure.messaging.eventhubs.implementation.ClientConstants;
+import com.azure.messaging.eventhubs.models.ProxyAuthenticationType;
+import com.azure.messaging.eventhubs.models.ProxyConfiguration;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -39,7 +41,7 @@ public void missingConnectionString() {
     @Test
     public void defaultProxyConfigurationBuilder() {
         final EventHubClientBuilder builder = new EventHubClientBuilder();
-        final EventHubClient client = builder.connectionString(CORRECT_CONNECTION_STRING).buildAsyncClient();
+        final EventHubAsyncClient client = builder.connectionString(CORRECT_CONNECTION_STRING).buildAsyncClient();
 
         Assert.assertNotNull(client);
     }
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java
index 7d3deba988ecf..ba80afd99c381 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java
@@ -6,6 +6,9 @@
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.ApiTestBase;
 import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -24,16 +27,16 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static com.azure.messaging.eventhubs.EventHubClient.DEFAULT_CONSUMER_GROUP_NAME;
+import static com.azure.messaging.eventhubs.EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
- * Tests scenarios on {@link EventHubClient}.
+ * Tests scenarios on {@link EventHubAsyncClient}.
  */
 public class EventHubClientIntegrationTest extends ApiTestBase {
     private static final String PARTITION_ID = "0";
 
-    private EventHubClient client;
+    private EventHubAsyncClient client;
 
     @Rule
     public TestName testName = new TestName();
@@ -50,7 +53,7 @@ protected String testName() {
     @Override
     protected void beforeTest() {
         ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
-        client = new EventHubClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
+        client = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
     }
 
     @Override
@@ -60,7 +63,7 @@ protected void afterTest() {
 
     @Test(expected = NullPointerException.class)
     public void nullConstructor() throws NullPointerException {
-        new EventHubClient(null, null, null);
+        new EventHubAsyncClient(null, null, null);
     }
 
     /**
@@ -146,9 +149,9 @@ public void parallelEventHubClients() throws InterruptedException {
         });
 
         final CountDownLatch countDownLatch = new CountDownLatch(numberOfClients);
-        final EventHubClient[] clients = new EventHubClient[numberOfClients];
+        final EventHubAsyncClient[] clients = new EventHubAsyncClient[numberOfClients];
         for (int i = 0; i < numberOfClients; i++) {
-            clients[i] = new EventHubClient(getConnectionOptions(), getReactorProvider(), new ReactorHandlerProvider(getReactorProvider()));
+            clients[i] = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), new ReactorHandlerProvider(getReactorProvider()));
         }
 
         final EventHubProducer producer = clients[0].createProducer(new EventHubProducerOptions().partitionId(PARTITION_ID));
@@ -156,7 +159,7 @@ public void parallelEventHubClients() throws InterruptedException {
         final Disposable.Composite subscriptions = Disposables.composite();
 
         try {
-            for (final EventHubClient hubClient : clients) {
+            for (final EventHubAsyncClient hubClient : clients) {
                 final EventHubConsumer consumer = hubClient.createConsumer(DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID, EventPosition.latest());
                 consumers.add(consumer);
 
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientMetadataIntegrationTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientMetadataIntegrationTest.java
index 26a8499b9fbee..7758f5d9c0aae 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientMetadataIntegrationTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientMetadataIntegrationTest.java
@@ -14,6 +14,7 @@
 import com.azure.messaging.eventhubs.implementation.ConnectionOptions;
 import com.azure.messaging.eventhubs.implementation.ConnectionStringProperties;
 import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
+import com.azure.messaging.eventhubs.models.ProxyConfiguration;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -31,7 +32,7 @@
  */
 public class EventHubClientMetadataIntegrationTest extends ApiTestBase {
     private final String[] expectedPartitionIds = new String[]{"0", "1"};
-    private EventHubClient client;
+    private EventHubAsyncClient client;
     private ReactorHandlerProvider handlerProvider;
     private String eventHubPath;
 
@@ -53,7 +54,7 @@ protected void beforeTest() {
 
         eventHubPath = getConnectionOptions().eventHubPath();
         handlerProvider = new ReactorHandlerProvider(getReactorProvider());
-        client = new EventHubClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
+        client = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
     }
 
     @Override
@@ -134,7 +135,7 @@ public void getPartitionPropertiesInvalidToken() throws InvalidKeyException, NoS
         final ConnectionOptions connectionOptions = new ConnectionOptions(original.endpoint().getHost(),
             original.eventHubPath(), badTokenProvider, getAuthorizationType(), TIMEOUT,
             TransportType.AMQP, Retry.getNoRetry(), ProxyConfiguration.SYSTEM_DEFAULTS, getConnectionOptions().scheduler());
-        final EventHubClient client = new EventHubClient(connectionOptions, getReactorProvider(), handlerProvider);
+        final EventHubAsyncClient client = new EventHubAsyncClient(connectionOptions, getReactorProvider(), handlerProvider);
 
         // Act & Assert
         StepVerifier.create(client.getProperties())
@@ -159,7 +160,7 @@ public void getPartitionPropertiesNonExistentHub() {
         final ConnectionOptions connectionOptions = new ConnectionOptions(original.endpoint().getHost(),
             "invalid-event-hub", getTokenCredential(), getAuthorizationType(), TIMEOUT,
             TransportType.AMQP, Retry.getNoRetry(), ProxyConfiguration.SYSTEM_DEFAULTS, getConnectionOptions().scheduler());
-        final EventHubClient client = new EventHubClient(connectionOptions, getReactorProvider(), handlerProvider);
+        final EventHubAsyncClient client = new EventHubAsyncClient(connectionOptions, getReactorProvider(), handlerProvider);
 
         // Act & Assert
         StepVerifier.create(client.getPartitionIds())
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerIntegrationTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerIntegrationTest.java
index dd512717b464d..46c57aaca1c6b 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerIntegrationTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerIntegrationTest.java
@@ -11,6 +11,10 @@
 import com.azure.messaging.eventhubs.implementation.ConnectionOptions;
 import com.azure.messaging.eventhubs.implementation.ConnectionStringProperties;
 import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
+import com.azure.messaging.eventhubs.models.ProxyConfiguration;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -31,7 +35,7 @@
 import java.util.function.Consumer;
 
 import static com.azure.core.amqp.exception.ErrorCondition.RESOURCE_LIMIT_EXCEEDED;
-import static com.azure.messaging.eventhubs.EventHubClient.DEFAULT_CONSUMER_GROUP_NAME;
+import static com.azure.messaging.eventhubs.EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -46,7 +50,7 @@ public class EventHubConsumerIntegrationTest extends ApiTestBase {
     // The maximum number of receivers on a partition + consumer group is 5.
     private static final int MAX_NUMBER_OF_CONSUMERS = 5;
 
-    private EventHubClient client;
+    private EventHubAsyncClient client;
 
     public EventHubConsumerIntegrationTest() {
         super(new ClientLogger(EventHubConsumerIntegrationTest.class));
@@ -68,7 +72,7 @@ protected void beforeTest() {
             properties.eventHubPath(), getTokenCredential(), getAuthorizationType(), TIMEOUT, TransportType.AMQP,
             Retry.getNoRetry(), ProxyConfiguration.SYSTEM_DEFAULTS, Schedulers.newSingle("single-threaded"));
 
-        client = new EventHubClient(connectionOptions, getReactorProvider(), handlerProvider);
+        client = new EventHubAsyncClient(connectionOptions, getReactorProvider(), handlerProvider);
     }
 
     @Override
@@ -77,7 +81,7 @@ protected void afterTest() {
     }
 
     /**
-     * Tests that the same EventHubClient can create multiple EventHubConsumers listening to different partitions.
+     * Tests that the same EventHubAsyncClient can create multiple EventHubConsumers listening to different partitions.
      */
     @Test
     public void parallelCreationOfReceivers() {
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerTest.java
index 8b98ced4b4fb1..3271864c39cea 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerTest.java
@@ -7,6 +7,7 @@
 import com.azure.core.amqp.Retry;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.AmqpReceiveLink;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
 import org.apache.qpid.proton.message.Message;
 import org.junit.After;
 import org.junit.Assert;
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerTest.java
index 58bfeb2f82961..56e44f777736f 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerTest.java
@@ -7,6 +7,8 @@
 import com.azure.core.amqp.exception.AmqpException;
 import com.azure.core.amqp.exception.ErrorCondition;
 import com.azure.messaging.eventhubs.implementation.AmqpSendLink;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.SendOptions;
 import org.apache.qpid.proton.amqp.messaging.Section;
 import org.apache.qpid.proton.message.Message;
 import org.junit.After;
@@ -74,7 +76,7 @@ public void sendMultipleMessages() {
         when(sendLink.send(anyList())).thenReturn(Mono.empty());
 
         final int maxMessageSize = 16 * 1024;
-        final SendOptions options = new SendOptions().maximumSizeInBytes(maxMessageSize);
+        final SendOptions options = new SendOptions();
         final EventHubProducerOptions producerOptions = new EventHubProducerOptions().retry(Retry.getNoRetry()).timeout(Duration.ofSeconds(30));
         final EventHubProducer producer = new EventHubProducer(Mono.just(sendLink), producerOptions);
 
@@ -101,8 +103,7 @@ public void sendSingleMessage() {
 
         when(sendLink.send(any(Message.class))).thenReturn(Mono.empty());
 
-        final int maxMessageSize = 16 * 1024;
-        final SendOptions options = new SendOptions().maximumSizeInBytes(maxMessageSize);
+        final SendOptions options = new SendOptions();
         final EventHubProducerOptions producerOptions = new EventHubProducerOptions().retry(Retry.getNoRetry()).timeout(Duration.ofSeconds(30));
         final EventHubProducer producer = new EventHubProducer(Mono.just(sendLink), producerOptions);
 
@@ -154,14 +155,13 @@ public void partitionProducerCannotSendWithPartitionKey() {
      */
     @Test
     public void sendTooManyMessages() {
-        final Flux<EventData> testData = Flux.range(0, 20).flatMap(number -> {
+        final Flux<EventData> testData = Flux.range(0, 500).flatMap(number -> {
             final EventData data = new EventData(CONTENTS.getBytes(UTF_8));
             return Flux.just(data);
         });
 
         final AmqpSendLink sendLink = mock(AmqpSendLink.class);
-        final int maxMessageSize = 16 * 1024;
-        final SendOptions options = new SendOptions().maximumSizeInBytes(maxMessageSize);
+        final SendOptions options = new SendOptions();
         final EventHubProducerOptions producerOptions = new EventHubProducerOptions().retry(Retry.getNoRetry()).timeout(Duration.ofSeconds(30));
         final EventHubProducer producer = new EventHubProducer(Mono.just(sendLink), producerOptions);
 
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java
index d9337acf5435b..04a8f19aab2dd 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java
@@ -6,6 +6,8 @@
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.ApiTestBase;
 import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -25,7 +27,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.azure.messaging.eventhubs.EventHubClient.DEFAULT_CONSUMER_GROUP_NAME;
+import static com.azure.messaging.eventhubs.EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME;
 import static com.azure.messaging.eventhubs.TestUtils.isMatchingEvent;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -45,7 +47,7 @@ public class EventPositionIntegrationTest extends ApiTestBase {
     private static final String MESSAGE_TRACKING_VALUE = UUID.randomUUID().toString();
     private static final AtomicReference<Instant> MESSAGES_PUSHED_INSTANT = new AtomicReference<>();
 
-    private EventHubClient client;
+    private EventHubAsyncClient client;
 
     public EventPositionIntegrationTest() {
         super(new ClientLogger(EventPositionIntegrationTest.class));
@@ -64,7 +66,7 @@ protected void beforeTest() {
         skipIfNotRecordMode();
 
         final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
-        client = new EventHubClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
+        client = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
 
         setupEventTestData(client);
     }
@@ -330,7 +332,7 @@ public void receiveMessageFromSequenceNumberNonInclusive() {
      * When we run this test, we check if there have been events already pushed to the partition, if not, we push some
      * events there.
      */
-    private void setupEventTestData(EventHubClient client) {
+    private void setupEventTestData(EventHubAsyncClient client) {
         if (HAS_PUSHED_EVENTS.getAndSet(true)) {
             logger.info("Already pushed events to partition. Skipping.");
             return;
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/InteropAmqpPropertiesTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/InteropAmqpPropertiesTest.java
index d8d47b64accaf..c3aefcb3c4ebf 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/InteropAmqpPropertiesTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/InteropAmqpPropertiesTest.java
@@ -8,6 +8,8 @@
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.ApiTestBase;
 import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
 import org.apache.qpid.proton.Proton;
 import org.apache.qpid.proton.amqp.Binary;
 import org.apache.qpid.proton.amqp.Symbol;
@@ -36,7 +38,7 @@ public class InteropAmqpPropertiesTest extends ApiTestBase {
     private static final String PARTITION_ID = "0";
     private static final String PAYLOAD = "test-message";
 
-    private EventHubClient client;
+    private EventHubAsyncClient client;
     private EventHubProducer producer;
     private EventHubConsumer consumer;
 
@@ -55,11 +57,11 @@ protected String testName() {
     @Override
     protected void beforeTest() {
         final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
-        client = new EventHubClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
+        client = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
 
         final EventHubProducerOptions producerOptions = new EventHubProducerOptions().partitionId(PARTITION_ID).retry(Retry.getNoRetry()).timeout(Duration.ofSeconds(30));
         producer = client.createProducer(producerOptions);
-        consumer = client.createConsumer(EventHubClient.DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID, EventPosition.latest());
+        consumer = client.createConsumer(EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID, EventPosition.latest());
     }
 
     @Override
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/SendOptionsTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/SendOptionsTest.java
index 141ee2e961fd6..3905cfb8fcc24 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/SendOptionsTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/SendOptionsTest.java
@@ -3,6 +3,7 @@
 
 package com.azure.messaging.eventhubs;
 
+import com.azure.messaging.eventhubs.models.SendOptions;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -15,7 +16,7 @@ public class SendOptionsTest {
     public void createDefault() {
         SendOptions options = new SendOptions();
 
-        Assert.assertEquals(EventHubProducer.MAX_MESSAGE_LENGTH_BYTES, options.maximumSizeInBytes());
+        // Assert.assertEquals(EventHubProducer.MAX_MESSAGE_LENGTH_BYTES, options.maximumSizeInBytes());
         Assert.assertNull(options.partitionKey());
     }
 
@@ -27,9 +28,9 @@ public void setMaximumSize() {
         int size = 1024;
         SendOptions options = new SendOptions();
 
-        options.maximumSizeInBytes(size);
+        // options.maximumSizeInBytes(size);
 
-        Assert.assertEquals(size, options.maximumSizeInBytes());
+        // Assert.assertEquals(size, options.maximumSizeInBytes());
         Assert.assertNull(options.partitionKey());
     }
 
@@ -43,7 +44,7 @@ public void setPartitionKey() {
 
         options.partitionKey(partitionKey);
 
-        Assert.assertEquals(EventHubProducer.MAX_MESSAGE_LENGTH_BYTES, options.maximumSizeInBytes());
+        // Assert.assertEquals(EventHubProducer.MAX_MESSAGE_LENGTH_BYTES, options.maximumSizeInBytes());
         Assert.assertEquals(partitionKey, options.partitionKey());
     }
 
@@ -55,18 +56,19 @@ public void cloneIdentical() {
         // Arrange
         String partitionKey = "My partition key";
         int size = 800;
-        SendOptions options = new SendOptions().partitionKey(partitionKey).maximumSizeInBytes(size);
+        // SendOptions options = new SendOptions().partitionKey(partitionKey).maximumSizeInBytes(size);
+        SendOptions options = new SendOptions().partitionKey(partitionKey);
 
         // Act
         SendOptions clone = options.clone();
 
         // Assert
         Assert.assertNotSame(clone, options);
-        Assert.assertEquals(size, options.maximumSizeInBytes());
+        // Assert.assertEquals(size, options.maximumSizeInBytes());
         Assert.assertEquals(partitionKey, options.partitionKey());
 
         Assert.assertEquals(partitionKey, clone.partitionKey());
-        Assert.assertEquals(size, clone.maximumSizeInBytes());
+        // Assert.assertEquals(size, clone.maximumSizeInBytes());
     }
 
 
@@ -82,18 +84,19 @@ public void cloneModifyContents() {
         String partitionKey = "A new partition key";
         int size = 24;
 
-        SendOptions options = new SendOptions().partitionKey(originalPartitionKey).maximumSizeInBytes(originalSize);
+        // SendOptions options = new SendOptions().partitionKey(originalPartitionKey).maximumSizeInBytes(originalSize);
+        SendOptions options = new SendOptions().partitionKey(originalPartitionKey);
         SendOptions clone = options.clone();
 
         // Act
-        clone.partitionKey(partitionKey)
-            .maximumSizeInBytes(size);
+        // clone.partitionKey(partitionKey).maximumSizeInBytes(size);
+        clone.partitionKey(partitionKey);
 
         // Assert
         Assert.assertEquals(partitionKey, clone.partitionKey());
-        Assert.assertEquals(size, clone.maximumSizeInBytes());
+        // Assert.assertEquals(size, clone.maximumSizeInBytes());
 
-        Assert.assertEquals(originalSize, options.maximumSizeInBytes());
+        // Assert.assertEquals(originalSize, options.maximumSizeInBytes());
         Assert.assertEquals(originalPartitionKey, options.partitionKey());
     }
 }
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/SetPrefetchCountTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/SetPrefetchCountTest.java
index a292d9b2be827..80d1c7548cb26 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/SetPrefetchCountTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/SetPrefetchCountTest.java
@@ -7,6 +7,8 @@
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.ApiTestBase;
 import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -24,8 +26,10 @@
  */
 public class SetPrefetchCountTest extends ApiTestBase {
     private static final String PARTITION_ID = "0";
+    // Default number of events to fetch when creating the consumer.
+    private static final int DEFAULT_PREFETCH_COUNT = 500;
 
-    private EventHubClient client;
+    private EventHubAsyncClient client;
     private EventHubProducer producer;
     private EventHubConsumer consumer;
 
@@ -46,7 +50,7 @@ protected void beforeTest() {
         skipIfNotRecordMode();
 
         final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
-        client = new EventHubClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
+        client = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), handlerProvider);
         producer = client.createProducer();
     }
 
@@ -63,13 +67,13 @@ public void setLargePrefetchCount() throws InterruptedException {
         // Arrange
         // Since we cannot test receiving very large prefetch like 10000 in a unit test, DefaultPrefetchCount * 3 was
         // chosen
-        final int eventCount = EventHubConsumerOptions.DEFAULT_PREFETCH_COUNT * 3;
+        final int eventCount = DEFAULT_PREFETCH_COUNT * 3;
         final CountDownLatch countDownLatch = new CountDownLatch(eventCount);
         final EventHubConsumerOptions options = new EventHubConsumerOptions()
             .retry(Retry.getDefaultRetry())
             .prefetchCount(2000);
 
-        consumer = client.createConsumer(EventHubClient.DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID,
+        consumer = client.createConsumer(EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID,
             EventPosition.latest(), options);
 
         final Disposable subscription = consumer.receive()
@@ -99,7 +103,7 @@ public void setSmallPrefetchCount() throws InterruptedException {
         final CountDownLatch countDownLatch = new CountDownLatch(eventCount);
         final EventHubConsumerOptions options = new EventHubConsumerOptions().prefetchCount(11);
 
-        consumer = client.createConsumer(EventHubClient.DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID,
+        consumer = client.createConsumer(EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID,
             EventPosition.latest(), options);
 
         final Disposable subscription = consumer.receive()
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/ApiTestBase.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/ApiTestBase.java
index 544c105838d2e..c6dfeec5ff7e3 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/ApiTestBase.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/ApiTestBase.java
@@ -11,7 +11,7 @@
 import com.azure.core.test.TestMode;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.EventHubSharedAccessKeyCredential;
-import com.azure.messaging.eventhubs.ProxyConfiguration;
+import com.azure.messaging.eventhubs.models.ProxyConfiguration;
 import org.apache.qpid.proton.reactor.Reactor;
 import org.apache.qpid.proton.reactor.Selectable;
 import org.junit.After;
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/ReactorConnectionTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/ReactorConnectionTest.java
index 449fe21e82b76..e631a76f3fb96 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/ReactorConnectionTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/ReactorConnectionTest.java
@@ -8,7 +8,7 @@
 import com.azure.core.amqp.Retry;
 import com.azure.core.amqp.TransportType;
 import com.azure.core.credentials.TokenCredential;
-import com.azure.messaging.eventhubs.ProxyConfiguration;
+import com.azure.messaging.eventhubs.models.ProxyConfiguration;
 import com.azure.messaging.eventhubs.implementation.handler.ConnectionHandler;
 import com.azure.messaging.eventhubs.implementation.handler.SessionHandler;
 import org.apache.qpid.proton.amqp.Symbol;
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerOptionsTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/models/EventHubConsumerOptionsTest.java
similarity index 98%
rename from sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerOptionsTest.java
rename to sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/models/EventHubConsumerOptionsTest.java
index a7ee3620c1e50..c9b240487f2f9 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerOptionsTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/models/EventHubConsumerOptionsTest.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.messaging.eventhubs;
+package com.azure.messaging.eventhubs.models;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerOptionsTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/models/EventHubProducerOptionsTest.java
similarity index 96%
rename from sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerOptionsTest.java
rename to sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/models/EventHubProducerOptionsTest.java
index 12db5b6cc92da..eba44d5b987f0 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerOptionsTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/models/EventHubProducerOptionsTest.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.messaging.eventhubs;
+package com.azure.messaging.eventhubs.models;
 
 import com.azure.core.amqp.ExponentialRetry;
 import com.azure.core.amqp.Retry;
diff --git a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/ProxyConfigurationTest.java b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/models/ProxyConfigurationTest.java
similarity index 97%
rename from sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/ProxyConfigurationTest.java
rename to sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/models/ProxyConfigurationTest.java
index 5ab9fc2ca0029..f34722f9127b7 100644
--- a/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/ProxyConfigurationTest.java
+++ b/sdk/eventhubs/azure-eventhubs/src/test/java/com/azure/messaging/eventhubs/models/ProxyConfigurationTest.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.messaging.eventhubs;
+package com.azure.messaging.eventhubs.models;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -14,7 +14,7 @@
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 
-import static com.azure.messaging.eventhubs.ProxyConfiguration.SYSTEM_DEFAULTS;
+import static com.azure.messaging.eventhubs.models.ProxyConfiguration.SYSTEM_DEFAULTS;
 
 @RunWith(Theories.class)
 public class ProxyConfigurationTest {

From e950aa6bce759cb5aa3d9fc935ee4e0d80c7b9b6 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Fri, 12 Jul 2019 12:12:26 -0700
Subject: [PATCH 2/3] Move core to sdk/core (#4413)

* Moved core
* Repointed POMs where appropriate.
---
 eng/.docsettings.yml                                      | 8 ++++----
 pom.client.xml                                            | 2 +-
 sdk/appconfiguration/pom.service.xml                      | 2 +-
 {core => sdk/core}/.gitignore                             | 0
 {core => sdk/core}/README.md                              | 0
 {core => sdk/core}/azure-core-amqp/README.md              | 0
 {core => sdk/core}/azure-core-amqp/pom.xml                | 0
 .../src/main/java/com/azure/core/amqp/AmqpConnection.java | 0
 .../main/java/com/azure/core/amqp/AmqpEndpointState.java  | 0
 .../java/com/azure/core/amqp/AmqpExceptionHandler.java    | 0
 .../src/main/java/com/azure/core/amqp/AmqpLink.java       | 0
 .../src/main/java/com/azure/core/amqp/AmqpSession.java    | 0
 .../main/java/com/azure/core/amqp/AmqpShutdownSignal.java | 0
 .../src/main/java/com/azure/core/amqp/CBSNode.java        | 0
 .../java/com/azure/core/amqp/EndpointStateNotifier.java   | 0
 .../main/java/com/azure/core/amqp/ExponentialRetry.java   | 0
 .../main/java/com/azure/core/amqp/MessageConstant.java    | 0
 .../src/main/java/com/azure/core/amqp/Retry.java          | 0
 .../src/main/java/com/azure/core/amqp/TransportType.java  | 0
 .../java/com/azure/core/amqp/exception/AmqpException.java | 0
 .../com/azure/core/amqp/exception/AmqpResponseCode.java   | 0
 .../com/azure/core/amqp/exception/ErrorCondition.java     | 0
 .../java/com/azure/core/amqp/exception/ErrorContext.java  | 0
 .../java/com/azure/core/amqp/exception/ExceptionUtil.java | 0
 .../com/azure/core/amqp/exception/LinkErrorContext.java   | 0
 .../core/amqp/exception/OperationCancelledException.java  | 0
 .../azure/core/amqp/exception/SessionErrorContext.java    | 0
 .../java/com/azure/core/amqp/exception/package-info.java  | 0
 .../src/main/java/com/azure/core/amqp/package-info.java   | 0
 .../java/com/azure/core/amqp/AmqpShutdownSignalTest.java  | 0
 .../java/com/azure/core/amqp/ExponentialRetryTest.java    | 0
 .../java/com/azure/core/amqp/MessageConstantTest.java     | 0
 .../src/test/java/com/azure/core/amqp/RetryTest.java      | 0
 .../test/java/com/azure/core/amqp/TransportTypeTest.java  | 0
 .../com/azure/core/amqp/exception/AmqpExceptionTest.java  | 0
 .../azure/core/amqp/exception/AmqpResponseCodeTest.java   | 0
 .../com/azure/core/amqp/exception/ErrorContextTest.java   | 0
 .../com/azure/core/amqp/exception/ExceptionUtilTest.java  | 0
 .../azure/core/amqp/exception/LinkErrorContextTest.java   | 0
 .../amqp/exception/OperationCancelledExceptionTest.java   | 0
 .../core/amqp/exception/SessionErrorContextTest.java      | 0
 {core => sdk/core}/azure-core-management/pom.xml          | 0
 .../com/azure/core/management/AsyncOperationResource.java | 0
 .../main/java/com/azure/core/management/CloudError.java   | 0
 .../java/com/azure/core/management/CloudException.java    | 0
 .../java/com/azure/core/management/OperationState.java    | 0
 .../src/main/java/com/azure/core/management/Page.java     | 0
 .../main/java/com/azure/core/management/PagedList.java    | 0
 .../src/main/java/com/azure/core/management/Resource.java | 0
 .../main/java/com/azure/core/management/SubResource.java  | 0
 .../com/azure/core/management/annotations/AzureHost.java  | 0
 .../azure/core/management/annotations/package-info.java   | 0
 .../implementation/AzureAsyncOperationPollStrategy.java   | 0
 .../azure/core/management/implementation/AzureProxy.java  | 0
 .../management/implementation/CompletedPollStrategy.java  | 0
 .../management/implementation/LocationPollStrategy.java   | 0
 .../core/management/implementation/OperationStatus.java   | 0
 .../core/management/implementation/PollStrategy.java      | 0
 .../implementation/ProvisioningStatePollStrategy.java     | 0
 .../implementation/ResourceWithProvisioningState.java     | 0
 .../main/java/com/azure/core/management/package-info.java | 0
 .../core/management/serializer/AzureJacksonAdapter.java   | 0
 .../management/serializer/CloudErrorDeserializer.java     | 0
 .../azure/core/management/serializer/package-info.java    | 0
 .../azure/core/management/AzureProxyToRestProxyTests.java | 0
 .../management/AzureProxyToRestProxyWithMockTests.java    | 0
 .../management/AzureProxyToRestProxyWithNettyTests.java   | 0
 .../test/java/com/azure/core/management/AzureTests.java   | 0
 .../test/java/com/azure/core/management/HttpBinJSON.java  | 0
 .../test/java/com/azure/core/management/MockResource.java | 0
 .../java/com/azure/core/management/MyAzureException.java  | 0
 .../java/com/azure/core/management/PagedListTests.java    | 0
 .../azure/core/management/http/MockAzureHttpClient.java   | 0
 .../core/management/implementation/AzureProxyTests.java   | 0
 .../com/azure/core/management/implementation/Value.java   | 0
 .../azure/core/management/implementation/ValueTests.java  | 0
 {core => sdk/core}/azure-core-test/README.md              | 0
 {core => sdk/core}/azure-core-test/pom.xml                | 0
 .../main/java/com/azure/core/test/InterceptorManager.java | 0
 .../src/main/java/com/azure/core/test/TestBase.java       | 0
 .../src/main/java/com/azure/core/test/TestMode.java       | 0
 .../java/com/azure/core/test/http/MockHttpResponse.java   | 0
 .../java/com/azure/core/test/http/PlaybackClient.java     | 0
 .../main/java/com/azure/core/test/http/package-info.java  | 0
 .../com/azure/core/test/models/NetworkCallRecord.java     | 0
 .../java/com/azure/core/test/models/RecordedData.java     | 0
 .../java/com/azure/core/test/models/package-info.java     | 0
 .../src/main/java/com/azure/core/test/package-info.java   | 0
 .../azure/core/test/policy/RecordNetworkCallPolicy.java   | 0
 .../java/com/azure/core/test/policy/package-info.java     | 0
 .../java/com/azure/core/test/utils/ResourceNamer.java     | 0
 .../java/com/azure/core/test/utils/TestResourceNamer.java | 0
 .../main/java/com/azure/core/test/utils/package-info.java | 0
 {core => sdk/core}/azure-core/README.md                   | 0
 {core => sdk/core}/azure-core/pom.xml                     | 0
 .../src/main/java/com/azure/core/AzureEnvironment.java    | 0
 .../main/java/com/azure/core/credentials/AccessToken.java | 0
 .../core/credentials/BasicAuthenticationCredential.java   | 0
 .../java/com/azure/core/credentials/SimpleTokenCache.java | 0
 .../java/com/azure/core/credentials/TokenCredential.java  | 0
 .../java/com/azure/core/credentials/package-info.java     | 0
 .../java/com/azure/core/exception/AzureException.java     | 0
 .../core/exception/ClientAuthenticationException.java     | 0
 .../java/com/azure/core/exception/DecodeException.java    | 0
 .../com/azure/core/exception/HttpRequestException.java    | 0
 .../com/azure/core/exception/HttpResponseException.java   | 0
 .../com/azure/core/exception/ResourceExistsException.java | 0
 .../azure/core/exception/ResourceModifiedException.java   | 0
 .../azure/core/exception/ResourceNotFoundException.java   | 0
 .../azure/core/exception/ServiceResponseException.java    | 0
 .../azure/core/exception/TooManyRedirectsException.java   | 0
 .../main/java/com/azure/core/exception/package-info.java  | 0
 .../src/main/java/com/azure/core/http/HttpClient.java     | 0
 .../src/main/java/com/azure/core/http/HttpHeader.java     | 0
 .../src/main/java/com/azure/core/http/HttpHeaders.java    | 0
 .../src/main/java/com/azure/core/http/HttpMethod.java     | 0
 .../src/main/java/com/azure/core/http/HttpPipeline.java   | 0
 .../java/com/azure/core/http/HttpPipelineBuilder.java     | 0
 .../java/com/azure/core/http/HttpPipelineCallContext.java | 0
 .../java/com/azure/core/http/HttpPipelineNextPolicy.java  | 0
 .../src/main/java/com/azure/core/http/HttpRequest.java    | 0
 .../src/main/java/com/azure/core/http/HttpResponse.java   | 0
 .../src/main/java/com/azure/core/http/ProxyOptions.java   | 0
 .../main/java/com/azure/core/http/ReactorNettyClient.java | 0
 .../src/main/java/com/azure/core/http/package-info.java   | 0
 .../java/com/azure/core/http/policy/AddDatePolicy.java    | 0
 .../java/com/azure/core/http/policy/AddHeadersPolicy.java | 0
 .../core/http/policy/BearerTokenAuthenticationPolicy.java | 0
 .../java/com/azure/core/http/policy/CookiePolicy.java     | 0
 .../main/java/com/azure/core/http/policy/HostPolicy.java  | 0
 .../com/azure/core/http/policy/HttpLogDetailLevel.java    | 0
 .../com/azure/core/http/policy/HttpLoggingPolicy.java     | 0
 .../com/azure/core/http/policy/HttpPipelinePolicy.java    | 0
 .../main/java/com/azure/core/http/policy/PortPolicy.java  | 0
 .../java/com/azure/core/http/policy/ProtocolPolicy.java   | 0
 .../azure/core/http/policy/ProxyAuthenticationPolicy.java | 0
 .../java/com/azure/core/http/policy/RequestIdPolicy.java  | 0
 .../main/java/com/azure/core/http/policy/RetryPolicy.java | 0
 .../java/com/azure/core/http/policy/TimeoutPolicy.java    | 0
 .../java/com/azure/core/http/policy/UserAgentPolicy.java  | 0
 .../java/com/azure/core/http/policy/package-info.java     | 0
 .../src/main/java/com/azure/core/http/rest/Page.java      | 0
 .../src/main/java/com/azure/core/http/rest/PagedFlux.java | 0
 .../main/java/com/azure/core/http/rest/PagedResponse.java | 0
 .../src/main/java/com/azure/core/http/rest/Response.java  | 0
 .../main/java/com/azure/core/http/rest/ResponseBase.java  | 0
 .../java/com/azure/core/http/rest/SimpleResponse.java     | 0
 .../java/com/azure/core/http/rest/StreamResponse.java     | 0
 .../main/java/com/azure/core/http/rest/VoidResponse.java  | 0
 .../main/java/com/azure/core/http/rest/package-info.java  | 0
 .../java/com/azure/core/implementation/Base64Url.java     | 0
 .../com/azure/core/implementation/CollectionFormat.java   | 0
 .../com/azure/core/implementation/DateTimeRfc1123.java    | 0
 .../com/azure/core/implementation/EncodedParameter.java   | 0
 .../azure/core/implementation/OperationDescription.java   | 0
 .../com/azure/core/implementation/PercentEscaper.java     | 0
 .../java/com/azure/core/implementation/RestProxy.java     | 0
 .../java/com/azure/core/implementation/Substitution.java  | 0
 .../azure/core/implementation/SwaggerInterfaceParser.java | 0
 .../azure/core/implementation/SwaggerMethodParser.java    | 0
 .../implementation/UnexpectedExceptionInformation.java    | 0
 .../main/java/com/azure/core/implementation/UnixTime.java | 0
 .../java/com/azure/core/implementation/UrlEscapers.java   | 0
 .../java/com/azure/core/implementation/Validator.java     | 0
 .../com/azure/core/implementation/annotation/Beta.java    | 0
 .../azure/core/implementation/annotation/BodyParam.java   | 0
 .../com/azure/core/implementation/annotation/Delete.java  | 0
 .../core/implementation/annotation/ExpectedResponses.java | 0
 .../com/azure/core/implementation/annotation/Fluent.java  | 0
 .../azure/core/implementation/annotation/FormParam.java   | 0
 .../com/azure/core/implementation/annotation/Get.java     | 0
 .../com/azure/core/implementation/annotation/Head.java    | 0
 .../core/implementation/annotation/HeaderCollection.java  | 0
 .../azure/core/implementation/annotation/HeaderParam.java | 0
 .../com/azure/core/implementation/annotation/Headers.java | 0
 .../com/azure/core/implementation/annotation/Host.java    | 0
 .../azure/core/implementation/annotation/HostParam.java   | 0
 .../azure/core/implementation/annotation/Immutable.java   | 0
 .../azure/core/implementation/annotation/JsonFlatten.java | 0
 .../com/azure/core/implementation/annotation/Patch.java   | 0
 .../azure/core/implementation/annotation/PathParam.java   | 0
 .../com/azure/core/implementation/annotation/Post.java    | 0
 .../com/azure/core/implementation/annotation/Put.java     | 0
 .../azure/core/implementation/annotation/QueryParam.java  | 0
 .../core/implementation/annotation/ResumeOperation.java   | 0
 .../azure/core/implementation/annotation/ReturnType.java  | 0
 .../implementation/annotation/ReturnValueWireType.java    | 0
 .../core/implementation/annotation/ServiceClient.java     | 0
 .../implementation/annotation/ServiceClientBuilder.java   | 0
 .../core/implementation/annotation/ServiceInterface.java  | 0
 .../core/implementation/annotation/ServiceMethod.java     | 0
 .../implementation/annotation/SkipParentValidation.java   | 0
 .../annotation/UnexpectedResponseExceptionType.java       | 0
 .../annotation/UnexpectedResponseExceptionTypes.java      | 0
 .../core/implementation/annotation/package-info.java      | 0
 .../exception/InvalidReturnTypeException.java             | 0
 .../exception/MissingRequiredAnnotationException.java     | 0
 .../azure/core/implementation/exception/package-info.java | 0
 .../core/implementation/http/BufferedHttpResponse.java    | 0
 .../com/azure/core/implementation/http/ContentType.java   | 0
 .../azure/core/implementation/http/PagedResponseBase.java | 0
 .../com/azure/core/implementation/http/UrlBuilder.java    | 0
 .../java/com/azure/core/implementation/http/UrlToken.java | 0
 .../com/azure/core/implementation/http/UrlTokenType.java  | 0
 .../com/azure/core/implementation/http/UrlTokenizer.java  | 0
 .../azure/core/implementation/http/UrlTokenizerState.java | 0
 .../com/azure/core/implementation/http/package-info.java  | 0
 .../http/policy/spi/AfterRetryPolicyProvider.java         | 0
 .../http/policy/spi/BeforeRetryPolicyProvider.java        | 0
 .../http/policy/spi/HttpPolicyProviders.java              | 0
 .../implementation/http/policy/spi/PolicyProvider.java    | 0
 .../core/implementation/http/policy/spi/package-info.java | 0
 .../java/com/azure/core/implementation/package-info.java  | 0
 .../serializer/HttpResponseBodyDecoder.java               | 0
 .../implementation/serializer/HttpResponseDecodeData.java | 0
 .../implementation/serializer/HttpResponseDecoder.java    | 0
 .../serializer/HttpResponseHeaderDecoder.java             | 0
 .../azure/core/implementation/serializer/ItemPage.java    | 0
 .../serializer/MalformedValueException.java               | 0
 .../core/implementation/serializer/SerializerAdapter.java | 0
 .../implementation/serializer/SerializerEncoding.java     | 0
 .../jackson/AdditionalPropertiesDeserializer.java         | 0
 .../jackson/AdditionalPropertiesSerializer.java           | 0
 .../serializer/jackson/Base64UrlSerializer.java           | 0
 .../serializer/jackson/ByteArraySerializer.java           | 0
 .../serializer/jackson/DateTimeRfc1123Serializer.java     | 0
 .../serializer/jackson/DateTimeSerializer.java            | 0
 .../serializer/jackson/DurationSerializer.java            | 0
 .../serializer/jackson/FlatteningDeserializer.java        | 0
 .../serializer/jackson/FlatteningSerializer.java          | 0
 .../implementation/serializer/jackson/JacksonAdapter.java | 0
 .../implementation/serializer/jackson/package-info.java   | 0
 .../core/implementation/serializer/package-info.java      | 0
 .../com/azure/core/implementation/tracing/Tracer.java     | 0
 .../azure/core/implementation/tracing/TracerProxy.java    | 0
 .../com/azure/core/implementation/util/Base64Util.java    | 0
 .../java/com/azure/core/implementation/util/FluxUtil.java | 0
 .../com/azure/core/implementation/util/ImplUtils.java     | 0
 .../com/azure/core/implementation/util/ScopeUtil.java     | 0
 .../java/com/azure/core/implementation/util/TypeUtil.java | 0
 .../com/azure/core/implementation/util/package-info.java  | 0
 .../src/main/java/com/azure/core/package-info.java        | 0
 .../src/main/java/com/azure/core/util/Context.java        | 0
 .../java/com/azure/core/util/ExpandableStringEnum.java    | 0
 .../azure/core/util/configuration/BaseConfigurations.java | 0
 .../com/azure/core/util/configuration/Configuration.java  | 0
 .../core/util/configuration/ConfigurationManager.java     | 0
 .../azure/core/util/configuration/NoopConfiguration.java  | 0
 .../com/azure/core/util/configuration/package-info.java   | 0
 .../java/com/azure/core/util/logging/ClientLogger.java    | 0
 .../java/com/azure/core/util/logging/package-info.java    | 0
 .../src/main/java/com/azure/core/util/package-info.java   | 0
 .../java/com/azure/core/util/polling/PollResponse.java    | 0
 .../src/main/java/com/azure/core/util/polling/Poller.java | 0
 .../java/com/azure/core/util/polling/package-info.java    | 0
 .../core/http/rest/PagedFluxJavaDocCodeSnippets.java      | 0
 .../util/ClientLoggerJavaDocCodeSnippets.java             | 0
 .../implementation/util/FluxUtilJavaDocCodeSnippets.java  | 0
 .../util/polling/PollResponseJavaDocCodeSnippets.java     | 0
 .../core/util/polling/PollerJavaDocCodeSnippets.java      | 0
 .../src/test/java/com/azure/core/ConfigurationTests.java  | 0
 .../src/test/java/com/azure/core/MockServer.java          | 0
 .../test/java/com/azure/core/MyOtherRestException.java    | 0
 .../src/test/java/com/azure/core/MyRestException.java     | 0
 .../src/test/java/com/azure/core/UserAgentTests.java      | 0
 .../java/com/azure/core/credentials/CredentialsTests.java | 0
 .../java/com/azure/core/credentials/TokenCacheTests.java  | 0
 .../test/java/com/azure/core/entities/AccessPolicy.java   | 0
 .../java/com/azure/core/entities/HttpBinFormDataJSON.java | 0
 .../test/java/com/azure/core/entities/HttpBinHeaders.java | 0
 .../test/java/com/azure/core/entities/HttpBinJSON.java    | 0
 .../com/azure/core/entities/SignedIdentifierInner.java    | 0
 .../com/azure/core/entities/SignedIdentifiersWrapper.java | 0
 .../src/test/java/com/azure/core/entities/Slide.java      | 0
 .../src/test/java/com/azure/core/entities/Slideshow.java  | 0
 .../test/java/com/azure/core/http/HttpHeaderTests.java    | 0
 .../test/java/com/azure/core/http/HttpHeadersTests.java   | 0
 .../test/java/com/azure/core/http/HttpMethodTests.java    | 0
 .../test/java/com/azure/core/http/HttpPipelineTests.java  | 0
 .../test/java/com/azure/core/http/HttpRequestTests.java   | 0
 .../src/test/java/com/azure/core/http/MockHttpClient.java | 0
 .../test/java/com/azure/core/http/MockHttpResponse.java   | 0
 .../java/com/azure/core/http/ReactorNettyClientTests.java | 0
 .../java/com/azure/core/http/policy/HostPolicyTests.java  | 0
 .../com/azure/core/http/policy/ProtocolPolicyTests.java   | 0
 .../core/http/policy/ProxyAuthenticationPolicyTests.java  | 0
 .../com/azure/core/http/policy/RequestIdPolicyTests.java  | 0
 .../java/com/azure/core/http/policy/RetryPolicyTests.java | 0
 .../test/java/com/azure/core/http/rest/PagedFluxTest.java | 0
 .../com/azure/core/implementation/Base64UrlTests.java     | 0
 .../azure/core/implementation/EncodedParameterTests.java  | 0
 .../azure/core/implementation/RestProxyStressTests.java   | 0
 .../com/azure/core/implementation/RestProxyTests.java     | 0
 .../implementation/RestProxyWithHttpProxyNettyTests.java  | 0
 .../azure/core/implementation/RestProxyWithMockTests.java | 0
 .../core/implementation/RestProxyWithNettyTests.java      | 0
 .../com/azure/core/implementation/RestProxyXMLTests.java  | 0
 .../com/azure/core/implementation/SubstitutionTests.java  | 0
 .../core/implementation/SwaggerInterfaceParserTests.java  | 0
 .../core/implementation/SwaggerMethodParserTests.java     | 0
 .../com/azure/core/implementation/UrlEscaperTests.java    | 0
 .../com/azure/core/implementation/ValidatorTests.java     | 0
 .../azure/core/implementation/http/UrlBuilderTests.java   | 0
 .../azure/core/implementation/http/UrlTokenizerTests.java | 0
 .../jackson/AdditionalPropertiesSerializerTests.java      | 0
 .../serializer/jackson/DateTimeSerializerTests.java       | 0
 .../serializer/jackson/DurationSerializerTests.java       | 0
 .../serializer/jackson/FlatteningSerializerTests.java     | 0
 .../serializer/jackson/JacksonAdapterTests.java           | 0
 .../com/azure/core/implementation/util/FluxUtilTests.java | 0
 .../test/java/com/azure/core/implementation/util/Foo.java | 0
 .../java/com/azure/core/implementation/util/FooChild.java | 0
 .../azure/core/implementation/util/ImplUtilsTests.java    | 0
 .../com/azure/core/implementation/util/TypeUtilTests.java | 0
 .../java/com/azure/core/util/polling/PollerTests.java     | 0
 .../azure-core/src/test/resources/GetContainerACLs.xml    | 0
 .../src/test/resources/GetXMLWithAttributes.xml           | 0
 .../core}/azure-core/src/test/resources/upload.txt        | 0
 sdk/core/pom.service.xml                                  | 5 ++++-
 {core => sdk/core}/pom.xml                                | 2 +-
 sdk/eventhubs/pom.service.xml                             | 2 +-
 sdk/keyvault/pom.service.xml                              | 2 +-
 322 files changed, 13 insertions(+), 10 deletions(-)
 rename {core => sdk/core}/.gitignore (100%)
 rename {core => sdk/core}/README.md (100%)
 rename {core => sdk/core}/azure-core-amqp/README.md (100%)
 rename {core => sdk/core}/azure-core-amqp/pom.xml (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpConnection.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpEndpointState.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpExceptionHandler.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpLink.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpSession.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpShutdownSignal.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/CBSNode.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/EndpointStateNotifier.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/ExponentialRetry.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/MessageConstant.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/Retry.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/TransportType.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpException.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpResponseCode.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorCondition.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorContext.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ExceptionUtil.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/LinkErrorContext.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/OperationCancelledException.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/SessionErrorContext.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/package-info.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/main/java/com/azure/core/amqp/package-info.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/AmqpShutdownSignalTest.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/ExponentialRetryTest.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/MessageConstantTest.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/RetryTest.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/TransportTypeTest.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpExceptionTest.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpResponseCodeTest.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ErrorContextTest.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ExceptionUtilTest.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/LinkErrorContextTest.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/OperationCancelledExceptionTest.java (100%)
 rename {core => sdk/core}/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/SessionErrorContextTest.java (100%)
 rename {core => sdk/core}/azure-core-management/pom.xml (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/AsyncOperationResource.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/CloudError.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/CloudException.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/OperationState.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/Page.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/PagedList.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/Resource.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/SubResource.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/annotations/AzureHost.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/annotations/package-info.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureAsyncOperationPollStrategy.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureProxy.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/implementation/CompletedPollStrategy.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/implementation/LocationPollStrategy.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/implementation/OperationStatus.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/implementation/PollStrategy.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/implementation/ProvisioningStatePollStrategy.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/implementation/ResourceWithProvisioningState.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/package-info.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/serializer/AzureJacksonAdapter.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/serializer/CloudErrorDeserializer.java (100%)
 rename {core => sdk/core}/azure-core-management/src/main/java/com/azure/core/management/serializer/package-info.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyTests.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithMockTests.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithNettyTests.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/AzureTests.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/HttpBinJSON.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/MockResource.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/MyAzureException.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/PagedListTests.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/http/MockAzureHttpClient.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/implementation/AzureProxyTests.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/implementation/Value.java (100%)
 rename {core => sdk/core}/azure-core-management/src/test/java/com/azure/core/management/implementation/ValueTests.java (100%)
 rename {core => sdk/core}/azure-core-test/README.md (100%)
 rename {core => sdk/core}/azure-core-test/pom.xml (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/TestBase.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/TestMode.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/http/MockHttpResponse.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/http/PlaybackClient.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/http/package-info.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/models/NetworkCallRecord.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/models/RecordedData.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/models/package-info.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/package-info.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/policy/RecordNetworkCallPolicy.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/policy/package-info.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/utils/ResourceNamer.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/utils/TestResourceNamer.java (100%)
 rename {core => sdk/core}/azure-core-test/src/main/java/com/azure/core/test/utils/package-info.java (100%)
 rename {core => sdk/core}/azure-core/README.md (100%)
 rename {core => sdk/core}/azure-core/pom.xml (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/AzureEnvironment.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/credentials/AccessToken.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/credentials/BasicAuthenticationCredential.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/credentials/TokenCredential.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/credentials/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/exception/AzureException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/exception/ClientAuthenticationException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/exception/DecodeException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/exception/HttpRequestException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/exception/HttpResponseException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/exception/ResourceExistsException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/exception/ResourceModifiedException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/exception/ResourceNotFoundException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/exception/ServiceResponseException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/exception/TooManyRedirectsException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/exception/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/HttpClient.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/HttpHeader.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/HttpHeaders.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/HttpMethod.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/HttpPipeline.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/HttpPipelineBuilder.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/HttpPipelineCallContext.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/HttpPipelineNextPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/HttpRequest.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/HttpResponse.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/ProxyOptions.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/ReactorNettyClient.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/AddDatePolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/AddHeadersPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/CookiePolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/HostPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/HttpLogDetailLevel.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/HttpPipelinePolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/PortPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/ProtocolPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/ProxyAuthenticationPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/RequestIdPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/RetryPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/TimeoutPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/UserAgentPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/policy/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/rest/Page.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/rest/PagedFlux.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/rest/PagedResponse.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/rest/Response.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/rest/ResponseBase.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/rest/SimpleResponse.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/rest/StreamResponse.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/rest/VoidResponse.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/http/rest/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/Base64Url.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/CollectionFormat.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/DateTimeRfc1123.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/EncodedParameter.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/OperationDescription.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/PercentEscaper.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/RestProxy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/Substitution.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/SwaggerInterfaceParser.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/SwaggerMethodParser.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/UnexpectedExceptionInformation.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/UnixTime.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/UrlEscapers.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/Validator.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/Beta.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/BodyParam.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/Delete.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/ExpectedResponses.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/Fluent.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/FormParam.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/Get.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/Head.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderCollection.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderParam.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/Headers.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/Host.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/HostParam.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/Immutable.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/JsonFlatten.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/Patch.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/PathParam.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/Post.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/Put.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/QueryParam.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/ResumeOperation.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnType.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnValueWireType.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClient.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClientBuilder.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceInterface.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceMethod.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/SkipParentValidation.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionType.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionTypes.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/annotation/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/exception/InvalidReturnTypeException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/exception/MissingRequiredAnnotationException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/exception/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/BufferedHttpResponse.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/ContentType.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/PagedResponseBase.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/UrlBuilder.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/UrlToken.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenType.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizer.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizerState.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/AfterRetryPolicyProvider.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/BeforeRetryPolicyProvider.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/HttpPolicyProviders.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/PolicyProvider.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecodeData.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecoder.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/ItemPage.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/MalformedValueException.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerAdapter.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerEncoding.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesDeserializer.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializer.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/Base64UrlSerializer.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/ByteArraySerializer.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeRfc1123Serializer.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializer.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DurationSerializer.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningDeserializer.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializer.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/JacksonAdapter.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/serializer/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/tracing/Tracer.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/tracing/TracerProxy.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/util/Base64Util.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/util/ImplUtils.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/util/ScopeUtil.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/util/TypeUtil.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/implementation/util/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/Context.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/configuration/BaseConfigurations.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/configuration/Configuration.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/configuration/ConfigurationManager.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/configuration/NoopConfiguration.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/configuration/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/logging/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/polling/PollResponse.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/polling/Poller.java (100%)
 rename {core => sdk/core}/azure-core/src/main/java/com/azure/core/util/polling/package-info.java (100%)
 rename {core => sdk/core}/azure-core/src/samples/java/com/azure/core/http/rest/PagedFluxJavaDocCodeSnippets.java (100%)
 rename {core => sdk/core}/azure-core/src/samples/java/com/azure/core/implementation/util/ClientLoggerJavaDocCodeSnippets.java (100%)
 rename {core => sdk/core}/azure-core/src/samples/java/com/azure/core/implementation/util/FluxUtilJavaDocCodeSnippets.java (100%)
 rename {core => sdk/core}/azure-core/src/samples/java/com/azure/core/util/polling/PollResponseJavaDocCodeSnippets.java (100%)
 rename {core => sdk/core}/azure-core/src/samples/java/com/azure/core/util/polling/PollerJavaDocCodeSnippets.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/ConfigurationTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/MockServer.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/MyOtherRestException.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/MyRestException.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/UserAgentTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/credentials/CredentialsTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/credentials/TokenCacheTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/entities/AccessPolicy.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/entities/HttpBinFormDataJSON.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/entities/HttpBinHeaders.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/entities/HttpBinJSON.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/entities/SignedIdentifierInner.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/entities/SignedIdentifiersWrapper.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/entities/Slide.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/entities/Slideshow.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/HttpHeaderTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/HttpHeadersTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/HttpMethodTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/HttpPipelineTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/HttpRequestTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/MockHttpClient.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/MockHttpResponse.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/ReactorNettyClientTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/policy/HostPolicyTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/policy/ProtocolPolicyTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/policy/ProxyAuthenticationPolicyTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/policy/RequestIdPolicyTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/policy/RetryPolicyTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/Base64UrlTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/EncodedParameterTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/RestProxyStressTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/RestProxyTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithHttpProxyNettyTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithMockTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithNettyTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/RestProxyXMLTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/SubstitutionTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/SwaggerInterfaceParserTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/SwaggerMethodParserTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/UrlEscaperTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/ValidatorTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/http/UrlBuilderTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/http/UrlTokenizerTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializerTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializerTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DurationSerializerTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializerTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/JacksonAdapterTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/util/FluxUtilTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/util/Foo.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/util/FooChild.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/util/ImplUtilsTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/implementation/util/TypeUtilTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java (100%)
 rename {core => sdk/core}/azure-core/src/test/resources/GetContainerACLs.xml (100%)
 rename {core => sdk/core}/azure-core/src/test/resources/GetXMLWithAttributes.xml (100%)
 rename {core => sdk/core}/azure-core/src/test/resources/upload.txt (100%)
 rename {core => sdk/core}/pom.xml (97%)

diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml
index d82894fb16af9..9a97c9831e858 100644
--- a/eng/.docsettings.yml
+++ b/eng/.docsettings.yml
@@ -43,9 +43,9 @@ known_presence_issues:
   - ['sdk/mediaservices/microsoft-azure-media', '#2847']
   - ['mediaservices/data-plane', '#2847']
   - ['core/build-tools', '#2847']
-  - ['core/azure-core', '#2847']
-  - ['core/azure-core-auth', '#2847']
-  - ['core/azure-core-management', '#2847']
+  - ['sdk/core/azure-core', '#2847']
+  - ['sdk/core/azure-core-auth', '#2847']
+  - ['sdk/core/azure-core-management', '#2847']
   - ['cosmosdb/data-plane/commons-test-utils', '#2847']
   - ['cosmosdb/data-plane/sdk', '#2847']
   - ['sdk/cosmos/sdk', '#2847']
@@ -66,7 +66,7 @@ known_content_issues:
   - ['sdk/servicebus/README.md', '#3113']
   - ['storage/data-plane/README.md', '#3113']
   - ['storage/data-plane/swagger/README.md', '#3113']
-  - ['core/README.md', '#3113']
+  - ['sdk/core/README.md', '#3113']
   - ['cosmosdb/data-plane/README.md', '#3113']
   - ['cosmosdb/data-plane/benchmark/README.md', '#3113']
   - ['cosmosdb/data-plane/changelog/README.md', '#3113']
diff --git a/pom.client.xml b/pom.client.xml
index 6d5510e1db74a..d4ed7878ba447 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -740,7 +740,7 @@
 
   <modules>
     <module>./sdk/appconfiguration/azure-data-appconfiguration</module>
-    <module>./core</module>
+    <module>./sdk/core</module>
     <module>./sdk/eventhubs/azure-eventhubs</module>
     <module>./sdk/keyvault/azure-keyvault-secrets</module>
     <module>./sdk/keyvault/azure-keyvault-keys</module>
diff --git a/sdk/appconfiguration/pom.service.xml b/sdk/appconfiguration/pom.service.xml
index e33082c71b929..5e032d27570c0 100644
--- a/sdk/appconfiguration/pom.service.xml
+++ b/sdk/appconfiguration/pom.service.xml
@@ -9,7 +9,7 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
+    <module>../core</module>
     <module>azure-data-appconfiguration</module>
-    <module>../../core</module>
   </modules>
 </project>
diff --git a/core/.gitignore b/sdk/core/.gitignore
similarity index 100%
rename from core/.gitignore
rename to sdk/core/.gitignore
diff --git a/core/README.md b/sdk/core/README.md
similarity index 100%
rename from core/README.md
rename to sdk/core/README.md
diff --git a/core/azure-core-amqp/README.md b/sdk/core/azure-core-amqp/README.md
similarity index 100%
rename from core/azure-core-amqp/README.md
rename to sdk/core/azure-core-amqp/README.md
diff --git a/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml
similarity index 100%
rename from core/azure-core-amqp/pom.xml
rename to sdk/core/azure-core-amqp/pom.xml
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpConnection.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpConnection.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpConnection.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpConnection.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpEndpointState.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpEndpointState.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpEndpointState.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpEndpointState.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpExceptionHandler.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpExceptionHandler.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpExceptionHandler.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpExceptionHandler.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpLink.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpLink.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpLink.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpLink.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpSession.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpSession.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpSession.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpSession.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpShutdownSignal.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpShutdownSignal.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpShutdownSignal.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpShutdownSignal.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/CBSNode.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/CBSNode.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/CBSNode.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/CBSNode.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/EndpointStateNotifier.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/EndpointStateNotifier.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/EndpointStateNotifier.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/EndpointStateNotifier.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/ExponentialRetry.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/ExponentialRetry.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/ExponentialRetry.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/ExponentialRetry.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/MessageConstant.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/MessageConstant.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/MessageConstant.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/MessageConstant.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/Retry.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/Retry.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/Retry.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/Retry.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/TransportType.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/TransportType.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/TransportType.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/TransportType.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpException.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpException.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpException.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpException.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpResponseCode.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpResponseCode.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpResponseCode.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpResponseCode.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorCondition.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorCondition.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorCondition.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorCondition.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorContext.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorContext.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorContext.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorContext.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ExceptionUtil.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ExceptionUtil.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ExceptionUtil.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ExceptionUtil.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/LinkErrorContext.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/LinkErrorContext.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/LinkErrorContext.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/LinkErrorContext.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/OperationCancelledException.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/OperationCancelledException.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/OperationCancelledException.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/OperationCancelledException.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/SessionErrorContext.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/SessionErrorContext.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/SessionErrorContext.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/SessionErrorContext.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/package-info.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/package-info.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/package-info.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/package-info.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/package-info.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/package-info.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/package-info.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/package-info.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/AmqpShutdownSignalTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/AmqpShutdownSignalTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/AmqpShutdownSignalTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/AmqpShutdownSignalTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/ExponentialRetryTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/ExponentialRetryTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/ExponentialRetryTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/ExponentialRetryTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/MessageConstantTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/MessageConstantTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/MessageConstantTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/MessageConstantTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/RetryTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/RetryTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/RetryTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/RetryTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/TransportTypeTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/TransportTypeTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/TransportTypeTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/TransportTypeTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpExceptionTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpExceptionTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpExceptionTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpExceptionTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpResponseCodeTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpResponseCodeTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpResponseCodeTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpResponseCodeTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ErrorContextTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ErrorContextTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ErrorContextTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ErrorContextTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ExceptionUtilTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ExceptionUtilTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ExceptionUtilTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ExceptionUtilTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/LinkErrorContextTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/LinkErrorContextTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/LinkErrorContextTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/LinkErrorContextTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/OperationCancelledExceptionTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/OperationCancelledExceptionTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/OperationCancelledExceptionTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/OperationCancelledExceptionTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/SessionErrorContextTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/SessionErrorContextTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/SessionErrorContextTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/SessionErrorContextTest.java
diff --git a/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml
similarity index 100%
rename from core/azure-core-management/pom.xml
rename to sdk/core/azure-core-management/pom.xml
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/AsyncOperationResource.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/AsyncOperationResource.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/AsyncOperationResource.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/AsyncOperationResource.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/CloudError.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/CloudError.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/CloudError.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/CloudError.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/CloudException.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/CloudException.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/CloudException.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/CloudException.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/OperationState.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/OperationState.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/OperationState.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/OperationState.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/Page.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/Page.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/Page.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/Page.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/PagedList.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/PagedList.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/PagedList.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/PagedList.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/Resource.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/Resource.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/Resource.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/Resource.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/SubResource.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/SubResource.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/SubResource.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/SubResource.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/annotations/AzureHost.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/annotations/AzureHost.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/annotations/AzureHost.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/annotations/AzureHost.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/annotations/package-info.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/annotations/package-info.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/annotations/package-info.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/annotations/package-info.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureAsyncOperationPollStrategy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureAsyncOperationPollStrategy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureAsyncOperationPollStrategy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureAsyncOperationPollStrategy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureProxy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureProxy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureProxy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureProxy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/CompletedPollStrategy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/CompletedPollStrategy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/CompletedPollStrategy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/CompletedPollStrategy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/LocationPollStrategy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/LocationPollStrategy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/LocationPollStrategy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/LocationPollStrategy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/OperationStatus.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/OperationStatus.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/OperationStatus.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/OperationStatus.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/PollStrategy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/PollStrategy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/PollStrategy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/PollStrategy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ProvisioningStatePollStrategy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ProvisioningStatePollStrategy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/ProvisioningStatePollStrategy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ProvisioningStatePollStrategy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ResourceWithProvisioningState.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ResourceWithProvisioningState.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/ResourceWithProvisioningState.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ResourceWithProvisioningState.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/package-info.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/package-info.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/package-info.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/package-info.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/serializer/AzureJacksonAdapter.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/AzureJacksonAdapter.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/serializer/AzureJacksonAdapter.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/AzureJacksonAdapter.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/serializer/CloudErrorDeserializer.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/CloudErrorDeserializer.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/serializer/CloudErrorDeserializer.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/CloudErrorDeserializer.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/serializer/package-info.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/package-info.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/serializer/package-info.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/package-info.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithMockTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithMockTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithMockTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithMockTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithNettyTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithNettyTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithNettyTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithNettyTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/AzureTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/AzureTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/HttpBinJSON.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/HttpBinJSON.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/HttpBinJSON.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/HttpBinJSON.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/MockResource.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/MockResource.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/MockResource.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/MockResource.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/MyAzureException.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/MyAzureException.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/MyAzureException.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/MyAzureException.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/PagedListTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/PagedListTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/PagedListTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/PagedListTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/http/MockAzureHttpClient.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/http/MockAzureHttpClient.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/http/MockAzureHttpClient.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/http/MockAzureHttpClient.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/implementation/AzureProxyTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/AzureProxyTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/implementation/AzureProxyTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/AzureProxyTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/implementation/Value.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/Value.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/implementation/Value.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/Value.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/implementation/ValueTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/ValueTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/implementation/ValueTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/ValueTests.java
diff --git a/core/azure-core-test/README.md b/sdk/core/azure-core-test/README.md
similarity index 100%
rename from core/azure-core-test/README.md
rename to sdk/core/azure-core-test/README.md
diff --git a/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml
similarity index 100%
rename from core/azure-core-test/pom.xml
rename to sdk/core/azure-core-test/pom.xml
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/TestBase.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/TestBase.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/TestBase.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/TestBase.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/TestMode.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/TestMode.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/TestMode.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/TestMode.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/http/MockHttpResponse.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/MockHttpResponse.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/http/MockHttpResponse.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/MockHttpResponse.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/http/PlaybackClient.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/PlaybackClient.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/http/PlaybackClient.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/PlaybackClient.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/http/package-info.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/package-info.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/http/package-info.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/package-info.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/models/NetworkCallRecord.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/NetworkCallRecord.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/models/NetworkCallRecord.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/NetworkCallRecord.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/models/RecordedData.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/RecordedData.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/models/RecordedData.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/RecordedData.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/models/package-info.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/package-info.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/models/package-info.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/package-info.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/package-info.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/package-info.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/package-info.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/package-info.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/policy/RecordNetworkCallPolicy.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/policy/RecordNetworkCallPolicy.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/policy/RecordNetworkCallPolicy.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/policy/RecordNetworkCallPolicy.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/policy/package-info.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/policy/package-info.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/policy/package-info.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/policy/package-info.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/utils/ResourceNamer.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/ResourceNamer.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/utils/ResourceNamer.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/ResourceNamer.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/utils/TestResourceNamer.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/TestResourceNamer.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/utils/TestResourceNamer.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/TestResourceNamer.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/utils/package-info.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/package-info.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/utils/package-info.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/package-info.java
diff --git a/core/azure-core/README.md b/sdk/core/azure-core/README.md
similarity index 100%
rename from core/azure-core/README.md
rename to sdk/core/azure-core/README.md
diff --git a/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml
similarity index 100%
rename from core/azure-core/pom.xml
rename to sdk/core/azure-core/pom.xml
diff --git a/core/azure-core/src/main/java/com/azure/core/AzureEnvironment.java b/sdk/core/azure-core/src/main/java/com/azure/core/AzureEnvironment.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/AzureEnvironment.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/AzureEnvironment.java
diff --git a/core/azure-core/src/main/java/com/azure/core/credentials/AccessToken.java b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/AccessToken.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/credentials/AccessToken.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/credentials/AccessToken.java
diff --git a/core/azure-core/src/main/java/com/azure/core/credentials/BasicAuthenticationCredential.java b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/BasicAuthenticationCredential.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/credentials/BasicAuthenticationCredential.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/credentials/BasicAuthenticationCredential.java
diff --git a/core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java
diff --git a/core/azure-core/src/main/java/com/azure/core/credentials/TokenCredential.java b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/TokenCredential.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/credentials/TokenCredential.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/credentials/TokenCredential.java
diff --git a/core/azure-core/src/main/java/com/azure/core/credentials/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/credentials/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/credentials/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/AzureException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/AzureException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/AzureException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/AzureException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/ClientAuthenticationException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/ClientAuthenticationException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/ClientAuthenticationException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/ClientAuthenticationException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/DecodeException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/DecodeException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/DecodeException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/DecodeException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/HttpRequestException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/HttpRequestException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/HttpRequestException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/HttpRequestException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/HttpResponseException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/HttpResponseException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/HttpResponseException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/HttpResponseException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/ResourceExistsException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceExistsException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/ResourceExistsException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceExistsException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/ResourceModifiedException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceModifiedException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/ResourceModifiedException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceModifiedException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/ResourceNotFoundException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceNotFoundException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/ResourceNotFoundException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceNotFoundException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/ServiceResponseException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/ServiceResponseException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/ServiceResponseException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/ServiceResponseException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/TooManyRedirectsException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/TooManyRedirectsException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/TooManyRedirectsException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/TooManyRedirectsException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpClient.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpClient.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpClient.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpClient.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpHeader.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpHeader.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpHeader.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpHeader.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpHeaders.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpHeaders.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpHeaders.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpHeaders.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpMethod.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpMethod.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpMethod.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpMethod.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpPipeline.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipeline.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpPipeline.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipeline.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineBuilder.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineBuilder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpPipelineBuilder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineBuilder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineCallContext.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineCallContext.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpPipelineCallContext.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineCallContext.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineNextPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineNextPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpPipelineNextPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineNextPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpRequest.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpRequest.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpRequest.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpRequest.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/ProxyOptions.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/ProxyOptions.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/ProxyOptions.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/ProxyOptions.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/ReactorNettyClient.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/ReactorNettyClient.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/ReactorNettyClient.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/ReactorNettyClient.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/AddDatePolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/AddDatePolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/AddDatePolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/AddDatePolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/AddHeadersPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/AddHeadersPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/AddHeadersPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/AddHeadersPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/CookiePolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/CookiePolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/CookiePolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/CookiePolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/HostPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HostPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/HostPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HostPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLogDetailLevel.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLogDetailLevel.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/HttpLogDetailLevel.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLogDetailLevel.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/HttpPipelinePolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpPipelinePolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/HttpPipelinePolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpPipelinePolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/PortPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/PortPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/PortPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/PortPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/ProtocolPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/ProtocolPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/ProtocolPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/ProtocolPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/ProxyAuthenticationPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/ProxyAuthenticationPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/ProxyAuthenticationPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/ProxyAuthenticationPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/RequestIdPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/RequestIdPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/RequestIdPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/RequestIdPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/RetryPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/RetryPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/RetryPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/RetryPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/TimeoutPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/TimeoutPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/TimeoutPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/TimeoutPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/UserAgentPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/UserAgentPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/UserAgentPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/UserAgentPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/Page.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/Page.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/Page.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/Page.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/PagedFlux.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/PagedFlux.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/PagedFlux.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/PagedFlux.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/PagedResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/PagedResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/PagedResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/PagedResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/Response.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/Response.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/Response.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/Response.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/ResponseBase.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/ResponseBase.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/ResponseBase.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/ResponseBase.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/SimpleResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/SimpleResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/SimpleResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/SimpleResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/StreamResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/StreamResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/StreamResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/StreamResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/VoidResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/VoidResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/VoidResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/VoidResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/Base64Url.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/Base64Url.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/Base64Url.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/Base64Url.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/CollectionFormat.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/CollectionFormat.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/CollectionFormat.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/CollectionFormat.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/DateTimeRfc1123.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/DateTimeRfc1123.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/DateTimeRfc1123.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/DateTimeRfc1123.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/EncodedParameter.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/EncodedParameter.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/EncodedParameter.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/EncodedParameter.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/OperationDescription.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OperationDescription.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/OperationDescription.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/OperationDescription.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/PercentEscaper.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/PercentEscaper.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/PercentEscaper.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/PercentEscaper.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/RestProxy.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/RestProxy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/RestProxy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/RestProxy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/Substitution.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/Substitution.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/Substitution.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/Substitution.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerInterfaceParser.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerInterfaceParser.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/SwaggerInterfaceParser.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerInterfaceParser.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerMethodParser.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerMethodParser.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/SwaggerMethodParser.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerMethodParser.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/UnexpectedExceptionInformation.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/UnexpectedExceptionInformation.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/UnexpectedExceptionInformation.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/UnexpectedExceptionInformation.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/UnixTime.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/UnixTime.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/UnixTime.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/UnixTime.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/UrlEscapers.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/UrlEscapers.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/UrlEscapers.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/UrlEscapers.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/Validator.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/Validator.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/Validator.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/Validator.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Beta.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Beta.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Beta.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Beta.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/BodyParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/BodyParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/BodyParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/BodyParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Delete.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Delete.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Delete.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Delete.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ExpectedResponses.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ExpectedResponses.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ExpectedResponses.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ExpectedResponses.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Fluent.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Fluent.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Fluent.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Fluent.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/FormParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/FormParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/FormParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/FormParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Get.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Get.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Get.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Get.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Head.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Head.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Head.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Head.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderCollection.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderCollection.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderCollection.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderCollection.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Headers.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Headers.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Headers.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Headers.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Host.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Host.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Host.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Host.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HostParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HostParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/HostParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HostParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Immutable.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Immutable.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Immutable.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Immutable.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/JsonFlatten.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/JsonFlatten.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/JsonFlatten.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/JsonFlatten.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Patch.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Patch.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Patch.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Patch.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/PathParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/PathParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/PathParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/PathParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Post.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Post.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Post.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Post.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Put.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Put.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Put.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Put.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/QueryParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/QueryParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/QueryParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/QueryParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ResumeOperation.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ResumeOperation.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ResumeOperation.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ResumeOperation.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnType.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnType.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnType.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnType.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnValueWireType.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnValueWireType.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnValueWireType.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnValueWireType.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClient.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClient.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClient.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClient.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClientBuilder.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClientBuilder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClientBuilder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClientBuilder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceInterface.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceInterface.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceInterface.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceInterface.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceMethod.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceMethod.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceMethod.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceMethod.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/SkipParentValidation.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/SkipParentValidation.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/SkipParentValidation.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/SkipParentValidation.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionType.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionType.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionType.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionType.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionTypes.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionTypes.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionTypes.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionTypes.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/exception/InvalidReturnTypeException.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/InvalidReturnTypeException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/exception/InvalidReturnTypeException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/InvalidReturnTypeException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/exception/MissingRequiredAnnotationException.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/MissingRequiredAnnotationException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/exception/MissingRequiredAnnotationException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/MissingRequiredAnnotationException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/exception/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/exception/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/BufferedHttpResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/BufferedHttpResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/BufferedHttpResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/BufferedHttpResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/ContentType.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/ContentType.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/ContentType.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/ContentType.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/PagedResponseBase.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/PagedResponseBase.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/PagedResponseBase.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/PagedResponseBase.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlBuilder.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlBuilder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/UrlBuilder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlBuilder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlToken.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlToken.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/UrlToken.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlToken.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenType.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenType.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenType.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenType.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizerState.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizerState.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizerState.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizerState.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/AfterRetryPolicyProvider.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/AfterRetryPolicyProvider.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/AfterRetryPolicyProvider.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/AfterRetryPolicyProvider.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/BeforeRetryPolicyProvider.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/BeforeRetryPolicyProvider.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/BeforeRetryPolicyProvider.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/BeforeRetryPolicyProvider.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/HttpPolicyProviders.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/HttpPolicyProviders.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/HttpPolicyProviders.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/HttpPolicyProviders.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/PolicyProvider.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/PolicyProvider.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/PolicyProvider.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/PolicyProvider.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecodeData.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecodeData.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecodeData.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecodeData.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecoder.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecoder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecoder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecoder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/ItemPage.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/ItemPage.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/ItemPage.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/ItemPage.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/MalformedValueException.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/MalformedValueException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/MalformedValueException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/MalformedValueException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerAdapter.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerAdapter.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerAdapter.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerAdapter.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerEncoding.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerEncoding.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerEncoding.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerEncoding.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesDeserializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesDeserializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesDeserializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesDeserializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/Base64UrlSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/Base64UrlSerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/Base64UrlSerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/Base64UrlSerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/ByteArraySerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/ByteArraySerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/ByteArraySerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/ByteArraySerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeRfc1123Serializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeRfc1123Serializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeRfc1123Serializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeRfc1123Serializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DurationSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DurationSerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DurationSerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DurationSerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningDeserializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningDeserializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningDeserializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningDeserializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/JacksonAdapter.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/JacksonAdapter.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/JacksonAdapter.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/JacksonAdapter.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/tracing/Tracer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/tracing/Tracer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/tracing/Tracer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/tracing/Tracer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/tracing/TracerProxy.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/tracing/TracerProxy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/tracing/TracerProxy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/tracing/TracerProxy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/Base64Util.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/Base64Util.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/Base64Util.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/Base64Util.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/ImplUtils.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/ImplUtils.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/ImplUtils.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/ImplUtils.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/ScopeUtil.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/ScopeUtil.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/ScopeUtil.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/ScopeUtil.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/TypeUtil.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/TypeUtil.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/TypeUtil.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/TypeUtil.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/Context.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/Context.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/Context.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/Context.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/configuration/BaseConfigurations.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/BaseConfigurations.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/configuration/BaseConfigurations.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/BaseConfigurations.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/configuration/Configuration.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/Configuration.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/configuration/Configuration.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/Configuration.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/configuration/ConfigurationManager.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/ConfigurationManager.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/configuration/ConfigurationManager.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/ConfigurationManager.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/configuration/NoopConfiguration.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/NoopConfiguration.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/configuration/NoopConfiguration.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/NoopConfiguration.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/configuration/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/configuration/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/logging/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/logging/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/logging/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/logging/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/polling/PollResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/polling/PollResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/polling/PollResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/polling/PollResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/polling/Poller.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/polling/Poller.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/polling/Poller.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/polling/Poller.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/polling/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/polling/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/polling/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/polling/package-info.java
diff --git a/core/azure-core/src/samples/java/com/azure/core/http/rest/PagedFluxJavaDocCodeSnippets.java b/sdk/core/azure-core/src/samples/java/com/azure/core/http/rest/PagedFluxJavaDocCodeSnippets.java
similarity index 100%
rename from core/azure-core/src/samples/java/com/azure/core/http/rest/PagedFluxJavaDocCodeSnippets.java
rename to sdk/core/azure-core/src/samples/java/com/azure/core/http/rest/PagedFluxJavaDocCodeSnippets.java
diff --git a/core/azure-core/src/samples/java/com/azure/core/implementation/util/ClientLoggerJavaDocCodeSnippets.java b/sdk/core/azure-core/src/samples/java/com/azure/core/implementation/util/ClientLoggerJavaDocCodeSnippets.java
similarity index 100%
rename from core/azure-core/src/samples/java/com/azure/core/implementation/util/ClientLoggerJavaDocCodeSnippets.java
rename to sdk/core/azure-core/src/samples/java/com/azure/core/implementation/util/ClientLoggerJavaDocCodeSnippets.java
diff --git a/core/azure-core/src/samples/java/com/azure/core/implementation/util/FluxUtilJavaDocCodeSnippets.java b/sdk/core/azure-core/src/samples/java/com/azure/core/implementation/util/FluxUtilJavaDocCodeSnippets.java
similarity index 100%
rename from core/azure-core/src/samples/java/com/azure/core/implementation/util/FluxUtilJavaDocCodeSnippets.java
rename to sdk/core/azure-core/src/samples/java/com/azure/core/implementation/util/FluxUtilJavaDocCodeSnippets.java
diff --git a/core/azure-core/src/samples/java/com/azure/core/util/polling/PollResponseJavaDocCodeSnippets.java b/sdk/core/azure-core/src/samples/java/com/azure/core/util/polling/PollResponseJavaDocCodeSnippets.java
similarity index 100%
rename from core/azure-core/src/samples/java/com/azure/core/util/polling/PollResponseJavaDocCodeSnippets.java
rename to sdk/core/azure-core/src/samples/java/com/azure/core/util/polling/PollResponseJavaDocCodeSnippets.java
diff --git a/core/azure-core/src/samples/java/com/azure/core/util/polling/PollerJavaDocCodeSnippets.java b/sdk/core/azure-core/src/samples/java/com/azure/core/util/polling/PollerJavaDocCodeSnippets.java
similarity index 100%
rename from core/azure-core/src/samples/java/com/azure/core/util/polling/PollerJavaDocCodeSnippets.java
rename to sdk/core/azure-core/src/samples/java/com/azure/core/util/polling/PollerJavaDocCodeSnippets.java
diff --git a/core/azure-core/src/test/java/com/azure/core/ConfigurationTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/ConfigurationTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/ConfigurationTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/ConfigurationTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/MockServer.java b/sdk/core/azure-core/src/test/java/com/azure/core/MockServer.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/MockServer.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/MockServer.java
diff --git a/core/azure-core/src/test/java/com/azure/core/MyOtherRestException.java b/sdk/core/azure-core/src/test/java/com/azure/core/MyOtherRestException.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/MyOtherRestException.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/MyOtherRestException.java
diff --git a/core/azure-core/src/test/java/com/azure/core/MyRestException.java b/sdk/core/azure-core/src/test/java/com/azure/core/MyRestException.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/MyRestException.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/MyRestException.java
diff --git a/core/azure-core/src/test/java/com/azure/core/UserAgentTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/UserAgentTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/UserAgentTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/UserAgentTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/credentials/CredentialsTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/credentials/CredentialsTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/credentials/CredentialsTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/credentials/CredentialsTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/credentials/TokenCacheTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/credentials/TokenCacheTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/credentials/TokenCacheTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/credentials/TokenCacheTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/AccessPolicy.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/AccessPolicy.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/AccessPolicy.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/AccessPolicy.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/HttpBinFormDataJSON.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinFormDataJSON.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/HttpBinFormDataJSON.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinFormDataJSON.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/HttpBinHeaders.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinHeaders.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/HttpBinHeaders.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinHeaders.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/HttpBinJSON.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinJSON.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/HttpBinJSON.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinJSON.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifierInner.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifierInner.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifierInner.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifierInner.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifiersWrapper.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifiersWrapper.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifiersWrapper.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifiersWrapper.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/Slide.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/Slide.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/Slide.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/Slide.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/Slideshow.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/Slideshow.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/Slideshow.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/Slideshow.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/HttpHeaderTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/HttpHeaderTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/HttpHeaderTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/HttpHeaderTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/HttpHeadersTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/HttpHeadersTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/HttpHeadersTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/HttpHeadersTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/HttpMethodTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/HttpMethodTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/HttpMethodTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/HttpMethodTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/HttpPipelineTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/HttpPipelineTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/HttpPipelineTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/HttpPipelineTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/HttpRequestTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/HttpRequestTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/HttpRequestTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/HttpRequestTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/MockHttpClient.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/MockHttpClient.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/MockHttpClient.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/MockHttpClient.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/MockHttpResponse.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/MockHttpResponse.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/MockHttpResponse.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/MockHttpResponse.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/ReactorNettyClientTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/ReactorNettyClientTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/ReactorNettyClientTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/ReactorNettyClientTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/policy/HostPolicyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/policy/HostPolicyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/policy/HostPolicyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/policy/HostPolicyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/policy/ProtocolPolicyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/policy/ProtocolPolicyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/policy/ProtocolPolicyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/policy/ProtocolPolicyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/policy/ProxyAuthenticationPolicyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/policy/ProxyAuthenticationPolicyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/policy/ProxyAuthenticationPolicyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/policy/ProxyAuthenticationPolicyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/policy/RequestIdPolicyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/policy/RequestIdPolicyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/policy/RequestIdPolicyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/policy/RequestIdPolicyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/policy/RetryPolicyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/policy/RetryPolicyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/policy/RetryPolicyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/policy/RetryPolicyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/Base64UrlTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/Base64UrlTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/Base64UrlTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/Base64UrlTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/EncodedParameterTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/EncodedParameterTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/EncodedParameterTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/EncodedParameterTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyStressTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyStressTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyStressTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyStressTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithHttpProxyNettyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithHttpProxyNettyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithHttpProxyNettyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithHttpProxyNettyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithMockTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithMockTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithMockTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithMockTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithNettyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithNettyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithNettyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithNettyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyXMLTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyXMLTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyXMLTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyXMLTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/SubstitutionTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/SubstitutionTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/SubstitutionTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/SubstitutionTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerInterfaceParserTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerInterfaceParserTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/SwaggerInterfaceParserTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerInterfaceParserTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerMethodParserTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerMethodParserTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/SwaggerMethodParserTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerMethodParserTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/UrlEscaperTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/UrlEscaperTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/UrlEscaperTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/UrlEscaperTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/ValidatorTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/ValidatorTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/ValidatorTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/ValidatorTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlBuilderTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlBuilderTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/http/UrlBuilderTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlBuilderTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlTokenizerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlTokenizerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/http/UrlTokenizerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlTokenizerTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializerTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializerTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DurationSerializerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DurationSerializerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DurationSerializerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DurationSerializerTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializerTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/JacksonAdapterTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/JacksonAdapterTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/JacksonAdapterTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/JacksonAdapterTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/util/FluxUtilTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/FluxUtilTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/util/FluxUtilTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/FluxUtilTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/util/Foo.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/Foo.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/util/Foo.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/Foo.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/util/FooChild.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/FooChild.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/util/FooChild.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/FooChild.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/util/ImplUtilsTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/ImplUtilsTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/util/ImplUtilsTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/ImplUtilsTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/util/TypeUtilTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/TypeUtilTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/util/TypeUtilTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/TypeUtilTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java
diff --git a/core/azure-core/src/test/resources/GetContainerACLs.xml b/sdk/core/azure-core/src/test/resources/GetContainerACLs.xml
similarity index 100%
rename from core/azure-core/src/test/resources/GetContainerACLs.xml
rename to sdk/core/azure-core/src/test/resources/GetContainerACLs.xml
diff --git a/core/azure-core/src/test/resources/GetXMLWithAttributes.xml b/sdk/core/azure-core/src/test/resources/GetXMLWithAttributes.xml
similarity index 100%
rename from core/azure-core/src/test/resources/GetXMLWithAttributes.xml
rename to sdk/core/azure-core/src/test/resources/GetXMLWithAttributes.xml
diff --git a/core/azure-core/src/test/resources/upload.txt b/sdk/core/azure-core/src/test/resources/upload.txt
similarity index 100%
rename from core/azure-core/src/test/resources/upload.txt
rename to sdk/core/azure-core/src/test/resources/upload.txt
diff --git a/sdk/core/pom.service.xml b/sdk/core/pom.service.xml
index 7c475cc3a4808..10c012fa679b8 100644
--- a/sdk/core/pom.service.xml
+++ b/sdk/core/pom.service.xml
@@ -9,6 +9,9 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-    <!--<module>microsoft-azure-batch</module>-->
+    <module>azure-core</module>
+    <module>azure-core-amqp</module>
+    <module>azure-core-management</module>
+    <module>azure-core-test</module>
   </modules>
 </project>
diff --git a/core/pom.xml b/sdk/core/pom.xml
similarity index 97%
rename from core/pom.xml
rename to sdk/core/pom.xml
index 8a99642ce90cc..033b535580980 100644
--- a/core/pom.xml
+++ b/sdk/core/pom.xml
@@ -10,7 +10,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
     <version>1.1.0</version>
-    <relativePath>../pom.client.xml</relativePath>
+    <relativePath>../../pom.client.xml</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>
diff --git a/sdk/eventhubs/pom.service.xml b/sdk/eventhubs/pom.service.xml
index 2f81bff7b40e9..87821b3eed055 100644
--- a/sdk/eventhubs/pom.service.xml
+++ b/sdk/eventhubs/pom.service.xml
@@ -9,7 +9,7 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-    <module>../../core</module>
+    <module>../core</module>
     <module>azure-eventhubs</module>
   </modules>
 </project>
diff --git a/sdk/keyvault/pom.service.xml b/sdk/keyvault/pom.service.xml
index 862a0ba0d96ee..98d1b31a7867c 100644
--- a/sdk/keyvault/pom.service.xml
+++ b/sdk/keyvault/pom.service.xml
@@ -19,7 +19,7 @@
     <module>microsoft-azure-keyvault-complete</module>
     
     <!-- Track 2 -->
-    <module>../../core</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
+    <module>../core</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
     <module>../identity/azure-identity</module> <!-- NOTE: We need to build identity so we can build against the version in the repo. -->
     <module>azure-keyvault-keys</module>
     <module>azure-keyvault-secrets</module>

From 2fdc3c4b8f7ca5234e084331e550a3ae18303ebc Mon Sep 17 00:00:00 2001
From: Connie Yau <conniey@microsoft.com>
Date: Fri, 12 Jul 2019 14:06:20 -0700
Subject: [PATCH 3/3] Fix NullPointerException when annotation is a nested
 class. (#4417)

---
 .../azure/tools/checkstyle/checks/JavadocThrowsChecks.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/JavadocThrowsChecks.java b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/JavadocThrowsChecks.java
index 01fd42149ae2b..c12eeb540056c 100644
--- a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/JavadocThrowsChecks.java
+++ b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/JavadocThrowsChecks.java
@@ -140,7 +140,10 @@ private boolean isOverrideAnnotation(DetailAST modifierToken) {
             return false;
         }
 
-        return "Override".equals(modifierToken.findFirstToken(TokenTypes.IDENT).getText());
+        // Possible for an identifier not to exist if it is a nested class (ie. @Parameterized.Parameters(String)).
+        final DetailAST identifier = modifierToken.findFirstToken(TokenTypes.IDENT);
+
+        return identifier != null && "Override".equals(identifier.getText());
     }
 
     /*