diff --git a/.gitattributes b/.gitattributes
index c26a1fd..a5b5f9a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
-/Tests export-ignore
 /documentation export-ignore
+/tests export-ignore
 /.* export-ignore
 /phpunit.xml.dist export-ignore
 /psalm.xml export-ignore
diff --git a/composer.json b/composer.json
index 595caff..a275696 100644
--- a/composer.json
+++ b/composer.json
@@ -18,21 +18,21 @@
     "symfony/polyfill-intl-idn": "^1.10"
   },
   "require-dev": {
-    "satooshi/php-coveralls": "^1.0.1",
+    "dominicsayers/isemail": "^3.0.7",
     "phpunit/phpunit": "^4.8.36|^7.5.15",
-    "dominicsayers/isemail": "^3.0.7"
+    "satooshi/php-coveralls": "^1.0.1"
   },
   "suggest": {
     "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
   },
   "autoload": {
     "psr-4": {
-      "Egulias\\EmailValidator\\": "EmailValidator"
+      "Egulias\\EmailValidator\\": "src"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Egulias\\Tests\\": "Tests"
+      "Egulias\\EmailValidator\\Tests\\": "tests"
     }
   }
 }
diff --git a/psalm.baseline.xml b/psalm.baseline.xml
index f81df72..13a922e 100644
--- a/psalm.baseline.xml
+++ b/psalm.baseline.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="3.8.3@389af1bfc739bfdff3f9e3dc7bd6499aee51a831">
-  <file src="EmailValidator/EmailLexer.php">
+  <file src="src/EmailLexer.php">
     <DocblockTypeContradiction occurrences="1">
       <code>self::$nullToken</code>
     </DocblockTypeContradiction>
   </file>
-  <file src="EmailValidator/Parser/Parser.php">
+  <file src="src/Parser/Parser.php">
     <MissingReturnType occurrences="1">
       <code>parse</code>
     </MissingReturnType>
   </file>
-  <file src="EmailValidator/Validation/SpoofCheckValidation.php">
+  <file src="src/Validation/SpoofCheckValidation.php">
     <UndefinedClass occurrences="2">
       <code>Spoofchecker</code>
       <code>Spoofchecker</code>
diff --git a/psalm.xml b/psalm.xml
index fb17dc8..e6be752 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -8,7 +8,7 @@
     errorBaseline="./psalm.baseline.xml"
 >
     <projectFiles>
