diff --git a/hazelcast-integration/README.md b/hazelcast-integration/README.md
index 2cb93eda7..b24df405f 100644
--- a/hazelcast-integration/README.md
+++ b/hazelcast-integration/README.md
@@ -25,19 +25,3 @@
 	Implementation of integration of MongoDB with hazelcast.
 - <h3>openshift</h3>
   	A guideline to start using Hazelcast on the Red Hat OpenShift platform.
-- <h3>spring-configuration</h3>
-	Implementation of spring framework integration of hazelcast.
-- <h3>spring-data-hazelcast-chemistry-sample</h3>
-	Example client-server Spring Data Hazelcast project, chemistry elements and isotopes.
-- <h3>spring-data-jpa-hazelcast-migration</h3>
-	Example of migrating from JPA to Hazelcast with Spring Data
-- <h3>spring-hibernate-2ndlevel-cache</h3>
-	Implementation of spring and hibernate 2nd level cache integration of hazelcast as customer managing application.
-- <h3>springaware-annotation</h3>
-	Example usage of SpringAware annotation.
-- <h3>springboot-caching-jcache</h3>
-	Implementation of Spring Boot Caching Auto Configuration feature for Hazelcast and JCache.
-- <h3>springboot-caching</h3>
-	Spring Boot Hazelcast Integration Example via [Spring Framework Caching Abstraction](https://docs.spring.io/spring/docs/current/spring-framework-reference/integration.html#cache).
-- <h3>springboot-http</h3>
-	Spring Boot style HTTP session replication, using embedded web container in standalone Jar.    
diff --git a/hazelcast-integration/pom.xml b/hazelcast-integration/pom.xml
index fb075e0f5..cc959df27 100644
--- a/hazelcast-integration/pom.xml
+++ b/hazelcast-integration/pom.xml
@@ -45,12 +45,7 @@
         <module>kubernetes</module>
         <module>manager-based-session-replication</module>
         <module>openshift</module>
-        <module>spring-configuration</module>
-        <module>spring-data-hazelcast-chemistry-sample</module>
-        <module>spring-data-jpa-hazelcast-migration</module>
-        <module>springaware-annotation</module>
         <module>eureka</module>
-        <module>spring-hibernate-2ndlevel-cache</module>
     </modules>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index a3259d224..e7140044f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,7 @@
         <module>querying</module>
         <module>serialization</module>
         <module>spi</module>
+        <module>spring</module>
         <module>transactions</module>
         <module>variable-replacers</module>
         <module>generic-record</module>
diff --git a/spring/README.md b/spring/README.md
new file mode 100644
index 000000000..09f619285
--- /dev/null
+++ b/spring/README.md
@@ -0,0 +1,18 @@
+<h1>Hazelcast Examples with Spring and Spring Boot</h1>
+
+- <h3>spring-configuration</h3>
+	Implementation of spring framework integration of hazelcast.
+- <h3>spring-data-hazelcast-chemistry-sample</h3>
+	Example client-server Spring Data Hazelcast project, chemistry elements and isotopes.
+- <h3>spring-data-jpa-hazelcast-migration</h3>
+	Example of migrating from JPA to Hazelcast with Spring Data
+- <h3>spring-hibernate-2ndlevel-cache</h3>
+	Implementation of spring and hibernate 2nd level cache integration of hazelcast as customer managing application.
+- <h3>springaware-annotation</h3>
+	Example usage of SpringAware annotation.
+- <h3>springboot-caching-jcache</h3>
+	Implementation of Spring Boot Caching Auto Configuration feature for Hazelcast and JCache.
+- <h3>springboot-caching</h3>
+	Spring Boot Hazelcast Integration Example via [Spring Framework Caching Abstraction](https://docs.spring.io/spring/docs/current/spring-framework-reference/integration.html#cache).
+- <h3>springboot-http</h3>
+	Spring Boot style HTTP session replication, using embedded web container in standalone Jar.    
diff --git a/spring/pom.xml b/spring/pom.xml
new file mode 100644
index 000000000..96f2b5d66
--- /dev/null
+++ b/spring/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~  Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved.
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  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.
+  ~
+  -->
+<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</artifactId>
+    <packaging>pom</packaging>
+
+    <parent>
+        <artifactId>code-samples</artifactId>
+        <groupId>com.hazelcast.samples</groupId>
+        <version>0.1-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+        <!-- needed for checkstyle/findbugs -->
+        <main.basedir>${project.parent.basedir}</main.basedir>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <modules>
+        <module>spring-configuration</module>
+        <module>spring-data-hazelcast-chemistry-sample</module>
+        <module>spring-data-jpa-hazelcast-migration</module>
+        <module>spring-hibernate-2ndlevel-cache</module>
+        <module>springaware-annotation</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.hazelcast</groupId>
+            <artifactId>hazelcast</artifactId>
+            <version>${hazelcast.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.hazelcast.samples</groupId>
+            <artifactId>helper</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/hazelcast-integration/spring-configuration/.gitignore b/spring/spring-configuration/.gitignore
similarity index 100%
rename from hazelcast-integration/spring-configuration/.gitignore
rename to spring/spring-configuration/.gitignore
diff --git a/hazelcast-integration/spring-configuration/README.md b/spring/spring-configuration/README.md
similarity index 100%
rename from hazelcast-integration/spring-configuration/README.md
rename to spring/spring-configuration/README.md
diff --git a/hazelcast-integration/spring-configuration/pom.xml b/spring/spring-configuration/pom.xml
similarity index 96%
rename from hazelcast-integration/spring-configuration/pom.xml
rename to spring/spring-configuration/pom.xml
index 30a1c0ead..7b6298514 100644
--- a/hazelcast-integration/spring-configuration/pom.xml
+++ b/spring/spring-configuration/pom.xml
@@ -13,7 +13,7 @@
     <url>http://hazelcast.org/</url>
 
     <parent>
-        <artifactId>hazelcast-integration</artifactId>
+        <artifactId>spring</artifactId>
         <groupId>com.hazelcast.samples</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
diff --git a/hazelcast-integration/spring-configuration/src/main/java/com/hazelcast/springconfiguration/HazelcastDataTypes.java b/spring/spring-configuration/src/main/java/com/hazelcast/springconfiguration/HazelcastDataTypes.java
similarity index 100%
rename from hazelcast-integration/spring-configuration/src/main/java/com/hazelcast/springconfiguration/HazelcastDataTypes.java
rename to spring/spring-configuration/src/main/java/com/hazelcast/springconfiguration/HazelcastDataTypes.java
diff --git a/hazelcast-integration/spring-configuration/src/main/java/com/hazelcast/springconfiguration/HazelcastSpringClient.java b/spring/spring-configuration/src/main/java/com/hazelcast/springconfiguration/HazelcastSpringClient.java
similarity index 100%
rename from hazelcast-integration/spring-configuration/src/main/java/com/hazelcast/springconfiguration/HazelcastSpringClient.java
rename to spring/spring-configuration/src/main/java/com/hazelcast/springconfiguration/HazelcastSpringClient.java
diff --git a/hazelcast-integration/spring-configuration/src/main/resources/applicationContext.xml b/spring/spring-configuration/src/main/resources/applicationContext.xml
similarity index 100%
rename from hazelcast-integration/spring-configuration/src/main/resources/applicationContext.xml
rename to spring/spring-configuration/src/main/resources/applicationContext.xml
diff --git a/hazelcast-integration/spring-configuration/src/main/resources/hazelcast-config.properties b/spring/spring-configuration/src/main/resources/hazelcast-config.properties
similarity index 100%
rename from hazelcast-integration/spring-configuration/src/main/resources/hazelcast-config.properties
rename to spring/spring-configuration/src/main/resources/hazelcast-config.properties
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/.gitignore b/spring/spring-data-hazelcast-chemistry-sample/.gitignore
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/.gitignore
rename to spring/spring-data-hazelcast-chemistry-sample/.gitignore
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/README.md b/spring/spring-data-hazelcast-chemistry-sample/README.md
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/README.md
rename to spring/spring-data-hazelcast-chemistry-sample/README.md
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/pom.xml b/spring/spring-data-hazelcast-chemistry-sample/client/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/pom.xml
rename to spring/spring-data-hazelcast-chemistry-sample/client/pom.xml
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/Client.java b/spring/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/Client.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/Client.java
rename to spring/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/Client.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientConfiguration.java b/spring/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientConfiguration.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientConfiguration.java
rename to spring/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientConfiguration.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientController.java b/spring/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientController.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientController.java
rename to spring/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientController.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/resources/hazelcast-client.xml b/spring/spring-data-hazelcast-chemistry-sample/client/src/main/resources/hazelcast-client.xml
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/resources/hazelcast-client.xml
rename to spring/spring-data-hazelcast-chemistry-sample/client/src/main/resources/hazelcast-client.xml
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/pom.xml b/spring/spring-data-hazelcast-chemistry-sample/common/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/pom.xml
rename to spring/spring-data-hazelcast-chemistry-sample/common/pom.xml
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/CommonConfiguration.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/CommonConfiguration.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/CommonConfiguration.java
rename to spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/CommonConfiguration.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/Constants.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/Constants.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/Constants.java
rename to spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/Constants.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Element.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Element.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Element.java
rename to spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Element.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Isotope.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Isotope.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Isotope.java
rename to spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Isotope.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/IsotopeKey.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/IsotopeKey.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/IsotopeKey.java
rename to spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/IsotopeKey.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/repository/ElementRepository.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/repository/ElementRepository.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/repository/ElementRepository.java
rename to spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/repository/ElementRepository.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/repository/IsotopeRepository.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/repository/IsotopeRepository.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/repository/IsotopeRepository.java
rename to spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/repository/IsotopeRepository.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/service/ChemistryService.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/service/ChemistryService.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/service/ChemistryService.java
rename to spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/service/ChemistryService.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/pom.xml b/spring/spring-data-hazelcast-chemistry-sample/pom.xml
similarity index 98%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/pom.xml
rename to spring/spring-data-hazelcast-chemistry-sample/pom.xml
index 9ad72e958..4484c3513 100644
--- a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/pom.xml
+++ b/spring/spring-data-hazelcast-chemistry-sample/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>hazelcast-integration</artifactId>
+        <artifactId>spring</artifactId>
         <groupId>com.hazelcast.samples</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/pom.xml b/spring/spring-data-hazelcast-chemistry-sample/server/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/pom.xml
rename to spring/spring-data-hazelcast-chemistry-sample/server/pom.xml
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/Server.java b/spring/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/Server.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/Server.java
rename to spring/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/Server.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/ServerCommands.java b/spring/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/ServerCommands.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/ServerCommands.java
rename to spring/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/ServerCommands.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/ServerConfiguration.java b/spring/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/ServerConfiguration.java
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/ServerConfiguration.java
rename to spring/spring-data-hazelcast-chemistry-sample/server/src/main/java/com/hazelcast/samples/spring/data/chemistry/ServerConfiguration.java
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/resources/META-INF/spring/spring-shell-plugin.xml b/spring/spring-data-hazelcast-chemistry-sample/server/src/main/resources/META-INF/spring/spring-shell-plugin.xml
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/resources/META-INF/spring/spring-shell-plugin.xml
rename to spring/spring-data-hazelcast-chemistry-sample/server/src/main/resources/META-INF/spring/spring-shell-plugin.xml
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/resources/hazelcast.xml b/spring/spring-data-hazelcast-chemistry-sample/server/src/main/resources/hazelcast.xml
similarity index 100%
rename from hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/resources/hazelcast.xml
rename to spring/spring-data-hazelcast-chemistry-sample/server/src/main/resources/hazelcast.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/README.md b/spring/spring-data-jpa-hazelcast-migration/README.md
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/README.md
rename to spring/spring-data-jpa-hazelcast-migration/README.md
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-domain/pom.xml b/spring/spring-data-jpa-hazelcast-migration/after/after-domain/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-domain/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/after/after-domain/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Noun.java b/spring/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Noun.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Noun.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Noun.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Tense.java b/spring/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Tense.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Tense.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Tense.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Verb.java b/spring/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Verb.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Verb.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Verb.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/pom.xml b/spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastServer.java b/spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastServer.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastServer.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastServer.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastServerConfiguration.java b/spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastServerConfiguration.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastServerConfiguration.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastServerConfiguration.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/MyNounLoader.java b/spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/MyNounLoader.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/MyNounLoader.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/MyNounLoader.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/MyVerbLoader.java b/spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/MyVerbLoader.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/MyVerbLoader.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/java/com/hazelcast/samples/spring/data/migration/MyVerbLoader.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/application.properties b/spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/application.properties
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/application.properties
rename to spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/application.properties
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/hazelcast.xml b/spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/hazelcast.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/hazelcast.xml
rename to spring/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/hazelcast.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/pom.xml b/spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounJPARepository.java b/spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounJPARepository.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounJPARepository.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounJPARepository.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbJPARepository.java b/spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbJPARepository.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbJPARepository.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbJPARepository.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounJPARepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounJPARepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounJPARepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounJPARepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbJPARepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbJPARepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbJPARepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbJPARepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-service/pom.xml b/spring/spring-data-jpa-hazelcast-migration/after/after-jpa-service/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-service/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/after/after-jpa-service/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/main/java/com/hazelcast/samples/spring/data/migration/DatabaseService.java b/spring/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/main/java/com/hazelcast/samples/spring/data/migration/DatabaseService.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/main/java/com/hazelcast/samples/spring/data/migration/DatabaseService.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/main/java/com/hazelcast/samples/spring/data/migration/DatabaseService.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/test/java/com/hazelcast/samples/spring/data/migration/DatabaseServiceTest.java b/spring/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/test/java/com/hazelcast/samples/spring/data/migration/DatabaseServiceTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/test/java/com/hazelcast/samples/spring/data/migration/DatabaseServiceTest.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/test/java/com/hazelcast/samples/spring/data/migration/DatabaseServiceTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/test/resources/testdata.sql b/spring/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/test/resources/testdata.sql
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/test/resources/testdata.sql
rename to spring/spring-data-jpa-hazelcast-migration/after/after-jpa-service/src/test/resources/testdata.sql
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/pom.xml b/spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounKVRepository.java b/spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounKVRepository.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounKVRepository.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounKVRepository.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbKVRepository.java b/spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbKVRepository.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbKVRepository.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbKVRepository.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounKVRepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounKVRepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounKVRepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounKVRepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbKVRepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbKVRepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbKVRepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-kv-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbKVRepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-service/pom.xml b/spring/spring-data-jpa-hazelcast-migration/after/after-kv-service/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-service/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/after/after-kv-service/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-service/src/main/java/com/hazelcast/samples/spring/data/migration/TranslationService.java b/spring/spring-data-jpa-hazelcast-migration/after/after-kv-service/src/main/java/com/hazelcast/samples/spring/data/migration/TranslationService.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-service/src/main/java/com/hazelcast/samples/spring/data/migration/TranslationService.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-kv-service/src/main/java/com/hazelcast/samples/spring/data/migration/TranslationService.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-service/src/test/java/com/hazelcast/samples/spring/data/migration/TranslationServiceTest.java b/spring/spring-data-jpa-hazelcast-migration/after/after-kv-service/src/test/java/com/hazelcast/samples/spring/data/migration/TranslationServiceTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-kv-service/src/test/java/com/hazelcast/samples/spring/data/migration/TranslationServiceTest.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-kv-service/src/test/java/com/hazelcast/samples/spring/data/migration/TranslationServiceTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/pom.xml b/spring/spring-data-jpa-hazelcast-migration/after/after-main/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/after/after-main/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslator.java b/spring/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslator.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslator.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslator.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslatorCommands.java b/spring/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslatorCommands.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslatorCommands.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslatorCommands.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslatorConfiguration.java b/spring/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslatorConfiguration.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslatorConfiguration.java
rename to spring/spring-data-jpa-hazelcast-migration/after/after-main/src/main/java/com/hazelcast/samples/spring/data/migration/AfterTranslatorConfiguration.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/resources/hazelcast-client.xml b/spring/spring-data-jpa-hazelcast-migration/after/after-main/src/main/resources/hazelcast-client.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/resources/hazelcast-client.xml
rename to spring/spring-data-jpa-hazelcast-migration/after/after-main/src/main/resources/hazelcast-client.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/pom.xml b/spring/spring-data-jpa-hazelcast-migration/after/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/after/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/after/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-domain/pom.xml b/spring/spring-data-jpa-hazelcast-migration/before/before-domain/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-domain/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/before/before-domain/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Noun.java b/spring/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Noun.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Noun.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Noun.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Tense.java b/spring/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Tense.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Tense.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Tense.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Verb.java b/spring/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Verb.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Verb.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-domain/src/main/java/com/hazelcast/samples/spring/data/migration/Verb.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/pom.xml b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounJPARepository.java b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounJPARepository.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounJPARepository.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/NounJPARepository.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbJPARepository.java b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbJPARepository.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbJPARepository.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/main/java/com/hazelcast/samples/spring/data/migration/VerbJPARepository.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractVerbRepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounJPARepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounJPARepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounJPARepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/NounJPARepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbJPARepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbJPARepositoryTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbJPARepositoryTest.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/VerbJPARepositoryTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-service/pom.xml b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-service/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-service/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/before/before-jpa-service/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/main/java/com/hazelcast/samples/spring/data/migration/TranslationService.java b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/main/java/com/hazelcast/samples/spring/data/migration/TranslationService.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/main/java/com/hazelcast/samples/spring/data/migration/TranslationService.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/main/java/com/hazelcast/samples/spring/data/migration/TranslationService.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/test/java/com/hazelcast/samples/spring/data/migration/TranslationServiceTest.java b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/test/java/com/hazelcast/samples/spring/data/migration/TranslationServiceTest.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/test/java/com/hazelcast/samples/spring/data/migration/TranslationServiceTest.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/test/java/com/hazelcast/samples/spring/data/migration/TranslationServiceTest.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/test/resources/testdata.sql b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/test/resources/testdata.sql
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/test/resources/testdata.sql
rename to spring/spring-data-jpa-hazelcast-migration/before/before-jpa-service/src/test/resources/testdata.sql
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-main/pom.xml b/spring/spring-data-jpa-hazelcast-migration/before/before-main/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-main/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/before/before-main/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslator.java b/spring/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslator.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslator.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslator.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslatorCommands.java b/spring/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslatorCommands.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslatorCommands.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslatorCommands.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslatorConfiguration.java b/spring/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslatorConfiguration.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslatorConfiguration.java
rename to spring/spring-data-jpa-hazelcast-migration/before/before-main/src/main/java/com/hazelcast/samples/spring/data/migration/BeforeTranslatorConfiguration.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-main/src/main/resources/application.properties b/spring/spring-data-jpa-hazelcast-migration/before/before-main/src/main/resources/application.properties
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/before-main/src/main/resources/application.properties
rename to spring/spring-data-jpa-hazelcast-migration/before/before-main/src/main/resources/application.properties
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/before/pom.xml b/spring/spring-data-jpa-hazelcast-migration/before/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/before/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/before/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/database/pom.xml b/spring/spring-data-jpa-hazelcast-migration/database/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/database/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/database/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/database/src/main/java/com/hazelcast/samples/spring/data/migration/Database.java b/spring/spring-data-jpa-hazelcast-migration/database/src/main/java/com/hazelcast/samples/spring/data/migration/Database.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/database/src/main/java/com/hazelcast/samples/spring/data/migration/Database.java
rename to spring/spring-data-jpa-hazelcast-migration/database/src/main/java/com/hazelcast/samples/spring/data/migration/Database.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/database/src/main/java/com/hazelcast/samples/spring/data/migration/DatabaseConfiguration.java b/spring/spring-data-jpa-hazelcast-migration/database/src/main/java/com/hazelcast/samples/spring/data/migration/DatabaseConfiguration.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/database/src/main/java/com/hazelcast/samples/spring/data/migration/DatabaseConfiguration.java
rename to spring/spring-data-jpa-hazelcast-migration/database/src/main/java/com/hazelcast/samples/spring/data/migration/DatabaseConfiguration.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/database/src/main/resources/application.properties b/spring/spring-data-jpa-hazelcast-migration/database/src/main/resources/application.properties
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/database/src/main/resources/application.properties
rename to spring/spring-data-jpa-hazelcast-migration/database/src/main/resources/application.properties
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/database/src/main/resources/data.sql b/spring/spring-data-jpa-hazelcast-migration/database/src/main/resources/data.sql
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/database/src/main/resources/data.sql
rename to spring/spring-data-jpa-hazelcast-migration/database/src/main/resources/data.sql
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/database/src/main/resources/schema.sql b/spring/spring-data-jpa-hazelcast-migration/database/src/main/resources/schema.sql
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/database/src/main/resources/schema.sql
rename to spring/spring-data-jpa-hazelcast-migration/database/src/main/resources/schema.sql
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/pom.xml b/spring/spring-data-jpa-hazelcast-migration/pom.xml
similarity index 98%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/pom.xml
index 9a23dc01f..f55ef97f9 100644
--- a/hazelcast-integration/spring-data-jpa-hazelcast-migration/pom.xml
+++ b/spring/spring-data-jpa-hazelcast-migration/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>hazelcast-integration</artifactId>
+        <artifactId>spring</artifactId>
         <groupId>com.hazelcast.samples</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/shared/pom.xml b/spring/spring-data-jpa-hazelcast-migration/shared/pom.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/shared/pom.xml
rename to spring/spring-data-jpa-hazelcast-migration/shared/pom.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/shared/src/main/java/com/hazelcast/samples/spring/data/migration/DebugCommands.java b/spring/spring-data-jpa-hazelcast-migration/shared/src/main/java/com/hazelcast/samples/spring/data/migration/DebugCommands.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/shared/src/main/java/com/hazelcast/samples/spring/data/migration/DebugCommands.java
rename to spring/spring-data-jpa-hazelcast-migration/shared/src/main/java/com/hazelcast/samples/spring/data/migration/DebugCommands.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/shared/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastTestInstance.java b/spring/spring-data-jpa-hazelcast-migration/shared/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastTestInstance.java
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/shared/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastTestInstance.java
rename to spring/spring-data-jpa-hazelcast-migration/shared/src/main/java/com/hazelcast/samples/spring/data/migration/HazelcastTestInstance.java
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/shared/src/main/resources/META-INF/spring/spring-shell-plugin.xml b/spring/spring-data-jpa-hazelcast-migration/shared/src/main/resources/META-INF/spring/spring-shell-plugin.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/shared/src/main/resources/META-INF/spring/spring-shell-plugin.xml
rename to spring/spring-data-jpa-hazelcast-migration/shared/src/main/resources/META-INF/spring/spring-shell-plugin.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/shared/src/main/resources/logback.xml b/spring/spring-data-jpa-hazelcast-migration/shared/src/main/resources/logback.xml
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/shared/src/main/resources/logback.xml
rename to spring/spring-data-jpa-hazelcast-migration/shared/src/main/resources/logback.xml
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-arch.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-arch.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-arch.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-arch.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-1.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-1.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-1.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-1.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-2.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-2.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-2.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-2.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-3.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-3.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-3.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-3.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-4.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-4.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-4.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-4.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-5.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-5.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-5.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-hz-main-5.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-1.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-1.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-1.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-1.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-2.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-2.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-2.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-2.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-3.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-3.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-3.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/after-main-3.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-arch.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-arch.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-arch.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-arch.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-database-1.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-database-1.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-database-1.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-database-1.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-database-2.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-database-2.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-database-2.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-database-2.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-1.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-1.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-1.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-1.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-2.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-2.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-2.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-2.png
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-3.png b/spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-3.png
similarity index 100%
rename from hazelcast-integration/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-3.png
rename to spring/spring-data-jpa-hazelcast-migration/src/site/markdown/images/before-main-3.png
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/.gitignore b/spring/spring-hibernate-2ndlevel-cache/.gitignore
similarity index 100%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/.gitignore
rename to spring/spring-hibernate-2ndlevel-cache/.gitignore
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/README.md b/spring/spring-hibernate-2ndlevel-cache/README.md
similarity index 98%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/README.md
rename to spring/spring-hibernate-2ndlevel-cache/README.md
index e2b5eae0c..b9f4cf27a 100644
--- a/hazelcast-integration/spring-hibernate-2ndlevel-cache/README.md
+++ b/spring/spring-hibernate-2ndlevel-cache/README.md
@@ -8,7 +8,7 @@ in `application.properties`.
 You can spin-up a PostgreSQL instance easily using Docker:
 
 ```shell
-docker run --name 2lc-postgres --publish 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword postgres:15
+docker run --name 2lc-postgres --publish 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword postgres
 ```
 
 If you want to use Hazelcast client, you can start an IMDG instance in a Docker container easily, and then connect to
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/pom.xml b/spring/spring-hibernate-2ndlevel-cache/pom.xml
similarity index 95%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/pom.xml
rename to spring/spring-hibernate-2ndlevel-cache/pom.xml
index 094183764..57cb43df2 100644
--- a/hazelcast-integration/spring-hibernate-2ndlevel-cache/pom.xml
+++ b/spring/spring-hibernate-2ndlevel-cache/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>hazelcast-integration</artifactId>
+        <artifactId>spring</artifactId>
         <groupId>com.hazelcast.samples</groupId>
         <version>0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -11,7 +11,7 @@
 
     <artifactId>spring-hibernate-2lc</artifactId>
     <name>spring-hibernate-2lc</name>
-    <description>Demo project for Spring Boot</description>
+    <description>Demo project for Spring Boot and Hibernate 2nd level cache</description>
 
     <properties>
         <!-- needed for checkstyle/findbugs -->
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/Runner.java b/spring/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/Runner.java
similarity index 100%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/Runner.java
rename to spring/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/Runner.java
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/SecondLevelCacheVisualizer.java b/spring/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/SecondLevelCacheVisualizer.java
similarity index 100%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/SecondLevelCacheVisualizer.java
rename to spring/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/SecondLevelCacheVisualizer.java
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/SpringHibernate2lcApplication.java b/spring/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/SpringHibernate2lcApplication.java
similarity index 100%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/SpringHibernate2lcApplication.java
rename to spring/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/SpringHibernate2lcApplication.java
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/persistence/Book.java b/spring/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/persistence/Book.java
similarity index 100%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/persistence/Book.java
rename to spring/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/persistence/Book.java
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/persistence/BookRepository.java b/spring/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/persistence/BookRepository.java
similarity index 100%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/persistence/BookRepository.java
rename to spring/spring-hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/persistence/BookRepository.java
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/resources/application.properties b/spring/spring-hibernate-2ndlevel-cache/src/main/resources/application.properties
similarity index 100%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/resources/application.properties
rename to spring/spring-hibernate-2ndlevel-cache/src/main/resources/application.properties
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/resources/hazelcast.xml b/spring/spring-hibernate-2ndlevel-cache/src/main/resources/hazelcast.xml
similarity index 100%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/resources/hazelcast.xml
rename to spring/spring-hibernate-2ndlevel-cache/src/main/resources/hazelcast.xml
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/test/java/com/hazelcast/hibernate/springhibernate2lc/SpringHibernate2lcApplicationTest.java b/spring/spring-hibernate-2ndlevel-cache/src/test/java/com/hazelcast/hibernate/springhibernate2lc/SpringHibernate2lcApplicationTest.java
similarity index 100%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/src/test/java/com/hazelcast/hibernate/springhibernate2lc/SpringHibernate2lcApplicationTest.java
rename to spring/spring-hibernate-2ndlevel-cache/src/test/java/com/hazelcast/hibernate/springhibernate2lc/SpringHibernate2lcApplicationTest.java
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/test/resources/application.properties b/spring/spring-hibernate-2ndlevel-cache/src/test/resources/application.properties
similarity index 100%
rename from hazelcast-integration/spring-hibernate-2ndlevel-cache/src/test/resources/application.properties
rename to spring/spring-hibernate-2ndlevel-cache/src/test/resources/application.properties
diff --git a/hazelcast-integration/springaware-annotation/README.md b/spring/springaware-annotation/README.md
similarity index 100%
rename from hazelcast-integration/springaware-annotation/README.md
rename to spring/springaware-annotation/README.md
diff --git a/hazelcast-integration/springaware-annotation/pom.xml b/spring/springaware-annotation/pom.xml
similarity index 97%
rename from hazelcast-integration/springaware-annotation/pom.xml
rename to spring/springaware-annotation/pom.xml
index 6a0478fe8..e6727aac0 100644
--- a/hazelcast-integration/springaware-annotation/pom.xml
+++ b/spring/springaware-annotation/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>springaware-annotation</artifactId>
 
     <parent>
-        <artifactId>hazelcast-integration</artifactId>
+        <artifactId>spring</artifactId>
         <groupId>com.hazelcast.samples</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
diff --git a/hazelcast-integration/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAnnotationJavaConfig.java b/spring/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAnnotationJavaConfig.java
similarity index 100%
rename from hazelcast-integration/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAnnotationJavaConfig.java
rename to spring/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAnnotationJavaConfig.java
diff --git a/hazelcast-integration/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAnnotationXmlConfig.java b/spring/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAnnotationXmlConfig.java
similarity index 100%
rename from hazelcast-integration/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAnnotationXmlConfig.java
rename to spring/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAnnotationXmlConfig.java
diff --git a/hazelcast-integration/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAwareTask.java b/spring/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAwareTask.java
similarity index 100%
rename from hazelcast-integration/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAwareTask.java
rename to spring/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAwareTask.java
diff --git a/hazelcast-integration/springaware-annotation/src/main/resources/applicationContext.xml b/spring/springaware-annotation/src/main/resources/applicationContext.xml
similarity index 100%
rename from hazelcast-integration/springaware-annotation/src/main/resources/applicationContext.xml
rename to spring/springaware-annotation/src/main/resources/applicationContext.xml
diff --git a/hazelcast-integration/springboot-caching-jcache/README.md b/spring/springboot-caching-jcache/README.md
similarity index 100%
rename from hazelcast-integration/springboot-caching-jcache/README.md
rename to spring/springboot-caching-jcache/README.md
diff --git a/hazelcast-integration/springboot-caching/README.md b/spring/springboot-caching/README.md
similarity index 100%
rename from hazelcast-integration/springboot-caching/README.md
rename to spring/springboot-caching/README.md
diff --git a/hazelcast-integration/springboot-http/README.md b/spring/springboot-http/README.md
similarity index 100%
rename from hazelcast-integration/springboot-http/README.md
rename to spring/springboot-http/README.md