diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0704a293e078..49bbcb915559 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -31,7 +31,7 @@
 
 # PRLabel: %Cosmos
 /sdk/cosmos/                                        @moderakh @kushagraThapar @David-Noble-at-work @kirankumarkolli @mbhaskar
-/sdk/cosmos/azure-spring-data-cosmos/               @kushagraThapar @saragluna @yiliuTo @chenrujun @zhoufenqin @jialindai
+/sdk/cosmos/azure-spring-data-cosmos-core/               @kushagraThapar @saragluna @yiliuTo @chenrujun @zhoufenqin @jialindai
 
 # PRLabel: %Event Hubs
 /sdk/eventhubs/                                     @conniey @srnagar @mssfang
diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
index bc57e3009e90..07b350892d91 100755
--- a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
+++ b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -491,7 +491,7 @@
   <!-- Checkstyle suppressions for azure-spring AADB2C package name-->
   <suppress checks="PackageName" files="com.microsoft.azure.spring.autoconfigure.*|com.azure.spring.*"/>
 
-  <!-- Checkstyle suppressions for azure-spring-data-cosmos package -->
+  <!-- Checkstyle suppressions for azure.spring.data.cosmos package -->
   <suppress checks="com.azure.tools.checkstyle.checks.GoodLoggingCheck|ExternalDependencyExposedCheck|ThrowFromClientLoggerCheck" files="com.azure.spring.data.cosmos.*\.java"/>
   <suppress checks="MethodName|MemberName|ParameterName|VisibilityModifier" files="com.azure.spring.data.cosmos.domain|repository|config.*\.java"/>
   <suppress checks="ConstantName" files="com.azure.spring.data.cosmos.repository|common.*\.java" />
diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 19d46aabd729..00dec13e67bd 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -274,8 +274,8 @@
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
-      <artifactId>azure-spring-data-cosmos</artifactId>
-      <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+      <artifactId>azure-spring-data-cosmos-core</artifactId>
+      <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos-core;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index d0cdebb5e27b..a31407a7cf27 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -37,7 +37,7 @@ com.azure:azure-security-keyvault-certificates;4.0.4;4.1.0-beta.5
 com.azure:azure-security-keyvault-keys;4.1.4;4.2.0-beta.6
 com.azure:azure-security-keyvault-secrets;4.1.4;4.2.0-beta.5
 com.azure:azure-sdk-template;1.1.0;1.2.0-beta.1
-com.azure:azure-spring-data-cosmos;3.0.0-beta.1;3.0.0-beta.1
+com.azure:azure-spring-data-cosmos-core;3.0.0-beta.1;3.0.0-beta.1
 com.azure:azure-spring-data-2-2-cosmos;3.0.0-beta.1;3.0.0-beta.1
 com.azure:azure-spring-data-2-3-cosmos;3.0.0-beta.1;3.0.0-beta.1
 com.azure:azure-spring-data-test;3.0.0-beta.1;3.0.0-beta.1
diff --git a/sdk/cosmos/azure-spring-data-2-2-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-2-2-cosmos/pom.xml
index 5aff2fd6a65a..0940e263091f 100644
--- a/sdk/cosmos/azure-spring-data-2-2-cosmos/pom.xml
+++ b/sdk/cosmos/azure-spring-data-2-2-cosmos/pom.xml
@@ -26,8 +26,8 @@
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
-      <artifactId>azure-spring-data-cosmos</artifactId>
-      <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+      <artifactId>azure-spring-data-cosmos-core</artifactId>
+      <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos-core;current} -->
     </dependency>
   </dependencies>
 
diff --git a/sdk/cosmos/azure-spring-data-2-3-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-2-3-cosmos/pom.xml
index 48c50462129a..1b06557505fe 100644
--- a/sdk/cosmos/azure-spring-data-2-3-cosmos/pom.xml
+++ b/sdk/cosmos/azure-spring-data-2-3-cosmos/pom.xml
@@ -26,8 +26,8 @@
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
-      <artifactId>azure-spring-data-cosmos</artifactId>
-      <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+      <artifactId>azure-spring-data-cosmos-core</artifactId>
+      <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos-core;current} -->
     </dependency>
   </dependencies>
 