-        <directory name="EmailValidator" />
+        <directory name="src" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>
diff --git a/EmailValidator/EmailLexer.php b/src/EmailLexer.php
similarity index 100%
rename from EmailValidator/EmailLexer.php
rename to src/EmailLexer.php
diff --git a/EmailValidator/EmailParser.php b/src/EmailParser.php
similarity index 100%
rename from EmailValidator/EmailParser.php
rename to src/EmailParser.php
diff --git a/EmailValidator/EmailValidator.php b/src/EmailValidator.php
similarity index 100%
rename from EmailValidator/EmailValidator.php
rename to src/EmailValidator.php
diff --git a/EmailValidator/Exception/AtextAfterCFWS.php b/src/Exception/AtextAfterCFWS.php
similarity index 100%
rename from EmailValidator/Exception/AtextAfterCFWS.php
rename to src/Exception/AtextAfterCFWS.php
diff --git a/EmailValidator/Exception/CRLFAtTheEnd.php b/src/Exception/CRLFAtTheEnd.php
similarity index 100%
rename from EmailValidator/Exception/CRLFAtTheEnd.php
rename to src/Exception/CRLFAtTheEnd.php
diff --git a/EmailValidator/Exception/CRLFX2.php b/src/Exception/CRLFX2.php
similarity index 100%
rename from EmailValidator/Exception/CRLFX2.php
rename to src/Exception/CRLFX2.php
diff --git a/EmailValidator/Exception/CRNoLF.php b/src/Exception/CRNoLF.php
similarity index 100%
rename from EmailValidator/Exception/CRNoLF.php
rename to src/Exception/CRNoLF.php
diff --git a/EmailValidator/Exception/CharNotAllowed.php b/src/Exception/CharNotAllowed.php
similarity index 100%
rename from EmailValidator/Exception/CharNotAllowed.php
rename to src/Exception/CharNotAllowed.php
diff --git a/EmailValidator/Exception/CommaInDomain.php b/src/Exception/CommaInDomain.php
similarity index 100%
rename from EmailValidator/Exception/CommaInDomain.php
rename to src/Exception/CommaInDomain.php
diff --git a/EmailValidator/Exception/ConsecutiveAt.php b/src/Exception/ConsecutiveAt.php
similarity index 100%
rename from EmailValidator/Exception/ConsecutiveAt.php
rename to src/Exception/ConsecutiveAt.php
diff --git a/EmailValidator/Exception/ConsecutiveDot.php b/src/Exception/ConsecutiveDot.php
similarity index 100%
rename from EmailValidator/Exception/ConsecutiveDot.php
rename to src/Exception/ConsecutiveDot.php
diff --git a/EmailValidator/Exception/DomainHyphened.php b/src/Exception/DomainHyphened.php
similarity index 100%
rename from EmailValidator/Exception/DomainHyphened.php
rename to src/Exception/DomainHyphened.php
diff --git a/EmailValidator/Exception/DotAtEnd.php b/src/Exception/DotAtEnd.php
similarity index 100%
rename from EmailValidator/Exception/DotAtEnd.php
rename to src/Exception/DotAtEnd.php
diff --git a/EmailValidator/Exception/DotAtStart.php b/src/Exception/DotAtStart.php
similarity index 100%
rename from EmailValidator/Exception/DotAtStart.php
rename to src/Exception/DotAtStart.php
diff --git a/EmailValidator/Exception/ExpectingAT.php b/src/Exception/ExpectingAT.php
similarity index 100%
rename from EmailValidator/Exception/ExpectingAT.php
rename to src/Exception/ExpectingAT.php
diff --git a/EmailValidator/Exception/ExpectingATEXT.php b/src/Exception/ExpectingATEXT.php
similarity index 100%
rename from EmailValidator/Exception/ExpectingATEXT.php
rename to src/Exception/ExpectingATEXT.php
diff --git a/EmailValidator/Exception/ExpectingCTEXT.php b/src/Exception/ExpectingCTEXT.php
similarity index 100%
rename from EmailValidator/Exception/ExpectingCTEXT.php
rename to src/Exception/ExpectingCTEXT.php
diff --git a/EmailValidator/Exception/ExpectingDTEXT.php b/src/Exception/ExpectingDTEXT.php
similarity index 100%
rename from EmailValidator/Exception/ExpectingDTEXT.php
rename to src/Exception/ExpectingDTEXT.php
diff --git a/EmailValidator/Exception/ExpectingDomainLiteralClose.php b/src/Exception/ExpectingDomainLiteralClose.php
similarity index 100%
rename from EmailValidator/Exception/ExpectingDomainLiteralClose.php
rename to src/Exception/ExpectingDomainLiteralClose.php
diff --git a/EmailValidator/Exception/ExpectingQPair.php b/src/Exception/ExpectingQPair.php
similarity index 100%
rename from EmailValidator/Exception/ExpectingQPair.php
rename to src/Exception/ExpectingQPair.php
diff --git a/EmailValidator/Exception/InvalidEmail.php b/src/Exception/InvalidEmail.php
similarity index 100%
rename from EmailValidator/Exception/InvalidEmail.php
rename to src/Exception/InvalidEmail.php
diff --git a/EmailValidator/Exception/NoDNSRecord.php b/src/Exception/NoDNSRecord.php
similarity index 100%
rename from EmailValidator/Exception/NoDNSRecord.php
rename to src/Exception/NoDNSRecord.php
diff --git a/EmailValidator/Exception/NoDomainPart.php b/src/Exception/NoDomainPart.php
similarity index 100%
rename from EmailValidator/Exception/NoDomainPart.php
rename to src/Exception/NoDomainPart.php
diff --git a/EmailValidator/Exception/NoLocalPart.php b/src/Exception/NoLocalPart.php
similarity index 100%
rename from EmailValidator/Exception/NoLocalPart.php
rename to src/Exception/NoLocalPart.php
diff --git a/EmailValidator/Exception/UnclosedComment.php b/src/Exception/UnclosedComment.php
similarity index 100%
rename from EmailValidator/Exception/UnclosedComment.php
rename to src/Exception/UnclosedComment.php
diff --git a/EmailValidator/Exception/UnclosedQuotedString.php b/src/Exception/UnclosedQuotedString.php
similarity index 100%
rename from EmailValidator/Exception/UnclosedQuotedString.php
rename to src/Exception/UnclosedQuotedString.php
diff --git a/EmailValidator/Exception/UnopenedComment.php b/src/Exception/UnopenedComment.php
similarity index 100%
rename from EmailValidator/Exception/UnopenedComment.php
rename to src/Exception/UnopenedComment.php
diff --git a/EmailValidator/Parser/DomainPart.php b/src/Parser/DomainPart.php
similarity index 100%
rename from EmailValidator/Parser/DomainPart.php
rename to src/Parser/DomainPart.php
diff --git a/EmailValidator/Parser/LocalPart.php b/src/Parser/LocalPart.php
similarity index 100%
rename from EmailValidator/Parser/LocalPart.php
rename to src/Parser/LocalPart.php
diff --git a/EmailValidator/Parser/Parser.php b/src/Parser/Parser.php
similarity index 99%
rename from EmailValidator/Parser/Parser.php
rename to src/Parser/Parser.php
index d0673b9..ccdc938 100644
--- a/EmailValidator/Parser/Parser.php
+++ b/src/Parser/Parser.php
@@ -22,7 +22,7 @@ use Egulias\EmailValidator\Warning\QuotedString;
 abstract class Parser
 {
     /**
-     * @var \Egulias\EmailValidator\Warning\Warning[]
+     * @var array
      */
     protected $warnings = [];
 
diff --git a/EmailValidator/Validation/DNSCheckValidation.php b/src/Validation/DNSCheckValidation.php
similarity index 100%
rename from EmailValidator/Validation/DNSCheckValidation.php
rename to src/Validation/DNSCheckValidation.php
diff --git a/EmailValidator/Validation/EmailValidation.php b/src/Validation/EmailValidation.php
similarity index 100%
rename from EmailValidator/Validation/EmailValidation.php
rename to src/Validation/EmailValidation.php
diff --git a/EmailValidator/Validation/Error/RFCWarnings.php b/src/Validation/Error/RFCWarnings.php
similarity index 100%
rename from EmailValidator/Validation/Error/RFCWarnings.php
rename to src/Validation/Error/RFCWarnings.php
diff --git a/EmailValidator/Validation/Error/SpoofEmail.php b/src/Validation/Error/SpoofEmail.php
similarity index 100%
rename from EmailValidator/Validation/Error/SpoofEmail.php
rename to src/Validation/Error/SpoofEmail.php
diff --git a/EmailValidator/Validation/Exception/EmptyValidationList.php b/src/Validation/Exception/EmptyValidationList.php
similarity index 100%
rename from EmailValidator/Validation/Exception/EmptyValidationList.php
rename to src/Validation/Exception/EmptyValidationList.php
diff --git a/EmailValidator/Validation/MultipleErrors.php b/src/Validation/MultipleErrors.php
similarity index 100%
rename from EmailValidator/Validation/MultipleErrors.php
rename to src/Validation/MultipleErrors.php
diff --git a/EmailValidator/Validation/MultipleValidationWithAnd.php b/src/Validation/MultipleValidationWithAnd.php
similarity index 100%
rename from EmailValidator/Validation/MultipleValidationWithAnd.php
rename to src/Validation/MultipleValidationWithAnd.php
diff --git a/EmailValidator/Validation/NoRFCWarningsValidation.php b/src/Validation/NoRFCWarningsValidation.php
similarity index 100%
rename from EmailValidator/Validation/NoRFCWarningsValidation.php
rename to src/Validation/NoRFCWarningsValidation.php
diff --git a/EmailValidator/Validation/RFCValidation.php b/src/Validation/RFCValidation.php
similarity index 100%
rename from EmailValidator/Validation/RFCValidation.php
rename to src/Validation/RFCValidation.php
diff --git a/EmailValidator/Validation/SpoofCheckValidation.php b/src/Validation/SpoofCheckValidation.php
similarity index 100%
rename from EmailValidator/Validation/SpoofCheckValidation.php
rename to src/Validation/SpoofCheckValidation.php
diff --git a/EmailValidator/Warning/AddressLiteral.php b/src/Warning/AddressLiteral.php
similarity index 100%
rename from EmailValidator/Warning/AddressLiteral.php
rename to src/Warning/AddressLiteral.php
diff --git a/EmailValidator/Warning/CFWSNearAt.php b/src/Warning/CFWSNearAt.php
similarity index 100%
rename from EmailValidator/Warning/CFWSNearAt.php
rename to src/Warning/CFWSNearAt.php
diff --git a/EmailValidator/Warning/CFWSWithFWS.php b/src/Warning/CFWSWithFWS.php
similarity index 100%
rename from EmailValidator/Warning/CFWSWithFWS.php
rename to src/Warning/CFWSWithFWS.php
diff --git a/EmailValidator/Warning/Comment.php b/src/Warning/Comment.php
similarity index 100%
rename from EmailValidator/Warning/Comment.php
rename to src/Warning/Comment.php
diff --git a/EmailValidator/Warning/DeprecatedComment.php b/src/Warning/DeprecatedComment.php
similarity index 100%
rename from EmailValidator/Warning/DeprecatedComment.php
rename to src/Warning/DeprecatedComment.php
diff --git a/EmailValidator/Warning/DomainLiteral.php b/src/Warning/DomainLiteral.php
similarity index 100%
rename from EmailValidator/Warning/DomainLiteral.php
rename to src/Warning/DomainLiteral.php
diff --git a/EmailValidator/Warning/DomainTooLong.php b/src/Warning/DomainTooLong.php
similarity index 100%
rename from EmailValidator/Warning/DomainTooLong.php
rename to src/Warning/DomainTooLong.php
diff --git a/EmailValidator/Warning/EmailTooLong.php b/src/Warning/EmailTooLong.php
similarity index 100%
rename from EmailValidator/Warning/EmailTooLong.php
rename to src/Warning/EmailTooLong.php
diff --git a/EmailValidator/Warning/IPV6BadChar.php b/src/Warning/IPV6BadChar.php
similarity index 100%
rename from EmailValidator/Warning/IPV6BadChar.php
rename to src/Warning/IPV6BadChar.php
diff --git a/EmailValidator/Warning/IPV6ColonEnd.php b/src/Warning/IPV6ColonEnd.php
similarity index 100%
rename from EmailValidator/Warning/IPV6ColonEnd.php
rename to src/Warning/IPV6ColonEnd.php
diff --git a/EmailValidator/Warning/IPV6ColonStart.php b/src/Warning/IPV6ColonStart.php
similarity index 100%
rename from EmailValidator/Warning/IPV6ColonStart.php
rename to src/Warning/IPV6ColonStart.php
diff --git a/EmailValidator/Warning/IPV6Deprecated.php b/src/Warning/IPV6Deprecated.php
similarity index 100%
rename from EmailValidator/Warning/IPV6Deprecated.php
rename to src/Warning/IPV6Deprecated.php
diff --git a/EmailValidator/Warning/IPV6DoubleColon.php b/src/Warning/IPV6DoubleColon.php
similarity index 100%
rename from EmailValidator/Warning/IPV6DoubleColon.php
rename to src/Warning/IPV6DoubleColon.php
diff --git a/EmailValidator/Warning/IPV6GroupCount.php b/src/Warning/IPV6GroupCount.php
similarity index 100%
rename from EmailValidator/Warning/IPV6GroupCount.php
rename to src/Warning/IPV6GroupCount.php
diff --git a/EmailValidator/Warning/IPV6MaxGroups.php b/src/Warning/IPV6MaxGroups.php
similarity index 100%
rename from EmailValidator/Warning/IPV6MaxGroups.php
rename to src/Warning/IPV6MaxGroups.php
diff --git a/EmailValidator/Warning/LabelTooLong.php b/src/Warning/LabelTooLong.php
similarity index 100%
rename from EmailValidator/Warning/LabelTooLong.php
rename to src/Warning/LabelTooLong.php
diff --git a/EmailValidator/Warning/LocalTooLong.php b/src/Warning/LocalTooLong.php
similarity index 100%
rename from EmailValidator/Warning/LocalTooLong.php
rename to src/Warning/LocalTooLong.php
diff --git a/EmailValidator/Warning/NoDNSMXRecord.php b/src/Warning/NoDNSMXRecord.php
similarity index 100%
rename from EmailValidator/Warning/NoDNSMXRecord.php
rename to src/Warning/NoDNSMXRecord.php
diff --git a/EmailValidator/Warning/ObsoleteDTEXT.php b/src/Warning/ObsoleteDTEXT.php
similarity index 100%
rename from EmailValidator/Warning/ObsoleteDTEXT.php
rename to src/Warning/ObsoleteDTEXT.php
diff --git a/EmailValidator/Warning/QuotedPart.php b/src/Warning/QuotedPart.php
similarity index 100%
rename from EmailValidator/Warning/QuotedPart.php
rename to src/Warning/QuotedPart.php
diff --git a/EmailValidator/Warning/QuotedString.php b/src/Warning/QuotedString.php
similarity index 100%
rename from EmailValidator/Warning/QuotedString.php
rename to src/Warning/QuotedString.php
diff --git a/EmailValidator/Warning/TLD.php b/src/Warning/TLD.php
similarity index 100%
rename from EmailValidator/Warning/TLD.php
rename to src/Warning/TLD.php
diff --git a/EmailValidator/Warning/Warning.php b/src/Warning/Warning.php
similarity index 100%
rename from EmailValidator/Warning/Warning.php
rename to src/Warning/Warning.php
diff --git a/Tests/EmailValidator/EmailLexerTest.php b/tests/EmailValidator/EmailLexerTest.php
similarity index 98%
rename from Tests/EmailValidator/EmailLexerTest.php
rename to tests/EmailValidator/EmailLexerTest.php
index 61d86d5..3d8bc86 100644
--- a/Tests/EmailValidator/EmailLexerTest.php
+++ b/tests/EmailValidator/EmailLexerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator;
+namespace Egulias\EmailValidator\Tests\EmailValidator;
 
 use Egulias\EmailValidator\EmailLexer;
 use PHPUnit\Framework\TestCase;
diff --git a/Tests/EmailValidator/EmailValidatorTest.php b/tests/EmailValidator/EmailValidatorTest.php
similarity index 96%
rename from Tests/EmailValidator/EmailValidatorTest.php
rename to tests/EmailValidator/EmailValidatorTest.php
index 4a47137..bc422ff 100644
--- a/Tests/EmailValidator/EmailValidatorTest.php
+++ b/tests/EmailValidator/EmailValidatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator;
+namespace Egulias\EmailValidator\Tests\EmailValidator;
 
 use Egulias\EmailValidator\EmailValidator;
 use Egulias\EmailValidator\Validation\EmailValidation;
diff --git a/Tests/EmailValidator/Validation/DNSCheckValidationTest.php b/tests/EmailValidator/Validation/DNSCheckValidationTest.php
similarity index 96%
rename from Tests/EmailValidator/Validation/DNSCheckValidationTest.php
rename to tests/EmailValidator/Validation/DNSCheckValidationTest.php
index a664809..766dc69 100644
--- a/Tests/EmailValidator/Validation/DNSCheckValidationTest.php
+++ b/tests/EmailValidator/Validation/DNSCheckValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Exception\NoDNSRecord;
@@ -24,7 +24,7 @@ class DNSCheckValidationTest extends TestCase
             ['"Abc@def"@example.com'],
             ['"Fred\ Bloggs"@example.com'],
             ['"Joe.\\Blow"@example.com'],
-            
+
             // unicide
             ['ñandu.cl'],
         ];
