diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml
index 87bcfaa203..9ecad50d9c 100644
--- a/spring-web-modules/pom.xml
+++ b/spring-web-modules/pom.xml
@@ -23,6 +23,7 @@
         <module>spring-mvc-basics-3</module>
         <module>spring-mvc-basics-4</module>
         <module>spring-mvc-basics-5</module>
+        <module>spring-mvc-basics-6</module>
         <module>spring-mvc-crash</module>
         <module>spring-mvc-file</module>
         <module>spring-mvc-forms-jsp</module>
diff --git a/spring-web-modules/spring-mvc-basics-5/README.md b/spring-web-modules/spring-mvc-basics-5/README.md
index d503b9e78e..ec91449b0f 100644
--- a/spring-web-modules/spring-mvc-basics-5/README.md
+++ b/spring-web-modules/spring-mvc-basics-5/README.md
@@ -14,5 +14,4 @@ The "REST With Spring" Classes: https://bit.ly/restwithspring
 - [Spring @RequestParam vs @PathVariable Annotations](https://www.baeldung.com/spring-requestparam-vs-pathvariable)
 - [@RequestMapping Value in Properties File](https://www.baeldung.com/spring-requestmapping-properties-file)
 - [Map a JSON POST to Multiple Spring MVC Parameters](https://www.baeldung.com/spring-mvc-json-param-mapping)
-- [Getting Query String Parameters from HttpServletRequest](https://www.baeldung.com/java-httpservletrequest-get-query-parameters)
 - More articles: [[<-- prev]](../spring-mvc-basics-4)
diff --git a/spring-web-modules/spring-mvc-basics-6/README.md b/spring-web-modules/spring-mvc-basics-6/README.md
new file mode 100644
index 0000000000..f2e6835187
--- /dev/null
+++ b/spring-web-modules/spring-mvc-basics-6/README.md
@@ -0,0 +1,11 @@
+## Spring MVC Basics
+
+This module contains articles about the basics of Spring MVC. Articles about more specific areas of Spring MVC have
+their own module. 
+
+### The Course
+The "REST With Spring" Classes: https://bit.ly/restwithspring
+
+### Relevant Articles:
+- [Getting Query String Parameters from HttpServletRequest](https://www.baeldung.com/java-httpservletrequest-get-query-parameters)
+- More articles: [[<-- prev]](../spring-mvc-basics-4)
diff --git a/spring-web-modules/spring-mvc-basics-6/pom.xml b/spring-web-modules/spring-mvc-basics-6/pom.xml
new file mode 100644
index 0000000000..7b63dfbcde
--- /dev/null
+++ b/spring-web-modules/spring-mvc-basics-6/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-mvc-basics-6</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-mvc-basics-6</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>spring-mvc-basics-5</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.Application</mainClass>
+                    <layout>JAR</layout>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-6/src/main/java/com/baeldung/Application.java b/spring-web-modules/spring-mvc-basics-6/src/main/java/com/baeldung/Application.java
new file mode 100644
index 0000000000..d58049fb35
--- /dev/null
+++ b/spring-web-modules/spring-mvc-basics-6/src/main/java/com/baeldung/Application.java
@@ -0,0 +1,11 @@
+package com.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/spring-web-modules/spring-mvc-basics-5/src/main/java/com/baeldung/requestparam/QueryStringController.java b/spring-web-modules/spring-mvc-basics-6/src/main/java/com/baeldung/requestparam/QueryStringController.java
similarity index 100%
rename from spring-web-modules/spring-mvc-basics-5/src/main/java/com/baeldung/requestparam/QueryStringController.java
rename to spring-web-modules/spring-mvc-basics-6/src/main/java/com/baeldung/requestparam/QueryStringController.java
diff --git a/spring-web-modules/spring-mvc-basics-5/src/main/java/com/baeldung/requestparam/RequestParamController.java b/spring-web-modules/spring-mvc-basics-6/src/main/java/com/baeldung/requestparam/RequestParamController.java
similarity index 100%
rename from spring-web-modules/spring-mvc-basics-5/src/main/java/com/baeldung/requestparam/RequestParamController.java
rename to spring-web-modules/spring-mvc-basics-6/src/main/java/com/baeldung/requestparam/RequestParamController.java
diff --git a/spring-web-modules/spring-mvc-basics-5/src/main/java/com/baeldung/requestparam/UserDto.java b/spring-web-modules/spring-mvc-basics-6/src/main/java/com/baeldung/requestparam/UserDto.java
similarity index 100%
rename from spring-web-modules/spring-mvc-basics-5/src/main/java/com/baeldung/requestparam/UserDto.java
rename to spring-web-modules/spring-mvc-basics-6/src/main/java/com/baeldung/requestparam/UserDto.java
diff --git a/spring-web-modules/spring-mvc-basics-6/src/main/resources/application.properties b/spring-web-modules/spring-mvc-basics-6/src/main/resources/application.properties
new file mode 100644
index 0000000000..935f91554b
--- /dev/null
+++ b/spring-web-modules/spring-mvc-basics-6/src/main/resources/application.properties
@@ -0,0 +1 @@
+server.servlet.context-path=/spring-mvc-basics
diff --git a/spring-web-modules/spring-mvc-basics-5/src/test/java/com/baeldung/requestparam/QueryStringControllerIntegrationTest.java b/spring-web-modules/spring-mvc-basics-6/src/test/java/com/baeldung/requestparam/QueryStringControllerIntegrationTest.java
similarity index 100%
rename from spring-web-modules/spring-mvc-basics-5/src/test/java/com/baeldung/requestparam/QueryStringControllerIntegrationTest.java
rename to spring-web-modules/spring-mvc-basics-6/src/test/java/com/baeldung/requestparam/QueryStringControllerIntegrationTest.java
diff --git a/spring-web-modules/spring-mvc-basics-6/src/test/resources/logback-test.xml b/spring-web-modules/spring-mvc-basics-6/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..8d4771e308
--- /dev/null
+++ b/spring-web-modules/spring-mvc-basics-6/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="15 seconds" debug="false">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file