diff --git a/graphql/graphql-dgs/README.md b/graphql-modules/graphql-dgs/README.md
similarity index 100%
rename from graphql/graphql-dgs/README.md
rename to graphql-modules/graphql-dgs/README.md
diff --git a/graphql/graphql-dgs/pom.xml b/graphql-modules/graphql-dgs/pom.xml
similarity index 98%
rename from graphql/graphql-dgs/pom.xml
rename to graphql-modules/graphql-dgs/pom.xml
index 56e261f14d..051785b4b8 100644
--- a/graphql/graphql-dgs/pom.xml
+++ b/graphql-modules/graphql-dgs/pom.xml
@@ -9,7 +9,7 @@
com.baeldung.graphql
- graphql
+ graphql-modules
1.0.0-SNAPSHOT
diff --git a/graphql/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/Album.java b/graphql-modules/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/Album.java
similarity index 100%
rename from graphql/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/Album.java
rename to graphql-modules/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/Album.java
diff --git a/graphql/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/AlbumsDataFetcher.java b/graphql-modules/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/AlbumsDataFetcher.java
similarity index 100%
rename from graphql/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/AlbumsDataFetcher.java
rename to graphql-modules/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/AlbumsDataFetcher.java
diff --git a/graphql/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/Application.java b/graphql-modules/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/Application.java
similarity index 100%
rename from graphql/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/Application.java
rename to graphql-modules/graphql-dgs/src/main/java/com/bealdung/graphqlDGS/Application.java
diff --git a/graphql/graphql-dgs/src/main/resources/application.properties b/graphql-modules/graphql-dgs/src/main/resources/application.properties
similarity index 100%
rename from graphql/graphql-dgs/src/main/resources/application.properties
rename to graphql-modules/graphql-dgs/src/main/resources/application.properties
diff --git a/graphql/graphql-dgs/src/main/resources/schema/schema.graphqls b/graphql-modules/graphql-dgs/src/main/resources/schema/schema.graphqls
similarity index 100%
rename from graphql/graphql-dgs/src/main/resources/schema/schema.graphqls
rename to graphql-modules/graphql-dgs/src/main/resources/schema/schema.graphqls
diff --git a/graphql/graphql-error-handling/README.md b/graphql-modules/graphql-error-handling/README.md
similarity index 100%
rename from graphql/graphql-error-handling/README.md
rename to graphql-modules/graphql-error-handling/README.md
diff --git a/graphql/graphql-error-handling/pom.xml b/graphql-modules/graphql-error-handling/pom.xml
similarity index 98%
rename from graphql/graphql-error-handling/pom.xml
rename to graphql-modules/graphql-error-handling/pom.xml
index 92696d8ed7..f10bb524fb 100644
--- a/graphql/graphql-error-handling/pom.xml
+++ b/graphql-modules/graphql-error-handling/pom.xml
@@ -10,7 +10,7 @@
com.baeldung.graphql
- graphql
+ graphql-modules
1.0.0-SNAPSHOT
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/GraphQLErrorHandlerApplication.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/GraphQLErrorHandlerApplication.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/GraphQLErrorHandlerApplication.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/GraphQLErrorHandlerApplication.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/domain/Location.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/domain/Location.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/domain/Location.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/domain/Location.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/domain/Vehicle.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/domain/Vehicle.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/domain/Vehicle.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/domain/Vehicle.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/AbstractGraphQLException.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/AbstractGraphQLException.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/AbstractGraphQLException.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/AbstractGraphQLException.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/GraphQLErrorAdapter.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/GraphQLErrorAdapter.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/GraphQLErrorAdapter.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/GraphQLErrorAdapter.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/InvalidInputException.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/InvalidInputException.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/InvalidInputException.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/InvalidInputException.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/VehicleAlreadyPresentException.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/VehicleAlreadyPresentException.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/VehicleAlreadyPresentException.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/VehicleAlreadyPresentException.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/VehicleNotFoundException.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/VehicleNotFoundException.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/VehicleNotFoundException.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/VehicleNotFoundException.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/repository/InventoryRepository.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/repository/InventoryRepository.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/repository/InventoryRepository.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/repository/InventoryRepository.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/repository/LocationRepository.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/repository/LocationRepository.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/repository/LocationRepository.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/repository/LocationRepository.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/resolver/Mutation.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/resolver/Mutation.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/resolver/Mutation.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/resolver/Mutation.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/resolver/Query.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/resolver/Query.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/resolver/Query.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/resolver/Query.java
diff --git a/graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/service/InventoryService.java b/graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/service/InventoryService.java
similarity index 100%
rename from graphql/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/service/InventoryService.java
rename to graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/service/InventoryService.java
diff --git a/graphql/graphql-error-handling/src/main/resources/application.yml b/graphql-modules/graphql-error-handling/src/main/resources/application.yml
similarity index 100%
rename from graphql/graphql-error-handling/src/main/resources/application.yml
rename to graphql-modules/graphql-error-handling/src/main/resources/application.yml
diff --git a/graphql/graphql-error-handling/src/main/resources/graphql/inventory.graphqls b/graphql-modules/graphql-error-handling/src/main/resources/graphql/inventory.graphqls
similarity index 100%
rename from graphql/graphql-error-handling/src/main/resources/graphql/inventory.graphqls
rename to graphql-modules/graphql-error-handling/src/main/resources/graphql/inventory.graphqls
diff --git a/graphql/graphql-error-handling/src/main/resources/import.sql b/graphql-modules/graphql-error-handling/src/main/resources/import.sql
similarity index 100%
rename from graphql/graphql-error-handling/src/main/resources/import.sql
rename to graphql-modules/graphql-error-handling/src/main/resources/import.sql
diff --git a/graphql/graphql-error-handling/src/test/java/com/baeldung/graphql/error/handling/GraphQLErrorHandlerApplicationIntegrationTest.java b/graphql-modules/graphql-error-handling/src/test/java/com/baeldung/graphql/error/handling/GraphQLErrorHandlerApplicationIntegrationTest.java
similarity index 100%
rename from graphql/graphql-error-handling/src/test/java/com/baeldung/graphql/error/handling/GraphQLErrorHandlerApplicationIntegrationTest.java
rename to graphql-modules/graphql-error-handling/src/test/java/com/baeldung/graphql/error/handling/GraphQLErrorHandlerApplicationIntegrationTest.java
diff --git a/graphql/graphql-error-handling/src/test/java/com/baeldung/graphql/error/handling/TestUtils.java b/graphql-modules/graphql-error-handling/src/test/java/com/baeldung/graphql/error/handling/TestUtils.java
similarity index 100%
rename from graphql/graphql-error-handling/src/test/java/com/baeldung/graphql/error/handling/TestUtils.java
rename to graphql-modules/graphql-error-handling/src/test/java/com/baeldung/graphql/error/handling/TestUtils.java
diff --git a/graphql/graphql-error-handling/src/test/resources/graphql/request/field_error_request_non_null_fields_partial_response.graphql b/graphql-modules/graphql-error-handling/src/test/resources/graphql/request/field_error_request_non_null_fields_partial_response.graphql
similarity index 100%
rename from graphql/graphql-error-handling/src/test/resources/graphql/request/field_error_request_non_null_fields_partial_response.graphql
rename to graphql-modules/graphql-error-handling/src/test/resources/graphql/request/field_error_request_non_null_fields_partial_response.graphql
diff --git a/graphql/graphql-error-handling/src/test/resources/graphql/request/request_error_invalid_request_syntax.graphql b/graphql-modules/graphql-error-handling/src/test/resources/graphql/request/request_error_invalid_request_syntax.graphql
similarity index 100%
rename from graphql/graphql-error-handling/src/test/resources/graphql/request/request_error_invalid_request_syntax.graphql
rename to graphql-modules/graphql-error-handling/src/test/resources/graphql/request/request_error_invalid_request_syntax.graphql
diff --git a/graphql/graphql-error-handling/src/test/resources/graphql/request/request_error_unknown_operation.graphql b/graphql-modules/graphql-error-handling/src/test/resources/graphql/request/request_error_unknown_operation.graphql
similarity index 100%
rename from graphql/graphql-error-handling/src/test/resources/graphql/request/request_error_unknown_operation.graphql
rename to graphql-modules/graphql-error-handling/src/test/resources/graphql/request/request_error_unknown_operation.graphql
diff --git a/graphql/graphql-error-handling/src/test/resources/graphql/response/field_error_request_non_null_fields_partial_response.json b/graphql-modules/graphql-error-handling/src/test/resources/graphql/response/field_error_request_non_null_fields_partial_response.json
similarity index 100%
rename from graphql/graphql-error-handling/src/test/resources/graphql/response/field_error_request_non_null_fields_partial_response.json
rename to graphql-modules/graphql-error-handling/src/test/resources/graphql/response/field_error_request_non_null_fields_partial_response.json
diff --git a/graphql/graphql-error-handling/src/test/resources/graphql/response/request_error_invalid_request_syntax.json b/graphql-modules/graphql-error-handling/src/test/resources/graphql/response/request_error_invalid_request_syntax.json
similarity index 100%
rename from graphql/graphql-error-handling/src/test/resources/graphql/response/request_error_invalid_request_syntax.json
rename to graphql-modules/graphql-error-handling/src/test/resources/graphql/response/request_error_invalid_request_syntax.json
diff --git a/graphql/graphql-error-handling/src/test/resources/graphql/response/request_error_unknown_operation.json b/graphql-modules/graphql-error-handling/src/test/resources/graphql/response/request_error_unknown_operation.json
similarity index 100%
rename from graphql/graphql-error-handling/src/test/resources/graphql/response/request_error_unknown_operation.json
rename to graphql-modules/graphql-error-handling/src/test/resources/graphql/response/request_error_unknown_operation.json
diff --git a/graphql/graphql-error-handling/src/test/resources/init_script.sql b/graphql-modules/graphql-error-handling/src/test/resources/init_script.sql
similarity index 100%
rename from graphql/graphql-error-handling/src/test/resources/init_script.sql
rename to graphql-modules/graphql-error-handling/src/test/resources/init_script.sql
diff --git a/graphql/graphql-java/README.md b/graphql-modules/graphql-java/README.md
similarity index 100%
rename from graphql/graphql-java/README.md
rename to graphql-modules/graphql-java/README.md
diff --git a/graphql/graphql-java/payload-examples/createUser.json b/graphql-modules/graphql-java/payload-examples/createUser.json
similarity index 100%
rename from graphql/graphql-java/payload-examples/createUser.json
rename to graphql-modules/graphql-java/payload-examples/createUser.json
diff --git a/graphql/graphql-java/payload-examples/deleteUser.json b/graphql-modules/graphql-java/payload-examples/deleteUser.json
similarity index 100%
rename from graphql/graphql-java/payload-examples/deleteUser.json
rename to graphql-modules/graphql-java/payload-examples/deleteUser.json
diff --git a/graphql/graphql-java/payload-examples/listUsers.json b/graphql-modules/graphql-java/payload-examples/listUsers.json
similarity index 100%
rename from graphql/graphql-java/payload-examples/listUsers.json
rename to graphql-modules/graphql-java/payload-examples/listUsers.json
diff --git a/graphql/graphql-java/payload-examples/retrieveUser.json b/graphql-modules/graphql-java/payload-examples/retrieveUser.json
similarity index 100%
rename from graphql/graphql-java/payload-examples/retrieveUser.json
rename to graphql-modules/graphql-java/payload-examples/retrieveUser.json
diff --git a/graphql/graphql-java/payload-examples/searchName.json b/graphql-modules/graphql-java/payload-examples/searchName.json
similarity index 100%
rename from graphql/graphql-java/payload-examples/searchName.json
rename to graphql-modules/graphql-java/payload-examples/searchName.json
diff --git a/graphql/graphql-java/payload-examples/updateUser.json b/graphql-modules/graphql-java/payload-examples/updateUser.json
similarity index 100%
rename from graphql/graphql-java/payload-examples/updateUser.json
rename to graphql-modules/graphql-java/payload-examples/updateUser.json
diff --git a/graphql/graphql-java/pom.xml b/graphql-modules/graphql-java/pom.xml
similarity index 99%
rename from graphql/graphql-java/pom.xml
rename to graphql-modules/graphql-java/pom.xml
index b0b2c15359..1993130b12 100644
--- a/graphql/graphql-java/pom.xml
+++ b/graphql-modules/graphql-java/pom.xml
@@ -1,3 +1,4 @@
+
com.baeldung.graphql
- graphql
+ graphql-modules
1.0.0-SNAPSHOT
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/Application.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/Application.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/Application.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/Application.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/clients/AmericanExpressNodes.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/clients/AmericanExpressNodes.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/clients/AmericanExpressNodes.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/clients/AmericanExpressNodes.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/clients/ApacheHttpClient.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/clients/ApacheHttpClient.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/clients/ApacheHttpClient.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/clients/ApacheHttpClient.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/data/Author.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/data/Author.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/data/Author.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/data/Author.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/data/Book.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/data/Book.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/data/Book.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/data/Book.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/data/BookRepository.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/data/BookRepository.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/data/BookRepository.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/data/BookRepository.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/data/Data.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/data/Data.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/data/Data.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/data/Data.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/data/Response.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/data/Response.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/data/Response.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/data/Response.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/entity/User.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/entity/User.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/entity/User.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/entity/User.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/handler/UserHandler.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/handler/UserHandler.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/handler/UserHandler.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/handler/UserHandler.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/mutation/UserMutation.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/mutation/UserMutation.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/mutation/UserMutation.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/mutation/UserMutation.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/query/UserQuery.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/query/UserQuery.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/query/UserQuery.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/query/UserQuery.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/schema/UserSchema.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/schema/UserSchema.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/schema/UserSchema.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/schema/UserSchema.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/server/GraphQLEndpoint.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/server/GraphQLEndpoint.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/server/GraphQLEndpoint.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/server/GraphQLEndpoint.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/server/GraphQLQuery.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/server/GraphQLQuery.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/server/GraphQLQuery.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/server/GraphQLQuery.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphql/utils/SchemaUtils.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/utils/SchemaUtils.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphql/utils/SchemaUtils.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphql/utils/SchemaUtils.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/AppHandler.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/AppHandler.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/AppHandler.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/AppHandler.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/ExtendedGraphQLScalarType.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/ExtendedGraphQLScalarType.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/ExtendedGraphQLScalarType.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/ExtendedGraphQLScalarType.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/GraphqlReturnMap.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/GraphqlReturnMap.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/GraphqlReturnMap.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/GraphqlReturnMap.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/entity/Attribute.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/entity/Attribute.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/entity/Attribute.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/entity/Attribute.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/entity/Product.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/entity/Product.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/entity/Product.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/entity/Product.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/model/AttributeKeyValueModel.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/model/AttributeKeyValueModel.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/model/AttributeKeyValueModel.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/model/AttributeKeyValueModel.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/repository/ProductRepository.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/repository/ProductRepository.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/repository/ProductRepository.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/repository/ProductRepository.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/repository/impl/ProductRepositoryImpl.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/repository/impl/ProductRepositoryImpl.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/repository/impl/ProductRepositoryImpl.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/repository/impl/ProductRepositoryImpl.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/resolver/ProductResolver.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/resolver/ProductResolver.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/resolver/ProductResolver.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/resolver/ProductResolver.java
diff --git a/graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/resolver/Query.java b/graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/resolver/Query.java
similarity index 100%
rename from graphql/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/resolver/Query.java
rename to graphql-modules/graphql-java/src/main/java/com/baeldung/graphqlreturnmap/resolver/Query.java
diff --git a/graphql/graphql-java/src/main/resources/logback.xml b/graphql-modules/graphql-java/src/main/resources/logback.xml
similarity index 100%
rename from graphql/graphql-java/src/main/resources/logback.xml
rename to graphql-modules/graphql-java/src/main/resources/logback.xml
diff --git a/graphql/graphql-java/src/main/resources/schema.graphqls b/graphql-modules/graphql-java/src/main/resources/schema.graphqls
similarity index 100%
rename from graphql/graphql-java/src/main/resources/schema.graphqls
rename to graphql-modules/graphql-java/src/main/resources/schema.graphqls
diff --git a/graphql/graphql-java/src/test/java/com/baeldung/graphql/GraphQLMockServer.java b/graphql-modules/graphql-java/src/test/java/com/baeldung/graphql/GraphQLMockServer.java
similarity index 100%
rename from graphql/graphql-java/src/test/java/com/baeldung/graphql/GraphQLMockServer.java
rename to graphql-modules/graphql-java/src/test/java/com/baeldung/graphql/GraphQLMockServer.java
diff --git a/graphql/graphql-java/src/test/java/com/baeldung/graphql/clients/AmericanExpressNodesUnitTest.java b/graphql-modules/graphql-java/src/test/java/com/baeldung/graphql/clients/AmericanExpressNodesUnitTest.java
similarity index 100%
rename from graphql/graphql-java/src/test/java/com/baeldung/graphql/clients/AmericanExpressNodesUnitTest.java
rename to graphql-modules/graphql-java/src/test/java/com/baeldung/graphql/clients/AmericanExpressNodesUnitTest.java
diff --git a/graphql/graphql-java/src/test/java/com/baeldung/graphql/clients/ApacheHttpClientUnitTest.java b/graphql-modules/graphql-java/src/test/java/com/baeldung/graphql/clients/ApacheHttpClientUnitTest.java
similarity index 100%
rename from graphql/graphql-java/src/test/java/com/baeldung/graphql/clients/ApacheHttpClientUnitTest.java
rename to graphql-modules/graphql-java/src/test/java/com/baeldung/graphql/clients/ApacheHttpClientUnitTest.java
diff --git a/graphql/graphql-spqr/README.md b/graphql-modules/graphql-spqr/README.md
similarity index 100%
rename from graphql/graphql-spqr/README.md
rename to graphql-modules/graphql-spqr/README.md
diff --git a/graphql/graphql-spqr/pom.xml b/graphql-modules/graphql-spqr/pom.xml
similarity index 95%
rename from graphql/graphql-spqr/pom.xml
rename to graphql-modules/graphql-spqr/pom.xml
index 75a1b5d79b..7bc450036a 100644
--- a/graphql/graphql-spqr/pom.xml
+++ b/graphql-modules/graphql-spqr/pom.xml
@@ -9,7 +9,7 @@
com.baeldung.graphql
- graphql
+ graphql-modules
1.0.0-SNAPSHOT
diff --git a/graphql/graphql-spqr/src/main/java/com/baeldung/SpringBootApp.java b/graphql-modules/graphql-spqr/src/main/java/com/baeldung/SpringBootApp.java
similarity index 100%
rename from graphql/graphql-spqr/src/main/java/com/baeldung/SpringBootApp.java
rename to graphql-modules/graphql-spqr/src/main/java/com/baeldung/SpringBootApp.java
diff --git a/graphql/graphql-spqr/src/main/java/com/baeldung/spqr/Book.java b/graphql-modules/graphql-spqr/src/main/java/com/baeldung/spqr/Book.java
similarity index 100%
rename from graphql/graphql-spqr/src/main/java/com/baeldung/spqr/Book.java
rename to graphql-modules/graphql-spqr/src/main/java/com/baeldung/spqr/Book.java
diff --git a/graphql/graphql-spqr/src/main/java/com/baeldung/spqr/BookService.java b/graphql-modules/graphql-spqr/src/main/java/com/baeldung/spqr/BookService.java
similarity index 100%
rename from graphql/graphql-spqr/src/main/java/com/baeldung/spqr/BookService.java
rename to graphql-modules/graphql-spqr/src/main/java/com/baeldung/spqr/BookService.java
diff --git a/graphql/graphql-spqr/src/main/java/com/baeldung/spqr/IBookService.java b/graphql-modules/graphql-spqr/src/main/java/com/baeldung/spqr/IBookService.java
similarity index 100%
rename from graphql/graphql-spqr/src/main/java/com/baeldung/spqr/IBookService.java
rename to graphql-modules/graphql-spqr/src/main/java/com/baeldung/spqr/IBookService.java
diff --git a/graphql/pom.xml b/graphql-modules/pom.xml
similarity index 90%
rename from graphql/pom.xml
rename to graphql-modules/pom.xml
index aec097752a..7a77e3ff0c 100644
--- a/graphql/pom.xml
+++ b/graphql-modules/pom.xml
@@ -4,9 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
com.baeldung.graphql
- graphql
+ graphql-modules
1.0.0-SNAPSHOT
- graphql
+ graphql-modules
pom
@@ -23,4 +23,4 @@
graphql-spqr
-
\ No newline at end of file
+
diff --git a/pom.xml b/pom.xml
index 8fa7c1e2b4..86980874fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,7 +372,7 @@
cloud-foundry-uaa
code-generation
- core-groovy-modules
+ core-groovy-modules
core-java-modules
@@ -402,7 +402,7 @@
- graphql
+ graphql-modules
grpc
gson
guava-modules
@@ -832,7 +832,7 @@
code-generation
core-groovy-modules
-
+
core-java-modules
couchbase
@@ -861,7 +861,7 @@
- graphql
+ graphql-modules
grpc
gson
guava-modules