diff --git a/spring-security-rest/src/main/java/org/baeldung/web/ApiError.java b/spring-security-rest/src/main/java/org/baeldung/errorhandling/ApiError.java
similarity index 97%
rename from spring-security-rest/src/main/java/org/baeldung/web/ApiError.java
rename to spring-security-rest/src/main/java/org/baeldung/errorhandling/ApiError.java
index e1c58da64a..8a1ddd8882 100644
--- a/spring-security-rest/src/main/java/org/baeldung/web/ApiError.java
+++ b/spring-security-rest/src/main/java/org/baeldung/errorhandling/ApiError.java
@@ -1,4 +1,4 @@
-package org.baeldung.web;
+package org.baeldung.errorhandling;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/spring-security-rest/src/main/java/org/baeldung/web/CustomRestExceptionHandler.java b/spring-security-rest/src/main/java/org/baeldung/errorhandling/CustomRestExceptionHandler.java
similarity index 99%
rename from spring-security-rest/src/main/java/org/baeldung/web/CustomRestExceptionHandler.java
rename to spring-security-rest/src/main/java/org/baeldung/errorhandling/CustomRestExceptionHandler.java
index 71b1a4775e..cd4d58e60c 100644
--- a/spring-security-rest/src/main/java/org/baeldung/web/CustomRestExceptionHandler.java
+++ b/spring-security-rest/src/main/java/org/baeldung/errorhandling/CustomRestExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.baeldung.web;
+package org.baeldung.errorhandling;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-security-rest/src/test/java/org/baeldung/web/FooLiveTest.java b/spring-security-rest/src/test/java/org/baeldung/errorhandling/FooLiveTest.java
similarity index 96%
rename from spring-security-rest/src/test/java/org/baeldung/web/FooLiveTest.java
rename to spring-security-rest/src/test/java/org/baeldung/errorhandling/FooLiveTest.java
index 86beeb46a9..8d1db5736f 100644
--- a/spring-security-rest/src/test/java/org/baeldung/web/FooLiveTest.java
+++ b/spring-security-rest/src/test/java/org/baeldung/errorhandling/FooLiveTest.java
@@ -1,8 +1,10 @@
-package org.baeldung.web;
+package org.baeldung.errorhandling;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import org.baeldung.errorhandling.ApiError;
+import org.baeldung.web.TestConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.http.HttpStatus;
diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/spy/MockitoSpyIntegrationTest.java
similarity index 98%
rename from testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/spy/MockitoSpyIntegrationTest.java
index 118d50ea40..d0b838a789 100644
--- a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java
+++ b/testing-modules/mockito/src/test/java/org/baeldung/mockito/spy/MockitoSpyIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.mockito;
+package org.baeldung.mockito.spy;
 
 import static org.junit.Assert.assertEquals;