diff --git a/spring-rest/src/main/java/com/baeldung/custom/CustomApplication.java b/spring-rest/src/main/java/com/baeldung/changeport/CustomApplication.java
similarity index 93%
rename from spring-rest/src/main/java/com/baeldung/custom/CustomApplication.java
rename to spring-rest/src/main/java/com/baeldung/changeport/CustomApplication.java
index 75f4d714e2..3fce0f1289 100644
--- a/spring-rest/src/main/java/com/baeldung/custom/CustomApplication.java
+++ b/spring-rest/src/main/java/com/baeldung/changeport/CustomApplication.java
@@ -1,4 +1,4 @@
-package com.baeldung.custom;
+package com.baeldung.changeport;
 
 import java.util.Collections;
 
diff --git a/spring-rest/src/main/java/com/baeldung/custom/ServerPortCustomizer.java b/spring-rest/src/main/java/com/baeldung/changeport/ServerPortCustomizer.java
similarity index 92%
rename from spring-rest/src/main/java/com/baeldung/custom/ServerPortCustomizer.java
rename to spring-rest/src/main/java/com/baeldung/changeport/ServerPortCustomizer.java
index 978e7c8a82..f3610aeac6 100644
--- a/spring-rest/src/main/java/com/baeldung/custom/ServerPortCustomizer.java
+++ b/spring-rest/src/main/java/com/baeldung/changeport/ServerPortCustomizer.java
@@ -1,4 +1,4 @@
-package com.baeldung.custom;
+package com.baeldung.changeport;
 
 import org.springframework.boot.web.server.ConfigurableWebServerFactory;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
diff --git a/spring-rest/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-rest/src/test/java/com/baeldung/SpringContextIntegrationTest.java
index f04106c1e1..3c2cde4268 100644
--- a/spring-rest/src/test/java/com/baeldung/SpringContextIntegrationTest.java
+++ b/spring-rest/src/test/java/com/baeldung/SpringContextIntegrationTest.java
@@ -5,7 +5,7 @@ import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.custom.CustomApplication;
+import com.baeldung.changeport.CustomApplication;
 import com.baeldung.produceimage.ImageApplication;
 import com.baeldung.propertyeditor.PropertyEditorApplication;
 import com.baeldung.responseheaders.ResponseHeadersApplication;
diff --git a/spring-rest/src/test/java/com/baeldung/SpringContextTest.java b/spring-rest/src/test/java/com/baeldung/SpringContextTest.java
index 4b2024e207..0f39fc3983 100644
--- a/spring-rest/src/test/java/com/baeldung/SpringContextTest.java
+++ b/spring-rest/src/test/java/com/baeldung/SpringContextTest.java
@@ -5,7 +5,7 @@ import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.custom.CustomApplication;
+import com.baeldung.changeport.CustomApplication;
 import com.baeldung.produceimage.ImageApplication;
 import com.baeldung.propertyeditor.PropertyEditorApplication;
 import com.baeldung.responseheaders.ResponseHeadersApplication;
diff --git a/spring-security-mvc/src/main/java/com/baeldung/SpringSessionApplication.java b/spring-security-mvc/src/main/java/com/baeldung/session/SpringSessionApplication.java
similarity index 91%
rename from spring-security-mvc/src/main/java/com/baeldung/SpringSessionApplication.java
rename to spring-security-mvc/src/main/java/com/baeldung/session/SpringSessionApplication.java
index c2a4b35df0..ec1ba8dcd9 100644
--- a/spring-security-mvc/src/main/java/com/baeldung/SpringSessionApplication.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/session/SpringSessionApplication.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.session;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-security-mvc/src/main/java/com/baeldung/security/SessionFilter.java b/spring-security-mvc/src/main/java/com/baeldung/session/filter/SessionFilter.java
similarity index 97%
rename from spring-security-mvc/src/main/java/com/baeldung/security/SessionFilter.java
rename to spring-security-mvc/src/main/java/com/baeldung/session/filter/SessionFilter.java
index f4f876af9c..c30bfa5506 100644
--- a/spring-security-mvc/src/main/java/com/baeldung/security/SessionFilter.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/session/filter/SessionFilter.java
@@ -1,4 +1,4 @@
-package com.baeldung.security;
+package com.baeldung.session.filter;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/spring-security-mvc/src/main/java/com/baeldung/spring/SecSecurityConfig.java b/spring-security-mvc/src/main/java/com/baeldung/session/security/config/SecSecurityConfig.java
similarity index 98%
rename from spring-security-mvc/src/main/java/com/baeldung/spring/SecSecurityConfig.java
rename to spring-security-mvc/src/main/java/com/baeldung/session/security/config/SecSecurityConfig.java
index a922ba6f7f..35b53a0e7f 100644
--- a/spring-security-mvc/src/main/java/com/baeldung/spring/SecSecurityConfig.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/session/security/config/SecSecurityConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring;
+package com.baeldung.session.security.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-security-mvc/src/main/java/com/baeldung/web/SessionRestController.java b/spring-security-mvc/src/main/java/com/baeldung/session/web/SessionRestController.java
similarity index 93%
rename from spring-security-mvc/src/main/java/com/baeldung/web/SessionRestController.java
rename to spring-security-mvc/src/main/java/com/baeldung/session/web/SessionRestController.java
index 1353ee25d0..82199a9e4e 100644
--- a/spring-security-mvc/src/main/java/com/baeldung/web/SessionRestController.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/session/web/SessionRestController.java
@@ -1,4 +1,4 @@
-package com.baeldung.web;
+package com.baeldung.session.web;
 
 import javax.servlet.http.HttpSession;
 
diff --git a/spring-security-mvc/src/main/java/com/baeldung/spring/MvcConfig.java b/spring-security-mvc/src/main/java/com/baeldung/session/web/config/MvcConfig.java
similarity index 96%
rename from spring-security-mvc/src/main/java/com/baeldung/spring/MvcConfig.java
rename to spring-security-mvc/src/main/java/com/baeldung/session/web/config/MvcConfig.java
index 38a4f3f81b..4db6d07872 100644
--- a/spring-security-mvc/src/main/java/com/baeldung/spring/MvcConfig.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/session/web/config/MvcConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring;
+package com.baeldung.session.web.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;