diff --git a/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md b/sdk/cosmos/azure-spring-data-cosmos-core/CHANGELOG.md
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md
rename to sdk/cosmos/azure-spring-data-cosmos-core/CHANGELOG.md
diff --git a/sdk/cosmos/azure-spring-data-cosmos/CONTRIBUTING.md b/sdk/cosmos/azure-spring-data-cosmos-core/CONTRIBUTING.md
similarity index 91%
rename from sdk/cosmos/azure-spring-data-cosmos/CONTRIBUTING.md
rename to sdk/cosmos/azure-spring-data-cosmos-core/CONTRIBUTING.md
index 89f375ad5188..64b273d5750c 100644
--- a/sdk/cosmos/azure-spring-data-cosmos/CONTRIBUTING.md
+++ b/sdk/cosmos/azure-spring-data-cosmos-core/CONTRIBUTING.md
@@ -10,7 +10,7 @@ To build the project, run maven commands.
 
 ```bash
 git clone https://github.com/Azure/azure-sdk-for-java.git 
-cd sdk/cosmos/azure-spring-data-cosmos
+cd sdk/cosmos/azure-spring-data-cosmos-core
 mvnw clean install
 ```
 
@@ -35,7 +35,7 @@ mvn clean install -Dgpg.skip
   
      2. Set environment variables ACCOUNT_HOST, ACCOUNT_KEY and SECONDARY_ACCOUNT_KEY, where value of them are Cosmos account URI, primary key and secondary key. 
      
-        `azure-spring-data-cosmos` also support multiple database configuration. So set the second group environment variables NEW_ACCOUNT_HOST, NEW_ACCOUNT_KEY and NEW_SECONDARY_ACCOUNT_KEY, the two group environment variables can be same.
+        `azure-spring-data-cosmos-core` also support multiple database configuration. So set the second group environment variables NEW_ACCOUNT_HOST, NEW_ACCOUNT_KEY and NEW_SECONDARY_ACCOUNT_KEY, the two group environment variables can be same.
      3. Run maven command with `integration-test-azure` profile. 
   
         ```bash
diff --git a/sdk/cosmos/azure-spring-data-cosmos/README.md b/sdk/cosmos/azure-spring-data-cosmos-core/README.md
similarity index 97%
rename from sdk/cosmos/azure-spring-data-cosmos/README.md
rename to sdk/cosmos/azure-spring-data-cosmos-core/README.md
index 32b7796c5d9c..b9116b9be140 100644
--- a/sdk/cosmos/azure-spring-data-cosmos/README.md
+++ b/sdk/cosmos/azure-spring-data-cosmos-core/README.md
@@ -117,14 +117,14 @@ public class AuditableUser {
 ## Quick Start
 
 ### Add the dependency
-`azure-spring-data-cosmos` is published on Maven Central Repository.  
+`azure-spring-data-cosmos-core` is published on Maven Central Repository.  
 If you are using Maven, add the following dependency. 
 
-[//]: # "{x-version-update-start;com.azure:azure-spring-data-cosmos;current}"
+[//]: # "{x-version-update-start;com.azure:azure-spring-data-cosmos-core;current}"
 ```xml
 <dependency>
     <groupId>com.azure</groupId>
-    <artifactId>azure-spring-data-cosmos</artifactId>
+    <artifactId>azure-spring-data-cosmos-core</artifactId>
     <version>3.0.0-beta.1</version>
 </dependency>
 ```
@@ -367,14 +367,14 @@ public class SampleApplication implements CommandLineRunner {
 Autowired UserRepository interface, then can do save, delete and find operations. Spring Data Azure Cosmos DB uses the CosmosTemplate to execute the queries behind *find*, *save* methods. You can use the template yourself for more complex queries.
 
 ## Support multi-database configuration
-The `azure-spring-data-cosmos` support multi-database configuration, includes "multiple account" and "single account, multiple database". Here is an example.
+The `azure-spring-data-cosmos-core` support multi-database configuration, includes "multiple account" and "single account, multiple database". Here is an example.
 
 ### Add the dependency
-[//]: # "{x-version-update-start;com.azure:azure-spring-data-cosmos;current}"
+[//]: # "{x-version-update-start;com.azure:azure-spring-data-cosmos-core;current}"
 ```xml
 <dependency>
     <groupId>com.azure</groupId>
