diff --git a/README.md b/README.md
index acb50e7..c509d56 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 csv-validator
 =============
 
-CSV validator library
\ No newline at end of file
+CSV validator library.
+
+Works in progress. You should not use this package.
diff --git a/composer.json b/composer.json
index 9f6fff3..8afa235 100644
--- a/composer.json
+++ b/composer.json
@@ -9,8 +9,8 @@
         }
     ],
     "autoload": {
-        "psr-0": {
-            "": "src/"
+        "psr-4": {
+            "Deblan\\CsvValidator\\": "src/Deblan/CsvValidator/"
         }
     },
     "minimum-stability": "stable",
diff --git a/src/Deblan/Validator/Constraints/Csv.php b/src/Deblan/CsvValidator/Constraints/Csv.php
similarity index 94%
rename from src/Deblan/Validator/Constraints/Csv.php
rename to src/Deblan/CsvValidator/Constraints/Csv.php
index 23c9485..5a49ac0 100644
--- a/src/Deblan/Validator/Constraints/Csv.php
+++ b/src/Deblan/CsvValidator/Constraints/Csv.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Deblan\Validator\Constraints;
+namespace Deblan\CsvValidator\Constraints;
 
 use Symfony\Component\Validator\Constraints\File;
 
diff --git a/src/Deblan/Validator/Constraints/CsvValidator.php b/src/Deblan/CsvValidator/Constraints/CsvValidator.php
similarity index 98%
rename from src/Deblan/Validator/Constraints/CsvValidator.php
rename to src/Deblan/CsvValidator/Constraints/CsvValidator.php
index 711d0b8..5bf8d99 100644
--- a/src/Deblan/Validator/Constraints/CsvValidator.php
+++ b/src/Deblan/CsvValidator/Constraints/CsvValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Deblan\Validator\Constraints;
+namespace Deblan\CsvValidator\Constraints;
 
 use Symfony\Component\Validator\Constraints\FileValidator;
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Deblan/Validator/Validator.php b/src/Deblan/CsvValidator/Validator.php
similarity index 93%
rename from src/Deblan/Validator/Validator.php
rename to src/Deblan/CsvValidator/Validator.php
index 5954c03..e67b1c7 100644
--- a/src/Deblan/Validator/Validator.php
+++ b/src/Deblan/CsvValidator/Validator.php
@@ -4,8 +4,8 @@ namespace Deblan\CsvValidator;
 
 use Deblan\Csv\CsvParser;
 use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Validator\LegacyValidator;
 use Symfony\Component\Validator\ConstraintViolationList;
+use Symfony\Component\Validator\Validator\RecursiveValidator;
 
 class Validator
 {
@@ -21,7 +21,7 @@ class Validator
 
     protected $errors = [];
 
-    public function __construct(CsvParser $parser, LegacyValidator $validator)
+    public function __construct(CsvParser $parser, RecursiveValidator $validator)
     {
         $this->parser = $parser;
         $this->parser->parse();
@@ -77,6 +77,10 @@ class Validator
 
     protected function mergeViolationsMessages(ConstraintViolationList $violations, $line, $key = null)
     {
+        if (count($violations) === 0) {
+            return;
+        }
+
         if (!array_key_exists($line, $this->errors)) {
             $this->errors[$line] = [];
         }