diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java
index bc1c9bc9a3..94cdb3a2bb 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java
@@ -2,7 +2,7 @@ package org.baeldung.persistence.service;
 
 import org.baeldung.persistence.model.User;
 import org.baeldung.persistence.model.VerificationToken;
-import org.baeldung.validation.service.EmailExistsException;
+import org.baeldung.validation.EmailExistsException;
 
 public interface IUserService {
 
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java
index 29a59be2fc..4dac41c533 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java
@@ -2,8 +2,8 @@ package org.baeldung.persistence.service;
 
 import javax.validation.constraints.NotNull;
 
-import org.baeldung.validation.service.PasswordMatches;
-import org.baeldung.validation.service.ValidEmail;
+import org.baeldung.validation.PasswordMatches;
+import org.baeldung.validation.ValidEmail;
 import org.hibernate.validator.constraints.NotEmpty;
 
 @PasswordMatches
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java
index a0b8ed4a4b..4b3abb0582 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java
@@ -2,13 +2,13 @@ package org.baeldung.persistence.service;
 
 import javax.transaction.Transactional;
 
-import org.baeldung.hashing.HashGenerator;
 import org.baeldung.persistence.dao.UserRepository;
 import org.baeldung.persistence.dao.VerificationTokenRepository;
 import org.baeldung.persistence.model.Role;
 import org.baeldung.persistence.model.User;
 import org.baeldung.persistence.model.VerificationToken;
-import org.baeldung.validation.service.EmailExistsException;
+import org.baeldung.security.hash.HashGenerator;
+import org.baeldung.validation.EmailExistsException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/hashing/HashGenerator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/hash/HashGenerator.java
similarity index 90%
rename from spring-security-login-and-registration/src/main/java/org/baeldung/hashing/HashGenerator.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/security/hash/HashGenerator.java
index bf9620a052..6032cf4108 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/hashing/HashGenerator.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/security/hash/HashGenerator.java
@@ -1,4 +1,4 @@
-package org.baeldung.hashing;
+package org.baeldung.security.hash;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
index 9948ca5342..ce7f022c7d 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
@@ -2,9 +2,9 @@ package org.baeldung.spring;
 
 import java.util.Locale;
 
-import org.baeldung.hashing.HashGenerator;
-import org.baeldung.validation.service.EmailValidator;
-import org.baeldung.validation.service.PasswordMatchesValidator;
+import org.baeldung.security.hash.HashGenerator;
+import org.baeldung.validation.EmailValidator;
+import org.baeldung.validation.PasswordMatchesValidator;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/EmailExistsException.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailExistsException.java
similarity index 80%
rename from spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/EmailExistsException.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailExistsException.java
index 7b60bb9f08..952931bcff 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/EmailExistsException.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailExistsException.java
@@ -1,4 +1,4 @@
-package org.baeldung.validation.service;
+package org.baeldung.validation;
 
 @SuppressWarnings("serial")
 public class EmailExistsException extends Throwable {
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/EmailValidator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailValidator.java
similarity index 95%
rename from spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/EmailValidator.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailValidator.java
index 1ff8c4251f..bd69c7d550 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/EmailValidator.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailValidator.java
@@ -1,4 +1,4 @@
-package org.baeldung.validation.service;
+package org.baeldung.validation;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/PasswordMatches.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java
similarity index 94%
rename from spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/PasswordMatches.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java
index 63cfb297f0..a8322ad2f3 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/PasswordMatches.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java
@@ -1,4 +1,4 @@
-package org.baeldung.validation.service;
+package org.baeldung.validation;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/PasswordMatchesValidator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatchesValidator.java
similarity index 92%
rename from spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/PasswordMatchesValidator.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatchesValidator.java
index 99f569957b..e8ec952fa8 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/PasswordMatchesValidator.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatchesValidator.java
@@ -1,4 +1,4 @@
-package org.baeldung.validation.service;
+package org.baeldung.validation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/UserValidator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/UserValidator.java
similarity index 95%
rename from spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/UserValidator.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/UserValidator.java
index 45de9e3a94..cfd3a78f81 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/UserValidator.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/UserValidator.java
@@ -1,4 +1,4 @@
-package org.baeldung.validation.service;
+package org.baeldung.validation;
 
 import org.baeldung.persistence.service.UserDto;
 import org.springframework.validation.Errors;
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/ValidEmail.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java
similarity index 94%
rename from spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/ValidEmail.java
rename to spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java
index df852351c3..fa556c417c 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/service/ValidEmail.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java
@@ -1,4 +1,4 @@
-package org.baeldung.validation.service;
+package org.baeldung.validation;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
index a88f355577..3db7764c93 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
@@ -10,7 +10,7 @@ import org.baeldung.persistence.model.VerificationToken;
 import org.baeldung.persistence.service.UserDto;
 import org.baeldung.persistence.service.IUserService;
 import org.baeldung.registration.OnRegistrationCompleteEvent;
-import org.baeldung.validation.service.EmailExistsException;
+import org.baeldung.validation.EmailExistsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;