diff --git a/spring-security-rest/src/main/java/org/baeldung/spring/security/MySavedRequestAwareAuthenticationSuccessHandler.java b/spring-security-rest/src/main/java/org/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
similarity index 98%
rename from spring-security-rest/src/main/java/org/baeldung/spring/security/MySavedRequestAwareAuthenticationSuccessHandler.java
rename to spring-security-rest/src/main/java/org/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
index 82272292de..698052fa2b 100644
--- a/spring-security-rest/src/main/java/org/baeldung/spring/security/MySavedRequestAwareAuthenticationSuccessHandler.java
+++ b/spring-security-rest/src/main/java/org/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.security;
+package org.baeldung.security;
 
 import java.io.IOException;
 
diff --git a/spring-security-rest/src/main/java/org/baeldung/spring/security/RestAuthenticationEntryPoint.java b/spring-security-rest/src/main/java/org/baeldung/security/RestAuthenticationEntryPoint.java
similarity index 95%
rename from spring-security-rest/src/main/java/org/baeldung/spring/security/RestAuthenticationEntryPoint.java
rename to spring-security-rest/src/main/java/org/baeldung/security/RestAuthenticationEntryPoint.java
index 9e6f4da1e0..77aa32ff97 100644
--- a/spring-security-rest/src/main/java/org/baeldung/spring/security/RestAuthenticationEntryPoint.java
+++ b/spring-security-rest/src/main/java/org/baeldung/security/RestAuthenticationEntryPoint.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.security;
+package org.baeldung.security;
 
 import java.io.IOException;
 
diff --git a/spring-security-rest/src/main/java/org/baeldung/spring/config/SecSecurityConfig.java b/spring-security-rest/src/main/java/org/baeldung/spring/config/SecSecurityConfig.java
index d38c304d9a..8d5dfb0409 100644
--- a/spring-security-rest/src/main/java/org/baeldung/spring/config/SecSecurityConfig.java
+++ b/spring-security-rest/src/main/java/org/baeldung/spring/config/SecSecurityConfig.java
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.ImportResource;
 
 @Configuration
 @ImportResource({ "classpath:webSecurityConfig.xml" })
-@ComponentScan("org.baeldung.spring.security")
+@ComponentScan("org.baeldung.security")
 public class SecSecurityConfig {
 
     public SecSecurityConfig() {
diff --git a/spring-security-rest/src/main/java/org/baeldung/spring/config/WebConfig.java b/spring-security-rest/src/main/java/org/baeldung/spring/config/WebConfig.java
new file mode 100644
index 0000000000..33efc93b2b
--- /dev/null
+++ b/spring-security-rest/src/main/java/org/baeldung/spring/config/WebConfig.java
@@ -0,0 +1,14 @@
+package org.baeldung.spring.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan("org.baeldung.web")
+public class WebConfig {
+
+    public WebConfig() {
+        super();
+    }
+
+}
diff --git a/spring-security-rest/src/main/java/org/baeldung/web/controller/FooController.java b/spring-security-rest/src/main/java/org/baeldung/web/controller/FooController.java
new file mode 100644
index 0000000000..e4507df59c
--- /dev/null
+++ b/spring-security-rest/src/main/java/org/baeldung/web/controller/FooController.java
@@ -0,0 +1,8 @@
+package org.baeldung.web.controller;
+
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class FooController {
+    //
+}
diff --git a/spring-security-rest/src/main/java/org/baeldung/web/dto/Foo.java b/spring-security-rest/src/main/java/org/baeldung/web/dto/Foo.java
new file mode 100644
index 0000000000..cb12846cd7
--- /dev/null
+++ b/spring-security-rest/src/main/java/org/baeldung/web/dto/Foo.java
@@ -0,0 +1,5 @@
+package org.baeldung.web.dto;
+
+public class Foo {
+
+}
diff --git a/spring-security-rest/src/main/resources/webSecurityConfig.xml b/spring-security-rest/src/main/resources/webSecurityConfig.xml
index ebb73828c4..d3f8f6cfaf 100644
--- a/spring-security-rest/src/main/resources/webSecurityConfig.xml
+++ b/spring-security-rest/src/main/resources/webSecurityConfig.xml
@@ -15,7 +15,7 @@
         <logout />
     </http>
 
-    <beans:bean id="mySuccessHandler" class="org.baeldung.spring.security.MySavedRequestAwareAuthenticationSuccessHandler" />
+    <beans:bean id="mySuccessHandler" class="org.baeldung.security.MySavedRequestAwareAuthenticationSuccessHandler" />
 
     <authentication-manager alias="authenticationManager">
         <authentication-provider>