diff --git a/java-strings-2/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java b/java-strings-2/src/test/java/com/baeldung/base64encodinganddecoding/ApacheCommonsEncodeDecodeUnitTest.java
similarity index 97%
rename from java-strings-2/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/base64encodinganddecoding/ApacheCommonsEncodeDecodeUnitTest.java
index 7889e6ad53..a0fc845d52 100644
--- a/java-strings-2/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java
+++ b/java-strings-2/src/test/java/com/baeldung/base64encodinganddecoding/ApacheCommonsEncodeDecodeUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.base64;
+package com.baeldung.base64encodinganddecoding;
 
 import org.apache.commons.codec.binary.Base64;
 import org.junit.Test;
diff --git a/java-strings-2/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java b/java-strings-2/src/test/java/com/baeldung/base64encodinganddecoding/Java8EncodeDecodeUnitTest.java
similarity index 98%
rename from java-strings-2/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/base64encodinganddecoding/Java8EncodeDecodeUnitTest.java
index 62cfa4c0a1..191a3628e8 100644
--- a/java-strings-2/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java
+++ b/java-strings-2/src/test/java/com/baeldung/base64encodinganddecoding/Java8EncodeDecodeUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.base64;
+package com.baeldung.base64encodinganddecoding;
 
 import org.junit.Test;
 
diff --git a/java-strings-2/src/test/java/com/baeldung/java8/base64/StringToByteArrayUnitTest.java b/java-strings-2/src/test/java/com/baeldung/base64encodinganddecoding/StringToByteArrayUnitTest.java
similarity index 97%
rename from java-strings-2/src/test/java/com/baeldung/java8/base64/StringToByteArrayUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/base64encodinganddecoding/StringToByteArrayUnitTest.java
index c5f7051c25..e2bb7bb64d 100644
--- a/java-strings-2/src/test/java/com/baeldung/java8/base64/StringToByteArrayUnitTest.java
+++ b/java-strings-2/src/test/java/com/baeldung/base64encodinganddecoding/StringToByteArrayUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.base64;
+package com.baeldung.base64encodinganddecoding;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java b/spring-security-rest/src/main/java/org/baeldung/security/SecurityJavaConfig.java
similarity index 94%
rename from spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java
rename to spring-security-rest/src/main/java/org/baeldung/security/SecurityJavaConfig.java
index cc023110b6..74623080b5 100644
--- a/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java
+++ b/spring-security-rest/src/main/java/org/baeldung/security/SecurityJavaConfig.java
@@ -1,7 +1,7 @@
-package org.baeldung.spring;
+package org.baeldung.security;
 
-import org.baeldung.security.MySavedRequestAwareAuthenticationSuccessHandler;
-import org.baeldung.security.RestAuthenticationEntryPoint;
+import org.baeldung.security.web.MySavedRequestAwareAuthenticationSuccessHandler;
+import org.baeldung.security.web.RestAuthenticationEntryPoint;
 import org.baeldung.web.error.CustomAccessDeniedHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-security-rest/src/main/java/org/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java b/spring-security-rest/src/main/java/org/baeldung/security/web/MySavedRequestAwareAuthenticationSuccessHandler.java
similarity index 98%
rename from spring-security-rest/src/main/java/org/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
rename to spring-security-rest/src/main/java/org/baeldung/security/web/MySavedRequestAwareAuthenticationSuccessHandler.java
index 6018264632..c56568e979 100644
--- a/spring-security-rest/src/main/java/org/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
+++ b/spring-security-rest/src/main/java/org/baeldung/security/web/MySavedRequestAwareAuthenticationSuccessHandler.java
@@ -1,4 +1,4 @@
-package org.baeldung.security;
+package org.baeldung.security.web;
 
 import java.io.IOException;
 
diff --git a/spring-security-rest/src/main/java/org/baeldung/security/RestAuthenticationEntryPoint.java b/spring-security-rest/src/main/java/org/baeldung/security/web/RestAuthenticationEntryPoint.java
similarity index 95%
rename from spring-security-rest/src/main/java/org/baeldung/security/RestAuthenticationEntryPoint.java
rename to spring-security-rest/src/main/java/org/baeldung/security/web/RestAuthenticationEntryPoint.java
index e448e6537f..643e2f0575 100644
--- a/spring-security-rest/src/main/java/org/baeldung/security/RestAuthenticationEntryPoint.java
+++ b/spring-security-rest/src/main/java/org/baeldung/security/web/RestAuthenticationEntryPoint.java
@@ -1,4 +1,4 @@
-package org.baeldung.security;
+package org.baeldung.security.web;
 
 import java.io.IOException;
 
diff --git a/spring-security-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java
index e2e9f2af2b..ae0d80bb45 100644
--- a/spring-security-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-security-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -1,7 +1,7 @@
 package org.baeldung;
 
+import org.baeldung.security.SecurityJavaConfig;
 import org.baeldung.spring.ClientWebConfig;
-import org.baeldung.spring.SecurityJavaConfig;
 import org.baeldung.spring.WebConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java
index d984cf5c35..11586ce670 100644
--- a/spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java
@@ -1,7 +1,7 @@
 package org.baeldung;
 
+import org.baeldung.security.SecurityJavaConfig;
 import org.baeldung.spring.ClientWebConfig;
-import org.baeldung.spring.SecurityJavaConfig;
 import org.baeldung.spring.WebConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-security-rest/src/test/java/org/baeldung/web/AsyncControllerIntegrationTest.java b/spring-security-rest/src/test/java/org/baeldung/web/AsyncControllerIntegrationTest.java
index a09c225a4a..1e5e1b7d85 100644
--- a/spring-security-rest/src/test/java/org/baeldung/web/AsyncControllerIntegrationTest.java
+++ b/spring-security-rest/src/test/java/org/baeldung/web/AsyncControllerIntegrationTest.java
@@ -1,7 +1,7 @@
 package org.baeldung.web;
 
+import org.baeldung.security.SecurityJavaConfig;
 import org.baeldung.spring.ClientWebConfig;
-import org.baeldung.spring.SecurityJavaConfig;
 import org.baeldung.spring.WebConfig;
 import org.baeldung.web.controller.AsyncController;
 import org.junit.Before;