diff --git a/spring-all/.classpath b/spring-exceptions/.classpath
similarity index 100%
rename from spring-all/.classpath
rename to spring-exceptions/.classpath
diff --git a/spring-all/.gitignore b/spring-exceptions/.gitignore
similarity index 100%
rename from spring-all/.gitignore
rename to spring-exceptions/.gitignore
diff --git a/spring-all/.project b/spring-exceptions/.project
similarity index 98%
rename from spring-all/.project
rename to spring-exceptions/.project
index 4ae82dabf0..8c9eba8005 100644
--- a/spring-all/.project
+++ b/spring-exceptions/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>spring-all</name>
+	<name>spring-exceptions</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-all/.settings/.jsdtscope b/spring-exceptions/.settings/.jsdtscope
similarity index 100%
rename from spring-all/.settings/.jsdtscope
rename to spring-exceptions/.settings/.jsdtscope
diff --git a/spring-all/.settings/org.eclipse.jdt.core.prefs b/spring-exceptions/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from spring-all/.settings/org.eclipse.jdt.core.prefs
rename to spring-exceptions/.settings/org.eclipse.jdt.core.prefs
diff --git a/spring-all/.settings/org.eclipse.jdt.ui.prefs b/spring-exceptions/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from spring-all/.settings/org.eclipse.jdt.ui.prefs
rename to spring-exceptions/.settings/org.eclipse.jdt.ui.prefs
diff --git a/spring-all/.settings/org.eclipse.m2e.core.prefs b/spring-exceptions/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from spring-all/.settings/org.eclipse.m2e.core.prefs
rename to spring-exceptions/.settings/org.eclipse.m2e.core.prefs
diff --git a/spring-all/.settings/org.eclipse.m2e.wtp.prefs b/spring-exceptions/.settings/org.eclipse.m2e.wtp.prefs
similarity index 100%
rename from spring-all/.settings/org.eclipse.m2e.wtp.prefs
rename to spring-exceptions/.settings/org.eclipse.m2e.wtp.prefs
diff --git a/spring-all/.settings/org.eclipse.wst.common.component b/spring-exceptions/.settings/org.eclipse.wst.common.component
similarity index 70%
rename from spring-all/.settings/org.eclipse.wst.common.component
rename to spring-exceptions/.settings/org.eclipse.wst.common.component
index 847c6ff698..7785d041ba 100644
--- a/spring-all/.settings/org.eclipse.wst.common.component
+++ b/spring-exceptions/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="spring-all">
+    <wb-module deploy-name="spring-exceptions">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <property name="context-root" value="spring-all"/>
-        <property name="java-output-path" value="/spring-all/target/classes"/>
+        <property name="context-root" value="spring-exceptions"/>
+        <property name="java-output-path" value="/spring-exceptions/target/classes"/>
     </wb-module>
 </project-modules>
