diff --git a/pom.xml b/pom.xml
index b38fe174c9..71d12fddcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
         <module>jackson</module>
         <module>javaxval</module>
         <module>jjwt</module>
-        <module>jooq-spring</module>
+
         <module>jpa-storedprocedure</module>
         <module>json</module>
         <module>json-path</module>
@@ -87,8 +87,9 @@
         <module>spring-freemarker</module>
         <module>spring-hibernate3</module>
         <module>spring-hibernate4</module>
-        <module>spring-jpa</module>
         <module>spring-jms</module>
+        <module>spring-jooq</module>
+        <module>spring-jpa</module>
         <module>spring-katharsis</module>
         <module>spring-mockito</module>
         <module>spring-mvc-java</module>
diff --git a/jooq-spring/.gitignore b/spring-jooq/.gitignore
similarity index 100%
rename from jooq-spring/.gitignore
rename to spring-jooq/.gitignore
diff --git a/jooq-spring/README.md b/spring-jooq/README.md
similarity index 100%
rename from jooq-spring/README.md
rename to spring-jooq/README.md
diff --git a/jooq-spring/pom.xml b/spring-jooq/pom.xml
similarity index 100%
rename from jooq-spring/pom.xml
rename to spring-jooq/pom.xml
diff --git a/jooq-spring/src/main/resources/application.properties b/spring-jooq/src/main/resources/application.properties
similarity index 100%
rename from jooq-spring/src/main/resources/application.properties
rename to spring-jooq/src/main/resources/application.properties
diff --git a/jooq-spring/src/main/resources/intro_config.properties b/spring-jooq/src/main/resources/intro_config.properties
similarity index 100%
rename from jooq-spring/src/main/resources/intro_config.properties
rename to spring-jooq/src/main/resources/intro_config.properties
diff --git a/jooq-spring/src/main/resources/intro_schema.sql b/spring-jooq/src/main/resources/intro_schema.sql
similarity index 100%
rename from jooq-spring/src/main/resources/intro_schema.sql
rename to spring-jooq/src/main/resources/intro_schema.sql
diff --git a/jooq-spring/src/test/java/com/baeldung/jooq/introduction/ExceptionTranslator.java b/spring-jooq/src/test/java/com/baeldung/jooq/introduction/ExceptionTranslator.java
similarity index 100%
rename from jooq-spring/src/test/java/com/baeldung/jooq/introduction/ExceptionTranslator.java
rename to spring-jooq/src/test/java/com/baeldung/jooq/introduction/ExceptionTranslator.java
diff --git a/jooq-spring/src/test/java/com/baeldung/jooq/introduction/PersistenceContextIntegrationTest.java b/spring-jooq/src/test/java/com/baeldung/jooq/introduction/PersistenceContextIntegrationTest.java
similarity index 100%
rename from jooq-spring/src/test/java/com/baeldung/jooq/introduction/PersistenceContextIntegrationTest.java
rename to spring-jooq/src/test/java/com/baeldung/jooq/introduction/PersistenceContextIntegrationTest.java
diff --git a/jooq-spring/src/test/java/com/baeldung/jooq/introduction/QueryIntegrationTest.java b/spring-jooq/src/test/java/com/baeldung/jooq/introduction/QueryIntegrationTest.java
similarity index 100%
rename from jooq-spring/src/test/java/com/baeldung/jooq/introduction/QueryIntegrationTest.java
rename to spring-jooq/src/test/java/com/baeldung/jooq/introduction/QueryIntegrationTest.java
diff --git a/jooq-spring/src/test/java/com/baeldung/jooq/springboot/Application.java b/spring-jooq/src/test/java/com/baeldung/jooq/springboot/Application.java
similarity index 100%
rename from jooq-spring/src/test/java/com/baeldung/jooq/springboot/Application.java
rename to spring-jooq/src/test/java/com/baeldung/jooq/springboot/Application.java
diff --git a/jooq-spring/src/test/java/com/baeldung/jooq/springboot/InitialConfiguration.java b/spring-jooq/src/test/java/com/baeldung/jooq/springboot/InitialConfiguration.java
similarity index 100%
rename from jooq-spring/src/test/java/com/baeldung/jooq/springboot/InitialConfiguration.java
rename to spring-jooq/src/test/java/com/baeldung/jooq/springboot/InitialConfiguration.java
diff --git a/jooq-spring/src/test/java/com/baeldung/jooq/springboot/SpringBootIntegrationTest.java b/spring-jooq/src/test/java/com/baeldung/jooq/springboot/SpringBootIntegrationTest.java
similarity index 100%
rename from jooq-spring/src/test/java/com/baeldung/jooq/springboot/SpringBootIntegrationTest.java
rename to spring-jooq/src/test/java/com/baeldung/jooq/springboot/SpringBootIntegrationTest.java