diff --git a/src/main/asciidoc/reference/repositories.adoc b/src/main/asciidoc/reference/repositories.adoc
index 0daf77b0..8e40b0a5 100644
--- a/src/main/asciidoc/reference/repositories.adoc
+++ b/src/main/asciidoc/reference/repositories.adoc
@@ -196,7 +196,7 @@ As an example, suppose you have a `Customers` application domain type and corres
 package ...;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 ...
 
 @Region("Customers")
diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java
index 84551019..9a798336 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java
@@ -63,7 +63,7 @@ public @interface EnableEntityDefinedRegions {
 	String[] value() default {};
 
 	/**
-	 * Base packages to scan for {@link org.springframework.data.gemfire.mapping.Region @Region} annotated
+	 * Base packages to scan for {@link org.springframework.data.gemfire.mapping.annotation.Region @Region} annotated
 	 * application persistent entities.  {@link #value()} is an alias for this attribute.
 	 * Use {@link #basePackageClasses()} for a type-safe alternative to String-based package names.
 	 *
@@ -75,7 +75,7 @@ public @interface EnableEntityDefinedRegions {
 
 	/**
 	 * Type-safe alternative to {@link #basePackages()} for specifying the packages to scan for
-	 * {@link org.springframework.data.gemfire.mapping.Region @Region} annotated application persistent entities.
+	 * {@link org.springframework.data.gemfire.mapping.annotation.Region @Region} annotated application persistent entities.
 	 * The package of each class specified will be scanned.  Consider creating a special no-op marker class or interface
 	 * in each package that serves no other purpose than being referenced by this attribute.
 	 *
diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsConfiguration.java
index 2da55f07..de4d74a2 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsConfiguration.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsConfiguration.java
@@ -61,12 +61,12 @@ import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
 import org.springframework.data.gemfire.config.annotation.support.GemFireCacheTypeAwareRegionFactoryBean;
 import org.springframework.data.gemfire.config.annotation.support.GemFireComponentClassTypeScanner;
 import org.springframework.data.gemfire.config.xml.GemfireConstants;
-import org.springframework.data.gemfire.mapping.ClientRegion;
 import org.springframework.data.gemfire.mapping.GemfireMappingContext;
 import org.springframework.data.gemfire.mapping.GemfirePersistentEntity;
-import org.springframework.data.gemfire.mapping.LocalRegion;
-import org.springframework.data.gemfire.mapping.PartitionRegion;
-import org.springframework.data.gemfire.mapping.ReplicateRegion;
+import org.springframework.data.gemfire.mapping.annotation.ClientRegion;
+import org.springframework.data.gemfire.mapping.annotation.LocalRegion;
+import org.springframework.data.gemfire.mapping.annotation.PartitionRegion;
+import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion;
 import org.springframework.data.gemfire.util.ArrayUtils;
 import org.springframework.data.gemfire.util.CollectionUtils;
 import org.springframework.util.Assert;
@@ -93,13 +93,13 @@ import org.springframework.util.StringUtils;
  * @see org.springframework.data.gemfire.client.ClientRegionFactoryBean
  * @see org.springframework.data.gemfire.config.annotation.support.GemFireCacheTypeAwareRegionFactoryBean
  * @see org.springframework.data.gemfire.config.annotation.support.GemFireComponentClassTypeScanner
- * @see org.springframework.data.gemfire.mapping.ClientRegion
+ * @see ClientRegion
  * @see org.springframework.data.gemfire.mapping.GemfireMappingContext
  * @see org.springframework.data.gemfire.mapping.GemfirePersistentEntity
- * @see org.springframework.data.gemfire.mapping.LocalRegion
- * @see org.springframework.data.gemfire.mapping.PartitionRegion
- * @see org.springframework.data.gemfire.mapping.ReplicateRegion
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see LocalRegion
+ * @see PartitionRegion
+ * @see ReplicateRegion
+ * @see org.springframework.data.gemfire.mapping.annotation.Region
  * @since 1.9.0
  */
 public class EntityDefinedRegionsConfiguration
@@ -116,7 +116,7 @@ public class EntityDefinedRegionsConfiguration
 		regionAnnotationToRegionFactoryBeanClass.put(LocalRegion.class, LocalRegionFactoryBean.class);
 		regionAnnotationToRegionFactoryBeanClass.put(PartitionRegion.class, PartitionedRegionFactoryBean.class);
 		regionAnnotationToRegionFactoryBeanClass.put(ReplicateRegion.class, ReplicatedRegionFactoryBean.class);
-		regionAnnotationToRegionFactoryBeanClass.put(org.springframework.data.gemfire.mapping.Region.class,
+		regionAnnotationToRegionFactoryBeanClass.put(org.springframework.data.gemfire.mapping.annotation.Region.class,
 			DEFAULT_REGION_FACTORY_BEAN_CLASS);
 	}
 
@@ -386,7 +386,7 @@ public class EntityDefinedRegionsConfiguration
 		Set<TypeFilter> regionAnnotatedPersistentEntityTypeFilters = new HashSet<>();
 
 		for (Class<? extends Annotation> annotationType :
-				org.springframework.data.gemfire.mapping.Region.REGION_ANNOTATION_TYPES) {
+				org.springframework.data.gemfire.mapping.annotation.Region.REGION_ANNOTATION_TYPES) {
 
 			regionAnnotatedPersistentEntityTypeFilters.add(new AnnotationTypeFilter(annotationType));
 		}
diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfiguration.java
index 4233e820..9e2d6faa 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfiguration.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfiguration.java
@@ -31,7 +31,7 @@ import org.springframework.data.gemfire.IndexType;
 import org.springframework.data.gemfire.config.xml.GemfireConstants;
 import org.springframework.data.gemfire.mapping.GemfirePersistentEntity;
 import org.springframework.data.gemfire.mapping.GemfirePersistentProperty;
-import org.springframework.data.gemfire.mapping.Indexed;
+import org.springframework.data.gemfire.mapping.annotation.Indexed;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.util.StringUtils;
 
@@ -51,7 +51,7 @@ import org.springframework.util.StringUtils;
  * @see org.springframework.data.gemfire.config.annotation.EntityDefinedRegionsConfiguration
  * @see org.springframework.data.gemfire.mapping.GemfirePersistentEntity
  * @see org.springframework.data.gemfire.mapping.GemfirePersistentProperty
- * @see org.springframework.data.gemfire.mapping.Indexed
+ * @see Indexed
  * @see org.apache.geode.cache.Region
  * @see org.apache.geode.cache.query.Index
  * @since 1.9.0
diff --git a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java b/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java
index c7e3151a..ac881f4e 100644
--- a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java
+++ b/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java
@@ -23,6 +23,11 @@ import java.lang.annotation.Annotation;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.data.gemfire.mapping.annotation.ClientRegion;
+import org.springframework.data.gemfire.mapping.annotation.LocalRegion;
+import org.springframework.data.gemfire.mapping.annotation.PartitionRegion;
+import org.springframework.data.gemfire.mapping.annotation.Region;
+import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.model.BasicPersistentEntity;
 import org.springframework.data.util.TypeInformation;
@@ -88,11 +93,11 @@ public class GemfirePersistentEntity<T> extends BasicPersistentEntity<T, Gemfire
 	 * @param <T> concrete {@link Class} type of the Region {@link Annotation}.
 	 * @return the {@link Region} annotation used to annotate this {@link PersistentEntity} or {@literal null}
 	 * if this {@link PersistentEntity} was not annotated with a {@link Region} annotation.
-	 * @see org.springframework.data.gemfire.mapping.ClientRegion
-	 * @see org.springframework.data.gemfire.mapping.LocalRegion
-	 * @see org.springframework.data.gemfire.mapping.PartitionRegion
-	 * @see org.springframework.data.gemfire.mapping.ReplicateRegion
-	 * @see org.springframework.data.gemfire.mapping.Region
+	 * @see ClientRegion
+	 * @see LocalRegion
+	 * @see PartitionRegion
+	 * @see ReplicateRegion
+	 * @see Region
 	 * @see java.lang.annotation.Annotation
 	 */
 	@SuppressWarnings("unchecked")
diff --git a/src/main/java/org/springframework/data/gemfire/mapping/ClientRegion.java b/src/main/java/org/springframework/data/gemfire/mapping/annotation/ClientRegion.java
similarity index 97%
rename from src/main/java/org/springframework/data/gemfire/mapping/ClientRegion.java
rename to src/main/java/org/springframework/data/gemfire/mapping/annotation/ClientRegion.java
index 68a665f4..e5f9075b 100644
--- a/src/main/java/org/springframework/data/gemfire/mapping/ClientRegion.java
+++ b/src/main/java/org/springframework/data/gemfire/mapping/annotation/ClientRegion.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.springframework.data.gemfire.mapping;
+package org.springframework.data.gemfire.mapping.annotation;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
@@ -35,7 +35,7 @@ import org.springframework.data.gemfire.config.xml.GemfireConstants;
  * persistent entity will be stored.
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.9.0
  */
 @Target(ElementType.TYPE)
diff --git a/src/main/java/org/springframework/data/gemfire/mapping/Indexed.java b/src/main/java/org/springframework/data/gemfire/mapping/annotation/Indexed.java
similarity index 91%
rename from src/main/java/org/springframework/data/gemfire/mapping/Indexed.java
rename to src/main/java/org/springframework/data/gemfire/mapping/annotation/Indexed.java
index ba5ae720..043c7b21 100644
--- a/src/main/java/org/springframework/data/gemfire/mapping/Indexed.java
+++ b/src/main/java/org/springframework/data/gemfire/mapping/annotation/Indexed.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.springframework.data.gemfire.mapping;
+package org.springframework.data.gemfire.mapping.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -27,6 +27,8 @@ import java.lang.annotation.Target;
 import org.apache.geode.cache.query.Index;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.data.gemfire.IndexType;
+import org.springframework.data.gemfire.mapping.GemfirePersistentEntity;
+import org.springframework.data.gemfire.mapping.GemfirePersistentProperty;
 
 /**
  * The {@link Indexed} annotation is used to index a {@link GemfirePersistentEntity} {@link GemfirePersistentProperty},
diff --git a/src/main/java/org/springframework/data/gemfire/mapping/LocalRegion.java b/src/main/java/org/springframework/data/gemfire/mapping/annotation/LocalRegion.java
similarity index 97%
rename from src/main/java/org/springframework/data/gemfire/mapping/LocalRegion.java
rename to src/main/java/org/springframework/data/gemfire/mapping/annotation/LocalRegion.java
index eb0c0bc5..512f31b0 100644
--- a/src/main/java/org/springframework/data/gemfire/mapping/LocalRegion.java
+++ b/src/main/java/org/springframework/data/gemfire/mapping/annotation/LocalRegion.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.springframework.data.gemfire.mapping;
+package org.springframework.data.gemfire.mapping.annotation;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
@@ -31,7 +31,7 @@ import org.springframework.core.annotation.AliasFor;
  * {@link Annotation} defining the Local {@link Region} in which the application persistent entity will be stored.
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.9.0
  */
 @Target(ElementType.TYPE)
diff --git a/src/main/java/org/springframework/data/gemfire/mapping/PartitionRegion.java b/src/main/java/org/springframework/data/gemfire/mapping/annotation/PartitionRegion.java
similarity index 98%
rename from src/main/java/org/springframework/data/gemfire/mapping/PartitionRegion.java
rename to src/main/java/org/springframework/data/gemfire/mapping/annotation/PartitionRegion.java
index 80945356..744b0401 100644
--- a/src/main/java/org/springframework/data/gemfire/mapping/PartitionRegion.java
+++ b/src/main/java/org/springframework/data/gemfire/mapping/annotation/PartitionRegion.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.springframework.data.gemfire.mapping;
+package org.springframework.data.gemfire.mapping.annotation;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
@@ -31,7 +31,7 @@ import org.springframework.core.annotation.AliasFor;
  * {@link Annotation} defining the Partition {@link Region} in which the application persistent entity will be stored.
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.9.0
  */
 @Target(ElementType.TYPE)
diff --git a/src/main/java/org/springframework/data/gemfire/mapping/Region.java b/src/main/java/org/springframework/data/gemfire/mapping/annotation/Region.java
similarity index 95%
rename from src/main/java/org/springframework/data/gemfire/mapping/Region.java
rename to src/main/java/org/springframework/data/gemfire/mapping/annotation/Region.java
index 89e6c4c6..e682214e 100644
--- a/src/main/java/org/springframework/data/gemfire/mapping/Region.java
+++ b/src/main/java/org/springframework/data/gemfire/mapping/annotation/Region.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +12,10 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package org.springframework.data.gemfire.mapping;
+package org.springframework.data.gemfire.mapping.annotation;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
diff --git a/src/main/java/org/springframework/data/gemfire/mapping/ReplicateRegion.java b/src/main/java/org/springframework/data/gemfire/mapping/annotation/ReplicateRegion.java
similarity index 97%
rename from src/main/java/org/springframework/data/gemfire/mapping/ReplicateRegion.java
rename to src/main/java/org/springframework/data/gemfire/mapping/annotation/ReplicateRegion.java
index 0d71df84..656258a1 100644
--- a/src/main/java/org/springframework/data/gemfire/mapping/ReplicateRegion.java
+++ b/src/main/java/org/springframework/data/gemfire/mapping/annotation/ReplicateRegion.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.springframework.data.gemfire.mapping;
+package org.springframework.data.gemfire.mapping.annotation;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
@@ -32,7 +32,7 @@ import org.springframework.data.gemfire.ScopeType;
  * {@link Annotation} defining the Replicate {@link Region} in which the application persistent entity will be stored.
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.9.0
  */
 @Target(ElementType.TYPE)
diff --git a/src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtension.java
index ef7f740f..2aee4b3f 100644
--- a/src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtension.java
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.data.gemfire.mapping.GemfireMappingContext;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.support.GemfireRepositoryFactoryBean;
 import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java
index 6e855e3a..39cf340b 100644
--- a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java
@@ -126,8 +126,8 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport {
 	}
 
 	String getRepositoryRegionName(Class<?> repositoryInterface) {
-		return (repositoryInterface.isAnnotationPresent(org.springframework.data.gemfire.mapping.Region.class) ?
-			repositoryInterface.getAnnotation(org.springframework.data.gemfire.mapping.Region.class).value() : null);
+		return (repositoryInterface.isAnnotationPresent(org.springframework.data.gemfire.mapping.annotation.Region.class) ?
+			repositoryInterface.getAnnotation(org.springframework.data.gemfire.mapping.annotation.Region.class).value() : null);
 	}
 
 	/*
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
index 45383859..8ddd8729 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <xsd:schema xmlns="http://www.springframework.org/schema/data/gemfire"
-			xmlns:beans="http://www.springframework.org/schema/beans"
 			xmlns:context="http://www.springframework.org/schema/context"
 			xmlns:gfe="http://www.springframework.org/schema/gemfire"
 			xmlns:repository="http://www.springframework.org/schema/data/repository"
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
index 4e7efbf7..a4b8fd32 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <xsd:schema xmlns="http://www.springframework.org/schema/gemfire"
-			xmlns:beans="http://www.springframework.org/schema/beans"
-			xmlns:context="http://www.springframework.org/schema/context"
-			xmlns:repository="http://www.springframework.org/schema/data/repository"
 			xmlns:tool="http://www.springframework.org/schema/tool"
 			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 			targetNamespace="http://www.springframework.org/schema/gemfire"
diff --git a/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java
index 21e1f3b5..05f797a8 100644
--- a/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java
@@ -45,7 +45,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
 import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
 import org.springframework.data.gemfire.client.PoolFactoryBean;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.process.ProcessExecutor;
 import org.springframework.data.gemfire.process.ProcessWrapper;
 import org.springframework.data.gemfire.server.CacheServerFactoryBean;
diff --git a/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java
index d1a00b57..7b3ef521 100644
--- a/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java
+++ b/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java
@@ -43,7 +43,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.gemfire.CacheFactoryBean;
 import org.springframework.data.gemfire.LocalRegionFactoryBean;
 import org.springframework.data.gemfire.mapping.GemfireMappingContext;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.support.GemfireRepositoryFactoryBean;
 import org.springframework.data.gemfire.test.support.IdentifierSequence;
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java
index d22598f1..0ce10a4c 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java
@@ -58,10 +58,10 @@ import org.springframework.data.gemfire.config.annotation.test.entities.Collocat
 import org.springframework.data.gemfire.config.annotation.test.entities.GenericRegionEntity;
 import org.springframework.data.gemfire.config.annotation.test.entities.NonEntity;
 import org.springframework.data.gemfire.config.xml.GemfireConstants;
-import org.springframework.data.gemfire.mapping.ClientRegion;
-import org.springframework.data.gemfire.mapping.LocalRegion;
-import org.springframework.data.gemfire.mapping.PartitionRegion;
-import org.springframework.data.gemfire.mapping.ReplicateRegion;
+import org.springframework.data.gemfire.mapping.annotation.ClientRegion;
+import org.springframework.data.gemfire.mapping.annotation.LocalRegion;
+import org.springframework.data.gemfire.mapping.annotation.PartitionRegion;
+import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion;
 import org.springframework.data.gemfire.util.CollectionUtils;
 
 /**
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java
index d5e0231a..a83681a4 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java
@@ -19,7 +19,7 @@ package org.springframework.data.gemfire.config.annotation.test.entities;
 
 import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.ClientRegion;
+import org.springframework.data.gemfire.mapping.annotation.ClientRegion;
 
 /**
  * {@link ClientRegionEntity} persistent entity stored in the "Users" {@link org.apache.geode.cache.DataPolicy#NORMAL},
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/CollocatedPartitionRegionEntity.java b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/CollocatedPartitionRegionEntity.java
index 8cb552e7..7a378889 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/CollocatedPartitionRegionEntity.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/CollocatedPartitionRegionEntity.java
@@ -17,7 +17,7 @@
 
 package org.springframework.data.gemfire.config.annotation.test.entities;
 
-import org.springframework.data.gemfire.mapping.PartitionRegion;
+import org.springframework.data.gemfire.mapping.annotation.PartitionRegion;
 
 /**
  * {@link CollocatedPartitionRegionEntity} persistent entity stored in the "ContactEvents"
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/GenericRegionEntity.java b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/GenericRegionEntity.java
index b5626f19..5d5f7118 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/GenericRegionEntity.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/GenericRegionEntity.java
@@ -18,7 +18,7 @@
 package org.springframework.data.gemfire.config.annotation.test.entities;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 
 /**
  * {@link GenericRegionEntity} persistent entity stored in the "GenericRegionEntity"
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/LocalRegionEntity.java b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/LocalRegionEntity.java
index 45aa3ceb..43d0780c 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/LocalRegionEntity.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/LocalRegionEntity.java
@@ -18,7 +18,7 @@
 package org.springframework.data.gemfire.config.annotation.test.entities;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.LocalRegion;
+import org.springframework.data.gemfire.mapping.annotation.LocalRegion;
 
 /**
  * {@link LocalRegionEntity} persistent entity stored in the "LocalRegionEntity" {@link org.apache.geode.cache.DataPolicy#NORMAL},
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/PartitionRegionEntity.java b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/PartitionRegionEntity.java
index 0e72a284..92cb0ab2 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/PartitionRegionEntity.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/PartitionRegionEntity.java
@@ -19,8 +19,8 @@ package org.springframework.data.gemfire.config.annotation.test.entities;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.gemfire.IndexType;
-import org.springframework.data.gemfire.mapping.Indexed;
-import org.springframework.data.gemfire.mapping.PartitionRegion;
+import org.springframework.data.gemfire.mapping.annotation.Indexed;
+import org.springframework.data.gemfire.mapping.annotation.PartitionRegion;
 
 /**
  * {@link PartitionRegionEntity} persistent entity stored in the "Customers"
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ReplicateRegionEntity.java b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ReplicateRegionEntity.java
index 97402ddf..979b62c5 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ReplicateRegionEntity.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ReplicateRegionEntity.java
@@ -18,7 +18,7 @@
 package org.springframework.data.gemfire.config.annotation.test.entities;
 
 import org.springframework.data.gemfire.ScopeType;
-import org.springframework.data.gemfire.mapping.ReplicateRegion;
+import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion;
 
 /**
  * {@link ReplicateRegionEntity} persistent entity stored in the "Accounts"
diff --git a/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextTest.java b/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextTest.java
index 86f0fa4c..73436ce3 100644
--- a/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextTest.java
+++ b/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextTest.java
@@ -28,6 +28,7 @@ import java.math.BigInteger;
 
 import org.junit.Test;
 import org.springframework.data.gemfire.TestUtils;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.mapping.model.GemfireSimpleTypeHolder;
 import org.springframework.data.mapping.PersistentEntity;
 
diff --git a/src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java
index 849360bd..124e9d30 100644
--- a/src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java
@@ -24,12 +24,13 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 
 import org.junit.Test;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.util.ClassTypeInformation;
 
 /**
  * Unit tests for {@link GemfirePersistentEntity}.
- * 
+ *
  * @author Oliver Gierke
  * @author John Blum
  */
diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/SamplePersonRepository.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/SamplePersonRepository.java
index bc12dae1..31834cdb 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/cdi/SamplePersonRepository.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/SamplePersonRepository.java
@@ -17,7 +17,7 @@
 
 package org.springframework.data.gemfire.repository.cdi;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.sample.Person;
 
diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java b/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java
index 245126c9..ab22845d 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java
@@ -42,7 +42,7 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.factory.xml.XmlReaderContext;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.support.GemfireRepositoryFactoryBean;
 import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Account.java b/src/test/java/org/springframework/data/gemfire/repository/sample/Account.java
index 465def5d..18ffc7a9 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/Account.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/Account.java
@@ -17,15 +17,15 @@
 package org.springframework.data.gemfire.repository.sample;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
-import org.springframework.data.gemfire.mapping.ReplicateRegion;
+import org.springframework.data.gemfire.mapping.annotation.Region;
+import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion;
 import org.springframework.util.Assert;
 
 /**
  * The Account class is an abstract data type (ADT) for modeling customer accounts.
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.0.0
  */
 @ReplicateRegion("Accounts")
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Address.java b/src/test/java/org/springframework/data/gemfire/repository/sample/Address.java
index 60016e0f..366fbefc 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/Address.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/Address.java
@@ -16,10 +16,10 @@
 package org.springframework.data.gemfire.repository.sample;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 
 /**
- * 
+ *
  * @author Oliver Gierke
  */
 @Region("address")
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Algorithm.java b/src/test/java/org/springframework/data/gemfire/repository/sample/Algorithm.java
index 9726698c..2c933ceb 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/Algorithm.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/Algorithm.java
@@ -17,14 +17,14 @@
 package org.springframework.data.gemfire.repository.sample;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 
 /**
  * The Algorithm interface define abstract data type modeling a computer algorithm.
  *
  * @author John Blum
  * @see org.springframework.data.annotation.Id
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.4.0
  */
 @Region("Algorithms")
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/CatRepository.java b/src/test/java/org/springframework/data/gemfire/repository/sample/CatRepository.java
index 2238a2d8..41548cb3 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/CatRepository.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/CatRepository.java
@@ -16,7 +16,7 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.Query;
 
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java b/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java
index 1161eef9..6940a41e 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java
@@ -17,8 +17,8 @@
 package org.springframework.data.gemfire.repository.sample;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
-import org.springframework.data.gemfire.mapping.ReplicateRegion;
+import org.springframework.data.gemfire.mapping.annotation.Region;
+import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -26,7 +26,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author John Blum
  * @see org.springframework.data.annotation.Id
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.0.0
  */
 @ReplicateRegion("Customers")
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/DogRepository.java b/src/test/java/org/springframework/data/gemfire/repository/sample/DogRepository.java
index 25721c19..b2fa3249 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/DogRepository.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/DogRepository.java
@@ -16,7 +16,7 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.Query;
 
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/GuestUser.java b/src/test/java/org/springframework/data/gemfire/repository/sample/GuestUser.java
index 4fbe1c7e..fb0ac5ee 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/GuestUser.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/GuestUser.java
@@ -16,13 +16,13 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 
 /**
  * The GuestUser class represents an authorized restricted user of a service or computer system, etc.
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @see org.springframework.data.gemfire.repository.sample.User
  * @since 1.4.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java b/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java
index cbc3fc65..a57d56ca 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java
@@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.util.ObjectUtils;
 
 /**
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Plant.java b/src/test/java/org/springframework/data/gemfire/repository/sample/Plant.java
index 48e26ab5..7011ed0a 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/Plant.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/Plant.java
@@ -17,7 +17,7 @@
 package org.springframework.data.gemfire.repository.sample;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -25,7 +25,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author John Blum
  * @see org.springframework.data.annotation.Id
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.4.0
  */
 @Region("Plants")
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Programmer.java b/src/test/java/org/springframework/data/gemfire/repository/sample/Programmer.java
index 8e669da2..5f0ba3b4 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/Programmer.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/Programmer.java
@@ -16,14 +16,14 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.util.StringUtils;
 
 /**
  * The Programmer class is a User representing/modeling a software engineer/developer.
  *
  * @author John J. Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @see org.springframework.data.gemfire.repository.sample.User
  * @since 1.4.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/RabbitRepository.java b/src/test/java/org/springframework/data/gemfire/repository/sample/RabbitRepository.java
index 36d1b7e1..f5f4b759 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/RabbitRepository.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/RabbitRepository.java
@@ -16,7 +16,7 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.Query;
 
@@ -25,7 +25,7 @@ import org.springframework.data.gemfire.repository.Query;
  * from/to an underlying data store (GemFire).
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @see org.springframework.data.gemfire.repository.GemfireRepository
  * @see org.springframework.data.gemfire.repository.Query
  * @since 1.4.0
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/RootUser.java b/src/test/java/org/springframework/data/gemfire/repository/sample/RootUser.java
index b6407e6a..47a1005f 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/RootUser.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/RootUser.java
@@ -16,13 +16,13 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 
 /**
  * The RootUser class represents an authorized administrative user of a service or computer system, etc.
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @see org.springframework.data.gemfire.repository.sample.User
  * @since 1.4.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/User.java b/src/test/java/org/springframework/data/gemfire/repository/sample/User.java
index fc6aecc4..915032a8 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/User.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/User.java
@@ -19,7 +19,7 @@ package org.springframework.data.gemfire.repository.sample;
 import java.util.Calendar;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -29,7 +29,7 @@ import org.springframework.util.ObjectUtils;
  * @author John Blum
  * @see java.lang.Comparable
  * @see org.springframework.data.annotation.Id
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.4.0
  */
 @Region("Users")
diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java
index fd2259c8..7d45258f 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java
@@ -314,7 +314,7 @@ public class GemfireRepositoryFactoryUnitTests {
 	interface SampleCustomGemfireRepository extends GemfireRepository<Person, Long>, SampleCustomRepository<Person> {
 	}
 
-	@org.springframework.data.gemfire.mapping.Region("People")
+	@org.springframework.data.gemfire.mapping.annotation.Region("People")
 	interface PersonRepository extends GemfireRepository<Person, Long> {
 	}
 }
diff --git a/src/test/java/org/springframework/data/gemfire/test/model/Person.java b/src/test/java/org/springframework/data/gemfire/test/model/Person.java
index 0c838a37..48e25d7d 100644
--- a/src/test/java/org/springframework/data/gemfire/test/model/Person.java
+++ b/src/test/java/org/springframework/data/gemfire/test/model/Person.java
@@ -24,7 +24,7 @@ import java.util.Date;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.test.support.IdentifierSequence;
 import org.springframework.data.gemfire.util.SpringUtils;
 import org.springframework.util.Assert;