diff --git a/spring-all/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-exceptions/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from spring-all/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to spring-exceptions/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/spring-all/.settings/org.eclipse.wst.jsdt.ui.superType.container b/spring-exceptions/.settings/org.eclipse.wst.jsdt.ui.superType.container
similarity index 100%
rename from spring-all/.settings/org.eclipse.wst.jsdt.ui.superType.container
rename to spring-exceptions/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/spring-all/.settings/org.eclipse.wst.jsdt.ui.superType.name b/spring-exceptions/.settings/org.eclipse.wst.jsdt.ui.superType.name
similarity index 100%
rename from spring-all/.settings/org.eclipse.wst.jsdt.ui.superType.name
rename to spring-exceptions/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/spring-all/.settings/org.eclipse.wst.validation.prefs b/spring-exceptions/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from spring-all/.settings/org.eclipse.wst.validation.prefs
rename to spring-exceptions/.settings/org.eclipse.wst.validation.prefs
diff --git a/spring-all/.settings/org.eclipse.wst.ws.service.policy.prefs b/spring-exceptions/.settings/org.eclipse.wst.ws.service.policy.prefs
similarity index 100%
rename from spring-all/.settings/org.eclipse.wst.ws.service.policy.prefs
rename to spring-exceptions/.settings/org.eclipse.wst.ws.service.policy.prefs
diff --git a/spring-all/.springBeans b/spring-exceptions/.springBeans
similarity index 100%
rename from spring-all/.springBeans
rename to spring-exceptions/.springBeans
diff --git a/spring-all/README.md b/spring-exceptions/README.md
similarity index 100%
rename from spring-all/README.md
rename to spring-exceptions/README.md
diff --git a/spring-all/pom.xml b/spring-exceptions/pom.xml
similarity index 98%
rename from spring-all/pom.xml
rename to spring-exceptions/pom.xml
index 9dfb42a623..ddbbd6ff19 100644
--- a/spring-all/pom.xml
+++ b/spring-exceptions/pom.xml
@@ -1,10 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
-    <artifactId>spring-all</artifactId>
+    <artifactId>spring-exceptions</artifactId>
     <version>0.1-SNAPSHOT</version>
 
-    <name>spring-all</name>
+    <name>spring-exceptions</name>
     <packaging>war</packaging>
 
     <dependencies>
@@ -122,7 +122,7 @@
     </dependencies>
 
     <build>
