diff --git a/README.adoc b/README.adoc index 6089f8800..3b6b81163 100644 --- a/README.adoc +++ b/README.adoc @@ -177,6 +177,113 @@ Building the documentation builds also the project without running tests. $ ./mvnw clean install -Pdistribute ---- +The generated documentation is available from `target/site/reference/html/index.html`. +It can be staged and accessed via : + +[source,bash] +---- + docs=`pwd`/target/site/reference/html + cd /tmp + # see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site + git clone git@github.com:mikereiche/staged.git -b gh-pages + cd staged + cp -R $docs/* . + git add . + git commit --message "stage for review" + git push origin gh-pages +---- +https://mikereiche.github.io/staged/index.html + +=== Building and staging reference documentation for review + +[source,bash] +---- + export MY_GIT_USER= + mvn generate-resources + docs=`pwd`/target/site/reference/html + pushd /tmp + mkdir $$ + cd $$ + # see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site + # this examples uses a repository named "staged" + git clone git@github.com:${MY_GIT_USER}/staged.git -b gh-pages + cd staged + cp -R $docs/* . + git add . + git commit --message "stage for review" + git push origin gh-pages + popd +---- + +The generated documentation is available from `target/site/reference/html/index.html`. + +=== Building and staging reference documentation for review + +[source,bash] +---- + export MY_GIT_USER= + mvn generate-resources + docs=`pwd`/target/site/reference/html + pushd /tmp + mkdir $$ + cd $$ + # see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site + # this examples uses a repository named "staged" + git clone git@github.com:${MY_GIT_USER}/staged.git -b gh-pages + cd staged + cp -R $docs/* . + git add . + git commit --message "stage for review" + git push origin gh-pages + popd +---- + +The generated documentation is available from `target/site/reference/html/index.html`. + +=== Building and staging reference documentation for review + +[source,bash] +---- + export MY_GIT_USER= + mvn generate-resources + docs=`pwd`/target/site/reference/html + pushd /tmp + mkdir $$ + cd $$ + # see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site + # this examples uses a repository named "staged" + git clone git@github.com:${MY_GIT_USER}/staged.git -b gh-pages + cd staged + cp -R $docs/* . + git add . + git commit --message "stage for review" + git push origin gh-pages + popd +---- + +The generated documentation is available from `target/site/reference/html/index.html`. + +=== Building and staging reference documentation for review + +[source,bash] +---- + export MY_GIT_USER= + mvn generate-resources + docs=`pwd`/target/site/reference/html + pushd /tmp + mkdir $$ + cd $$ + # see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site + # this examples uses a repository named "staged" + git clone git@github.com:${MY_GIT_USER}/staged.git -b gh-pages + cd staged + cp -R $docs/* . + git add . + git commit --message "stage for review" + git push origin gh-pages + popd +---- + The generated documentation is available from `target/site/reference/html/index.html`. === Building and staging reference documentation for review diff --git a/pom.xml b/pom.xml index 16960d6f4..1f9682f73 100644 --- a/pom.xml +++ b/pom.xml @@ -4,10 +4,11 @@ 4.0.0 org.springframework.data - spring-data-couchbase + spring-data-couchbase-parent 5.0.0-SNAPSHOT + pom - Spring Data Couchbase + Spring Data Couchbase Parent Spring Data integration for Couchbase https://github.com/spring-projects/spring-data-couchbase @@ -17,222 +18,24 @@ 3.0.0-SNAPSHOT + + spring-data-couchbase + spring-data-couchbase-distribution + + 3.3.2 3.3.2 3.0.0-SNAPSHOT spring.data.couchbase - 2.10.13 - 3.0.1 - 7.0.1.Final - 1.1.3 - 5.0.0 - 3.7.4 - - - - org.testcontainers - testcontainers-bom - ${testcontainers} - pom - import - - - - - - - com.querydsl - querydsl-apt - ${querydsl} - provided - - - - org.springframework - spring-context-support - - - - org.springframework - spring-web - - - - org.springframework - spring-tx - - - - ${project.groupId} - spring-data-commons - ${springdata.commons} - - com.couchbase.client java-client ${couchbase} - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - 3.0.0 - - - - org.springframework - spring-test - ${spring} - test - - - - org.hibernate.validator - hibernate-validator - 7.0.1.Final - test - - - - org.apache.httpcomponents - httpclient - 4.5.13 - test - - - - io.projectreactor - reactor-test - test - - - - com.fasterxml.jackson.core - jackson-databind - - - - joda-time - joda-time - ${jodatime} - true - - - - org.testcontainers - testcontainers - test - - - - - jakarta.validation - jakarta.validation-api - ${validation} - - - - jakarta.el - jakarta.el-api - 4.0.0 - provided - true - - - - javax.el - javax.el-api - 3.0.0 - test - - - - org.glassfish - jakarta.el - 4.0.2 - provided - true - - - - - - org.apache.geronimo.specs - geronimo-jcdi_2.0_spec - 1.0.1 - test - - - - javax.interceptor - javax.interceptor-api - 1.2.1 - test - - - - org.apache.openwebbeans - openwebbeans-se - ${webbeans} - test - - - - com.couchbase.mock - CouchbaseMock - 1.5.25 - test - - - - com.squareup.okhttp3 - okhttp - 4.8.1 - test - - - - com.squareup.okhttp3 - okhttp-tls - 4.8.1 - test - - - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin} - true - - - - org.jetbrains.kotlin - kotlin-reflect - ${kotlin} - true - - - - org.jetbrains.kotlin - kotlin-test - ${kotlin} - test - - - - org.awaitility - awaitility - 4.0.3 - test - - @@ -259,87 +62,4 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - false - - **/*Test.java - **/*Tests.java - - - **/*IntegrationTest.java - **/*IntegrationTests.java - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - false - - **/*IntegrationTest.java - **/*IntegrationTests.java - - - - - - integration-test - verify - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - - org.asciidoctor - asciidoctor-maven-plugin - - - generate-resources - - process-asciidoc - - - target/site/reference/html - - - - - - com.mysema.maven - apt-maven-plugin - ${apt} - - - com.querydsl - querydsl-apt - ${querydsl} - - - - - generate-test-sources - - test-process - - - target/generated-test-sources - org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor - - - - - - diff --git a/spring-data-couchbase-distribution/pom.xml b/spring-data-couchbase-distribution/pom.xml new file mode 100644 index 000000000..c3cd42013 --- /dev/null +++ b/spring-data-couchbase-distribution/pom.xml @@ -0,0 +1,44 @@ + + + + 4.0.0 + + spring-data-couchbase-distribution + + pom + + Spring Data Couchbase - Distribution + Distribution build for Spring Data Couchbase + + + org.springframework.data + spring-data-couchbase-parent + 5.0.0-SNAPSHOT + ../pom.xml + + + + ${basedir}/.. + SDCOUCH + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + org.asciidoctor + asciidoctor-maven-plugin + + + + + + + + + + diff --git a/spring-data-couchbase/pom.xml b/spring-data-couchbase/pom.xml new file mode 100644 index 000000000..b30294301 --- /dev/null +++ b/spring-data-couchbase/pom.xml @@ -0,0 +1,326 @@ + + + + 4.0.0 + + spring-data-couchbase + + Spring Data Couchbase + Spring Data integration for Couchbase + + + org.springframework.data + spring-data-couchbase-parent + 5.0.0-SNAPSHOT + ../pom.xml + + + + spring.data.couchbase + 2.10.13 + 3.0.1 + 7.0.1.Final + 1.1.3 + 5.0.0 + 3.7.4 + + + + + + org.testcontainers + testcontainers-bom + ${testcontainers} + pom + import + + + + + + + + com.querydsl + querydsl-apt + ${querydsl} + provided + + + + org.springframework + spring-context-support + + + + org.springframework + spring-web + + + + org.springframework + spring-tx + + + + ${project.groupId} + spring-data-commons + ${springdata.commons} + + + + + + + jakarta.enterprise + jakarta.enterprise.cdi-api + 3.0.0 + + + + org.springframework + spring-test + ${spring} + test + + + + org.hibernate.validator + hibernate-validator + 7.0.1.Final + test + + + + org.apache.httpcomponents + httpclient + 4.5.13 + test + + + + io.projectreactor + reactor-test + test + + + + com.fasterxml.jackson.core + jackson-databind + + + + joda-time + joda-time + ${jodatime} + true + + + + org.testcontainers + testcontainers + test + + + + + jakarta.validation + jakarta.validation-api + ${validation} + + + + jakarta.el + jakarta.el-api + 4.0.0 + provided + true + + + + javax.el + javax.el-api + 3.0.0 + test + + + + org.glassfish + jakarta.el + 4.0.2 + provided + true + + + + + + org.apache.geronimo.specs + geronimo-jcdi_2.0_spec + 1.0.1 + test + + + + javax.interceptor + javax.interceptor-api + 1.2.1 + test + + + + org.apache.openwebbeans + openwebbeans-se + ${webbeans} + test + + + + com.couchbase.mock + CouchbaseMock + 1.5.25 + test + + + + com.squareup.okhttp3 + okhttp + 4.8.1 + test + + + + com.squareup.okhttp3 + okhttp-tls + 4.8.1 + test + + + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin} + true + + + + org.jetbrains.kotlin + kotlin-reflect + ${kotlin} + true + + + + org.jetbrains.kotlin + kotlin-test + ${kotlin} + test + + + + org.awaitility + awaitility + 4.0.3 + test + + + + + + + spring-libs-snapshot + https://repo.spring.io/libs-snapshot + + + sonatype-snapshot + https://oss.sonatype.org/content/repositories/snapshots + + true + + + false + + + + + + + spring-plugins-release + https://repo.spring.io/plugins-release + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + false + + **/*Test.java + **/*Tests.java + + + **/*IntegrationTest.java + **/*IntegrationTests.java + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + false + + **/*IntegrationTest.java + **/*IntegrationTests.java + + + + + + integration-test + verify + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + com.mysema.maven + apt-maven-plugin + ${apt} + + + com.querydsl + querydsl-apt + ${querydsl} + + + + + generate-test-sources + + test-process + + + target/generated-test-sources + org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor + + + + + + + diff --git a/src/main/java/com/couchbase/client/java/transactions/AttemptContextReactiveAccessor.java b/spring-data-couchbase/src/main/java/com/couchbase/client/java/transactions/AttemptContextReactiveAccessor.java similarity index 100% rename from src/main/java/com/couchbase/client/java/transactions/AttemptContextReactiveAccessor.java rename to spring-data-couchbase/src/main/java/com/couchbase/client/java/transactions/AttemptContextReactiveAccessor.java diff --git a/src/main/java/com/querydsl/couchbase/document/AbstractCouchbaseQueryDSL.java b/spring-data-couchbase/src/main/java/com/querydsl/couchbase/document/AbstractCouchbaseQueryDSL.java similarity index 100% rename from src/main/java/com/querydsl/couchbase/document/AbstractCouchbaseQueryDSL.java rename to spring-data-couchbase/src/main/java/com/querydsl/couchbase/document/AbstractCouchbaseQueryDSL.java diff --git a/src/main/java/com/querydsl/couchbase/document/CouchbaseDocumentSerializer.java b/spring-data-couchbase/src/main/java/com/querydsl/couchbase/document/CouchbaseDocumentSerializer.java similarity index 100% rename from src/main/java/com/querydsl/couchbase/document/CouchbaseDocumentSerializer.java rename to spring-data-couchbase/src/main/java/com/querydsl/couchbase/document/CouchbaseDocumentSerializer.java diff --git a/src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java diff --git a/src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java diff --git a/src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java diff --git a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java diff --git a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java diff --git a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java diff --git a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java diff --git a/src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java diff --git a/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java diff --git a/src/main/java/org/springframework/data/couchbase/config/BeanNames.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/BeanNames.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/config/BeanNames.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/BeanNames.java diff --git a/src/main/java/org/springframework/data/couchbase/config/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/config/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java diff --git a/src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java diff --git a/src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java diff --git a/src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/RemoveResult.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/RemoveResult.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/RemoveResult.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/RemoveResult.java diff --git a/src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/translation/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/convert/translation/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java diff --git a/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java diff --git a/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java diff --git a/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java diff --git a/src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java diff --git a/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java diff --git a/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java diff --git a/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/Document.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/Field.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/event/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/mapping/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/core/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/Consistency.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Consistency.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/Consistency.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Consistency.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/FetchType.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/FetchType.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/FetchType.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/FetchType.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/HashSide.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/HashSide.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/HashSide.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/HashSide.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/Meta.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Meta.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/Meta.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Meta.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/Query.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Query.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/Query.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Query.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/View.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/View.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/View.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/View.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java diff --git a/src/main/java/org/springframework/data/couchbase/core/query/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/query/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/AnyId.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/AnyId.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/AnyId.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/AnyId.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/InCollection.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/InCollection.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/InCollection.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/InCollection.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/InScope.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/InScope.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/InScope.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/InScope.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/Collection.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Collection.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/Collection.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Collection.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/Options.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Options.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/Options.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Options.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/Query.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Query.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/Query.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Query.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/Scope.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Scope.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/Scope.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Scope.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/config/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/support/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/query/support/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/Util.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/Util.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/Util.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/Util.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/package-info.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/repository/support/package-info.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/package-info.java diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java diff --git a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java diff --git a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java diff --git a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java diff --git a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java diff --git a/src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java b/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java similarity index 100% rename from src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java rename to spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java diff --git a/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/spring-data-couchbase/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension rename to spring-data-couchbase/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension diff --git a/src/main/resources/META-INF/spring.factories b/spring-data-couchbase/src/main/resources/META-INF/spring.factories similarity index 100% rename from src/main/resources/META-INF/spring.factories rename to spring-data-couchbase/src/main/resources/META-INF/spring.factories diff --git a/src/main/resources/META-INF/spring.handlers b/spring-data-couchbase/src/main/resources/META-INF/spring.handlers similarity index 100% rename from src/main/resources/META-INF/spring.handlers rename to spring-data-couchbase/src/main/resources/META-INF/spring.handlers diff --git a/src/main/resources/META-INF/spring.schemas b/spring-data-couchbase/src/main/resources/META-INF/spring.schemas similarity index 100% rename from src/main/resources/META-INF/spring.schemas rename to spring-data-couchbase/src/main/resources/META-INF/spring.schemas diff --git a/src/main/resources/META-INF/spring.tooling b/spring-data-couchbase/src/main/resources/META-INF/spring.tooling similarity index 100% rename from src/main/resources/META-INF/spring.tooling rename to spring-data-couchbase/src/main/resources/META-INF/spring.tooling diff --git a/src/main/resources/changelog.txt b/spring-data-couchbase/src/main/resources/changelog.txt similarity index 100% rename from src/main/resources/changelog.txt rename to spring-data-couchbase/src/main/resources/changelog.txt diff --git a/src/main/resources/license.txt b/spring-data-couchbase/src/main/resources/license.txt similarity index 100% rename from src/main/resources/license.txt rename to spring-data-couchbase/src/main/resources/license.txt diff --git a/src/main/resources/notice.txt b/spring-data-couchbase/src/main/resources/notice.txt similarity index 100% rename from src/main/resources/notice.txt rename to spring-data-couchbase/src/main/resources/notice.txt diff --git a/src/test/java/org/springframework/data/couchbase/cache/CacheUser.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CacheUser.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/cache/CacheUser.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CacheUser.java diff --git a/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java diff --git a/src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/Address.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Address.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/Address.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Address.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/Airline.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Airline.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/Airline.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Airline.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/Airport.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Airport.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/Airport.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Airport.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportMini.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportMini.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AirportMini.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportMini.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/CollectionsConfig.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CollectionsConfig.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/CollectionsConfig.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CollectionsConfig.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/Config.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Config.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/Config.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Config.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/Course.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Course.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/Course.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Course.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/Iata.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Iata.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/Iata.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Iata.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/Library.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Library.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/Library.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Library.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/OtherUser.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/OtherUser.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/OtherUser.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/OtherUser.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/Person.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Person.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/Person.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Person.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/PersonValue.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/Submission.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Submission.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/Submission.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Submission.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/TypeAwareTypeInformationMapper.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/TypeAwareTypeInformationMapper.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/TypeAwareTypeInformationMapper.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/TypeAwareTypeInformationMapper.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/TypeBasedCouchbaseTypeMapper.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/TypeBasedCouchbaseTypeMapper.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/TypeBasedCouchbaseTypeMapper.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/TypeBasedCouchbaseTypeMapper.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/User.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/User.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/User.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/User.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserCol.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserCol.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserCol.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserCol.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java diff --git a/src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/PersonService.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/PersonService.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/PersonService.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/PersonService.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java diff --git a/src/test/java/org/springframework/data/couchbase/util/Capabilities.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Capabilities.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/Capabilities.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Capabilities.java diff --git a/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java diff --git a/src/test/java/org/springframework/data/couchbase/util/ClusterType.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterType.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/ClusterType.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterType.java diff --git a/src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java diff --git a/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java diff --git a/src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java diff --git a/src/test/java/org/springframework/data/couchbase/util/Services.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Services.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/Services.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Services.java diff --git a/src/test/java/org/springframework/data/couchbase/util/TestCluster.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestCluster.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/TestCluster.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestCluster.java diff --git a/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java diff --git a/src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java diff --git a/src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java diff --git a/src/test/java/org/springframework/data/couchbase/util/Util.java b/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Util.java similarity index 100% rename from src/test/java/org/springframework/data/couchbase/util/Util.java rename to spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Util.java diff --git a/src/test/resources/META-INF/beans.xml b/spring-data-couchbase/src/test/resources/META-INF/beans.xml similarity index 100% rename from src/test/resources/META-INF/beans.xml rename to spring-data-couchbase/src/test/resources/META-INF/beans.xml diff --git a/src/test/resources/configurations/couchbase-consistency.xml b/spring-data-couchbase/src/test/resources/configurations/couchbase-consistency.xml similarity index 100% rename from src/test/resources/configurations/couchbase-consistency.xml rename to spring-data-couchbase/src/test/resources/configurations/couchbase-consistency.xml diff --git a/src/test/resources/configurations/couchbase-multi-bucket-bean.xml b/spring-data-couchbase/src/test/resources/configurations/couchbase-multi-bucket-bean.xml similarity index 100% rename from src/test/resources/configurations/couchbase-multi-bucket-bean.xml rename to spring-data-couchbase/src/test/resources/configurations/couchbase-multi-bucket-bean.xml diff --git a/src/test/resources/configurations/couchbase-repository-bean.xml b/spring-data-couchbase/src/test/resources/configurations/couchbase-repository-bean.xml similarity index 100% rename from src/test/resources/configurations/couchbase-repository-bean.xml rename to spring-data-couchbase/src/test/resources/configurations/couchbase-repository-bean.xml diff --git a/src/test/resources/configurations/couchbase-template-bean.xml b/spring-data-couchbase/src/test/resources/configurations/couchbase-template-bean.xml similarity index 100% rename from src/test/resources/configurations/couchbase-template-bean.xml rename to spring-data-couchbase/src/test/resources/configurations/couchbase-template-bean.xml diff --git a/src/test/resources/configurations/couchbase-template-with-translation-service-bean.xml b/spring-data-couchbase/src/test/resources/configurations/couchbase-template-with-translation-service-bean.xml similarity index 100% rename from src/test/resources/configurations/couchbase-template-with-translation-service-bean.xml rename to spring-data-couchbase/src/test/resources/configurations/couchbase-template-with-translation-service-bean.xml diff --git a/src/test/resources/configurations/couchbase-typekey.xml b/spring-data-couchbase/src/test/resources/configurations/couchbase-typekey.xml similarity index 100% rename from src/test/resources/configurations/couchbase-typekey.xml rename to spring-data-couchbase/src/test/resources/configurations/couchbase-typekey.xml diff --git a/src/test/resources/configurations/couchbaseBucket-bean.xml b/spring-data-couchbase/src/test/resources/configurations/couchbaseBucket-bean.xml similarity index 100% rename from src/test/resources/configurations/couchbaseBucket-bean.xml rename to spring-data-couchbase/src/test/resources/configurations/couchbaseBucket-bean.xml diff --git a/src/test/resources/configurations/couchbaseCluster-bean.xml b/spring-data-couchbase/src/test/resources/configurations/couchbaseCluster-bean.xml similarity index 100% rename from src/test/resources/configurations/couchbaseCluster-bean.xml rename to spring-data-couchbase/src/test/resources/configurations/couchbaseCluster-bean.xml diff --git a/src/test/resources/configurations/couchbaseEnv-bean.xml b/spring-data-couchbase/src/test/resources/configurations/couchbaseEnv-bean.xml similarity index 100% rename from src/test/resources/configurations/couchbaseEnv-bean.xml rename to spring-data-couchbase/src/test/resources/configurations/couchbaseEnv-bean.xml diff --git a/src/test/resources/configurations/couchbaseSingleEnv-bean.xml b/spring-data-couchbase/src/test/resources/configurations/couchbaseSingleEnv-bean.xml similarity index 100% rename from src/test/resources/configurations/couchbaseSingleEnv-bean.xml rename to spring-data-couchbase/src/test/resources/configurations/couchbaseSingleEnv-bean.xml diff --git a/src/test/resources/integration.properties b/spring-data-couchbase/src/test/resources/integration.properties similarity index 100% rename from src/test/resources/integration.properties rename to spring-data-couchbase/src/test/resources/integration.properties diff --git a/src/test/resources/logback.xml b/spring-data-couchbase/src/test/resources/logback.xml similarity index 100% rename from src/test/resources/logback.xml rename to spring-data-couchbase/src/test/resources/logback.xml diff --git a/src/test/resources/server.properties b/spring-data-couchbase/src/test/resources/server.properties similarity index 100% rename from src/test/resources/server.properties rename to spring-data-couchbase/src/test/resources/server.properties