-    <artifactId>azure-spring-data-cosmos</artifactId>
+    <artifactId>azure-spring-data-cosmos-core</artifactId>
     <version>3.0.0-beta.1</version>
 </dependency>
 ```
@@ -399,7 +399,7 @@ azure.cosmos.secondary.populateQueryMetrics=if-populate-query-metrics
 ```
 
 ### Define Entities and Repositories
-The [Entity](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos#define-an-entity)  and [Repository](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos#create-repositories) definition is similar as above.
+The [Entity](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos-core#define-an-entity)  and [Repository](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos-core#create-repositories) definition is similar as above.
 You can put different database entities into different packages.
 
 ### Setup configuration
diff --git a/sdk/cosmos/azure-spring-data-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-cosmos-core/pom.xml
similarity index 98%
rename from sdk/cosmos/azure-spring-data-cosmos/pom.xml
rename to sdk/cosmos/azure-spring-data-cosmos-core/pom.xml
index 6bfe9c849950..422d25bccff3 100644
--- a/sdk/cosmos/azure-spring-data-cosmos/pom.xml
+++ b/sdk/cosmos/azure-spring-data-cosmos-core/pom.xml
@@ -11,12 +11,12 @@
   </parent>
 
   <groupId>com.azure</groupId>
-  <artifactId>azure-spring-data-cosmos</artifactId>
-  <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+  <artifactId>azure-spring-data-cosmos-core</artifactId>
+  <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos-core;current} -->
   <packaging>jar</packaging>
   <name>Spring Data for Azure Cosmos DB SQL API</name>
   <description>Spring Data for Azure Cosmos DB SQL API</description>
-  <url>https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos</url>
+  <url>https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos-core</url>
 
   <properties>
     <maven.build.timestamp.format>MM-dd-HH-mm-ss</maven.build.timestamp.format>
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/Constants.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/Constants.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/Constants.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/Constants.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/CosmosFactory.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/CosmosFactory.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/CosmosFactory.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/CosmosFactory.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/CosmosUtils.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/CosmosUtils.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/CosmosUtils.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/CosmosUtils.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/ExpressionResolver.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/ExpressionResolver.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/ExpressionResolver.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/ExpressionResolver.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/Memoizer.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/Memoizer.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/Memoizer.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/Memoizer.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/common/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfiguration.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfiguration.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfiguration.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfiguration.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfig.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfig.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfig.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfig.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfigurationSupport.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfigurationSupport.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfigurationSupport.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfigurationSupport.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/config/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/config/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosOperations.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/CosmosOperations.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosOperations.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/CosmosOperations.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosOperations.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosOperations.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosOperations.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosOperations.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnostics.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnostics.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnostics.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnostics.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/convert/MappingCosmosConverter.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/convert/MappingCosmosConverter.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/convert/MappingCosmosConverter.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/convert/MappingCosmosConverter.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/convert/ObjectMapperFactory.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/convert/ObjectMapperFactory.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/convert/ObjectMapperFactory.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/convert/ObjectMapperFactory.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/convert/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/convert/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/convert/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/convert/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/CountQueryGenerator.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/generator/CountQueryGenerator.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/CountQueryGenerator.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/generator/CountQueryGenerator.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/FindQuerySpecGenerator.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/generator/FindQuerySpecGenerator.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/FindQuerySpecGenerator.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/generator/FindQuerySpecGenerator.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/QuerySpecGenerator.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/generator/QuerySpecGenerator.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/QuerySpecGenerator.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/generator/QuerySpecGenerator.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/generator/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/generator/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentProperty.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentProperty.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentProperty.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentProperty.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/Container.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/Container.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/Container.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/Container.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosAuditingRegistrar.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosAuditingRegistrar.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosAuditingRegistrar.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosAuditingRegistrar.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosIndexingPolicy.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosIndexingPolicy.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosIndexingPolicy.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosIndexingPolicy.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosPersistentEntity.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosPersistentEntity.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosPersistentEntity.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosPersistentEntity.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosPersistentProperty.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosPersistentProperty.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosPersistentProperty.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosPersistentProperty.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/EnableCosmosAuditing.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/EnableCosmosAuditing.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/EnableCosmosAuditing.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/EnableCosmosAuditing.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/PartitionKey.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/PartitionKey.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/PartitionKey.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/PartitionKey.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/mapping/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosPageImpl.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosPageImpl.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosPageImpl.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosPageImpl.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosPageRequest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosPageRequest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosPageRequest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosPageRequest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/core/query/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/ConfigurationException.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/ConfigurationException.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/ConfigurationException.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/ConfigurationException.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/exception/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/CosmosRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/CosmosRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/CosmosRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/CosmosRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/ReactiveCosmosRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/ReactiveCosmosRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/ReactiveCosmosRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/ReactiveCosmosRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoriesRegistrar.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoriesRegistrar.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoriesRegistrar.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoriesRegistrar.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtension.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtension.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtension.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtension.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/EnableCosmosRepositories.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/EnableCosmosRepositories.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/EnableCosmosRepositories.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/EnableCosmosRepositories.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/EnableReactiveCosmosRepositories.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/EnableReactiveCosmosRepositories.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/EnableReactiveCosmosRepositories.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/EnableReactiveCosmosRepositories.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoriesRegistrar.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoriesRegistrar.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoriesRegistrar.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoriesRegistrar.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtension.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtension.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtension.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtension.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/config/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/config/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQuery.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQuery.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQuery.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQuery.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQuery.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQuery.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQuery.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQuery.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosEntityMetadata.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosEntityMetadata.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosEntityMetadata.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosEntityMetadata.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameterAccessor.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameterAccessor.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameterAccessor.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameterAccessor.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameterParameterAccessor.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameterParameterAccessor.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameterParameterAccessor.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameterParameterAccessor.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryExecution.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryExecution.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryExecution.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryExecution.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/PartTreeCosmosQuery.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/PartTreeCosmosQuery.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/PartTreeCosmosQuery.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/PartTreeCosmosQuery.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/PartTreeReactiveCosmosQuery.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/PartTreeReactiveCosmosQuery.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/PartTreeReactiveCosmosQuery.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/PartTreeReactiveCosmosQuery.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosEntityMetadata.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosEntityMetadata.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosEntityMetadata.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosEntityMetadata.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosParameterAccessor.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosParameterAccessor.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosParameterAccessor.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosParameterAccessor.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosParameterParameterAccessor.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosParameterParameterAccessor.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosParameterParameterAccessor.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosParameterParameterAccessor.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryExecution.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryExecution.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryExecution.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryExecution.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/SimpleCosmosEntityMetadata.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/SimpleCosmosEntityMetadata.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/SimpleCosmosEntityMetadata.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/SimpleCosmosEntityMetadata.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/SimpleReactiveCosmosEntityMetadata.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/SimpleReactiveCosmosEntityMetadata.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/SimpleReactiveCosmosEntityMetadata.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/SimpleReactiveCosmosEntityMetadata.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/query/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBean.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBean.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBean.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBean.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactoryBean.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactoryBean.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactoryBean.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactoryBean.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/package-info.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/package-info.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/package-info.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/java/com/azure/spring/data/cosmos/repository/support/package-info.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/resources/META-INF/project.properties b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/resources/META-INF/project.properties
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/resources/META-INF/project.properties
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/resources/META-INF/project.properties
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/resources/META-INF/spring.factories b/sdk/cosmos/azure-spring-data-cosmos-core/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/main/resources/META-INF/spring.factories
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/main/resources/META-INF/spring.factories
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/AppConfiguration.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/AppConfiguration.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/AppConfiguration.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/AppConfiguration.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/AppConfigurationCodeSnippet.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/AppConfigurationCodeSnippet.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/AppConfigurationCodeSnippet.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/AppConfigurationCodeSnippet.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/AuditableUser.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/AuditableUser.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/AuditableUser.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/AuditableUser.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/CosmosIndexingPolicyCodeSnippet.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/CosmosIndexingPolicyCodeSnippet.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/CosmosIndexingPolicyCodeSnippet.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/CosmosIndexingPolicyCodeSnippet.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/CosmosProperties.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/CosmosProperties.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/CosmosProperties.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/CosmosProperties.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/MyItem.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/MyItem.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/MyItem.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/MyItem.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/ObjectMapperConfigurationCodeSnippet.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/ObjectMapperConfigurationCodeSnippet.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/ObjectMapperConfigurationCodeSnippet.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/ObjectMapperConfigurationCodeSnippet.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/PageableRepositoryCodeSnippet.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/PageableRepositoryCodeSnippet.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/PageableRepositoryCodeSnippet.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/PageableRepositoryCodeSnippet.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/SampleApplication.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/SampleApplication.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/SampleApplication.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/SampleApplication.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/User.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/User.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/User.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/User.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/UserRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/UserRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/UserRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/UserRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/UserRepositoryConfiguration.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/UserRepositoryConfiguration.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/UserRepositoryConfiguration.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/UserRepositoryConfiguration.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/UserSample.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/UserSample.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/UserSample.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/UserSample.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/DatabaseConfiguration.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/DatabaseConfiguration.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/DatabaseConfiguration.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/DatabaseConfiguration.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/MultiDatasourceApplication.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/MultiDatasourceApplication.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/MultiDatasourceApplication.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/MultiDatasourceApplication.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/primarydatasource/first/User.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/primarydatasource/first/User.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/primarydatasource/first/User.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/primarydatasource/first/User.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/primarydatasource/first/UserRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/primarydatasource/first/UserRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/primarydatasource/first/UserRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/primarydatasource/first/UserRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/secondarydatasource/first/Book.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/secondarydatasource/first/Book.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/secondarydatasource/first/Book.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/secondarydatasource/first/Book.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/secondarydatasource/first/BookRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/secondarydatasource/first/BookRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/cosmos/multidatasource/secondarydatasource/first/BookRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/samples/java/com/azure/cosmos/multidatasource/secondarydatasource/first/BookRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/DynamicContainer.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/DynamicContainer.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/DynamicContainer.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/DynamicContainer.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/ExpressionResolverUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/ExpressionResolverUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/ExpressionResolverUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/ExpressionResolverUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PageTestUtils.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/PageTestUtils.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PageTestUtils.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/PageTestUtils.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PropertyLoaderUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/PropertyLoaderUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PropertyLoaderUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/PropertyLoaderUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/ResponseDiagnosticsTestUtils.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/ResponseDiagnosticsTestUtils.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/ResponseDiagnosticsTestUtils.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/ResponseDiagnosticsTestUtils.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/TestConstants.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/TestConstants.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/TestConstants.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/TestConstants.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/TestUtils.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/TestUtils.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/TestUtils.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/common/TestUtils.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfigurationIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfigurationIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfigurationIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfigurationIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIllegalTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIllegalTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIllegalTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIllegalTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/convert/ZonedDateTimeDeserializerTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/convert/ZonedDateTimeDeserializerTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/convert/ZonedDateTimeDeserializerTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/convert/ZonedDateTimeDeserializerTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/converter/MappingCosmosConverterUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/converter/MappingCosmosConverterUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/converter/MappingCosmosConverterUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/converter/MappingCosmosConverterUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContextUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContextUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContextUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContextUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CosmosQueryUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/query/CosmosQueryUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CosmosQueryUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/query/CosmosQueryUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CriteriaUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/query/CriteriaUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CriteriaUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/core/query/CriteriaUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Address.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Address.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Address.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Address.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/AuditableEntity.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/AuditableEntity.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/AuditableEntity.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/AuditableEntity.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Contact.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Contact.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Contact.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Contact.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Course.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Course.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Course.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Course.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/CourseWithEtag.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/CourseWithEtag.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/CourseWithEtag.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/CourseWithEtag.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Customer.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Customer.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Customer.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Customer.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Importance.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Importance.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Importance.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Importance.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IntegerIdDomain.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/IntegerIdDomain.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IntegerIdDomain.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/IntegerIdDomain.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomain.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomain.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomain.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomain.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomainPartition.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomainPartition.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomainPartition.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomainPartition.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Memo.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Memo.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Memo.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Memo.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/NoDBAnnotationPerson.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/NoDBAnnotationPerson.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/NoDBAnnotationPerson.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/NoDBAnnotationPerson.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageableAddress.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/PageableAddress.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageableAddress.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/PageableAddress.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageableMemo.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/PageableMemo.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageableMemo.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/PageableMemo.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageablePerson.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/PageablePerson.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageablePerson.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/PageablePerson.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PartitionPerson.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/PartitionPerson.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PartitionPerson.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/PartitionPerson.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Person.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Person.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Person.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Person.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PersonWithEtag.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/PersonWithEtag.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PersonWithEtag.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/PersonWithEtag.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Project.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Project.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Project.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Project.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Question.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Question.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Question.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Question.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Role.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Role.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Role.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Role.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SortedProject.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/SortedProject.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SortedProject.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/SortedProject.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELBeanStudent.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/SpELBeanStudent.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELBeanStudent.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/SpELBeanStudent.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELPropertyStudent.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/SpELPropertyStudent.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELPropertyStudent.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/SpELPropertyStudent.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Student.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Student.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Student.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/Student.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/TimeToLiveSample.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/TimeToLiveSample.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/TimeToLiveSample.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/TimeToLiveSample.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/inheritance/Shape.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/inheritance/Shape.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/inheritance/Shape.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/inheritance/Shape.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/inheritance/Square.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/inheritance/Square.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/inheritance/Square.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/domain/inheritance/Square.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SecondaryTestRepositoryConfig.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/SecondaryTestRepositoryConfig.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SecondaryTestRepositoryConfig.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/SecondaryTestRepositoryConfig.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryIllegalTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryIllegalTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryIllegalTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryIllegalTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/StubAuditorProvider.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/StubAuditorProvider.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/StubAuditorProvider.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/StubAuditorProvider.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/StubDateTimeProvider.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/StubDateTimeProvider.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/StubDateTimeProvider.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/StubDateTimeProvider.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/TestRepositoryConfig.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/TestRepositoryConfig.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/TestRepositoryConfig.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/TestRepositoryConfig.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtensionUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtensionUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtensionUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtensionUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtensionUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtensionUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtensionUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtensionUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQueryUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQueryUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQueryUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQueryUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQueryUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQueryUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQueryUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQueryUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/AddressRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/AddressRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/AddressRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/AddressRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/AuditableRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/AuditableRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/AuditableRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/AuditableRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ContactRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ContactRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ContactRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ContactRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/CustomerRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/CustomerRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/CustomerRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/CustomerRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/IntegerIdDomainRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/IntegerIdDomainRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/IntegerIdDomainRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/IntegerIdDomainRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/LongIdDomainRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/LongIdDomainRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/LongIdDomainRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/LongIdDomainRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/MemoRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/MemoRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/MemoRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/MemoRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageableAddressRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageableAddressRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageableAddressRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageableAddressRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageableMemoRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageableMemoRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageableMemoRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageableMemoRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageablePersonRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageablePersonRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageablePersonRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PageablePersonRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PartitionPersonRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PartitionPersonRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PartitionPersonRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PartitionPersonRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PersonRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PersonRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PersonRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PersonRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PersonWithEtagRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PersonWithEtagRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/PersonWithEtagRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/PersonWithEtagRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ProjectRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ProjectRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ProjectRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ProjectRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/QuestionRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/QuestionRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/QuestionRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/QuestionRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveAuditableRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveAuditableRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveAuditableRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveAuditableRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveCourseRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveCourseRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveCourseRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveCourseRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveCourseWithEtagRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveCourseWithEtagRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveCourseWithEtagRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveCourseWithEtagRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveLongIdDomainPartitionRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveLongIdDomainPartitionRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveLongIdDomainPartitionRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveLongIdDomainPartitionRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/RoleRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/RoleRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/RoleRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/RoleRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/SortedProjectRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/SortedProjectRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/SortedProjectRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/SortedProjectRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/SquareRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/SquareRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/SquareRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/SquareRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/StudentRepository.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/StudentRepository.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/StudentRepository.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/repository/StudentRepository.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformationUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformationUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformationUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformationUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBeanUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBeanUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBeanUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBeanUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryUnitTest.java b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryUnitTest.java
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryUnitTest.java
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryUnitTest.java
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/resources/application.properties b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/resources/application.properties
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/resources/application.properties
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/resources/application.properties
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/resources/application.yml b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/resources/application.yml
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/resources/application.yml
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/resources/application.yml
diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/test/resources/logback-test.xml b/sdk/cosmos/azure-spring-data-cosmos-core/src/test/resources/logback-test.xml
similarity index 100%
rename from sdk/cosmos/azure-spring-data-cosmos/src/test/resources/logback-test.xml
rename to sdk/cosmos/azure-spring-data-cosmos-core/src/test/resources/logback-test.xml
diff --git a/sdk/cosmos/azure-spring-data-test/pom.xml b/sdk/cosmos/azure-spring-data-test/pom.xml
index 85d19f45ba82..caa5311be323 100644
--- a/sdk/cosmos/azure-spring-data-test/pom.xml
+++ b/sdk/cosmos/azure-spring-data-test/pom.xml
@@ -26,8 +26,8 @@
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
-      <artifactId>azure-spring-data-cosmos</artifactId>
-      <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+      <artifactId>azure-spring-data-cosmos-core</artifactId>
+      <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos-core;current} -->
     </dependency>
   </dependencies>
 
