diff --git a/pom.xml b/pom.xml index 182b2e09..ec727e48 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -10,10 +12,32 @@ org.springframework.data - spring-data-geode + spring-data-geode-parent 2.3.0.BUILD-SNAPSHOT + pom - Spring Data Geode + Spring Data for Apache Geode and Pivotal GemFire Parent + Spring Data for Apache Geode and Pivotal GemFire Parent + https://projects.spring.io/spring-data-geode/ + + + + jblum + John Blum + jblum at pivotal.io + Pivotal + https://www.pivotal.io + + Lead Developer + + -8 + + + + + spring-data-geode + spring-data-gemfire + SGF @@ -22,7 +46,6 @@ 2.7.7 1.4.1 1.1.1 - 1.10.0 2.12.1 1.01 0.4 @@ -114,45 +137,7 @@ ${springdata.commons} - - - org.apache.geode - geode-core - ${geode.version} - - - org.apache.logging.log4j - log4j-jcl - - - org.apache.logging.log4j - log4j-jul - - - org.apache.logging.log4j - log4j-slf4j-impl - - - - - - org.apache.geode - geode-cq - ${geode.version} - - - - org.apache.geode - geode-lucene - ${geode.version} - - - - org.apache.geode - geode-wan - ${geode.version} - - + antlr antlr @@ -206,20 +191,6 @@ test - - org.hamcrest - hamcrest-library - ${hamcrest} - test - - - - org.hamcrest - hamcrest-core - ${hamcrest} - test - - org.assertj assertj-core @@ -241,6 +212,20 @@ test + + org.hamcrest + hamcrest-library + ${hamcrest} + test + + + + org.hamcrest + hamcrest-core + ${hamcrest} + test + + org.iq80.snappy snappy diff --git a/spring-data-gemfire/pom.xml b/spring-data-gemfire/pom.xml new file mode 100644 index 00000000..5a6f69cc --- /dev/null +++ b/spring-data-gemfire/pom.xml @@ -0,0 +1,91 @@ + + + + 4.0.0 + + + org.springframework.data + spring-data-geode-parent + 2.3.0.BUILD-SNAPSHOT + + + spring-data-gemfire + jar + + Spring Data for Pivotal GemFire + Spring Data for Pivotal GemFire (a.k.a. Spring Data GemFire or SDG) + + + 9.8.4 + + + + + + org.springframework.data + spring-data-geode + ${project.parent.version} + + + org.apache.geode + geode-core + + + org.apache.geode + geode-cq + + + org.apache.geode + geode-lucene + + + org.apache.geode + geode-wan + + + + + + + io.pivotal.gemfire + geode-core + ${gemfire.version} + + + org.apache.logging.log4j + log4j-jcl + + + org.apache.logging.log4j + log4j-jul + + + org.apache.logging.log4j + log4j-slf4j-impl + + + + + + io.pivotal.gemfire + geode-cq + ${gemfire.version} + + + + io.pivotal.gemfire + geode-lucene + ${gemfire.version} + + + + io.pivotal.gemfire + geode-wan + ${gemfire.version} + + + + + diff --git a/spring-data-geode/pom.xml b/spring-data-geode/pom.xml new file mode 100644 index 00000000..9e098ea0 --- /dev/null +++ b/spring-data-geode/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + + org.springframework.data + spring-data-geode-parent + 2.3.0.BUILD-SNAPSHOT + + + spring-data-geode + jar + + Spring Data for Apache Geode + Spring Data for Apache Geode (a.k.a. Spring Data Geode or SDG) + + + 1.10.0 + + + + + + + org.apache.geode + geode-core + ${geode.version} + + + org.apache.logging.log4j + log4j-jcl + + + org.apache.logging.log4j + log4j-jul + + + org.apache.logging.log4j + log4j-slf4j-impl + + + + + + org.apache.geode + geode-cq + ${geode.version} + + + + org.apache.geode + geode-lucene + ${geode.version} + + + + org.apache.geode + geode-wan + ${geode.version} + + + + + diff --git a/src/main/asciidoc/appendix/appendix-schema.adoc b/spring-data-geode/src/main/asciidoc/appendix/appendix-schema.adoc similarity index 100% rename from src/main/asciidoc/appendix/appendix-schema.adoc rename to spring-data-geode/src/main/asciidoc/appendix/appendix-schema.adoc diff --git a/src/main/asciidoc/images/epub-cover.png b/spring-data-geode/src/main/asciidoc/images/epub-cover.png similarity index 100% rename from src/main/asciidoc/images/epub-cover.png rename to spring-data-geode/src/main/asciidoc/images/epub-cover.png diff --git a/src/main/asciidoc/images/epub-cover.svg b/spring-data-geode/src/main/asciidoc/images/epub-cover.svg similarity index 100% rename from src/main/asciidoc/images/epub-cover.svg rename to spring-data-geode/src/main/asciidoc/images/epub-cover.svg diff --git a/src/main/asciidoc/index.adoc b/spring-data-geode/src/main/asciidoc/index.adoc similarity index 100% rename from src/main/asciidoc/index.adoc rename to spring-data-geode/src/main/asciidoc/index.adoc diff --git a/src/main/asciidoc/introduction/introduction.adoc b/spring-data-geode/src/main/asciidoc/introduction/introduction.adoc similarity index 100% rename from src/main/asciidoc/introduction/introduction.adoc rename to spring-data-geode/src/main/asciidoc/introduction/introduction.adoc diff --git a/src/main/asciidoc/introduction/new-features.adoc b/spring-data-geode/src/main/asciidoc/introduction/new-features.adoc similarity index 100% rename from src/main/asciidoc/introduction/new-features.adoc rename to spring-data-geode/src/main/asciidoc/introduction/new-features.adoc diff --git a/src/main/asciidoc/introduction/requirements.adoc b/spring-data-geode/src/main/asciidoc/introduction/requirements.adoc similarity index 100% rename from src/main/asciidoc/introduction/requirements.adoc rename to spring-data-geode/src/main/asciidoc/introduction/requirements.adoc diff --git a/src/main/asciidoc/links.adoc b/spring-data-geode/src/main/asciidoc/links.adoc similarity index 100% rename from src/main/asciidoc/links.adoc rename to spring-data-geode/src/main/asciidoc/links.adoc diff --git a/src/main/asciidoc/preface.adoc b/spring-data-geode/src/main/asciidoc/preface.adoc similarity index 100% rename from src/main/asciidoc/preface.adoc rename to spring-data-geode/src/main/asciidoc/preface.adoc diff --git a/src/main/asciidoc/reference/bootstrap-annotations-quickstart.adoc b/spring-data-geode/src/main/asciidoc/reference/bootstrap-annotations-quickstart.adoc similarity index 100% rename from src/main/asciidoc/reference/bootstrap-annotations-quickstart.adoc rename to spring-data-geode/src/main/asciidoc/reference/bootstrap-annotations-quickstart.adoc diff --git a/src/main/asciidoc/reference/bootstrap-annotations.adoc b/spring-data-geode/src/main/asciidoc/reference/bootstrap-annotations.adoc similarity index 100% rename from src/main/asciidoc/reference/bootstrap-annotations.adoc rename to spring-data-geode/src/main/asciidoc/reference/bootstrap-annotations.adoc diff --git a/src/main/asciidoc/reference/bootstrap.adoc b/spring-data-geode/src/main/asciidoc/reference/bootstrap.adoc similarity index 100% rename from src/main/asciidoc/reference/bootstrap.adoc rename to spring-data-geode/src/main/asciidoc/reference/bootstrap.adoc diff --git a/src/main/asciidoc/reference/cache.adoc b/spring-data-geode/src/main/asciidoc/reference/cache.adoc similarity index 100% rename from src/main/asciidoc/reference/cache.adoc rename to spring-data-geode/src/main/asciidoc/reference/cache.adoc diff --git a/src/main/asciidoc/reference/cq-container.adoc b/spring-data-geode/src/main/asciidoc/reference/cq-container.adoc similarity index 100% rename from src/main/asciidoc/reference/cq-container.adoc rename to spring-data-geode/src/main/asciidoc/reference/cq-container.adoc diff --git a/src/main/asciidoc/reference/data-access.adoc b/spring-data-geode/src/main/asciidoc/reference/data-access.adoc similarity index 100% rename from src/main/asciidoc/reference/data-access.adoc rename to spring-data-geode/src/main/asciidoc/reference/data-access.adoc diff --git a/src/main/asciidoc/reference/data.adoc b/spring-data-geode/src/main/asciidoc/reference/data.adoc similarity index 100% rename from src/main/asciidoc/reference/data.adoc rename to spring-data-geode/src/main/asciidoc/reference/data.adoc diff --git a/src/main/asciidoc/reference/diskstore.adoc b/spring-data-geode/src/main/asciidoc/reference/diskstore.adoc similarity index 100% rename from src/main/asciidoc/reference/diskstore.adoc rename to spring-data-geode/src/main/asciidoc/reference/diskstore.adoc diff --git a/src/main/asciidoc/reference/function-annotations.adoc b/spring-data-geode/src/main/asciidoc/reference/function-annotations.adoc similarity index 100% rename from src/main/asciidoc/reference/function-annotations.adoc rename to spring-data-geode/src/main/asciidoc/reference/function-annotations.adoc diff --git a/src/main/asciidoc/reference/function.adoc b/spring-data-geode/src/main/asciidoc/reference/function.adoc similarity index 100% rename from src/main/asciidoc/reference/function.adoc rename to spring-data-geode/src/main/asciidoc/reference/function.adoc diff --git a/src/main/asciidoc/reference/gateway.adoc b/spring-data-geode/src/main/asciidoc/reference/gateway.adoc similarity index 100% rename from src/main/asciidoc/reference/gateway.adoc rename to spring-data-geode/src/main/asciidoc/reference/gateway.adoc diff --git a/src/main/asciidoc/reference/gemfire-bootstrap.adoc b/spring-data-geode/src/main/asciidoc/reference/gemfire-bootstrap.adoc similarity index 100% rename from src/main/asciidoc/reference/gemfire-bootstrap.adoc rename to spring-data-geode/src/main/asciidoc/reference/gemfire-bootstrap.adoc diff --git a/src/main/asciidoc/reference/indexing.adoc b/spring-data-geode/src/main/asciidoc/reference/indexing.adoc similarity index 100% rename from src/main/asciidoc/reference/indexing.adoc rename to spring-data-geode/src/main/asciidoc/reference/indexing.adoc diff --git a/src/main/asciidoc/reference/introduction.adoc b/spring-data-geode/src/main/asciidoc/reference/introduction.adoc similarity index 100% rename from src/main/asciidoc/reference/introduction.adoc rename to spring-data-geode/src/main/asciidoc/reference/introduction.adoc diff --git a/src/main/asciidoc/reference/lucene.adoc b/spring-data-geode/src/main/asciidoc/reference/lucene.adoc similarity index 100% rename from src/main/asciidoc/reference/lucene.adoc rename to spring-data-geode/src/main/asciidoc/reference/lucene.adoc diff --git a/src/main/asciidoc/reference/mapping.adoc b/spring-data-geode/src/main/asciidoc/reference/mapping.adoc similarity index 100% rename from src/main/asciidoc/reference/mapping.adoc rename to spring-data-geode/src/main/asciidoc/reference/mapping.adoc diff --git a/src/main/asciidoc/reference/region.adoc b/spring-data-geode/src/main/asciidoc/reference/region.adoc similarity index 100% rename from src/main/asciidoc/reference/region.adoc rename to spring-data-geode/src/main/asciidoc/reference/region.adoc diff --git a/src/main/asciidoc/reference/repositories.adoc b/spring-data-geode/src/main/asciidoc/reference/repositories.adoc similarity index 100% rename from src/main/asciidoc/reference/repositories.adoc rename to spring-data-geode/src/main/asciidoc/reference/repositories.adoc diff --git a/src/main/asciidoc/reference/samples.adoc b/spring-data-geode/src/main/asciidoc/reference/samples.adoc similarity index 100% rename from src/main/asciidoc/reference/samples.adoc rename to spring-data-geode/src/main/asciidoc/reference/samples.adoc diff --git a/src/main/asciidoc/reference/serialization.adoc b/spring-data-geode/src/main/asciidoc/reference/serialization.adoc similarity index 100% rename from src/main/asciidoc/reference/serialization.adoc rename to spring-data-geode/src/main/asciidoc/reference/serialization.adoc diff --git a/src/main/asciidoc/reference/snapshot.adoc b/spring-data-geode/src/main/asciidoc/reference/snapshot.adoc similarity index 100% rename from src/main/asciidoc/reference/snapshot.adoc rename to spring-data-geode/src/main/asciidoc/reference/snapshot.adoc diff --git a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/ConfigurableRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/ConfigurableRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/ConfigurableRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/ConfigurableRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/FixedPartitionAttributesFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/FixedPartitionAttributesFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/FixedPartitionAttributesFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/FixedPartitionAttributesFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/GemfireAccessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java diff --git a/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/GemfireCallback.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireCallback.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/GemfireCallback.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireCallback.java diff --git a/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java diff --git a/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/GemfireIndexException.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java diff --git a/src/main/java/org/springframework/data/gemfire/GemfireOperations.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireOperations.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/GemfireOperations.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireOperations.java diff --git a/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/GemfireQueryException.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java diff --git a/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/GemfireSystemException.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java diff --git a/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/GemfireTemplate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java diff --git a/src/main/java/org/springframework/data/gemfire/GemfireUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/GemfireUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/GenericRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GenericRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/GenericRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/GenericRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyType.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyType.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyType.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyType.java diff --git a/src/main/java/org/springframework/data/gemfire/IndexType.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/IndexType.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/IndexType.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/IndexType.java diff --git a/src/main/java/org/springframework/data/gemfire/IndexTypeConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/IndexTypeConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/IndexTypeConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/IndexTypeConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/InterestPolicyType.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/InterestPolicyType.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/InterestPolicyType.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/InterestPolicyType.java diff --git a/src/main/java/org/springframework/data/gemfire/JndiDataSourceType.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/JndiDataSourceType.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/JndiDataSourceType.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/JndiDataSourceType.java diff --git a/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/LocatorFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/LocatorFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/LocatorFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/LocatorFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/LookupRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/LookupRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/LookupRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/LookupRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/PartitionedRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/PartitionedRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/PartitionedRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/PartitionedRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/PeerRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/PeerRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/PeerRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/PeerRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/RegionShortcutConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/RegionShortcutConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/RegionShortcutConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/RegionShortcutConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java diff --git a/src/main/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/ResolvableRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/ResolvableRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/ResolvableRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/ResolvableRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/ScopeConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/ScopeConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/ScopeConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/ScopeConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/ScopeType.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/ScopeType.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/ScopeType.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/ScopeType.java diff --git a/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapter.java diff --git a/src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java diff --git a/src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java diff --git a/src/main/java/org/springframework/data/gemfire/cache/config/EnableGemfireCaching.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/EnableGemfireCaching.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/cache/config/EnableGemfireCaching.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/EnableGemfireCaching.java diff --git a/src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java diff --git a/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/client/Interest.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/Interest.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/Interest.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/Interest.java diff --git a/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyType.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyType.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyType.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyType.java diff --git a/src/main/java/org/springframework/data/gemfire/client/KeyInterest.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/KeyInterest.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/KeyInterest.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/KeyInterest.java diff --git a/src/main/java/org/springframework/data/gemfire/client/PoolAdapter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/PoolAdapter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/PoolAdapter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/PoolAdapter.java diff --git a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/client/RegexInterest.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/RegexInterest.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/RegexInterest.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/RegexInterest.java diff --git a/src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java diff --git a/src/main/java/org/springframework/data/gemfire/client/package-info.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/package-info.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/package-info.java diff --git a/src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java diff --git a/src/main/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapter.java diff --git a/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/AbstractGemfireAdminOperations.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/AbstractGemfireAdminOperations.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/admin/AbstractGemfireAdminOperations.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/AbstractGemfireAdminOperations.java diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperations.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperations.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperations.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperations.java diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunction.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunction.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunction.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunction.java diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunction.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunction.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunction.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunction.java diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunction.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunction.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunction.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunction.java diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplate.java diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplate.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServerConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServerConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServerConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServerConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServersConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServersConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServersConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServersConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolsConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolsConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolsConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolsConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AdministrativeConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AdministrativeConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/AdministrativeConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AdministrativeConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ApacheShiroSecurityConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ApacheShiroSecurityConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/ApacheShiroSecurityConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ApacheShiroSecurityConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AuthConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AuthConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/AuthConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AuthConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AutoRegionLookupConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AutoRegionLookupConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/AutoRegionLookupConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AutoRegionLookupConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/BeanFactoryLocatorConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/BeanFactoryLocatorConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/BeanFactoryLocatorConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/BeanFactoryLocatorConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterDefinedRegionsConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterDefinedRegionsConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/ClusterDefinedRegionsConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterDefinedRegionsConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryListenerContainerConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryListenerContainerConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryListenerContainerConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryListenerContainerConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoresConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoresConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoresConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoresConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocator.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocator.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocator.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocator.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegions.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegions.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegions.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegions.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegions.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegions.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegions.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegions.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCompression.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCompression.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableCompression.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCompression.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueries.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueries.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueries.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueries.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStore.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStore.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStore.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStore.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStores.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStores.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStores.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStores.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiver.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiver.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiver.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiver.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewaySender.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewaySender.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewaySender.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewaySender.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewaySenders.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewaySenders.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewaySenders.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGatewaySenders.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireAsLastResource.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireAsLastResource.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireAsLastResource.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireAsLastResource.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableIndexing.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableIndexing.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableIndexing.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableIndexing.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableLocator.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableLocator.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableLocator.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableLocator.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableLogging.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableLogging.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableLogging.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableLogging.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableManager.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableManager.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableManager.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableManager.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableMcast.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableMcast.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableMcast.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableMcast.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableMemcachedServer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableMemcachedServer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableMemcachedServer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableMemcachedServer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePools.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePools.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnablePools.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePools.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableRedisServer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableRedisServer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableRedisServer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableRedisServer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableRegionDataAccessTracing.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableRegionDataAccessTracing.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableRegionDataAccessTracing.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableRegionDataAccessTracing.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableSecurity.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableSecurity.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableSecurity.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableSecurity.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableSsl.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableSsl.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableSsl.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableSsl.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableStatistics.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableStatistics.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EnableStatistics.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableStatistics.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ExpirationConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ExpirationConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/ExpirationConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ExpirationConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySendersConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySendersConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySendersConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GatewaySendersConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/GemFirePropertiesConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GemFirePropertiesConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/GemFirePropertiesConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GemFirePropertiesConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/GeodeIntegratedSecurityConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GeodeIntegratedSecurityConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/GeodeIntegratedSecurityConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/GeodeIntegratedSecurityConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/HttpServiceConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/HttpServiceConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/HttpServiceConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/HttpServiceConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/Jsr107CacheAnnotationsCacheNameResolver.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/Jsr107CacheAnnotationsCacheNameResolver.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/Jsr107CacheAnnotationsCacheNameResolver.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/Jsr107CacheAnnotationsCacheNameResolver.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/Jsr107CacheAnnotationsCacheNameResolverFactory.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/Jsr107CacheAnnotationsCacheNameResolverFactory.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/Jsr107CacheAnnotationsCacheNameResolverFactory.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/Jsr107CacheAnnotationsCacheNameResolverFactory.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableCacheServerConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableCacheServerConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableCacheServerConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableCacheServerConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableClientCacheConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableClientCacheConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableClientCacheConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableClientCacheConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableContinuousQueryListenerContainerConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableContinuousQueryListenerContainerConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableContinuousQueryListenerContainerConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableContinuousQueryListenerContainerConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableDiskStoreConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableDiskStoreConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableDiskStoreConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableDiskStoreConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableGatewayReceiverConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableGatewayReceiverConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableGatewayReceiverConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableGatewayReceiverConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableGatewaySenderConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableGatewaySenderConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableGatewaySenderConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableGatewaySenderConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableIndexConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableIndexConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableIndexConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableIndexConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableLocatorConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableLocatorConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableLocatorConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableLocatorConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposablePeerCacheConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposablePeerCacheConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposablePeerCacheConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposablePeerCacheConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposablePoolConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposablePoolConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposablePoolConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposablePoolConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableRegionConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableRegionConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableRegionConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableRegionConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplication.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplication.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplication.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplication.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LocatorConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LocatorConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LoggingConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LoggingConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/LoggingConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/LoggingConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ManagerConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ManagerConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/ManagerConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/ManagerConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/McastConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/McastConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/McastConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/McastConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/MemcachedServerConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/MemcachedServerConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/MemcachedServerConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/MemcachedServerConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/OffHeapConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/OffHeapConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/OffHeapConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/OffHeapConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/PoolConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PoolConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/PoolConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PoolConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/RedisServerConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/RedisServerConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/RedisServerConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/RedisServerConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/RegionConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/RegionConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/RegionConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/RegionConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/SslConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/SslConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/SslConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/SslConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/StatisticsConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/StatisticsConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/StatisticsConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/StatisticsConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/UsesGemFireProperties.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/UsesGemFireProperties.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/UsesGemFireProperties.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/UsesGemFireProperties.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractLazyResolvingComposableConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractLazyResolvingComposableConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractLazyResolvingComposableConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractLazyResolvingComposableConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/BeanDefinitionRegistryPostProcessorSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/BeanDefinitionRegistryPostProcessorSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/BeanDefinitionRegistryPostProcessorSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/BeanDefinitionRegistryPostProcessorSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/CacheTypeAwareRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/CacheTypeAwareRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/CacheTypeAwareRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/CacheTypeAwareRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/Configurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/Configurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/Configurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/Configurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspect.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspect.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspect.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspect.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspect.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspect.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspect.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspect.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireComponentClassTypeScanner.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireComponentClassTypeScanner.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireComponentClassTypeScanner.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireComponentClassTypeScanner.java diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/RegionDataAccessTracingAspect.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/RegionDataAccessTracingAspect.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/annotation/support/RegionDataAccessTracingAspect.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/RegionDataAccessTracingAspect.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectCollector.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectCollector.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectCollector.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectCollector.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefiner.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefiner.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefiner.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefiner.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinition.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinition.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinition.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinition.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectType.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectType.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectType.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectType.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinition.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinition.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinition.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinition.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinition.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinition.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinition.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinition.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollector.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollector.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollector.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollector.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollector.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollector.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollector.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollector.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefiner.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefiner.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefiner.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefiner.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexCollector.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexCollector.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/support/IndexCollector.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexCollector.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexDefiner.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexDefiner.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/support/IndexDefiner.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexDefiner.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionCollector.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionCollector.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/support/RegionCollector.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionCollector.java diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionDefiner.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionDefiner.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/schema/support/RegionDefiner.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionDefiner.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/AbstractDependencyStructuringBeanFactoryPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/AbstractDependencyStructuringBeanFactoryPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/AbstractDependencyStructuringBeanFactoryPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/AbstractDependencyStructuringBeanFactoryPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/AbstractSmartLifecycle.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/AbstractSmartLifecycle.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/AbstractSmartLifecycle.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/AbstractSmartLifecycle.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/ClientCachePoolBeanFactoryPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/ClientCachePoolBeanFactoryPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/ClientCachePoolBeanFactoryPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/ClientCachePoolBeanFactoryPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/GatewaySenderBeanFactoryPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/GatewaySenderBeanFactoryPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/GatewaySenderBeanFactoryPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/GatewaySenderBeanFactoryPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/GemfireFeature.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/GemfireFeature.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/GemfireFeature.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/GemfireFeature.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/config/support/RestTemplateConfigurer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/RestTemplateConfigurer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/support/RestTemplateConfigurer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/RestTemplateConfigurer.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/AbstractPeerRegionParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/AbstractPeerRegionParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/AbstractPeerRegionParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/AbstractPeerRegionParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/AbstractRegionParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/AbstractRegionParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/AbstractRegionParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/AbstractRegionParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/AnnotationDrivenParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/AnnotationDrivenParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/AnnotationDrivenParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/AnnotationDrivenParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/AutoRegionLookupParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/AutoRegionLookupParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/AutoRegionLookupParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/AutoRegionLookupParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/CacheParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/CacheParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/CacheParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/CacheParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/CacheServerParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/CacheServerParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/CacheServerParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/CacheServerParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/ClientCacheParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ClientCacheParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/ClientCacheParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ClientCacheParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/DiskStoreParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/DiskStoreParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/DiskStoreParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/DiskStoreParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GatewayReceiverParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GatewayReceiverParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/GatewayReceiverParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GatewayReceiverParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GatewaySenderParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GatewaySenderParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/GatewaySenderParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GatewaySenderParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireConstants.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireConstants.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/GemfireConstants.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireConstants.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataNamespaceHandler.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataNamespaceHandler.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataNamespaceHandler.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataNamespaceHandler.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataSourceParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataSourceParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataSourceParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataSourceParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireListenerContainerParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireListenerContainerParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/GemfireListenerContainerParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireListenerContainerParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireNamespaceHandler.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireNamespaceHandler.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/GemfireNamespaceHandler.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireNamespaceHandler.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireRegionAutoProxyParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireRegionAutoProxyParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/GemfireRegionAutoProxyParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/GemfireRegionAutoProxyParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/IndexParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/IndexParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/IndexParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/IndexParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/LocalRegionParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/LocalRegionParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/LocalRegionParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/LocalRegionParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/LuceneIndexParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/LuceneIndexParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/LuceneIndexParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/LuceneIndexParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/LuceneServiceParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/LuceneServiceParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/LuceneServiceParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/LuceneServiceParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/PartitionedRegionParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/PartitionedRegionParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/PartitionedRegionParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/PartitionedRegionParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/PoolParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/PoolParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/PoolParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/PoolParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/SnapshotServiceParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/SnapshotServiceParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/SnapshotServiceParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/SnapshotServiceParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/TemplateRegionParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/TemplateRegionParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/TemplateRegionParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/TemplateRegionParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/TransactionManagerParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/TransactionManagerParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/TransactionManagerParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/TransactionManagerParser.java diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/package-info.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/config/xml/package-info.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/package-info.java diff --git a/src/main/java/org/springframework/data/gemfire/dao/GemfireDaoSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/dao/GemfireDaoSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/dao/GemfireDaoSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/dao/GemfireDaoSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/domain/EmptyPage.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/EmptyPage.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/domain/EmptyPage.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/EmptyPage.java diff --git a/src/main/java/org/springframework/data/gemfire/domain/EmptySlice.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/EmptySlice.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/domain/EmptySlice.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/EmptySlice.java diff --git a/src/main/java/org/springframework/data/gemfire/domain/ListablePage.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/ListablePage.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/domain/ListablePage.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/ListablePage.java diff --git a/src/main/java/org/springframework/data/gemfire/domain/support/AbstractIndexSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/support/AbstractIndexSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/domain/support/AbstractIndexSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/support/AbstractIndexSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/domain/support/AbstractPageSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/support/AbstractPageSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/domain/support/AbstractPageSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/support/AbstractPageSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/eviction/EvictingRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictingRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/eviction/EvictingRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictingRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionType.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionType.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/eviction/EvictionActionType.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionType.java diff --git a/src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyType.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyType.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyType.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyType.java diff --git a/src/main/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpiration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpiration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpiration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpiration.java diff --git a/src/main/java/org/springframework/data/gemfire/expiration/Expiration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/Expiration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/expiration/Expiration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/Expiration.java diff --git a/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionType.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionType.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionType.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionType.java diff --git a/src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/expiration/ExpiringRegionFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/ExpiringRegionFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/expiration/ExpiringRegionFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/ExpiringRegionFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/expiration/IdleTimeoutExpiration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/IdleTimeoutExpiration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/expiration/IdleTimeoutExpiration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/IdleTimeoutExpiration.java diff --git a/src/main/java/org/springframework/data/gemfire/expiration/TimeToLiveExpiration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/TimeToLiveExpiration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/expiration/TimeToLiveExpiration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/expiration/TimeToLiveExpiration.java diff --git a/src/main/java/org/springframework/data/gemfire/function/BatchingResultSender.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/BatchingResultSender.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/BatchingResultSender.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/BatchingResultSender.java diff --git a/src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java diff --git a/src/main/java/org/springframework/data/gemfire/function/FunctionArgumentResolver.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/FunctionArgumentResolver.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/FunctionArgumentResolver.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/FunctionArgumentResolver.java diff --git a/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java diff --git a/src/main/java/org/springframework/data/gemfire/function/FunctionServiceFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/FunctionServiceFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/FunctionServiceFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/FunctionServiceFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java diff --git a/src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java diff --git a/src/main/java/org/springframework/data/gemfire/function/annotation/Filter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/Filter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/annotation/Filter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/Filter.java diff --git a/src/main/java/org/springframework/data/gemfire/function/annotation/FunctionId.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/FunctionId.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/annotation/FunctionId.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/FunctionId.java diff --git a/src/main/java/org/springframework/data/gemfire/function/annotation/GemfireFunction.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/GemfireFunction.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/annotation/GemfireFunction.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/GemfireFunction.java diff --git a/src/main/java/org/springframework/data/gemfire/function/annotation/OnMember.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/OnMember.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/annotation/OnMember.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/OnMember.java diff --git a/src/main/java/org/springframework/data/gemfire/function/annotation/OnMembers.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/OnMembers.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/annotation/OnMembers.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/OnMembers.java diff --git a/src/main/java/org/springframework/data/gemfire/function/annotation/OnRegion.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/OnRegion.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/annotation/OnRegion.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/OnRegion.java diff --git a/src/main/java/org/springframework/data/gemfire/function/annotation/OnServer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/OnServer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/annotation/OnServer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/OnServer.java diff --git a/src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java diff --git a/src/main/java/org/springframework/data/gemfire/function/annotation/RegionData.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/RegionData.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/annotation/RegionData.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/annotation/RegionData.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionBeanDefinitionBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionBeanDefinitionBuilder.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionBeanDefinitionBuilder.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctionExecutions.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctionExecutions.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctionExecutions.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctionExecutions.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctions.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctions.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctions.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctions.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionBuilderFactory.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionBuilderFactory.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionBuilderFactory.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionBuilderFactory.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProvider.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProvider.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProvider.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProvider.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionConfigurationSource.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionConfigurationSource.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionConfigurationSource.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionConfigurationSource.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessorRegistrar.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessorRegistrar.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessorRegistrar.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessorRegistrar.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilder.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilder.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/OnMemberFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnMemberFunctionExecutionBeanDefinitionBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/OnMemberFunctionExecutionBeanDefinitionBuilder.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnMemberFunctionExecutionBeanDefinitionBuilder.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/OnMembersFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnMembersFunctionExecutionBeanDefinitionBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/OnMembersFunctionExecutionBeanDefinitionBuilder.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnMembersFunctionExecutionBeanDefinitionBuilder.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/OnRegionFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnRegionFunctionExecutionBeanDefinitionBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/OnRegionFunctionExecutionBeanDefinitionBuilder.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnRegionFunctionExecutionBeanDefinitionBuilder.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/OnServerFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServerFunctionExecutionBeanDefinitionBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/OnServerFunctionExecutionBeanDefinitionBuilder.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServerFunctionExecutionBeanDefinitionBuilder.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/OnServersFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServersFunctionExecutionBeanDefinitionBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/OnServersFunctionExecutionBeanDefinitionBuilder.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServersFunctionExecutionBeanDefinitionBuilder.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilder.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilder.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/TypeFilterParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/TypeFilterParser.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/TypeFilterParser.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/TypeFilterParser.java diff --git a/src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/AllMembersFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/AllMembersFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/AllMembersFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/AllMembersFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/DefaultFunctionExecutionMethodMetadata.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/DefaultFunctionExecutionMethodMetadata.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/DefaultFunctionExecutionMethodMetadata.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/DefaultFunctionExecutionMethodMetadata.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/DefaultMemberFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/DefaultMemberFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/DefaultMemberFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/DefaultMemberFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMembersFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMembersFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/DistributedMembersFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMembersFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionCallback.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionCallback.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionCallback.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionCallback.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionOperations.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionOperations.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionOperations.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionOperations.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMemberFunctionTemplate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMemberFunctionTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMemberFunctionTemplate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMemberFunctionTemplate.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMembersFunctionTemplate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMembersFunctionTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMembersFunctionTemplate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMembersFunctionTemplate.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionOperations.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionOperations.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionOperations.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionOperations.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServerFunctionTemplate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServerFunctionTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServerFunctionTemplate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServerFunctionTemplate.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/OnRegionExecutionMethodMetadata.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/OnRegionExecutionMethodMetadata.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/OnRegionExecutionMethodMetadata.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/OnRegionExecutionMethodMetadata.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/OnRegionFunctionProxyFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/OnRegionFunctionProxyFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/OnRegionFunctionProxyFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/OnRegionFunctionProxyFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/ServerFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/ServerFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/ServerFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/ServerFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java diff --git a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryDefinition.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryDefinition.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryDefinition.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryDefinition.java diff --git a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListener.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListener.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListener.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListener.java diff --git a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java diff --git a/src/main/java/org/springframework/data/gemfire/listener/GemfireListenerExecutionFailedException.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/GemfireListenerExecutionFailedException.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/listener/GemfireListenerExecutionFailedException.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/GemfireListenerExecutionFailedException.java diff --git a/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java diff --git a/src/main/java/org/springframework/data/gemfire/listener/adapter/package-info.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/adapter/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/listener/adapter/package-info.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/adapter/package-info.java diff --git a/src/main/java/org/springframework/data/gemfire/listener/annotation/ContinuousQuery.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/annotation/ContinuousQuery.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/listener/annotation/ContinuousQuery.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/annotation/ContinuousQuery.java diff --git a/src/main/java/org/springframework/data/gemfire/listener/package-info.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/listener/package-info.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/listener/package-info.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/Regions.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/Regions.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/Regions.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/Regions.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/annotation/ClientRegion.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/ClientRegion.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/annotation/ClientRegion.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/ClientRegion.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/annotation/Indexed.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/Indexed.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/annotation/Indexed.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/Indexed.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/annotation/LocalRegion.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/LocalRegion.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/annotation/LocalRegion.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/LocalRegion.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/annotation/LuceneIndexed.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/LuceneIndexed.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/annotation/LuceneIndexed.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/LuceneIndexed.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/annotation/PartitionRegion.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/PartitionRegion.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/annotation/PartitionRegion.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/PartitionRegion.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/annotation/Region.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/Region.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/annotation/Region.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/Region.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/annotation/ReplicateRegion.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/ReplicateRegion.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/annotation/ReplicateRegion.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/annotation/ReplicateRegion.java diff --git a/src/main/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolder.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolder.java diff --git a/src/main/java/org/springframework/data/gemfire/package-info.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/package-info.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/package-info.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/GemfireRepository.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/GemfireRepository.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/GemfireRepository.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/GemfireRepository.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/Query.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/Query.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/Query.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/Query.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/Wrapper.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/Wrapper.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/Wrapper.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/Wrapper.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/config/EnableGemfireRepositories.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/config/EnableGemfireRepositories.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/config/EnableGemfireRepositories.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/config/EnableGemfireRepositories.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrar.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrar.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrar.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrar.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtension.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtension.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtension.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtension.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/package-info.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/package-info.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/package-info.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreator.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreator.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreator.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreator.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethod.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethod.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethod.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethod.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireRepositoryQuery.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireRepositoryQuery.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/GemfireRepositoryQuery.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireRepositoryQuery.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/PartTreeGemfireRepositoryQuery.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/PartTreeGemfireRepositoryQuery.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/PartTreeGemfireRepositoryQuery.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/PartTreeGemfireRepositoryQuery.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/Predicate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/Predicate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/Predicate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/Predicate.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/Predicates.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/Predicates.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/Predicates.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/Predicates.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/QueryPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/QueryPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/QueryPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/QueryPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Hint.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Hint.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/annotation/Hint.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Hint.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Import.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Import.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/annotation/Import.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Import.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Limit.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Limit.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/annotation/Limit.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Limit.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Trace.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Trace.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/annotation/Trace.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/annotation/Trace.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/support/OqlKeyword.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/support/OqlKeyword.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/query/support/OqlKeyword.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/support/OqlKeyword.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneOperations.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneOperations.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/LuceneOperations.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneOperations.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneTemplate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/LuceneTemplate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneTemplate.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessor.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperations.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperations.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperations.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperations.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplate.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplate.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplate.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplate.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneAccessorSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneAccessorSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneAccessorSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneAccessorSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneOperationsSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneOperationsSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneOperationsSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneOperationsSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/LucenePage.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/LucenePage.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/support/LucenePage.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/LucenePage.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptor.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactory.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactory.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactory.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactory.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneAccessorSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneAccessorSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneAccessorSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneAccessorSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneOperationsSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneOperationsSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneOperationsSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneOperationsSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java diff --git a/src/main/java/org/springframework/data/gemfire/serialization/EnumSerializer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/EnumSerializer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/serialization/EnumSerializer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/EnumSerializer.java diff --git a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorGenerator.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorGenerator.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/serialization/InstantiatorGenerator.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorGenerator.java diff --git a/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java diff --git a/src/main/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdvice.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdvice.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdvice.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdvice.java diff --git a/src/main/java/org/springframework/data/gemfire/serialization/package-info.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/serialization/package-info.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/package-info.java diff --git a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicy.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicy.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicy.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicy.java diff --git a/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/server/package-info.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/server/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/server/package-info.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/server/package-info.java diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/ExportSnapshotException.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/ExportSnapshotException.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/snapshot/ExportSnapshotException.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/ExportSnapshotException.java diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/ImportSnapshotException.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/ImportSnapshotException.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/snapshot/ImportSnapshotException.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/ImportSnapshotException.java diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/event/ExportSnapshotApplicationEvent.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/event/ExportSnapshotApplicationEvent.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/snapshot/event/ExportSnapshotApplicationEvent.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/event/ExportSnapshotApplicationEvent.java diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/event/ImportSnapshotApplicationEvent.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/event/ImportSnapshotApplicationEvent.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/snapshot/event/ImportSnapshotApplicationEvent.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/event/ImportSnapshotApplicationEvent.java diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilter.java diff --git a/src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/support/AbstractPropertyEditorConverterSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/AbstractPropertyEditorConverterSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/AbstractPropertyEditorConverterSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/AbstractPropertyEditorConverterSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/support/CompositeLifecycle.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/CompositeLifecycle.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/CompositeLifecycle.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/CompositeLifecycle.java diff --git a/src/main/java/org/springframework/data/gemfire/support/ConnectionEndpoint.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/ConnectionEndpoint.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/ConnectionEndpoint.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/ConnectionEndpoint.java diff --git a/src/main/java/org/springframework/data/gemfire/support/ConnectionEndpointList.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/ConnectionEndpointList.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/ConnectionEndpointList.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/ConnectionEndpointList.java diff --git a/src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java diff --git a/src/main/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/support/NoOpBeanFactoryPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/NoOpBeanFactoryPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/NoOpBeanFactoryPostProcessor.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/NoOpBeanFactoryPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/support/SmartLifecycleSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/SmartLifecycleSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/SmartLifecycleSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/SmartLifecycleSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java diff --git a/src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java diff --git a/src/main/java/org/springframework/data/gemfire/support/WiringDeclarableSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/WiringDeclarableSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/WiringDeclarableSupport.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/WiringDeclarableSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/support/package-info.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/support/package-info.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/support/package-info.java diff --git a/src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionCommitException.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionCommitException.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionCommitException.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionCommitException.java diff --git a/src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionManager.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionManager.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionManager.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionManager.java diff --git a/src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java diff --git a/src/main/java/org/springframework/data/gemfire/transaction/config/GemfireCacheTransactionsConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/config/GemfireCacheTransactionsConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/transaction/config/GemfireCacheTransactionsConfiguration.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/config/GemfireCacheTransactionsConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/transaction/event/ComposableTransactionWriter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/event/ComposableTransactionWriter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/transaction/event/ComposableTransactionWriter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/event/ComposableTransactionWriter.java diff --git a/src/main/java/org/springframework/data/gemfire/transaction/event/TransactionApplicationEvent.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/event/TransactionApplicationEvent.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/transaction/event/TransactionApplicationEvent.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/event/TransactionApplicationEvent.java diff --git a/src/main/java/org/springframework/data/gemfire/transaction/event/TransactionListenerAdapter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/event/TransactionListenerAdapter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/transaction/event/TransactionListenerAdapter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/event/TransactionListenerAdapter.java diff --git a/src/main/java/org/springframework/data/gemfire/util/ArrayUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/ArrayUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/util/ArrayUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/util/ArrayUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/util/CacheUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/CacheUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/util/CacheUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/util/CacheUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/util/CollectionUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/CollectionUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/util/CollectionUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/util/CollectionUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/util/Filter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/Filter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/util/Filter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/util/Filter.java diff --git a/src/main/java/org/springframework/data/gemfire/util/NetworkUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/NetworkUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/util/NetworkUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/util/NetworkUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/util/PropertiesBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/PropertiesBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/util/PropertiesBuilder.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/util/PropertiesBuilder.java diff --git a/src/main/java/org/springframework/data/gemfire/util/RegionUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/RegionUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/util/RegionUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/util/RegionUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/util/RuntimeExceptionFactory.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/RuntimeExceptionFactory.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/util/RuntimeExceptionFactory.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/util/RuntimeExceptionFactory.java diff --git a/src/main/java/org/springframework/data/gemfire/util/SpringUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/SpringUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/util/SpringUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/util/SpringUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/util/StreamUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/StreamUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/util/StreamUtils.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/util/StreamUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderWrapper.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderWrapper.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/wan/GatewaySenderWrapper.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderWrapper.java diff --git a/src/main/java/org/springframework/data/gemfire/wan/OrderPolicyConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/OrderPolicyConverter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/wan/OrderPolicyConverter.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/OrderPolicyConverter.java diff --git a/src/main/java/org/springframework/data/gemfire/wan/OrderPolicyType.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/OrderPolicyType.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/wan/OrderPolicyType.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/OrderPolicyType.java diff --git a/src/main/java/org/springframework/data/gemfire/wan/package-info.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/package-info.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/wan/package-info.java rename to spring-data-geode/src/main/java/org/springframework/data/gemfire/wan/package-info.java diff --git a/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/spring-data-geode/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension similarity index 100% rename from src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension rename to spring-data-geode/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension diff --git a/src/main/resources/META-INF/services/org.apache.geode.distributed.ServerLauncherCacheProvider b/spring-data-geode/src/main/resources/META-INF/services/org.apache.geode.distributed.ServerLauncherCacheProvider similarity index 100% rename from src/main/resources/META-INF/services/org.apache.geode.distributed.ServerLauncherCacheProvider rename to spring-data-geode/src/main/resources/META-INF/services/org.apache.geode.distributed.ServerLauncherCacheProvider diff --git a/src/main/resources/META-INF/spring.factories b/spring-data-geode/src/main/resources/META-INF/spring.factories similarity index 100% rename from src/main/resources/META-INF/spring.factories rename to spring-data-geode/src/main/resources/META-INF/spring.factories diff --git a/src/main/resources/META-INF/spring.handlers b/spring-data-geode/src/main/resources/META-INF/spring.handlers similarity index 100% rename from src/main/resources/META-INF/spring.handlers rename to spring-data-geode/src/main/resources/META-INF/spring.handlers diff --git a/src/main/resources/META-INF/spring.schemas b/spring-data-geode/src/main/resources/META-INF/spring.schemas similarity index 100% rename from src/main/resources/META-INF/spring.schemas rename to spring-data-geode/src/main/resources/META-INF/spring.schemas diff --git a/src/main/resources/META-INF/spring.tooling b/spring-data-geode/src/main/resources/META-INF/spring.tooling similarity index 100% rename from src/main/resources/META-INF/spring.tooling rename to spring-data-geode/src/main/resources/META-INF/spring.tooling diff --git a/src/main/resources/changelog.txt b/spring-data-geode/src/main/resources/changelog.txt similarity index 100% rename from src/main/resources/changelog.txt rename to spring-data-geode/src/main/resources/changelog.txt diff --git a/src/main/resources/license.txt b/spring-data-geode/src/main/resources/license.txt similarity index 100% rename from src/main/resources/license.txt rename to spring-data-geode/src/main/resources/license.txt diff --git a/src/main/resources/notice.txt b/spring-data-geode/src/main/resources/notice.txt similarity index 100% rename from src/main/resources/notice.txt rename to spring-data-geode/src/main/resources/notice.txt diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd b/spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd similarity index 100% rename from src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd rename to spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd b/spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd similarity index 100% rename from src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd rename to spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.2.xsd b/spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.2.xsd similarity index 100% rename from src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.2.xsd rename to spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.2.xsd diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.3.xsd b/spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.3.xsd similarity index 100% rename from src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.3.xsd rename to spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.3.xsd diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire.gif b/spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire.gif similarity index 100% rename from src/main/resources/org/springframework/data/gemfire/config/spring-gemfire.gif rename to spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire.gif diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.0.xsd b/spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.0.xsd similarity index 100% rename from src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.0.xsd rename to spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.0.xsd diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.1.xsd b/spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.1.xsd similarity index 100% rename from src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.1.xsd rename to spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.1.xsd diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.2.xsd b/spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.2.xsd similarity index 100% rename from src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.2.xsd rename to spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.2.xsd diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.3.xsd b/spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.3.xsd similarity index 100% rename from src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.3.xsd rename to spring-data-geode/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.3.xsd diff --git a/src/main/resources/readme.txt b/spring-data-geode/src/main/resources/readme.txt similarity index 100% rename from src/main/resources/readme.txt rename to spring-data-geode/src/main/resources/readme.txt diff --git a/src/test/java/com/gemstone/gemfire/TestGemStoneGemFireType.java b/spring-data-geode/src/test/java/com/gemstone/gemfire/TestGemStoneGemFireType.java similarity index 100% rename from src/test/java/com/gemstone/gemfire/TestGemStoneGemFireType.java rename to spring-data-geode/src/test/java/com/gemstone/gemfire/TestGemStoneGemFireType.java diff --git a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java diff --git a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/CacheAutoReconnectIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/CacheAutoReconnectIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/CacheAutoReconnectIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/CacheAutoReconnectIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/CacheServerIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/CacheServerIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/CacheServerIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/CacheServerIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java diff --git a/src/test/java/org/springframework/data/gemfire/DiskStoreBeanUsingPropertyPlaceholdersIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/DiskStoreBeanUsingPropertyPlaceholdersIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/DiskStoreBeanUsingPropertyPlaceholdersIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/DiskStoreBeanUsingPropertyPlaceholdersIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/DiskStoreFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/DiskStoreFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/DiskStoreFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/DiskStoreFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/ForkUtil.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/ForkUtil.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/ForkUtil.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/ForkUtil.java diff --git a/src/test/java/org/springframework/data/gemfire/GemfireTemplateIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/GemfireTemplateIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/GemfireTemplateIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/GemfireTemplateIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java diff --git a/src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java diff --git a/src/test/java/org/springframework/data/gemfire/IndexTypeConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexTypeConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/IndexTypeConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexTypeConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/IndexTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexTypeTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/IndexTypeTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexTypeTest.java diff --git a/src/test/java/org/springframework/data/gemfire/Init.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/Init.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/Init.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/Init.java diff --git a/src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java diff --git a/src/test/java/org/springframework/data/gemfire/InvalidRegionDataPolicyShortcutsTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/InvalidRegionDataPolicyShortcutsTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/InvalidRegionDataPolicyShortcutsTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/InvalidRegionDataPolicyShortcutsTest.java diff --git a/src/test/java/org/springframework/data/gemfire/JndiDataSourceTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/JndiDataSourceTypeTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/JndiDataSourceTypeTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/JndiDataSourceTypeTest.java diff --git a/src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/LocatorFactoryBeanUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/LocatorFactoryBeanUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/LocatorFactoryBeanUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/LocatorFactoryBeanUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java diff --git a/src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/PeerRegionFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/PeerRegionFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/PeerRegionFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/PeerRegionFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/RecreatingSpringApplicationContextTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/RecreatingSpringApplicationContextTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/RecreatingSpringApplicationContextTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/RecreatingSpringApplicationContextTest.java diff --git a/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java diff --git a/src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java diff --git a/src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java diff --git a/src/test/java/org/springframework/data/gemfire/SimpleCacheListener.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/SimpleCacheListener.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/SimpleCacheListener.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/SimpleCacheListener.java diff --git a/src/test/java/org/springframework/data/gemfire/SimpleCacheLoader.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/SimpleCacheLoader.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/SimpleCacheLoader.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/SimpleCacheLoader.java diff --git a/src/test/java/org/springframework/data/gemfire/SimpleCacheWriter.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/SimpleCacheWriter.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/SimpleCacheWriter.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/SimpleCacheWriter.java diff --git a/src/test/java/org/springframework/data/gemfire/SimpleObjectSizer.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/SimpleObjectSizer.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/SimpleObjectSizer.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/SimpleObjectSizer.java diff --git a/src/test/java/org/springframework/data/gemfire/SimplePartitionResolver.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/SimplePartitionResolver.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/SimplePartitionResolver.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/SimplePartitionResolver.java diff --git a/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/TestUtils.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/TestUtils.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/TestUtils.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/TestUtils.java diff --git a/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java diff --git a/src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java diff --git a/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/cache/config/EnableGemfireCachingIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/config/EnableGemfireCachingIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/cache/config/EnableGemfireCachingIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/config/EnableGemfireCachingIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java diff --git a/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateFollowRedirectsClientHttpRequestFactoryUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateFollowRedirectsClientHttpRequestFactoryUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateFollowRedirectsClientHttpRequestFactoryUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateFollowRedirectsClientHttpRequestFactoryUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroIniSecurityIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroIniSecurityIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroIniSecurityIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroIniSecurityIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerPropertiesIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerPropertiesIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerPropertiesIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerPropertiesIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsAppliesRegionConfigurersIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsAppliesRegionConfigurersIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsAppliesRegionConfigurersIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsAppliesRegionConfigurersIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsConsidersCacheConfigCacheNamesIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsConsidersCacheConfigCacheNamesIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsConsidersCacheConfigCacheNamesIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsConsidersCacheConfigCacheNamesIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsRegistersInterestsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsRegistersInterestsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsRegistersInterestsIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsRegistersInterestsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsUsesCacheConfigCacheNamesIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsUsesCacheConfigCacheNamesIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsUsesCacheConfigCacheNamesIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsUsesCacheConfigCacheNamesIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplicationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplicationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplicationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplicationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCachePropertiesIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCachePropertiesIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/ClientCachePropertiesIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCachePropertiesIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStorePropertiesIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStorePropertiesIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/DiskStorePropertiesIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStorePropertiesIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationWithSecurityIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationWithSecurityIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationWithSecurityIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationWithSecurityIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesWithClusterConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesWithClusterConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesWithClusterConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesWithClusterConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiverConfigurationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiverConfigurationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiverConfigurationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiverConfigurationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGemFirePropertiesIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGemFirePropertiesIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableGemFirePropertiesIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGemFirePropertiesIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableLuceneIndexingConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableLuceneIndexingConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableLuceneIndexingConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableLuceneIndexingConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOffHeapConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOffHeapConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableOffHeapConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOffHeapConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOqlIndexingConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOqlIndexingConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableOqlIndexingConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOqlIndexingConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationDefaultContextIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationDefaultContextIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationDefaultContextIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationDefaultContextIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurerTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurerTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurerTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurerTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverPropertiesTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverPropertiesTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverPropertiesTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverPropertiesTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurerTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurerTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurerTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderConfigurerTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderPropertiesTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderPropertiesTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderPropertiesTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GatewaySenderPropertiesTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfigurationUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfigurationUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfigurationUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/IndexConfigurerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/IndexConfigurerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/IndexConfigurerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/IndexConfigurerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfigurerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfigurerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfigurerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfigurerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationPropertiesIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationPropertiesIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationPropertiesIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationPropertiesIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/LoggingConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LoggingConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/LoggingConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LoggingConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationWithAddedCacheServerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationWithAddedCacheServerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationWithAddedCacheServerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationWithAddedCacheServerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCachePropertiesIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCachePropertiesIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/PeerCachePropertiesIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCachePropertiesIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PoolConfigurerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PoolConfigurerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/PoolConfigurerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PoolConfigurerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PoolPropertiesIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PoolPropertiesIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/PoolPropertiesIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/PoolPropertiesIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/RegionConfigurerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/RegionConfigurerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/RegionConfigurerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/RegionConfigurerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingAspectUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingAspectUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingAspectUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingAspectUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/TestSecurityManager.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/TestSecurityManager.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/TestSecurityManager.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/TestSecurityManager.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractLazyResolvingComposableConfigurerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractLazyResolvingComposableConfigurerUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractLazyResolvingComposableConfigurerUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractLazyResolvingComposableConfigurerUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/support/EnableGemFireAsLastResourceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/EnableGemFireAsLastResourceIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/support/EnableGemFireAsLastResourceIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/EnableGemFireAsLastResourceIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspectUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspectUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspectUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspectUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspectUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspectUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspectUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspectUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/CollocatedPartitionRegionEntity.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/CollocatedPartitionRegionEntity.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/CollocatedPartitionRegionEntity.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/CollocatedPartitionRegionEntity.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/GenericRegionEntity.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/GenericRegionEntity.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/GenericRegionEntity.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/GenericRegionEntity.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/LocalRegionEntity.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/LocalRegionEntity.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/LocalRegionEntity.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/LocalRegionEntity.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/NonEntity.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/NonEntity.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/NonEntity.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/NonEntity.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/PartitionRegionEntity.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/PartitionRegionEntity.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/PartitionRegionEntity.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/PartitionRegionEntity.java diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ReplicateRegionEntity.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ReplicateRegionEntity.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ReplicateRegionEntity.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ReplicateRegionEntity.java diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinitionUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinitionUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinitionUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinitionUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectTypeUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectTypeUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectTypeUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectTypeUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinitionUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinitionUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinitionUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinitionUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinitionUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinitionUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinitionUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinitionUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollectorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollectorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollectorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollectorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionUsingDataPolicyAndShortcutTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionUsingDataPolicyAndShortcutTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionUsingDataPolicyAndShortcutTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionUsingDataPolicyAndShortcutTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionDefinitionUsingBeansNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionDefinitionUsingBeansNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionDefinitionUsingBeansNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionDefinitionUsingBeansNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/domain/ListablePageUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/domain/ListablePageUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/domain/ListablePageUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/domain/ListablePageUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java diff --git a/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java diff --git a/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java diff --git a/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java diff --git a/src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/fork/CqCacheServerProcess.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/CqCacheServerProcess.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/fork/CqCacheServerProcess.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/CqCacheServerProcess.java diff --git a/src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java diff --git a/src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java diff --git a/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java diff --git a/src/test/java/org/springframework/data/gemfire/fork/ServerProcess.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/ServerProcess.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/fork/ServerProcess.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/ServerProcess.java diff --git a/src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java diff --git a/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java diff --git a/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java diff --git a/src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/FunctionWithRequiredPermissionsRegistrationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionWithRequiredPermissionsRegistrationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/FunctionWithRequiredPermissionsRegistrationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionWithRequiredPermissionsRegistrationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProviderTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProviderTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProviderTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProviderTest.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/four/TestFunctionExecution.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/four/TestFunctionExecution.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/four/TestFunctionExecution.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/four/TestFunctionExecution.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/one/TestFunctionExecution.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/one/TestFunctionExecution.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/one/TestFunctionExecution.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/one/TestFunctionExecution.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnRegionFunction.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnRegionFunction.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnRegionFunction.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnRegionFunction.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnServerFunction.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnServerFunction.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnServerFunction.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnServerFunction.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction.java diff --git a/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction2.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction2.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction2.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction2.java diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java diff --git a/src/test/java/org/springframework/data/gemfire/function/sample/ExceptionThrowingFunctionExecution.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/ExceptionThrowingFunctionExecution.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/sample/ExceptionThrowingFunctionExecution.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/ExceptionThrowingFunctionExecution.java diff --git a/src/test/java/org/springframework/data/gemfire/function/sample/HelloFunctionExecution.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/HelloFunctionExecution.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/function/sample/HelloFunctionExecution.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/HelloFunctionExecution.java diff --git a/src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/listener/GemfireMDP.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/GemfireMDP.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/listener/GemfireMDP.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/GemfireMDP.java diff --git a/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/listener/ListenerContainerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/listener/StubErrorHandler.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/StubErrorHandler.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/listener/StubErrorHandler.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/StubErrorHandler.java diff --git a/src/test/java/org/springframework/data/gemfire/listener/ThrowableEventListener.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/ThrowableEventListener.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/listener/ThrowableEventListener.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/ThrowableEventListener.java diff --git a/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java diff --git a/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java diff --git a/src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/process/ProcessConfiguration.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/process/ProcessConfiguration.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/process/ProcessConfiguration.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/process/ProcessConfiguration.java diff --git a/src/test/java/org/springframework/data/gemfire/process/ProcessExecutor.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/process/ProcessExecutor.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/process/ProcessExecutor.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/process/ProcessExecutor.java diff --git a/src/test/java/org/springframework/data/gemfire/process/ProcessInputStreamListener.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/process/ProcessInputStreamListener.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/process/ProcessInputStreamListener.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/process/ProcessInputStreamListener.java diff --git a/src/test/java/org/springframework/data/gemfire/process/ProcessWrapper.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/process/ProcessWrapper.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/process/ProcessWrapper.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/process/ProcessWrapper.java diff --git a/src/test/java/org/springframework/data/gemfire/process/support/PidUnavailableException.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/process/support/PidUnavailableException.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/process/support/PidUnavailableException.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/process/support/PidUnavailableException.java diff --git a/src/test/java/org/springframework/data/gemfire/process/support/ProcessUtils.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/process/support/ProcessUtils.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/process/support/ProcessUtils.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/process/support/ProcessUtils.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/OqlKeywordUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/OqlKeywordUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/OqlKeywordUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/OqlKeywordUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/CustomPersonRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/CustomPersonRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/cdi/CustomPersonRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/CustomPersonRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/CustomPersonRepositoryImpl.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/CustomPersonRepositoryImpl.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/cdi/CustomPersonRepositoryImpl.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/CustomPersonRepositoryImpl.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/SamplePersonRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/SamplePersonRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/cdi/SamplePersonRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/SamplePersonRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/IncompatibleRegionKeyRepositoryIdAndEntityIdRepositoryIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/IncompatibleRegionKeyRepositoryIdAndEntityIdRepositoryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/config/IncompatibleRegionKeyRepositoryIdAndEntityIdRepositoryIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/IncompatibleRegionKeyRepositoryIdAndEntityIdRepositoryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/NamespaceRepositoryIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/NamespaceRepositoryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/config/NamespaceRepositoryIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/NamespaceRepositoryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/PartitionedRegionNamespaceRepositoryIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/PartitionedRegionNamespaceRepositoryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/config/PartitionedRegionNamespaceRepositoryIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/PartitionedRegionNamespaceRepositoryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreatorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreatorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreatorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreatorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/PredicatesUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/PredicatesUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/query/PredicatesUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/PredicatesUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Account.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Account.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/Account.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Account.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/AccountRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/AccountRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/AccountRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/AccountRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Address.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Address.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/Address.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Address.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Algorithm.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Algorithm.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/Algorithm.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Algorithm.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Animal.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Animal.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/Animal.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Animal.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/CatRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/CatRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/CatRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/CatRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/CustomerRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/CustomerRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/CustomerRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/CustomerRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/DogRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/DogRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/DogRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/DogRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/GuestUser.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/GuestUser.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/GuestUser.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/GuestUser.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/GuestUserRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/GuestUserRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/GuestUserRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/GuestUserRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/Person.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Plant.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Plant.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/Plant.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Plant.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/PlantRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/PlantRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/PlantRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/PlantRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Programmer.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Programmer.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/Programmer.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Programmer.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/ProgrammerRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/ProgrammerRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/ProgrammerRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/ProgrammerRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/RabbitRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/RabbitRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/RabbitRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/RabbitRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/RepositoryQueriesWithJoinsIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/RepositoryQueriesWithJoinsIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/RepositoryQueriesWithJoinsIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/RepositoryQueriesWithJoinsIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/RootUser.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/RootUser.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/RootUser.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/RootUser.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/RootUserRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/RootUserRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/RootUserRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/RootUserRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/User.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/User.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/User.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/User.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/UserRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java diff --git a/src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java diff --git a/src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java diff --git a/src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/CompositeLifecycleUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/CompositeLifecycleUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/CompositeLifecycleUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/CompositeLifecycleUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointListTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointListTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointListTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointListTest.java diff --git a/src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorAnnotationConfigIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorAnnotationConfigIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorAnnotationConfigIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorAnnotationConfigIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorJavaConfigIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorJavaConfigIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorJavaConfigIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorJavaConfigIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/SmartLifecycleSupportUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/SmartLifecycleSupportUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/SmartLifecycleSupportUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/SmartLifecycleSupportUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderTest.java diff --git a/src/test/java/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/support/sample/TestUserDao.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/sample/TestUserDao.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/sample/TestUserDao.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/sample/TestUserDao.java diff --git a/src/test/java/org/springframework/data/gemfire/support/sample/TestUserService.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/sample/TestUserService.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/sample/TestUserService.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/sample/TestUserService.java diff --git a/src/test/java/org/springframework/data/gemfire/support/sample/UserApplicationConfiguration.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/sample/UserApplicationConfiguration.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/sample/UserApplicationConfiguration.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/sample/UserApplicationConfiguration.java diff --git a/src/test/java/org/springframework/data/gemfire/support/sample/UserDao.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/sample/UserDao.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/sample/UserDao.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/sample/UserDao.java diff --git a/src/test/java/org/springframework/data/gemfire/support/sample/UserService.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/sample/UserService.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/support/sample/UserService.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/support/sample/UserService.java diff --git a/src/test/java/org/springframework/data/gemfire/test/GemfireProfileValueSource.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/GemfireProfileValueSource.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/GemfireProfileValueSource.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/GemfireProfileValueSource.java diff --git a/src/test/java/org/springframework/data/gemfire/test/GemfireTestApplicationContextInitializer.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/GemfireTestApplicationContextInitializer.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/GemfireTestApplicationContextInitializer.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/GemfireTestApplicationContextInitializer.java diff --git a/src/test/java/org/springframework/data/gemfire/test/GemfireTestBeanPostProcessor.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/GemfireTestBeanPostProcessor.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/GemfireTestBeanPostProcessor.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/GemfireTestBeanPostProcessor.java diff --git a/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java diff --git a/src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java diff --git a/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java diff --git a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java diff --git a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java diff --git a/src/test/java/org/springframework/data/gemfire/test/StubAsyncEventQueueFactory.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubAsyncEventQueueFactory.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/StubAsyncEventQueueFactory.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubAsyncEventQueueFactory.java diff --git a/src/test/java/org/springframework/data/gemfire/test/StubCache.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubCache.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/StubCache.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubCache.java diff --git a/src/test/java/org/springframework/data/gemfire/test/StubCacheServer.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubCacheServer.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/StubCacheServer.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubCacheServer.java diff --git a/src/test/java/org/springframework/data/gemfire/test/StubCacheTransactionManager.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubCacheTransactionManager.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/StubCacheTransactionManager.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubCacheTransactionManager.java diff --git a/src/test/java/org/springframework/data/gemfire/test/StubDiskStore.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubDiskStore.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/StubDiskStore.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubDiskStore.java diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java diff --git a/src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java diff --git a/src/test/java/org/springframework/data/gemfire/test/logging/slf4j/logback/TestAppender.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/logging/slf4j/logback/TestAppender.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/logging/slf4j/logback/TestAppender.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/logging/slf4j/logback/TestAppender.java diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/MockObjectsSupport.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/MockObjectsSupport.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/mock/MockObjectsSupport.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/MockObjectsSupport.java diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/annotation/EnableGemFireMockObjects.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/annotation/EnableGemFireMockObjects.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/mock/annotation/EnableGemFireMockObjects.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/annotation/EnableGemFireMockObjects.java diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireMockObjectsConfiguration.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireMockObjectsConfiguration.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireMockObjectsConfiguration.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireMockObjectsConfiguration.java diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireUnitTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireUnitTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireUnitTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireUnitTest.java diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/config/GemFireMockObjectsBeanPostProcessor.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/config/GemFireMockObjectsBeanPostProcessor.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/mock/config/GemFireMockObjectsBeanPostProcessor.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/config/GemFireMockObjectsBeanPostProcessor.java diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/context/GemFireMockObjectsApplicationContextInitializer.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/context/GemFireMockObjectsApplicationContextInitializer.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/mock/context/GemFireMockObjectsApplicationContextInitializer.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/context/GemFireMockObjectsApplicationContextInitializer.java diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/support/MockObjectInvocationException.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/support/MockObjectInvocationException.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/mock/support/MockObjectInvocationException.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/support/MockObjectInvocationException.java diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/support/MockObjectsException.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/support/MockObjectsException.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/mock/support/MockObjectsException.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/support/MockObjectsException.java diff --git a/src/test/java/org/springframework/data/gemfire/test/model/Book.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/model/Book.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/model/Book.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/model/Book.java diff --git a/src/test/java/org/springframework/data/gemfire/test/model/Gender.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/model/Gender.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/model/Gender.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/model/Gender.java diff --git a/src/test/java/org/springframework/data/gemfire/test/model/Person.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/model/Person.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/model/Person.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/model/Person.java diff --git a/src/test/java/org/springframework/data/gemfire/test/repo/PersonRepository.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/repo/PersonRepository.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/repo/PersonRepository.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/repo/PersonRepository.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/AbstractGemFireClientServerIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractGemFireClientServerIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/AbstractGemFireClientServerIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractGemFireClientServerIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/AbstractNativeCacheTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractNativeCacheTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/AbstractNativeCacheTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractNativeCacheTests.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/AbstractUnitAndIntegrationTestsWithMockSupport.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractUnitAndIntegrationTestsWithMockSupport.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/AbstractUnitAndIntegrationTestsWithMockSupport.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractUnitAndIntegrationTestsWithMockSupport.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/ClientServerIntegrationTestsSupport.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/ClientServerIntegrationTestsSupport.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/ClientServerIntegrationTestsSupport.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/ClientServerIntegrationTestsSupport.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/DataSourceAdapter.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/DataSourceAdapter.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/DataSourceAdapter.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/DataSourceAdapter.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/FileSystemUtils.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/FileSystemUtils.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/FileSystemUtils.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/FileSystemUtils.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/IOUtils.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/IOUtils.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/IOUtils.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/IOUtils.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/IdentifierSequence.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/IdentifierSequence.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/IdentifierSequence.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/IdentifierSequence.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/MapBuilder.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/MapBuilder.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/MapBuilder.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/MapBuilder.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/SocketUtils.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/SocketUtils.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/SocketUtils.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/SocketUtils.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/StackTraceUtils.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/StackTraceUtils.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/StackTraceUtils.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/StackTraceUtils.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/ThreadUtils.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/ThreadUtils.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/ThreadUtils.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/ThreadUtils.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/ThrowableUtils.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/ThrowableUtils.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/ThrowableUtils.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/ThrowableUtils.java diff --git a/src/test/java/org/springframework/data/gemfire/test/support/ZipUtils.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/ZipUtils.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/test/support/ZipUtils.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/ZipUtils.java diff --git a/src/test/java/org/springframework/data/gemfire/transaction/AbstractTransactionalEventListenerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/AbstractTransactionalEventListenerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/transaction/AbstractTransactionalEventListenerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/AbstractTransactionalEventListenerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/transaction/AutoTransactionalEventListenerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/AutoTransactionalEventListenerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/transaction/AutoTransactionalEventListenerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/AutoTransactionalEventListenerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/transaction/GemfireTransactionManagerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/GemfireTransactionManagerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/transaction/GemfireTransactionManagerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/GemfireTransactionManagerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/transaction/TransactionalEventListenerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/TransactionalEventListenerIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/transaction/TransactionalEventListenerIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/TransactionalEventListenerIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/transaction/event/ComposableTransactionWriterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/event/ComposableTransactionWriterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/transaction/event/ComposableTransactionWriterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/event/ComposableTransactionWriterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/transaction/event/TransactionListenerAdapterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/event/TransactionListenerAdapterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/transaction/event/TransactionListenerAdapterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/event/TransactionListenerAdapterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/util/ArrayUtilsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/ArrayUtilsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/util/ArrayUtilsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/util/ArrayUtilsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/util/FilterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/FilterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/util/FilterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/util/FilterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/util/NetworkUtilsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/NetworkUtilsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/util/NetworkUtilsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/util/NetworkUtilsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/util/PropertiesBuilderTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/PropertiesBuilderTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/util/PropertiesBuilderTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/util/PropertiesBuilderTests.java diff --git a/src/test/java/org/springframework/data/gemfire/util/RegionUtilsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/RegionUtilsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/util/RegionUtilsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/util/RegionUtilsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/util/RuntimeExceptionFactoryUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/RuntimeExceptionFactoryUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/util/RuntimeExceptionFactoryUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/util/RuntimeExceptionFactoryUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/util/StreamUtilsTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/StreamUtilsTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/util/StreamUtilsTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/util/StreamUtilsTests.java diff --git a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java diff --git a/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java diff --git a/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java diff --git a/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java diff --git a/src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java rename to spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java diff --git a/src/test/resources/SpringServerLauncherCacheProviderIntegrationTest-context.xml b/spring-data-geode/src/test/resources/SpringServerLauncherCacheProviderIntegrationTest-context.xml similarity index 100% rename from src/test/resources/SpringServerLauncherCacheProviderIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/SpringServerLauncherCacheProviderIntegrationTest-context.xml diff --git a/src/test/resources/autoregionlookup-cache.xml b/spring-data-geode/src/test/resources/autoregionlookup-cache.xml similarity index 100% rename from src/test/resources/autoregionlookup-cache.xml rename to spring-data-geode/src/test/resources/autoregionlookup-cache.xml diff --git a/src/test/resources/cache-with-declarable.xml b/spring-data-geode/src/test/resources/cache-with-declarable.xml similarity index 100% rename from src/test/resources/cache-with-declarable.xml rename to spring-data-geode/src/test/resources/cache-with-declarable.xml diff --git a/src/test/resources/cache-with-regions.xml b/spring-data-geode/src/test/resources/cache-with-regions.xml similarity index 100% rename from src/test/resources/cache-with-regions.xml rename to spring-data-geode/src/test/resources/cache-with-regions.xml diff --git a/src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml b/spring-data-geode/src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml similarity index 100% rename from src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml rename to spring-data-geode/src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml diff --git a/src/test/resources/cache-with-spring-context-bootstrap-initializer.xml b/spring-data-geode/src/test/resources/cache-with-spring-context-bootstrap-initializer.xml similarity index 100% rename from src/test/resources/cache-with-spring-context-bootstrap-initializer.xml rename to spring-data-geode/src/test/resources/cache-with-spring-context-bootstrap-initializer.xml diff --git a/src/test/resources/cache_snapshot.zip b/spring-data-geode/src/test/resources/cache_snapshot.zip similarity index 100% rename from src/test/resources/cache_snapshot.zip rename to spring-data-geode/src/test/resources/cache_snapshot.zip diff --git a/src/test/resources/clientcache-with-regions.xml b/spring-data-geode/src/test/resources/clientcache-with-regions.xml similarity index 100% rename from src/test/resources/clientcache-with-regions.xml rename to spring-data-geode/src/test/resources/clientcache-with-regions.xml diff --git a/src/test/resources/cluster_config.zip b/spring-data-geode/src/test/resources/cluster_config.zip similarity index 100% rename from src/test/resources/cluster_config.zip rename to spring-data-geode/src/test/resources/cluster_config.zip diff --git a/src/test/resources/empty-cache.xml b/spring-data-geode/src/test/resources/empty-cache.xml similarity index 100% rename from src/test/resources/empty-cache.xml rename to spring-data-geode/src/test/resources/empty-cache.xml diff --git a/src/test/resources/empty-client-cache.xml b/spring-data-geode/src/test/resources/empty-client-cache.xml similarity index 100% rename from src/test/resources/empty-client-cache.xml rename to spring-data-geode/src/test/resources/empty-client-cache.xml diff --git a/src/test/resources/gemfire-cache.xml b/spring-data-geode/src/test/resources/gemfire-cache.xml similarity index 100% rename from src/test/resources/gemfire-cache.xml rename to spring-data-geode/src/test/resources/gemfire-cache.xml diff --git a/src/test/resources/gemfire-client-cache.xml b/spring-data-geode/src/test/resources/gemfire-client-cache.xml similarity index 100% rename from src/test/resources/gemfire-client-cache.xml rename to spring-data-geode/src/test/resources/gemfire-client-cache.xml diff --git a/src/test/resources/gemfire-datasource-integration-test-cache.xml b/spring-data-geode/src/test/resources/gemfire-datasource-integration-test-cache.xml similarity index 100% rename from src/test/resources/gemfire-datasource-integration-test-cache.xml rename to spring-data-geode/src/test/resources/gemfire-datasource-integration-test-cache.xml diff --git a/src/test/resources/java-util-logging.properties b/spring-data-geode/src/test/resources/java-util-logging.properties similarity index 100% rename from src/test/resources/java-util-logging.properties rename to spring-data-geode/src/test/resources/java-util-logging.properties diff --git a/src/test/resources/lazy-wiring-declarable-support-function-cache.xml b/spring-data-geode/src/test/resources/lazy-wiring-declarable-support-function-cache.xml similarity index 100% rename from src/test/resources/lazy-wiring-declarable-support-function-cache.xml rename to spring-data-geode/src/test/resources/lazy-wiring-declarable-support-function-cache.xml diff --git a/src/test/resources/log4j2-test.xml b/spring-data-geode/src/test/resources/log4j2-test.xml similarity index 100% rename from src/test/resources/log4j2-test.xml rename to spring-data-geode/src/test/resources/log4j2-test.xml diff --git a/src/test/resources/logback.xml b/spring-data-geode/src/test/resources/logback.xml similarity index 100% rename from src/test/resources/logback.xml rename to spring-data-geode/src/test/resources/logback.xml diff --git a/src/test/resources/lookup-region-mutation-cache.xml b/spring-data-geode/src/test/resources/lookup-region-mutation-cache.xml similarity index 100% rename from src/test/resources/lookup-region-mutation-cache.xml rename to spring-data-geode/src/test/resources/lookup-region-mutation-cache.xml diff --git a/src/test/resources/non-cluster-config-cache.xml b/spring-data-geode/src/test/resources/non-cluster-config-cache.xml similarity index 100% rename from src/test/resources/non-cluster-config-cache.xml rename to spring-data-geode/src/test/resources/non-cluster-config-cache.xml diff --git a/src/test/resources/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/allowRegionBeanDefinitionOverridesTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/allowRegionBeanDefinitionOverridesTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/allowRegionBeanDefinitionOverridesTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/allowRegionBeanDefinitionOverridesTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/basic-cache.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/basic-cache.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/basic-cache.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/basic-cache.xml diff --git a/src/test/resources/org/springframework/data/gemfire/basic-region.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/basic-region.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/basic-region.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/basic-region.xml diff --git a/src/test/resources/org/springframework/data/gemfire/basic-tx-config.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/basic-tx-config.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/basic-tx-config.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/basic-tx-config.xml diff --git a/src/test/resources/org/springframework/data/gemfire/cache-server-with-subscription-disk-store.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/cache-server-with-subscription-disk-store.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/cache-server-with-subscription-disk-store.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/cache-server-with-subscription-disk-store.xml diff --git a/src/test/resources/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/cache/cache-manager-client-cache.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/cache/cache-manager-client-cache.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/cache/cache-manager-client-cache.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/cache/cache-manager-client-cache.xml diff --git a/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml diff --git a/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml diff --git a/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalConfigurationIntegrationTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalConfigurationIntegrationTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/cacheUsingLocalConfigurationIntegrationTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalConfigurationIntegrationTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheIndexingTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheIndexingTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientCacheIndexingTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheIndexingTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheIndexingTest-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheIndexingTest-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientCacheIndexingTest-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheIndexingTest-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCachePoolTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCachePoolTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientCachePoolTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCachePoolTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCachePoolTests-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCachePoolTests-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientCachePoolTests-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCachePoolTests-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheSecurityTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheSecurityTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientCacheSecurityTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheSecurityTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheSecurityTest-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheSecurityTest-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientCacheSecurityTest-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheSecurityTest-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/colocated-region.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/colocated-region.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/colocated-region.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/colocated-region.xml diff --git a/src/test/resources/org/springframework/data/gemfire/complex-subregion.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/complex-subregion.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/complex-subregion.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/complex-subregion.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/GatewayReceiverNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/GatewayReceiverNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/GatewayReceiverNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/GatewayReceiverNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/InvalidDataPolicyPersistentAttributeSettingsBeansNamespaceTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/InvalidDataPolicyPersistentAttributeSettingsBeansNamespaceTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/InvalidDataPolicyPersistentAttributeSettingsBeansNamespaceTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/InvalidDataPolicyPersistentAttributeSettingsBeansNamespaceTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/MultipleCacheTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/MultipleCacheTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/MultipleCacheTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/MultipleCacheTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/cache-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/cache-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/cache-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/cache-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/cache-using-pdx-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/cache-using-pdx-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/cache-using-pdx-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/cache-using-pdx-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/client-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/client-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/client-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/client-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/client-region-using-datapolicy-and-shortcut.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/client-region-using-datapolicy-and-shortcut.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/client-region-using-datapolicy-and-shortcut.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/client-region-using-datapolicy-and-shortcut.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/diskstore-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/diskstore-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/diskstore-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/diskstore-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/function-service-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/function-service-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/function-service-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/function-service-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/gateway-v7-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/gateway-v7-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/gateway-v7-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/gateway-v7-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/gateway-v8-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/gateway-v8-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/gateway-v8-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/gateway-v8-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/index-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/index-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/index-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/index-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/jndi-binding-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/jndi-binding-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/jndi-binding-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/jndi-binding-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/jndi-binding-with-property-placeholders-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/jndi-binding-with-property-placeholders-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/jndi-binding-with-property-placeholders-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/jndi-binding-with-property-placeholders-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/local-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/local-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/local-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/local-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/membership-attributes-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/membership-attributes-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/membership-attributes-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/membership-attributes-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/partitioned-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/partitioned-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/partitioned-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/partitioned-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/pool-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/pool-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/pool-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/pool-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/replicated-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/replicated-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/replicated-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/replicated-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/server-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/server-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/server-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/server-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/subregion-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/subregion-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/subregion-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/subregion-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/subregion-with-inconsistent-datapolicy-persistent-settings.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/subregion-with-inconsistent-datapolicy-persistent-settings.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/subregion-with-inconsistent-datapolicy-persistent-settings.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/subregion-with-inconsistent-datapolicy-persistent-settings.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/subregion-with-invalid-datapolicy.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/subregion-with-invalid-datapolicy.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/subregion-with-invalid-datapolicy.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/subregion-with-invalid-datapolicy.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/subregionsubelement-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/subregionsubelement-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/subregionsubelement-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/subregionsubelement-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/subscription-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/subscription-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/subscription-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/subscription-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/tx-listeners-and-writers.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/tx-listeners-and-writers.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/tx-listeners-and-writers.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/tx-listeners-and-writers.xml diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/tx-ns.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/tx-ns.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/config/xml/tx-ns.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/tx-ns.xml diff --git a/src/test/resources/org/springframework/data/gemfire/diskstore-using-propertyplaceholders-config.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/diskstore-using-propertyplaceholders-config.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/diskstore-using-propertyplaceholders-config.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/diskstore-using-propertyplaceholders-config.xml diff --git a/src/test/resources/org/springframework/data/gemfire/enableClientRegionLookupsTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/enableClientRegionLookupsTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/enableClientRegionLookupsTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/enableClientRegionLookupsTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/enableRegionLookupsTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/enableRegionLookupsTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/enableRegionLookupsTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/enableRegionLookupsTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/GemfireFunctionProxyFactoryBeanTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/GemfireFunctionProxyFactoryBeanTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/GemfireFunctionProxyFactoryBeanTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/GemfireFunctionProxyFactoryBeanTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionCacheClientTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionCacheClientTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionCacheClientTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionCacheClientTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/invalid-region-shortcut-with-persistent-attribute.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/invalid-region-shortcut-with-persistent-attribute.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/invalid-region-shortcut-with-persistent-attribute.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/invalid-region-shortcut-with-persistent-attribute.xml diff --git a/src/test/resources/org/springframework/data/gemfire/invalid-use-of-region-datapolicy-and-shortcut.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/invalid-use-of-region-datapolicy-and-shortcut.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/invalid-use-of-region-datapolicy-and-shortcut.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/invalid-use-of-region-datapolicy-and-shortcut.xml diff --git a/src/test/resources/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/locatorContext.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/locatorContext.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/locatorContext.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/locatorContext.xml diff --git a/src/test/resources/org/springframework/data/gemfire/lookupSubRegion.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/lookupSubRegion.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/lookupSubRegion.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/lookupSubRegion.xml diff --git a/src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/noDuplicateRegionDefinitionsTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/noDuplicateRegionDefinitionsTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/noDuplicateRegionDefinitionsTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/noDuplicateRegionDefinitionsTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/noLocalRegionLookupTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/noLocalRegionLookupTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/noLocalRegionLookupTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/noLocalRegionLookupTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/noPartitionRegionLookupTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/noPartitionRegionLookupTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/noPartitionRegionLookupTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/noPartitionRegionLookupTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/noReplicateRegionLookupTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/noReplicateRegionLookupTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/noReplicateRegionLookupTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/noReplicateRegionLookupTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/noSubRegionLookupTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/noSubRegionLookupTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/noSubRegionLookupTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/noSubRegionLookupTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml diff --git a/src/test/resources/org/springframework/data/gemfire/region-datapolicy-shortcuts.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/region-datapolicy-shortcuts.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/region-datapolicy-shortcuts.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/region-datapolicy-shortcuts.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests-server-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests-server-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests-server-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests-server-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/repositoryQueriesWithJoins.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/repositoryQueriesWithJoins.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/sample/repositoryQueriesWithJoins.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/repositoryQueriesWithJoins.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/subregionRepository.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/subregionRepository.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/sample/subregionRepository.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/subregionRepository.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/support/PersonRepositoryIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/support/PersonRepositoryIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/support/PersonRepositoryIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/support/PersonRepositoryIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/serialization/simple-config.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/serialization/simple-config.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/serialization/simple-config.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/serialization/simple-config.xml diff --git a/src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-dao-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-dao-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/support/sample/initializer-dao-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-dao-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-gemfire-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-gemfire-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/support/sample/initializer-gemfire-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-gemfire-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-services-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-services-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/support/sample/initializer-services-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-services-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests-context.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests-context.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests-context.xml diff --git a/src/test/resources/org/springframework/data/gemfire/wan/asyncEventQueueWithListener.xml b/spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/asyncEventQueueWithListener.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/wan/asyncEventQueueWithListener.xml rename to spring-data-geode/src/test/resources/org/springframework/data/gemfire/wan/asyncEventQueueWithListener.xml diff --git a/src/test/resources/people.snapshot b/spring-data-geode/src/test/resources/people.snapshot similarity index 100% rename from src/test/resources/people.snapshot rename to spring-data-geode/src/test/resources/people.snapshot diff --git a/src/test/resources/port.properties b/spring-data-geode/src/test/resources/port.properties similarity index 100% rename from src/test/resources/port.properties rename to spring-data-geode/src/test/resources/port.properties diff --git a/src/test/resources/region-with-asynceventqueues-gatewaysenders-cache.xml b/spring-data-geode/src/test/resources/region-with-asynceventqueues-gatewaysenders-cache.xml similarity index 100% rename from src/test/resources/region-with-asynceventqueues-gatewaysenders-cache.xml rename to spring-data-geode/src/test/resources/region-with-asynceventqueues-gatewaysenders-cache.xml diff --git a/src/test/resources/shiro.ini b/spring-data-geode/src/test/resources/shiro.ini similarity index 100% rename from src/test/resources/shiro.ini rename to spring-data-geode/src/test/resources/shiro.ini diff --git a/src/test/resources/shiro.properties b/spring-data-geode/src/test/resources/shiro.properties similarity index 100% rename from src/test/resources/shiro.properties rename to spring-data-geode/src/test/resources/shiro.properties diff --git a/src/test/resources/subregion-cache.xml b/spring-data-geode/src/test/resources/subregion-cache.xml similarity index 100% rename from src/test/resources/subregion-cache.xml rename to spring-data-geode/src/test/resources/subregion-cache.xml diff --git a/src/test/resources/trusted.keystore b/spring-data-geode/src/test/resources/trusted.keystore similarity index 100% rename from src/test/resources/trusted.keystore rename to spring-data-geode/src/test/resources/trusted.keystore