diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index f8e3cb05e8..132a8b6b20 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -88,6 +88,9 @@
         <module>spring-data-mongodb-reactive</module>
         <module>spring-data-neo4j</module>
         <module>spring-data-redis</module>
+        <module>spring-data-rest</module>
+        <module>spring-data-rest-2</module>
+        <module>spring-data-rest-querydsl</module>
         <module>spring-data-solr</module>
         <module>spring-hibernate-3</module>
         <module>spring-hibernate-5</module> <!-- long running -->
diff --git a/spring-data-rest-2/README.md b/persistence-modules/spring-data-rest-2/README.md
similarity index 100%
rename from spring-data-rest-2/README.md
rename to persistence-modules/spring-data-rest-2/README.md
diff --git a/spring-data-rest-2/pom.xml b/persistence-modules/spring-data-rest-2/pom.xml
similarity index 98%
rename from spring-data-rest-2/pom.xml
rename to persistence-modules/spring-data-rest-2/pom.xml
index cf3265c46d..fa328854a2 100644
--- a/spring-data-rest-2/pom.xml
+++ b/persistence-modules/spring-data-rest-2/pom.xml
@@ -13,7 +13,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/SpringDataRestApplication.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/SpringDataRestApplication.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/SpringDataRestApplication.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/SpringDataRestApplication.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/config/DbConfig.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/DbConfig.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/config/DbConfig.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/DbConfig.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/config/RestConfig.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/RestConfig.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/config/RestConfig.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/RestConfig.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/models/WebsiteUser.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/models/WebsiteUser.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/models/WebsiteUser.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/models/WebsiteUser.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/repositories/UserRepository.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/repositories/UserRepository.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/repositories/UserRepository.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/repositories/UserRepository.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/App.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/App.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/halbrowser/App.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/App.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/DBLoader.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/DBLoader.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/DBLoader.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/DBLoader.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/RestConfig.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/RestConfig.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/RestConfig.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/RestConfig.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/data/BookRepository.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/data/BookRepository.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/halbrowser/data/BookRepository.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/data/BookRepository.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/model/Book.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/model/Book.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/halbrowser/model/Book.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/model/Book.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/Application.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/Application.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/Application.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/Application.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/controllers/UserController.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/controllers/UserController.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/controllers/UserController.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/controllers/UserController.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/entities/User.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/entities/User.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/entities/User.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/entities/User.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/repositories/UserRepository.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/repositories/UserRepository.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/repositories/UserRepository.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/repositories/UserRepository.java
diff --git a/spring-data-rest-2/src/main/resources/application.properties b/persistence-modules/spring-data-rest-2/src/main/resources/application.properties
similarity index 100%
rename from spring-data-rest-2/src/main/resources/application.properties
rename to persistence-modules/spring-data-rest-2/src/main/resources/application.properties
diff --git a/spring-data-rest-2/src/main/resources/logback.xml b/persistence-modules/spring-data-rest-2/src/main/resources/logback.xml
similarity index 100%
rename from spring-data-rest-2/src/main/resources/logback.xml
rename to persistence-modules/spring-data-rest-2/src/main/resources/logback.xml
diff --git a/spring-data-rest-2/src/main/resources/persistence-h2.properties b/persistence-modules/spring-data-rest-2/src/main/resources/persistence-h2.properties
similarity index 100%
rename from spring-data-rest-2/src/main/resources/persistence-h2.properties
rename to persistence-modules/spring-data-rest-2/src/main/resources/persistence-h2.properties
diff --git a/spring-data-rest-2/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-data-rest-2/src/test/java/com/baeldung/SpringContextTest.java
rename to persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-data-rest-2/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java b/persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java
similarity index 100%
rename from spring-data-rest-2/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java
rename to persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java
diff --git a/spring-data-rest-2/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java b/persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java
similarity index 100%
rename from spring-data-rest-2/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java
rename to persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java
diff --git a/spring-data-rest-querydsl/README.md b/persistence-modules/spring-data-rest-querydsl/README.md
similarity index 100%
rename from spring-data-rest-querydsl/README.md
rename to persistence-modules/spring-data-rest-querydsl/README.md
diff --git a/spring-data-rest-querydsl/pom.xml b/persistence-modules/spring-data-rest-querydsl/pom.xml
similarity index 98%
rename from spring-data-rest-querydsl/pom.xml
rename to persistence-modules/spring-data-rest-querydsl/pom.xml
index 0b1cdd8928..dc1cf64006 100644
--- a/spring-data-rest-querydsl/pom.xml
+++ b/persistence-modules/spring-data-rest-querydsl/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/Application.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/Application.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/Application.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/Application.java
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/QueryController.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/QueryController.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/controller/QueryController.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/QueryController.java
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/AddressRepository.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/AddressRepository.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/AddressRepository.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/AddressRepository.java
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/UserRepository.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/UserRepository.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/UserRepository.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/UserRepository.java
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/Address.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/Address.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/entity/Address.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/Address.java
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/User.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/User.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/entity/User.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/User.java
diff --git a/spring-data-rest-querydsl/src/main/resources/application.yml b/persistence-modules/spring-data-rest-querydsl/src/main/resources/application.yml
similarity index 100%
rename from spring-data-rest-querydsl/src/main/resources/application.yml
rename to persistence-modules/spring-data-rest-querydsl/src/main/resources/application.yml
diff --git a/spring-data-rest-querydsl/src/main/resources/logback.xml b/persistence-modules/spring-data-rest-querydsl/src/main/resources/logback.xml
similarity index 100%
rename from spring-data-rest-querydsl/src/main/resources/logback.xml
rename to persistence-modules/spring-data-rest-querydsl/src/main/resources/logback.xml
diff --git a/spring-data-rest-querydsl/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-data-rest-querydsl/src/test/java/com/baeldung/SpringContextTest.java
rename to persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java b/persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java
similarity index 100%
rename from spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java
rename to persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java
diff --git a/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/QuerydslIntegrationTest.java b/persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/QuerydslIntegrationTest.java
similarity index 100%
rename from spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/QuerydslIntegrationTest.java
rename to persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/QuerydslIntegrationTest.java
diff --git a/spring-data-rest-querydsl/src/test/resources/application.yml b/persistence-modules/spring-data-rest-querydsl/src/test/resources/application.yml
similarity index 100%
rename from spring-data-rest-querydsl/src/test/resources/application.yml
rename to persistence-modules/spring-data-rest-querydsl/src/test/resources/application.yml
diff --git a/spring-data-rest/README.md b/persistence-modules/spring-data-rest/README.md
similarity index 100%
rename from spring-data-rest/README.md
rename to persistence-modules/spring-data-rest/README.md
diff --git a/spring-data-rest/pom.xml b/persistence-modules/spring-data-rest/pom.xml
similarity index 98%
rename from spring-data-rest/pom.xml
rename to persistence-modules/spring-data-rest/pom.xml
index e223c0488e..f5601cb7ce 100644
--- a/spring-data-rest/pom.xml
+++ b/persistence-modules/spring-data-rest/pom.xml
@@ -13,7 +13,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/SpringDataRestApplication.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/SpringDataRestApplication.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/SpringDataRestApplication.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/SpringDataRestApplication.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/config/DbConfig.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/DbConfig.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/config/DbConfig.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/DbConfig.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/config/MvcConfig.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/MvcConfig.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/config/MvcConfig.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/MvcConfig.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/events/AuthorEventHandler.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/events/AuthorEventHandler.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/events/AuthorEventHandler.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/events/AuthorEventHandler.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/events/BookEventHandler.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/events/BookEventHandler.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/events/BookEventHandler.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/events/BookEventHandler.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/projections/CustomBook.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/projections/CustomBook.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/projections/CustomBook.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/projections/CustomBook.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/repositories/AddressRepository.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/AddressRepository.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/repositories/AddressRepository.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/AddressRepository.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/repositories/AuthorRepository.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/AuthorRepository.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/repositories/AuthorRepository.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/AuthorRepository.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/repositories/BookRepository.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/BookRepository.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/repositories/BookRepository.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/BookRepository.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/repositories/LibraryRepository.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/LibraryRepository.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/repositories/LibraryRepository.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/LibraryRepository.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/repositories/SubjectRepository.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/SubjectRepository.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/repositories/SubjectRepository.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/SubjectRepository.java
diff --git a/spring-data-rest/src/main/resources/application.properties b/persistence-modules/spring-data-rest/src/main/resources/application.properties
similarity index 100%
rename from spring-data-rest/src/main/resources/application.properties
rename to persistence-modules/spring-data-rest/src/main/resources/application.properties
diff --git a/spring-data-rest/src/main/resources/logback.xml b/persistence-modules/spring-data-rest/src/main/resources/logback.xml
similarity index 100%
rename from spring-data-rest/src/main/resources/logback.xml
rename to persistence-modules/spring-data-rest/src/main/resources/logback.xml
diff --git a/spring-data-rest/src/main/resources/persistence-derby.properties b/persistence-modules/spring-data-rest/src/main/resources/persistence-derby.properties
similarity index 100%
rename from spring-data-rest/src/main/resources/persistence-derby.properties
rename to persistence-modules/spring-data-rest/src/main/resources/persistence-derby.properties
diff --git a/spring-data-rest/src/main/resources/persistence-h2.properties b/persistence-modules/spring-data-rest/src/main/resources/persistence-h2.properties
similarity index 100%
rename from spring-data-rest/src/main/resources/persistence-h2.properties
rename to persistence-modules/spring-data-rest/src/main/resources/persistence-h2.properties
diff --git a/spring-data-rest/src/main/resources/persistence-hsqldb.properties b/persistence-modules/spring-data-rest/src/main/resources/persistence-hsqldb.properties
similarity index 100%
rename from spring-data-rest/src/main/resources/persistence-hsqldb.properties
rename to persistence-modules/spring-data-rest/src/main/resources/persistence-hsqldb.properties
diff --git a/spring-data-rest/src/main/resources/persistence-sqlite.properties b/persistence-modules/spring-data-rest/src/main/resources/persistence-sqlite.properties
similarity index 100%
rename from spring-data-rest/src/main/resources/persistence-sqlite.properties
rename to persistence-modules/spring-data-rest/src/main/resources/persistence-sqlite.properties
diff --git a/spring-data-rest/src/main/webapp/users.html b/persistence-modules/spring-data-rest/src/main/webapp/users.html
similarity index 100%
rename from spring-data-rest/src/main/webapp/users.html
rename to persistence-modules/spring-data-rest/src/main/webapp/users.html
diff --git a/spring-data-rest/src/main/webapp/view/app.js b/persistence-modules/spring-data-rest/src/main/webapp/view/app.js
similarity index 100%
rename from spring-data-rest/src/main/webapp/view/app.js
rename to persistence-modules/spring-data-rest/src/main/webapp/view/app.js
diff --git a/spring-data-rest/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/spring-data-rest/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-data-rest/src/test/java/com/baeldung/SpringContextTest.java
rename to persistence-modules/spring-data-rest/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-data-rest/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java b/persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java
similarity index 100%
rename from spring-data-rest/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java
rename to persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java
diff --git a/spring-data-rest/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java b/persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java
similarity index 100%
rename from spring-data-rest/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java
rename to persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java
diff --git a/spring-data-rest/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java b/persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java
similarity index 100%
rename from spring-data-rest/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java
rename to persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java
diff --git a/pom.xml b/pom.xml
index 10948514d9..802f8ea43c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -643,9 +643,6 @@
                 <module>spring-core-5</module>
                 <module>spring-cucumber</module>
 
-                <module>spring-data-rest</module>
-                <module>spring-data-rest-2</module>
-                <module>spring-data-rest-querydsl</module>
                 <module>spring-di</module>
                 <module>spring-di-2</module>
                 <module>spring-di-3</module>
@@ -1117,9 +1114,6 @@
                 <module>spring-core-5</module>
                 <module>spring-cucumber</module>
 
-                <module>spring-data-rest</module>
-                <module>spring-data-rest-2</module>
-                <module>spring-data-rest-querydsl</module>
                 <module>spring-di</module>
                 <module>spring-di-2</module>
                 <module>spring-di-3</module>