-        <finalName>spring-all</finalName>
+        <finalName>spring-exceptions</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
rename to spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
rename to spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java
rename to spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java
rename to spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java
rename to spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java
rename to spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java
rename to spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/persistence/Setup.java b/spring-exceptions/src/main/java/org/baeldung/persistence/Setup.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/persistence/Setup.java
rename to spring-exceptions/src/main/java/org/baeldung/persistence/Setup.java
diff --git a/spring-all/src/main/java/org/baeldung/properties/core/ComponentInXmlUsingProperties.java b/spring-exceptions/src/main/java/org/baeldung/properties/core/ComponentInXmlUsingProperties.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/properties/core/ComponentInXmlUsingProperties.java
rename to spring-exceptions/src/main/java/org/baeldung/properties/core/ComponentInXmlUsingProperties.java
diff --git a/spring-all/src/main/java/org/baeldung/properties/core/ComponentUsingProperties.java b/spring-exceptions/src/main/java/org/baeldung/properties/core/ComponentUsingProperties.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/properties/core/ComponentUsingProperties.java
rename to spring-exceptions/src/main/java/org/baeldung/properties/core/ComponentUsingProperties.java
diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java b/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java
rename to spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfigOther.java b/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
rename to spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfig.java b/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfig.java
rename to spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigOne.java b/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigOne.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigOne.java
rename to spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigOne.java
diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java b/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java
rename to spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java b/spring-exceptions/src/main/java/org/baeldung/spring/config/CoreConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java
rename to spring-exceptions/src/main/java/org/baeldung/spring/config/CoreConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java b/spring-exceptions/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java
rename to spring-exceptions/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/MvcConfig.java b/spring-exceptions/src/main/java/org/baeldung/spring/config/MvcConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring/config/MvcConfig.java
rename to spring-exceptions/src/main/java/org/baeldung/spring/config/MvcConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/PersistenceConfig.java b/spring-exceptions/src/main/java/org/baeldung/spring/config/PersistenceConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring/config/PersistenceConfig.java
rename to spring-exceptions/src/main/java/org/baeldung/spring/config/PersistenceConfig.java
diff --git a/spring-all/src/main/resources/bar.properties b/spring-exceptions/src/main/resources/bar.properties
similarity index 100%
rename from spring-all/src/main/resources/bar.properties
rename to spring-exceptions/src/main/resources/bar.properties
diff --git a/spring-all/src/main/resources/configForProperties.xml b/spring-exceptions/src/main/resources/configForProperties.xml
similarity index 100%
rename from spring-all/src/main/resources/configForProperties.xml
rename to spring-exceptions/src/main/resources/configForProperties.xml
diff --git a/spring-all/src/main/resources/configForPropertiesOne.xml b/spring-exceptions/src/main/resources/configForPropertiesOne.xml
similarity index 100%
rename from spring-all/src/main/resources/configForPropertiesOne.xml
rename to spring-exceptions/src/main/resources/configForPropertiesOne.xml
diff --git a/spring-all/src/main/resources/configForPropertiesTwo.xml b/spring-exceptions/src/main/resources/configForPropertiesTwo.xml
similarity index 100%
rename from spring-all/src/main/resources/configForPropertiesTwo.xml
rename to spring-exceptions/src/main/resources/configForPropertiesTwo.xml
diff --git a/spring-all/src/main/resources/foo.properties b/spring-exceptions/src/main/resources/foo.properties
similarity index 100%
rename from spring-all/src/main/resources/foo.properties
rename to spring-exceptions/src/main/resources/foo.properties
diff --git a/spring-all/src/main/resources/logback.xml b/spring-exceptions/src/main/resources/logback.xml
similarity index 100%
rename from spring-all/src/main/resources/logback.xml
rename to spring-exceptions/src/main/resources/logback.xml
diff --git a/spring-all/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-exceptions/src/main/webapp/WEB-INF/mvc-servlet.xml
similarity index 100%
rename from spring-all/src/main/webapp/WEB-INF/mvc-servlet.xml
rename to spring-exceptions/src/main/webapp/WEB-INF/mvc-servlet.xml
diff --git a/spring-all/src/main/webapp/WEB-INF/view/sample.jsp b/spring-exceptions/src/main/webapp/WEB-INF/view/sample.jsp
similarity index 100%
rename from spring-all/src/main/webapp/WEB-INF/view/sample.jsp
rename to spring-exceptions/src/main/webapp/WEB-INF/view/sample.jsp
diff --git a/spring-all/src/main/webapp/WEB-INF/web_old.xml b/spring-exceptions/src/main/webapp/WEB-INF/web_old.xml
similarity index 100%
rename from spring-all/src/main/webapp/WEB-INF/web_old.xml
rename to spring-exceptions/src/main/webapp/WEB-INF/web_old.xml
diff --git a/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionIntegrationTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionIntegrationTest.java
rename to spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionIntegrationTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionIntegrationTest.java
rename to spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionIntegrationTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionIntegrationTest.java
rename to spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/properties/core/PropertiesWithJavaIntegrationTest.java b/spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithJavaIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/properties/core/PropertiesWithJavaIntegrationTest.java
rename to spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithJavaIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/properties/core/PropertiesWithMultipleXmlsIntegrationTest.java b/spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithMultipleXmlsIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/properties/core/PropertiesWithMultipleXmlsIntegrationTest.java
rename to spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithMultipleXmlsIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/properties/core/PropertiesWithXmlIntegrationTest.java b/spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithXmlIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/properties/core/PropertiesWithXmlIntegrationTest.java
rename to spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithXmlIntegrationTest.java
diff --git a/spring-all/src/test/resources/.gitignore b/spring-exceptions/src/test/resources/.gitignore
similarity index 100%
rename from spring-all/src/test/resources/.gitignore
rename to spring-exceptions/src/test/resources/.gitignore
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
index 64bdf24944..c76b6175d6 100644
--- a/spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java
+++ b/spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java
@@ -1,6 +1,7 @@
 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;
@@ -8,7 +9,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 import org.springframework.web.servlet.view.JstlView;
 
