diff --git a/docs/src/docbkx/reference/bootstrap.xml b/docs/src/docbkx/reference/bootstrap.xml
index f54f6c1f..e8a8c1f6 100644
--- a/docs/src/docbkx/reference/bootstrap.xml
+++ b/docs/src/docbkx/reference/bootstrap.xml
@@ -174,13 +174,13 @@
       <classname>RegexInterest</classname> classes in the
       <literal>org.springframework.data.gemfire</literal> package:</para>
 
-      <programlisting language="xml">&lt;bean id="interested-client" class="org.springframework.data.gemfire.ClientRegionFactoryBean" p:cache-ref="cache" p:name="client-region"&gt;
+      <programlisting language="xml">&lt;bean id="interested-client" class="org.springframework.data.gemfire.client.ClientRegionFactoryBean" p:cache-ref="cache" p:name="client-region"&gt;
   &lt;property name="interests"&gt;
     &lt;array&gt;
       &lt;!-- key-based interest --&gt;
-      &lt;bean class="org.springframework.data.gemfire.Interest" p:key="Vlaicu" p:policy="NONE"/&gt;
+      &lt;bean class="org.springframework.data.gemfire.client.Interest" p:key="Vlaicu" p:policy="NONE"/&gt;
       &lt;!-- regex-based interest --&gt;
-      &lt;bean class="org.springframework.data.gemfire.RegexInterest" p:key=".*" p:policy="KEYS" p:durable="true"/&gt;
+      &lt;bean class="org.springframework.data.gemfire.client.RegexInterest" p:key=".*" p:policy="KEYS" p:durable="true"/&gt;
     &lt;/array&gt;
   &lt;/property&gt;
 &lt;/bean&gt;</programlisting>
diff --git a/src/main/java/org/springframework/data/gemfire/ClientRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java
similarity index 96%
rename from src/main/java/org/springframework/data/gemfire/ClientRegionFactoryBean.java
rename to src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java
index 6ba69271..a59463e9 100644
--- a/src/main/java/org/springframework/data/gemfire/ClientRegionFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.data.gemfire;
+package org.springframework.data.gemfire.client;
 
+import org.springframework.data.gemfire.RegionFactoryBean;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
diff --git a/src/main/java/org/springframework/data/gemfire/Interest.java b/src/main/java/org/springframework/data/gemfire/client/Interest.java
similarity index 98%
rename from src/main/java/org/springframework/data/gemfire/Interest.java
rename to src/main/java/org/springframework/data/gemfire/client/Interest.java
index 49eab8ad..56f021bc 100644
--- a/src/main/java/org/springframework/data/gemfire/Interest.java
+++ b/src/main/java/org/springframework/data/gemfire/client/Interest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.gemfire;
+package org.springframework.data.gemfire.client;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.Constants;
diff --git a/src/main/java/org/springframework/data/gemfire/PoolFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java
similarity index 98%
rename from src/main/java/org/springframework/data/gemfire/PoolFactoryBean.java
rename to src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java
index d7fb15f3..4bfebdc6 100644
--- a/src/main/java/org/springframework/data/gemfire/PoolFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.gemfire;
+package org.springframework.data.gemfire.client;
 
 import java.util.Collection;
 
@@ -24,7 +24,6 @@ import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.data.gemfire.client.PoolConnection;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
diff --git a/src/main/java/org/springframework/data/gemfire/RegexInterest.java b/src/main/java/org/springframework/data/gemfire/client/RegexInterest.java
similarity index 96%
rename from src/main/java/org/springframework/data/gemfire/RegexInterest.java
rename to src/main/java/org/springframework/data/gemfire/client/RegexInterest.java
index e01f448f..a26c524f 100644
--- a/src/main/java/org/springframework/data/gemfire/RegexInterest.java
+++ b/src/main/java/org/springframework/data/gemfire/client/RegexInterest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.gemfire;
+package org.springframework.data.gemfire.client;
 
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/org/springframework/data/gemfire/config/ClientRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/ClientRegionParser.java
index e0f9369b..0d8c5615 100644
--- a/src/main/java/org/springframework/data/gemfire/config/ClientRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/ClientRegionParser.java
@@ -22,9 +22,9 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.gemfire.ClientRegionFactoryBean;
-import org.springframework.data.gemfire.Interest;
-import org.springframework.data.gemfire.RegexInterest;
+import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
+import org.springframework.data.gemfire.client.Interest;
+import org.springframework.data.gemfire.client.RegexInterest;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.0.xsd
index 9a26e509..b4106ace 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.0.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.0.xsd
@@ -331,7 +331,7 @@ NONE -  Does not initialize the local cache.
 	
 	<xsd:element name="client-region">
 		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.gemfire.ClientRegionFactoryBean"><![CDATA[
