diff --git a/spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java
new file mode 100644
index 0000000000..4570857b30
--- /dev/null
+++ b/spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java
@@ -0,0 +1,40 @@
+package org.baeldung.spring;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+import org.springframework.web.servlet.view.JstlView;
+
+@EnableWebMvc
+@Configuration
+public class MvcConfig extends WebMvcConfigurerAdapter {
+
+    public MvcConfig() {
+        super();
+    }
+
+    // API
+
+    @Override
+    public void addViewControllers(final ViewControllerRegistry registry) {
+        super.addViewControllers(registry);
+
+        registry.addViewController("/login.html");
+        registry.addViewController("/homepage.html");
+    }
+
+    @Bean
+    public ViewResolver viewResolver() {
+        final InternalResourceViewResolver bean = new InternalResourceViewResolver();
+
+        bean.setViewClass(JstlView.class);
+        bean.setPrefix("/WEB-INF/view/");
+        bean.setSuffix(".jsp");
+
+        return bean;
+    }
+}
\ No newline at end of file
diff --git a/spring-security-custom/src/main/java/org/baeldung/spring/config/SecSecurityConfig.java b/spring-security-custom/src/main/java/org/baeldung/spring/SecSecurityConfig.java
similarity index 91%
rename from spring-security-custom/src/main/java/org/baeldung/spring/config/SecSecurityConfig.java
rename to spring-security-custom/src/main/java/org/baeldung/spring/SecSecurityConfig.java
index 8d5dfb0409..4ce80dab9f 100644
--- a/spring-security-custom/src/main/java/org/baeldung/spring/config/SecSecurityConfig.java
+++ b/spring-security-custom/src/main/java/org/baeldung/spring/SecSecurityConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.config;
+package org.baeldung.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-security-custom/src/main/java/org/baeldung/spring/config/ClientWebConfig.java b/spring-security-custom/src/main/java/org/baeldung/spring/config/ClientWebConfig.java
deleted file mode 100644
index 1a87fd8a09..0000000000
--- a/spring-security-custom/src/main/java/org/baeldung/spring/config/ClientWebConfig.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.baeldung.spring.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@EnableWebMvc
-@Configuration
-public class ClientWebConfig extends WebMvcConfigurerAdapter {
-
-    public ClientWebConfig() {
-        super();
-    }
-
-    // API
-
-}
\ No newline at end of file
diff --git a/spring-security-custom/src/main/java/org/baeldung/spring/config/WebConfig.java b/spring-security-custom/src/main/java/org/baeldung/spring/config/WebConfig.java
deleted file mode 100644
index 33efc93b2b..0000000000
--- a/spring-security-custom/src/main/java/org/baeldung/spring/config/WebConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-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-custom/src/main/resources/webSecurityConfig.xml b/spring-security-custom/src/main/resources/webSecurityConfig.xml
index b5d0c46e3f..85476a2a21 100644
--- a/spring-security-custom/src/main/resources/webSecurityConfig.xml
+++ b/spring-security-custom/src/main/resources/webSecurityConfig.xml
@@ -17,7 +17,7 @@
 
     <beans:bean id="mySuccessHandler" class="org.baeldung.security.MySavedRequestAwareAuthenticationSuccessHandler" />
 
-    <authentication-manager alias="authenticationManager">
+    <authentication-manager>
         <authentication-provider ref="customAuthenticationProvider" />
     </authentication-manager>
 
diff --git a/spring-security-login/src/main/java/org/baeldung/spring/security/CustomLogoutSuccessHandler.java b/spring-security-login/src/main/java/org/baeldung/security/CustomLogoutSuccessHandler.java
similarity index 96%
rename from spring-security-login/src/main/java/org/baeldung/spring/security/CustomLogoutSuccessHandler.java
rename to spring-security-login/src/main/java/org/baeldung/security/CustomLogoutSuccessHandler.java
index 4d19744033..7360b4e03f 100644
--- a/spring-security-login/src/main/java/org/baeldung/spring/security/CustomLogoutSuccessHandler.java
+++ b/spring-security-login/src/main/java/org/baeldung/security/CustomLogoutSuccessHandler.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.security;
+package org.baeldung.security;
 
 import java.io.IOException;
 
diff --git a/spring-security-login/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java b/spring-security-login/src/main/java/org/baeldung/spring/MvcConfig.java
similarity index 89%
rename from spring-security-login/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java
rename to spring-security-login/src/main/java/org/baeldung/spring/MvcConfig.java
index 316759b24b..f6f3e2a429 100644
--- a/spring-security-login/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java
+++ b/spring-security-login/src/main/java/org/baeldung/spring/MvcConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.web.config;
+package org.baeldung.spring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -11,9 +11,9 @@ import org.springframework.web.servlet.view.JstlView;
 
 @EnableWebMvc
 @Configuration
-public class ClientWebConfig extends WebMvcConfigurerAdapter {
+public class MvcConfig extends WebMvcConfigurerAdapter {
 
-    public ClientWebConfig() {
+    public MvcConfig() {
         super();
     }
 
diff --git a/spring-security-login/src/main/java/org/baeldung/spring/web/config/SecSecurityConfig.java b/spring-security-login/src/main/java/org/baeldung/spring/SecSecurityConfig.java
similarity index 87%
rename from spring-security-login/src/main/java/org/baeldung/spring/web/config/SecSecurityConfig.java
rename to spring-security-login/src/main/java/org/baeldung/spring/SecSecurityConfig.java
index a21a05c17d..4da114c78b 100644
--- a/spring-security-login/src/main/java/org/baeldung/spring/web/config/SecSecurityConfig.java
+++ b/spring-security-login/src/main/java/org/baeldung/spring/SecSecurityConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.web.config;
+package org.baeldung.spring;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;