diff --git a/Tests/EmailValidator/Validation/IsEmailFunctionTests.php b/tests/EmailValidator/Validation/IsEmailFunctionTests.php
similarity index 89%
rename from Tests/EmailValidator/Validation/IsEmailFunctionTests.php
rename to tests/EmailValidator/Validation/IsEmailFunctionTests.php
index 565741a..e8b3997 100644
--- a/Tests/EmailValidator/Validation/IsEmailFunctionTests.php
+++ b/tests/EmailValidator/Validation/IsEmailFunctionTests.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailValidator;
 use Egulias\EmailValidator\Validation\DNSCheckValidation;
@@ -27,7 +27,7 @@ class IsEmailFunctionTests extends TestCase
 
     public function isEmailTestSuite()
     {
-        $testSuite = dirname(__FILE__) . '/../../resources/is_email_tests.xml';
+        $testSuite = __DIR__ . '/../../resources/is_email_tests.xml';
         $document = new \DOMDocument();
         $document->load($testSuite);
         $elements = $document->getElementsByTagName('test');
diff --git a/Tests/EmailValidator/Validation/MultipleValidationWithAndTest.php b/tests/EmailValidator/Validation/MultipleValidationWithAndTest.php
similarity index 96%
rename from Tests/EmailValidator/Validation/MultipleValidationWithAndTest.php
rename to tests/EmailValidator/Validation/MultipleValidationWithAndTest.php
index 9e3610d..be6cdc6 100644
--- a/Tests/EmailValidator/Validation/MultipleValidationWithAndTest.php
+++ b/tests/EmailValidator/Validation/MultipleValidationWithAndTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Exception\CommaInDomain;
@@ -18,7 +18,7 @@ class MultipleValidationWithAndTest extends TestCase
     public function testUsesAndLogicalOperation()
     {
         $lexer = new EmailLexer();
-        $validationTrue = $this->getMockBuilder("Egulias\\EmailValidator\\Validation\\EmailValidation")->getMock();
+        $validationTrue = $this->getMockBuilder(EmailValidation::class)->getMock();
         $validationTrue->expects($this->any())->method("isValid")->willReturn(true);
         $validationTrue->expects($this->any())->method("getWarnings")->willReturn([]);
         $validationFalse = $this->getMockBuilder(EmailValidation::class)->getMock();
@@ -60,7 +60,7 @@ class MultipleValidationWithAndTest extends TestCase
         $expectedResult = array_merge($warnings1, $warnings2);
 
         $lexer = new EmailLexer();
-        $validation1 = $this->getMockBuilder("Egulias\\EmailValidator\\Validation\\EmailValidation")->getMock();
+        $validation1 = $this->getMockBuilder(EmailValidation::class)->getMock();
         $validation1->expects($this->any())->method("isValid")->willReturn(true);
         $validation1->expects($this->once())->method("getWarnings")->willReturn($warnings1);
 
diff --git a/Tests/EmailValidator/Validation/NoRFCWarningsValidationTest.php b/tests/EmailValidator/Validation/NoRFCWarningsValidationTest.php
similarity index 94%
rename from Tests/EmailValidator/Validation/NoRFCWarningsValidationTest.php
rename to tests/EmailValidator/Validation/NoRFCWarningsValidationTest.php
index 2690feb..ce335c1 100644
--- a/Tests/EmailValidator/Validation/NoRFCWarningsValidationTest.php
+++ b/tests/EmailValidator/Validation/NoRFCWarningsValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Exception\NoDomainPart;
diff --git a/Tests/EmailValidator/Validation/RFCValidationTest.php b/tests/EmailValidator/Validation/RFCValidationTest.php
similarity index 98%
rename from Tests/EmailValidator/Validation/RFCValidationTest.php
rename to tests/EmailValidator/Validation/RFCValidationTest.php
index a2dfa87..4e72e9e 100644
--- a/Tests/EmailValidator/Validation/RFCValidationTest.php
+++ b/tests/EmailValidator/Validation/RFCValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Validation\RFCValidation;
@@ -104,7 +104,7 @@ class RFCValidationTest extends TestCase
 
     public function testInvalidUTF8Email()
     {
-        $email     = "\x80\x81\x82@\x83\x84\x85.\x86\x87\x88";
+        $email = "\x80\x81\x82@\x83\x84\x85.\x86\x87\x88";
         $this->assertFalse($this->validator->isValid($email, $this->lexer));
     }
 
diff --git a/Tests/EmailValidator/Validation/SpoofCheckValidationTest.php b/tests/EmailValidator/Validation/SpoofCheckValidationTest.php
similarity index 95%
rename from Tests/EmailValidator/Validation/SpoofCheckValidationTest.php
rename to tests/EmailValidator/Validation/SpoofCheckValidationTest.php
index e345a19..4895fda 100644
--- a/Tests/EmailValidator/Validation/SpoofCheckValidationTest.php
+++ b/tests/EmailValidator/Validation/SpoofCheckValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Validation\SpoofCheckValidation;
diff --git a/Tests/Performance/AgainstFilterVar.php b/tests/Performance/AgainstFilterVar.php
similarity index 100%
rename from Tests/Performance/AgainstFilterVar.php
rename to tests/Performance/AgainstFilterVar.php
diff --git a/Tests/Performance/AgainstOldIsemail.php b/tests/Performance/AgainstOldIsemail.php
similarity index 100%
rename from Tests/Performance/AgainstOldIsemail.php
rename to tests/Performance/AgainstOldIsemail.php
diff --git a/Tests/resources/is_email_tests.xml b/tests/resources/is_email_tests.xml
similarity index 100%
rename from Tests/resources/is_email_tests.xml
rename to tests/resources/is_email_tests.xml