diff --git a/javaxval/src/main/java/org/baeldung/User.java b/javaxval/src/main/java/org/baeldung/javaxval/beanvalidation/User.java
similarity index 97%
rename from javaxval/src/main/java/org/baeldung/User.java
rename to javaxval/src/main/java/org/baeldung/javaxval/beanvalidation/User.java
index e2f2732399..cf80266c9d 100644
--- a/javaxval/src/main/java/org/baeldung/User.java
+++ b/javaxval/src/main/java/org/baeldung/javaxval/beanvalidation/User.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package org.baeldung.javaxval.beanvalidation;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/javaxval/src/test/java/org/baeldung/ValidationIntegrationTest.java b/javaxval/src/test/java/org/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java
similarity index 97%
rename from javaxval/src/test/java/org/baeldung/ValidationIntegrationTest.java
rename to javaxval/src/test/java/org/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java
index 78745a1af2..6639d60ac6 100644
--- a/javaxval/src/test/java/org/baeldung/ValidationIntegrationTest.java
+++ b/javaxval/src/test/java/org/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java
@@ -1,20 +1,18 @@
-package org.baeldung;
+package org.baeldung.javaxval.beanvalidation;
+
+import static org.junit.Assert.assertEquals;
 
 import java.time.LocalDate;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.Set;
 
-import java.util.Optional;
-
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
 
-import static org.junit.Assert.*;
-import org.junit.Test;
 import org.junit.Before;
+import org.junit.Test;
 
 public class ValidationIntegrationTest {
 
diff --git a/spring-security-mvc-login/src/main/java/com/baeldung/spring/SecSecurityConfig.java b/spring-security-mvc-login/src/main/java/com/baeldung/security/config/SecSecurityConfig.java
similarity index 98%
rename from spring-security-mvc-login/src/main/java/com/baeldung/spring/SecSecurityConfig.java
rename to spring-security-mvc-login/src/main/java/com/baeldung/security/config/SecSecurityConfig.java
index 08a83f8633..15fa06aa3e 100644
--- a/spring-security-mvc-login/src/main/java/com/baeldung/spring/SecSecurityConfig.java
+++ b/spring-security-mvc-login/src/main/java/com/baeldung/security/config/SecSecurityConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring;
+package com.baeldung.security.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-security-mvc-login/src/test/java/com/baeldung/security/FormLoginUnitTest.java b/spring-security-mvc-login/src/test/java/com/baeldung/security/FormLoginUnitTest.java
index b7d959bf36..01cb8e7b67 100644
--- a/spring-security-mvc-login/src/test/java/com/baeldung/security/FormLoginUnitTest.java
+++ b/spring-security-mvc-login/src/test/java/com/baeldung/security/FormLoginUnitTest.java
@@ -12,7 +12,7 @@ import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.baeldung.spring.SecSecurityConfig;
+import com.baeldung.security.config.SecSecurityConfig;
 
 import javax.servlet.Filter;