diff --git a/sdk/cosmos/ci.yml b/sdk/cosmos/ci.yml
index af5e41a53bea..9242ac0f513c 100644
--- a/sdk/cosmos/ci.yml
+++ b/sdk/cosmos/ci.yml
@@ -43,9 +43,9 @@ extends:
       - name: azure-cosmos
         groupId: com.azure
         safeName: azurecosmos
-      - name: azure-spring-data-cosmos
+      - name: azure-spring-data-cosmos-core
         groupId: com.azure
-        safeName: azurespringdatacosmos
+        safeName: azurespringdatacosmoscore
       - name: azure-spring-data-2-2-cosmos
         groupId: com.azure
         safeName: azurespringdata22cosmos
diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml
index 29f8f7b5d390..f3dcf035f8d4 100644
--- a/sdk/cosmos/pom.xml
+++ b/sdk/cosmos/pom.xml
@@ -14,7 +14,7 @@
     <module>azure-cosmos-encryption</module>
     <module>azure-spring-data-2-2-cosmos</module>
     <module>azure-spring-data-2-3-cosmos</module>
-    <module>azure-spring-data-cosmos</module>
+    <module>azure-spring-data-cosmos-core</module>
     <module>azure-spring-data-test</module>
   </modules>
 
diff --git a/sdk/cosmos/tests.yml b/sdk/cosmos/tests.yml
index bfcc0d6671b5..f450c0948ec5 100644
--- a/sdk/cosmos/tests.yml
+++ b/sdk/cosmos/tests.yml
@@ -251,9 +251,9 @@ jobs:
         TestName: Integration_Test_Spring_Data_Cosmosdb
         ServiceDirectory: cosmos
         Artifacts:
-            - name: azure-spring-data-cosmos
+            - name: azure-spring-data-cosmos-core
               groupId: com.azure
-              safeName: azurespringdatacosmos
+              safeName: azurespringdatacosmoscore
         TimeoutInMinutes: 90
         Matrix:
           Session_Integration:
diff --git a/sdk/spring/azure-spring-boot-starter-cosmosdb/README.md b/sdk/spring/azure-spring-boot-starter-cosmosdb/README.md
index bfbfbe8d5ea8..7f03ed990e19 100644
--- a/sdk/spring/azure-spring-boot-starter-cosmosdb/README.md
+++ b/sdk/spring/azure-spring-boot-starter-cosmosdb/README.md
@@ -214,7 +214,7 @@ You can participate community driven [![Gitter](https://badges.gitter.im/Microso
 
 ## Next steps
 
-Besides using this Azure CosmosDb Spring Boot Starter, you can directly use Spring Data for Azure CosmosDb package for more complex scenarios. Please refer to [Spring Data for Azure CosmosDB](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos) for more details.
+Besides using this Azure CosmosDb Spring Boot Starter, you can directly use Spring Data for Azure CosmosDb package for more complex scenarios. Please refer to [Spring Data for Azure CosmosDB](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos-core) for more details.
 
 ## Contributing
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com.