-// @Configuration
+@Configuration
 @EnableWebMvc
 public class MvcConfig extends WebMvcConfigurerAdapter {
 
diff --git a/spring-security-custom/src/main/resources/webSecurityConfig.xml b/spring-security-custom/src/main/resources/webSecurityConfig.xml
index 590adab8ce..55974f664d 100644
--- a/spring-security-custom/src/main/resources/webSecurityConfig.xml
+++ b/spring-security-custom/src/main/resources/webSecurityConfig.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/security"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="
+<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+    xsi:schemaLocation="
         http://www.springframework.org/schema/security 
         http://www.springframework.org/schema/security/spring-security-3.1.xsd
         http://www.springframework.org/schema/beans 
         http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
-	<http use-expressions="true">
-		<intercept-url pattern="/login*" access="permitAll" />
-		<intercept-url pattern="/**" access="isAuthenticated()" />
+    <http use-expressions="true">
+        <intercept-url pattern="/login*" access="permitAll" />
+        <intercept-url pattern="/**" access="isAuthenticated()" />
+        
+        <form-login 
+            login-page='/login.html' 
+            login-processing-url="/perform_login" 
+            default-target-url="/homepage.html"
+            authentication-failure-url="/login.html?error=true" 
+            always-use-default-target="true"/>
+            
+        <http-basic />
 
-		<!-- <form-login login-page='/login.html' login-processing-url="/perform_login" 
-			default-target-url="/homepage.html" authentication-failure-url="/login.html?error=true" -->
-		<!-- always-use-default-target="true" /> -->
+    </http>
 
-		<http-basic />
-
-	</http>
-
-	<authentication-manager>
-		<authentication-provider ref="customAuthenticationProvider" />
-	</authentication-manager>
+    <authentication-manager>
+        <authentication-provider ref="customAuthenticationProvider" />
+    </authentication-manager>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-security-custom/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-custom/src/main/webapp/WEB-INF/mvc-servlet.xml
new file mode 100644
index 0000000000..5463820874
--- /dev/null
+++ b/spring-security-custom/src/main/webapp/WEB-INF/mvc-servlet.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd" >
+
+</beans>
\ No newline at end of file
diff --git a/spring-security-custom/src/main/webapp/WEB-INF/web.xml b/spring-security-custom/src/main/webapp/WEB-INF/web.xml
index db64386b14..e7fbf52aae 100644
--- a/spring-security-custom/src/main/webapp/WEB-INF/web.xml
+++ b/spring-security-custom/src/main/webapp/WEB-INF/web.xml
@@ -1,52 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xsi:schemaLocation="
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	id="WebApp_ID" version="3.0">
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
 
-	<display-name>Spring Security Custom Application</display-name>
+    <display-name>Spring Security Custom Application</display-name>
 
-	<!-- Spring root -->
-	<context-param>
-		<param-name>contextClass</param-name>
-		<param-value>
+    <!-- Spring root -->
+    <context-param>
+        <param-name>contextClass</param-name>
+        <param-value>
          org.springframework.web.context.support.AnnotationConfigWebApplicationContext
       </param-value>
-	</context-param>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>org.baeldung.spring</param-value>
-	</context-param>
+    </context-param>
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>org.baeldung.spring</param-value>
+    </context-param>
 
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
 
-	<!-- Spring child -->
-	<servlet>
-		<servlet-name>api</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>api</servlet-name>
-		<url-pattern>/api/*</url-pattern>
-	</servlet-mapping>
+    <!-- Spring child -->
+    <servlet>
+        <servlet-name>api</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>api</servlet-name>
+        <url-pattern>/api/*</url-pattern>
+    </servlet-mapping>
 
-	<!-- Spring Security -->
-	<filter>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
+    <servlet>
+        <servlet-name>mvc</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>mvc</servlet-name>
+        <url-pattern>/*</url-pattern>
+    </servlet-mapping>
 
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
+    <!-- Spring Security -->
+    <filter>
+        <filter-name>springSecurityFilterChain</filter-name>
+        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>springSecurityFilterChain</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+<!--     <welcome-file-list> -->
+<!--         <welcome-file>index.html</welcome-file> -->
+<!--     </welcome-file-list> -->
 
 </web-app>
\ No newline at end of file