diff --git a/README.md b/README.md
index d971a45c..94f6f9f6 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,10 @@ We have separate folders for the samples of individual modules:
 
 * `basic` - Basic usage of Spring Data JDBC.
 
+## Spring Data R2DBC
+
+* `example` - Basic usage of Spring Data R2DBC.
+
 ## Miscellaneous
 
 * `bom` - Example project how to use the Spring Data release train bom in non-Spring-Boot scenarios.
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index c973a673..4c1ec62a 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -19,7 +19,6 @@
 	<modules>
 		<module>basics</module>
 		<module>mybatis</module>
-		<module>r2dbc</module>
 		<module>jooq</module>
 	</modules>
 
diff --git a/pom.xml b/pom.xml
index da8cfb00..767854e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
 		<module>mongodb</module>
 		<module>multi-store</module>
 		<module>neo4j</module>
+		<module>r2dbc</module>
 		<module>rest</module>
 		<module>redis</module>
 		<module>solr</module>
diff --git a/jdbc/r2dbc/README.adoc b/r2dbc/example/README.adoc
similarity index 100%
rename from jdbc/r2dbc/README.adoc
rename to r2dbc/example/README.adoc
diff --git a/r2dbc/example/pom.xml b/r2dbc/example/pom.xml
new file mode 100644
index 00000000..3a3eeb7a
--- /dev/null
+++ b/r2dbc/example/pom.xml
@@ -0,0 +1,17 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.springframework.data.examples</groupId>
+		<artifactId>spring-data-r2dbc-examples</artifactId>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>spring-data-r2dbc-example</artifactId>
+
+	<name>Spring Data R2DBC - Example</name>
+
+
+</project>
diff --git a/jdbc/r2dbc/src/main/java/example/springdata/r2dbc/basics/Customer.java b/r2dbc/example/src/main/java/example/springdata/r2dbc/basics/Customer.java
similarity index 100%
rename from jdbc/r2dbc/src/main/java/example/springdata/r2dbc/basics/Customer.java
rename to r2dbc/example/src/main/java/example/springdata/r2dbc/basics/Customer.java
diff --git a/jdbc/r2dbc/src/main/java/example/springdata/r2dbc/basics/CustomerRepository.java b/r2dbc/example/src/main/java/example/springdata/r2dbc/basics/CustomerRepository.java
similarity index 94%
rename from jdbc/r2dbc/src/main/java/example/springdata/r2dbc/basics/CustomerRepository.java
rename to r2dbc/example/src/main/java/example/springdata/r2dbc/basics/CustomerRepository.java
index 0a920755..0b58731c 100644
--- a/jdbc/r2dbc/src/main/java/example/springdata/r2dbc/basics/CustomerRepository.java
+++ b/r2dbc/example/src/main/java/example/springdata/r2dbc/basics/CustomerRepository.java
@@ -17,7 +17,7 @@ package example.springdata.r2dbc.basics;
 
 import reactor.core.publisher.Flux;
 
-import org.springframework.data.jdbc.repository.query.Query;
+import org.springframework.data.r2dbc.repository.query.Query;
 import org.springframework.data.repository.reactive.ReactiveCrudRepository;
 
 /**
diff --git a/jdbc/r2dbc/src/test/java/example/springdata/r2dbc/basics/CustomerRepositoryIntegrationTests.java b/r2dbc/example/src/test/java/example/springdata/r2dbc/basics/CustomerRepositoryIntegrationTests.java
similarity index 100%
rename from jdbc/r2dbc/src/test/java/example/springdata/r2dbc/basics/CustomerRepositoryIntegrationTests.java
rename to r2dbc/example/src/test/java/example/springdata/r2dbc/basics/CustomerRepositoryIntegrationTests.java
diff --git a/jdbc/r2dbc/src/test/java/example/springdata/r2dbc/basics/InfrastructureConfiguration.java b/r2dbc/example/src/test/java/example/springdata/r2dbc/basics/InfrastructureConfiguration.java
similarity index 100%
rename from jdbc/r2dbc/src/test/java/example/springdata/r2dbc/basics/InfrastructureConfiguration.java
rename to r2dbc/example/src/test/java/example/springdata/r2dbc/basics/InfrastructureConfiguration.java
diff --git a/jdbc/r2dbc/pom.xml b/r2dbc/pom.xml
similarity index 76%
rename from jdbc/r2dbc/pom.xml
rename to r2dbc/pom.xml
index 0848378f..c6d2e48f 100644
--- a/jdbc/r2dbc/pom.xml
+++ b/r2dbc/pom.xml
@@ -1,17 +1,24 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
 	<modelVersion>4.0.0</modelVersion>
 
+	<artifactId>spring-data-r2dbc-examples</artifactId>
+	<packaging>pom</packaging>
+
 	<parent>
 		<groupId>org.springframework.data.examples</groupId>
-		<artifactId>spring-data-jdbc-examples</artifactId>
+		<artifactId>spring-data-examples</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>spring-data-r2dbc</artifactId>
+	<name>Spring Data R2DBC - Examples</name>
+	<description>Sample projects for Spring Data R2DBC</description>
 
-	<name>Spring Data JDBC - Demonstrating reactive repositories with R2DBC</name>
+	<inceptionYear>2018</inceptionYear>
+
+	<modules>
+		<module>example</module>
+	</modules>
 
 	<properties>
 		<reactor-bom.version>Californium-RELEASE</reactor-bom.version>
@@ -21,8 +28,8 @@
 
 		<dependency>
 			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-jdbc</artifactId>
-			<version>1.0.0.r2dbc-SNAPSHOT</version>
+			<artifactId>spring-data-r2dbc</artifactId>
+			<version>1.0.0.BUILD-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -61,4 +68,5 @@
 		</dependency>
 
 	</dependencies>
+
 </project>