diff --git a/spring-security-login-error-handling/.classpath b/spring-security-login-and-registration/.classpath
similarity index 100%
rename from spring-security-login-error-handling/.classpath
rename to spring-security-login-and-registration/.classpath
diff --git a/spring-security-login-error-handling/.project b/spring-security-login-and-registration/.project
similarity index 100%
rename from spring-security-login-error-handling/.project
rename to spring-security-login-and-registration/.project
diff --git a/spring-security-login-error-handling/.springBeans b/spring-security-login-and-registration/.springBeans
similarity index 100%
rename from spring-security-login-error-handling/.springBeans
rename to spring-security-login-and-registration/.springBeans
diff --git a/spring-security-login-error-handling/pom.xml b/spring-security-login-and-registration/pom.xml
similarity index 100%
rename from spring-security-login-error-handling/pom.xml
rename to spring-security-login-and-registration/pom.xml
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/persistence/dao/UserRepository.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/UserRepository.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/persistence/dao/UserRepository.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/UserRepository.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/persistence/model/Role.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/persistence/model/Role.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/persistence/model/User.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/persistence/model/User.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/IUserService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/IUserService.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/UserDto.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/UserDto.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/UserService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/UserService.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/security/MyUserDetailsService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/security/MyUserDetailsService.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/spring/AppConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/AppConfig.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/spring/AppConfig.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/spring/AppConfig.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/spring/MvcConfig.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/spring/SecSecurityConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/spring/SecSecurityConfig.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/EmailExistsException.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/EmailExistsException.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/EmailExistsException.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/EmailExistsException.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/EmailValidator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/EmailValidator.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/EmailValidator.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/EmailValidator.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/PasswordMatches.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/PasswordMatches.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/PasswordMatches.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/PasswordMatches.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/PasswordMatchesValidator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/PasswordMatchesValidator.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/PasswordMatchesValidator.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/PasswordMatchesValidator.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/UserValidator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/UserValidator.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/UserValidator.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/UserValidator.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/ValidEmail.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/ValidEmail.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/validation/service/ValidEmail.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/ValidEmail.java
diff --git a/spring-security-login-error-handling/src/main/java/org/baeldung/web/controller/RegistrationController.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
similarity index 100%
rename from spring-security-login-error-handling/src/main/java/org/baeldung/web/controller/RegistrationController.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
diff --git a/spring-security-login-error-handling/src/main/resources/application.properties b/spring-security-login-and-registration/src/main/resources/application.properties
similarity index 100%
rename from spring-security-login-error-handling/src/main/resources/application.properties
rename to spring-security-login-and-registration/src/main/resources/application.properties
diff --git a/spring-security-login-error-handling/src/main/resources/logback.xml b/spring-security-login-and-registration/src/main/resources/logback.xml
similarity index 100%
rename from spring-security-login-error-handling/src/main/resources/logback.xml
rename to spring-security-login-and-registration/src/main/resources/logback.xml
diff --git a/spring-security-login-error-handling/src/main/resources/messages_en.properties b/spring-security-login-and-registration/src/main/resources/messages_en.properties
similarity index 100%
rename from spring-security-login-error-handling/src/main/resources/messages_en.properties
rename to spring-security-login-and-registration/src/main/resources/messages_en.properties
diff --git a/spring-security-login-error-handling/src/main/resources/messages_es_ES.properties b/spring-security-login-and-registration/src/main/resources/messages_es_ES.properties
similarity index 100%
rename from spring-security-login-error-handling/src/main/resources/messages_es_ES.properties
rename to spring-security-login-and-registration/src/main/resources/messages_es_ES.properties
diff --git a/spring-security-login-error-handling/src/main/resources/webSecurityConfig.xml b/spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml
similarity index 100%
rename from spring-security-login-error-handling/src/main/resources/webSecurityConfig.xml
rename to spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml
diff --git a/spring-security-login-error-handling/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-login-and-registration/src/main/webapp/WEB-INF/mvc-servlet.xml
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/WEB-INF/mvc-servlet.xml
rename to spring-security-login-and-registration/src/main/webapp/WEB-INF/mvc-servlet.xml
diff --git a/spring-security-login-error-handling/src/main/webapp/WEB-INF/view/admin.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/WEB-INF/view/admin.jsp
rename to spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp
diff --git a/spring-security-login-error-handling/src/main/webapp/WEB-INF/view/console.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/WEB-INF/view/console.jsp
rename to spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp
diff --git a/spring-security-login-error-handling/src/main/webapp/WEB-INF/view/home.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/home.jsp
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/WEB-INF/view/home.jsp
rename to spring-security-login-and-registration/src/main/webapp/WEB-INF/view/home.jsp
diff --git a/spring-security-login-error-handling/src/main/webapp/WEB-INF/view/homepage.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/homepage.jsp
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/WEB-INF/view/homepage.jsp
rename to spring-security-login-and-registration/src/main/webapp/WEB-INF/view/homepage.jsp
diff --git a/spring-security-login-error-handling/src/main/webapp/WEB-INF/view/invalidSession.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/invalidSession.jsp
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/WEB-INF/view/invalidSession.jsp
rename to spring-security-login-and-registration/src/main/webapp/WEB-INF/view/invalidSession.jsp
diff --git a/spring-security-login-error-handling/src/main/webapp/WEB-INF/view/login.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/WEB-INF/view/login.jsp
rename to spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp
diff --git a/spring-security-login-error-handling/src/main/webapp/WEB-INF/view/logout.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/WEB-INF/view/logout.jsp
rename to spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp
diff --git a/spring-security-login-error-handling/src/main/webapp/WEB-INF/view/registration.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/WEB-INF/view/registration.jsp
rename to spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp
diff --git a/spring-security-login-error-handling/src/main/webapp/WEB-INF/view/successRegister.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/successRegister.jsp
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/WEB-INF/view/successRegister.jsp
rename to spring-security-login-and-registration/src/main/webapp/WEB-INF/view/successRegister.jsp
diff --git a/spring-security-login-error-handling/src/main/webapp/WEB-INF/web.xml b/spring-security-login-and-registration/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/WEB-INF/web.xml
rename to spring-security-login-and-registration/src/main/webapp/WEB-INF/web.xml
diff --git a/spring-security-login-error-handling/src/main/webapp/resources/bootstrap.css b/spring-security-login-and-registration/src/main/webapp/resources/bootstrap.css
similarity index 100%
rename from spring-security-login-error-handling/src/main/webapp/resources/bootstrap.css
rename to spring-security-login-and-registration/src/main/webapp/resources/bootstrap.css