diff --git a/samples/boot/src/main/java/sample/config/HttpSessionConfig.java b/samples/boot/src/main/java/sample/config/HttpSessionConfig.java
index 04c9b652..1db98177 100644
--- a/samples/boot/src/main/java/sample/config/HttpSessionConfig.java
+++ b/samples/boot/src/main/java/sample/config/HttpSessionConfig.java
@@ -16,8 +16,8 @@
 package sample.config;
 
 import org.springframework.session.data.redis.config.annotation.web.http.*;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
 
-import sample.EnableEmbeddedRedis;
 
 @EnableEmbeddedRedis
 // tag::class[]
diff --git a/samples/httpsession-xml/src/main/webapp/WEB-INF/spring/session.xml b/samples/httpsession-xml/src/main/webapp/WEB-INF/spring/session.xml
index b711a0cc..f9849cb1 100644
--- a/samples/httpsession-xml/src/main/webapp/WEB-INF/spring/session.xml
+++ b/samples/httpsession-xml/src/main/webapp/WEB-INF/spring/session.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<!-- tag::beans[] -->
-	<bean class="sample.EmbeddedRedisConfiguration"/> <!--1-->
+	<bean class="org.springframework.session.redis.embedded.EmbeddedRedisConfiguration"/> <!--1-->
 
 	<!--2-->
 	<context:annotation-config/>
diff --git a/samples/httpsession/src/main/java/sample/Config.java b/samples/httpsession/src/main/java/sample/Config.java
index 2c05f8d9..dbfa26bb 100644
--- a/samples/httpsession/src/main/java/sample/Config.java
+++ b/samples/httpsession/src/main/java/sample/Config.java
@@ -18,6 +18,8 @@ package sample;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
+import org.springframework.session.redis.embedded.RedisServerPort;
 
 // tag::class[]
 @EnableEmbeddedRedis // <1>
diff --git a/samples/rest/src/main/java/sample/HttpSessionConfig.java b/samples/rest/src/main/java/sample/HttpSessionConfig.java
index aa52fa30..de6b694b 100644
--- a/samples/rest/src/main/java/sample/HttpSessionConfig.java
+++ b/samples/rest/src/main/java/sample/HttpSessionConfig.java
@@ -19,6 +19,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
+import org.springframework.session.redis.embedded.RedisServerPort;
 import org.springframework.session.web.http.HeaderHttpSessionStrategy;
 import org.springframework.session.web.http.HttpSessionStrategy;
 
diff --git a/samples/security/src/main/java/sample/Config.java b/samples/security/src/main/java/sample/Config.java
index 6be1a4ae..e15946aa 100644
--- a/samples/security/src/main/java/sample/Config.java
+++ b/samples/security/src/main/java/sample/Config.java
@@ -19,6 +19,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
+import org.springframework.session.redis.embedded.RedisServerPort;
 
 // tag::class[]
 @Configuration
diff --git a/samples/spring-embedded-redis/src/main/java/sample/EmbeddedRedisConfiguration.java b/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/EmbeddedRedisConfiguration.java
similarity index 98%
rename from samples/spring-embedded-redis/src/main/java/sample/EmbeddedRedisConfiguration.java
rename to samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/EmbeddedRedisConfiguration.java
index 29594a18..c20db8bc 100644
--- a/samples/spring-embedded-redis/src/main/java/sample/EmbeddedRedisConfiguration.java
+++ b/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/EmbeddedRedisConfiguration.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package sample;
+package org.springframework.session.redis.embedded;
 
 import java.io.IOException;
 import java.net.ServerSocket;
diff --git a/samples/spring-embedded-redis/src/main/java/sample/EnableEmbeddedRedis.java b/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/EnableEmbeddedRedis.java
similarity index 97%
rename from samples/spring-embedded-redis/src/main/java/sample/EnableEmbeddedRedis.java
rename to samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/EnableEmbeddedRedis.java
index 03c85662..9709eb57 100644
--- a/samples/spring-embedded-redis/src/main/java/sample/EnableEmbeddedRedis.java
+++ b/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/EnableEmbeddedRedis.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package sample;
+package org.springframework.session.redis.embedded;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
diff --git a/samples/spring-embedded-redis/src/main/java/sample/RedisServerPort.java b/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/RedisServerPort.java
similarity index 97%
rename from samples/spring-embedded-redis/src/main/java/sample/RedisServerPort.java
rename to samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/RedisServerPort.java
index d6d73283..480ddc50 100644
--- a/samples/spring-embedded-redis/src/main/java/sample/RedisServerPort.java
+++ b/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/RedisServerPort.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package sample;
+package org.springframework.session.redis.embedded;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/samples/users/src/main/java/sample/Config.java b/samples/users/src/main/java/sample/Config.java
index 05a7386d..93d1ed74 100644
--- a/samples/users/src/main/java/sample/Config.java
+++ b/samples/users/src/main/java/sample/Config.java
@@ -19,6 +19,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
+import org.springframework.session.redis.embedded.RedisServerPort;
 
 /**
  * @author Rob Winch
diff --git a/samples/websocket/src/main/java/sample/config/DataSourceConfig.java b/samples/websocket/src/main/java/sample/config/DataSourceConfig.java
index f2804f52..05c16b6b 100644
--- a/samples/websocket/src/main/java/sample/config/DataSourceConfig.java
+++ b/samples/websocket/src/main/java/sample/config/DataSourceConfig.java
@@ -22,8 +22,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
-
-import sample.RedisServerPort;
+import org.springframework.session.redis.embedded.RedisServerPort;
 
 @Configuration
 public class DataSourceConfig {
diff --git a/spring-session/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java b/spring-session/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java
index 613f8686..e614a636 100644
--- a/spring-session/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java
+++ b/spring-session/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java
@@ -34,13 +34,12 @@ import org.springframework.session.Session;
 import org.springframework.session.SessionRepository;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.session.events.SessionDestroyedEvent;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
+import org.springframework.session.redis.embedded.RedisServerPort;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import sample.EnableEmbeddedRedis;
-import sample.RedisServerPort;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
 @WebAppConfiguration
diff --git a/spring-session/src/integration-test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSessionExpireSessionDestroyedTests.java b/spring-session/src/integration-test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSessionExpireSessionDestroyedTests.java
index e917f0aa..21b87be6 100644
--- a/spring-session/src/integration-test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSessionExpireSessionDestroyedTests.java
+++ b/spring-session/src/integration-test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSessionExpireSessionDestroyedTests.java
@@ -34,13 +34,12 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.session.ExpiringSession;
 import org.springframework.session.SessionRepository;
 import org.springframework.session.events.SessionDestroyedEvent;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
+import org.springframework.session.redis.embedded.RedisServerPort;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import sample.EnableEmbeddedRedis;
-import sample.RedisServerPort;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
 @WebAppConfiguration