diff --git a/vavr/vavr-validation/src/main/java/com/baeldung/vavrvalidation/application/Application.java b/vavr/src/main/java/com/baeldung/vavrvalidation/application/Application.java
similarity index 95%
rename from vavr/vavr-validation/src/main/java/com/baeldung/vavrvalidation/application/Application.java
rename to vavr/src/main/java/com/baeldung/vavrvalidation/application/Application.java
index 8acc4522af..a23ed185c8 100644
--- a/vavr/vavr-validation/src/main/java/com/baeldung/vavrvalidation/application/Application.java
+++ b/vavr/src/main/java/com/baeldung/vavrvalidation/application/Application.java
@@ -8,10 +8,10 @@ import io.vavr.control.Validation;
 public class Application {
 
     public static void main(String[] args) {
-        
+
         UserValidator userValidator = new UserValidator();
         Validation<Seq<String>, User> validation = userValidator.validateUser("John", "john@domain.com");
-        
+
         // process validation results here
-	}	
+    }	
 }
diff --git a/vavr/vavr-validation/src/main/java/com/baeldung/vavrvalidation/model/User.java b/vavr/src/main/java/com/baeldung/vavrvalidation/model/User.java
similarity index 100%
rename from vavr/vavr-validation/src/main/java/com/baeldung/vavrvalidation/model/User.java
rename to vavr/src/main/java/com/baeldung/vavrvalidation/model/User.java
diff --git a/vavr/vavr-validation/src/main/java/com/baeldung/vavrvalidation/validator/UserValidator.java b/vavr/src/main/java/com/baeldung/vavrvalidation/validator/UserValidator.java
similarity index 100%
rename from vavr/vavr-validation/src/main/java/com/baeldung/vavrvalidation/validator/UserValidator.java
rename to vavr/src/main/java/com/baeldung/vavrvalidation/validator/UserValidator.java
diff --git a/vavr/vavr-validation/src/test/java/com/baeldung/vavrvalidation/validator/UserValidatorTest.java b/vavr/src/test/java/com/baeldung/vavrvalidation/validator/UserValidatorUnitTest.java
similarity index 95%
rename from vavr/vavr-validation/src/test/java/com/baeldung/vavrvalidation/validator/UserValidatorTest.java
rename to vavr/src/test/java/com/baeldung/vavrvalidation/validator/UserValidatorUnitTest.java
index cb9557fa53..8ac6100b27 100644
--- a/vavr/vavr-validation/src/test/java/com/baeldung/vavrvalidation/validator/UserValidatorTest.java
+++ b/vavr/src/test/java/com/baeldung/vavrvalidation/validator/UserValidatorUnitTest.java
@@ -7,7 +7,7 @@ import com.baeldung.vavrvalidation.validator.UserValidator;
 import io.vavr.control.Validation.Invalid;
 import io.vavr.control.Validation.Valid;
 
-public class UserValidatorTest {
+public class UserValidatorUnitTest {
     
     @Test
     public void givenValidUserParams_whenValidated_thenInstanceOfValid() {
diff --git a/vavr/vavr-validation/src/test/java/com/baeldung/vavrvalidation/validator/ValidationTest.java b/vavr/src/test/java/com/baeldung/vavrvalidation/validator/ValidationUnitTest.java
similarity index 98%
rename from vavr/vavr-validation/src/test/java/com/baeldung/vavrvalidation/validator/ValidationTest.java
rename to vavr/src/test/java/com/baeldung/vavrvalidation/validator/ValidationUnitTest.java
index c89b43b5e3..7b8c551aeb 100644
--- a/vavr/vavr-validation/src/test/java/com/baeldung/vavrvalidation/validator/ValidationTest.java
+++ b/vavr/src/test/java/com/baeldung/vavrvalidation/validator/ValidationUnitTest.java
@@ -11,7 +11,7 @@ import io.vavr.control.Either.Right;
 import io.vavr.control.Validation.Invalid;
 import io.vavr.control.Validation.Valid;
 
-public class ValidationTest {
+public class ValidationUnitTest {
 	
     private static UserValidator userValidator;