diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml
index 8d98395ab7..ce718e5661 100644
--- a/spring-security-modules/pom.xml
+++ b/spring-security-modules/pom.xml
@@ -44,8 +44,7 @@
         <module>spring-security-web-rest</module>
         <module>spring-security-web-sockets</module>
         <module>spring-security-web-thymeleaf</module>
-        <module>spring-security-web-x509</module>
-        <module>spring-session</module>
+        <module>spring-security-web-x509</module>        
         <module>spring-social-login</module>
         <module>spring-security-opa</module>
     </modules>
diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml
index a5c23c1649..a2bdc9035e 100644
--- a/spring-web-modules/pom.xml
+++ b/spring-web-modules/pom.xml
@@ -41,6 +41,7 @@
         <module>spring-resttemplate</module>
         <module>spring-resttemplate-2</module>
         <module>spring-resttemplate-3</module>
+        <module>spring-session</module>
         <module>spring-thymeleaf</module>
         <module>spring-thymeleaf-2</module>
         <module>spring-thymeleaf-3</module>
diff --git a/spring-security-modules/spring-session/README.md b/spring-web-modules/spring-session/README.md
similarity index 100%
rename from spring-security-modules/spring-session/README.md
rename to spring-web-modules/spring-session/README.md
diff --git a/spring-security-modules/spring-session/pom.xml b/spring-web-modules/spring-session/pom.xml
similarity index 100%
rename from spring-security-modules/spring-session/pom.xml
rename to spring-web-modules/spring-session/pom.xml
diff --git a/spring-security-modules/spring-session/spring-session-jdbc/README.md b/spring-web-modules/spring-session/spring-session-jdbc/README.md
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-jdbc/README.md
rename to spring-web-modules/spring-session/spring-session-jdbc/README.md
diff --git a/spring-security-modules/spring-session/spring-session-jdbc/pom.xml b/spring-web-modules/spring-session/spring-session-jdbc/pom.xml
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-jdbc/pom.xml
rename to spring-web-modules/spring-session/spring-session-jdbc/pom.xml
diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java b/spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java
rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java
diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java b/spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java
rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java
diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties b/spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties
rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties
diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml b/spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml
rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml
diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java b/spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java b/spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java
rename to spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java
diff --git a/spring-security-modules/spring-session/spring-session-mongodb/README.md b/spring-web-modules/spring-session/spring-session-mongodb/README.md
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-mongodb/README.md
rename to spring-web-modules/spring-session/spring-session-mongodb/README.md
diff --git a/spring-security-modules/spring-session/spring-session-mongodb/pom.xml b/spring-web-modules/spring-session/spring-session-mongodb/pom.xml
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-mongodb/pom.xml
rename to spring-web-modules/spring-session/spring-session-mongodb/pom.xml
diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java b/spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java
rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java
diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java b/spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java
rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java
diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties b/spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties
rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties
diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml b/spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml
rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml
diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java b/spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java b/spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java
rename to spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java
diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties b/spring-web-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties
rename to spring-web-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties
diff --git a/spring-security-modules/spring-session/spring-session-redis/README.md b/spring-web-modules/spring-session/spring-session-redis/README.md
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-redis/README.md
rename to spring-web-modules/spring-session/spring-session-redis/README.md
diff --git a/spring-security-modules/spring-session/spring-session-redis/pom.xml b/spring-web-modules/spring-session/spring-session-redis/pom.xml
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-redis/pom.xml
rename to spring-web-modules/spring-session/spring-session-redis/pom.xml
diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java
rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java
diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java
rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java
diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java
rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java
diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java
rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java
diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/resources/application.properties b/spring-web-modules/spring-session/spring-session-redis/src/main/resources/application.properties
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-redis/src/main/resources/application.properties
rename to spring-web-modules/spring-session/spring-session-redis/src/main/resources/application.properties
diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/resources/logback.xml b/spring-web-modules/spring-session/spring-session-redis/src/main/resources/logback.xml
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-redis/src/main/resources/logback.xml
rename to spring-web-modules/spring-session/spring-session-redis/src/main/resources/logback.xml
diff --git a/spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java
rename to spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java
diff --git a/spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java b/spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java
similarity index 100%
rename from spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java
rename to spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java