+			<xsd:documentation source="org.springframework.data.gemfire.client.ClientRegionFactoryBean"><![CDATA[
 Defines a GemFire client region instance. A client region is connected to a (long-lived) farm of GemFire servers from
 which it receives its data. The client can hold some data locally or forward all requests to the server.
 			]]></xsd:documentation>
@@ -437,7 +437,7 @@ Defines a pool for connections from a client to a set of GemFire Cache Servers.
 			</xsd:appinfo>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID" use="optional" default="gemfire-pool">
+			<xsd:attribute name="id" type="xsd:ID" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the pool definition (by default "gemfire-pool").]]></xsd:documentation>
diff --git a/src/test/java/org/springframework/data/gemfire/RegionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java
similarity index 97%
rename from src/test/java/org/springframework/data/gemfire/RegionIntegrationTest.java
rename to src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java
index 81968c8f..7ef7921f 100644
--- a/src/test/java/org/springframework/data/gemfire/RegionIntegrationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.gemfire;
+package org.springframework.data.gemfire.client;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
@@ -25,6 +25,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
diff --git a/src/test/java/org/springframework/data/gemfire/config/ClientRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/ClientRegionNamespaceTest.java
index 355fa4cf..9709ea36 100644
--- a/src/test/java/org/springframework/data/gemfire/config/ClientRegionNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/ClientRegionNamespaceTest.java
@@ -25,10 +25,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.data.gemfire.ClientRegionFactoryBean;
-import org.springframework.data.gemfire.Interest;
-import org.springframework.data.gemfire.RegexInterest;
 import org.springframework.data.gemfire.TestUtils;
+import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
+import org.springframework.data.gemfire.client.Interest;
+import org.springframework.data.gemfire.client.RegexInterest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.ObjectUtils;
diff --git a/src/test/resources/org/springframework/data/gemfire/basic-region.xml b/src/test/resources/org/springframework/data/gemfire/client/basic-region.xml
similarity index 75%
rename from src/test/resources/org/springframework/data/gemfire/basic-region.xml
rename to src/test/resources/org/springframework/data/gemfire/client/basic-region.xml
index 35d88300..d7af81e8 100644
--- a/src/test/resources/org/springframework/data/gemfire/basic-region.xml
+++ b/src/test/resources/org/springframework/data/gemfire/client/basic-region.xml
@@ -22,20 +22,20 @@
 	<bean id="listeners" class="org.springframework.data.gemfire.RegionFactoryBean" p:cache-ref="cache" p:name="listeners">
 		<property name="cacheListeners">
 			<array>
-				<bean class="org.springframework.data.gemfire.RegionIntegrationTest$CacheList"/>
-				<bean class="org.springframework.data.gemfire.RegionIntegrationTest$CacheList"/>
+				<bean class="org.springframework.data.gemfire.client.RegionIntegrationTest$CacheList"/>
+				<bean class="org.springframework.data.gemfire.client.RegionIntegrationTest$CacheList"/>
 			</array>
 		</property>
-		<property name="cacheLoader"><bean class="org.springframework.data.gemfire.RegionIntegrationTest$CacheLoad"/></property>
-		<property name="cacheWriter"><bean class="org.springframework.data.gemfire.RegionIntegrationTest$CacheWrite"/></property>
+		<property name="cacheLoader"><bean class="org.springframework.data.gemfire.client.RegionIntegrationTest$CacheLoad"/></property>
+		<property name="cacheWriter"><bean class="org.springframework.data.gemfire.client.RegionIntegrationTest$CacheWrite"/></property>
 	</bean>
 	
 	<!--  client configurations -->
-	<bean id="basic-client" class="org.springframework.data.gemfire.ClientRegionFactoryBean" p:cache-ref="cache" p:name="client-region" lazy-init="true">
+	<bean id="basic-client" class="org.springframework.data.gemfire.client.ClientRegionFactoryBean" p:cache-ref="cache" p:name="client-region" lazy-init="true">
 		<property name="interests">
 			<array>
-				<bean class="org.springframework.data.gemfire.Interest" p:key="Vlaicu" p:policy="NONE"/>
-				<bean class="org.springframework.data.gemfire.RegexInterest" p:key=".*" p:policy="KEYS" p:durable="true"/>
+				<bean class="org.springframework.data.gemfire.client.Interest" p:key="Vlaicu" p:policy="NONE"/>
+				<bean class="org.springframework.data.gemfire.client.RegexInterest" p:key=".*" p:policy="KEYS" p:durable="true"/>
 			</array>
 		</property>
 	</bean>