diff --git a/pom.xml b/pom.xml
index adc3d30970..2a0ae0d8d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -645,7 +645,6 @@
                 <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
                 <module>spring-boot-client</module>
                 <module>spring-boot-config-jpa-error</module>
-                <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-deployment</module>
                 <module>spring-boot-di</module>
                 <module>spring-boot-environment</module>
@@ -1168,7 +1167,6 @@
                 <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
                 <module>spring-boot-client</module>
                 <module>spring-boot-config-jpa-error</module>
-                <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-deployment</module>
                 <module>spring-boot-di</module>
                 <module>spring-boot-environment</module>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 4550836388..5e5a68b954 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -16,6 +16,7 @@
     <modules>
         <module>spring-boot-admin</module>
         <module>spring-boot-artifacts</module>
+        <module>spring-boot-ctx-fluent</module>
         <module>spring-boot-autoconfiguration</module>
         <module>spring-boot-camel</module>
         <module>spring-boot-custom-starter</module>
diff --git a/spring-boot-ctx-fluent/README.md b/spring-boot-modules/spring-boot-ctx-fluent/README.md
similarity index 100%
rename from spring-boot-ctx-fluent/README.md
rename to spring-boot-modules/spring-boot-ctx-fluent/README.md
diff --git a/spring-boot-ctx-fluent/pom.xml b/spring-boot-modules/spring-boot-ctx-fluent/pom.xml
similarity index 93%
rename from spring-boot-ctx-fluent/pom.xml
rename to spring-boot-modules/spring-boot-ctx-fluent/pom.xml
index 782e1fd7f6..872e15d307 100644
--- a/spring-boot-ctx-fluent/pom.xml
+++ b/spring-boot-modules/spring-boot-ctx-fluent/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-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java
diff --git a/spring-boot-ctx-fluent/src/main/resources/ctx1.properties b/spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx1.properties
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/resources/ctx1.properties
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx1.properties
diff --git a/spring-boot-ctx-fluent/src/main/resources/ctx2.properties b/spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx2.properties
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/resources/ctx2.properties
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx2.properties
diff --git a/spring-boot-ctx-fluent/src/main/resources/logback.xml b/spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/logback.xml
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/resources/logback.xml
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/logback.xml
diff --git a/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-modules/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java