diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index bc18da3..469fc99 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -3,7 +3,7 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
-    ->exclude('tests/ClassNotation/_data')
+    ->exclude('tests/Fixer/ClassNotation/_data')
 ;
 
 return Ely\CS\Config::create([
diff --git a/src/AbstractFixer.php b/src/Fixer/AbstractFixer.php
similarity index 85%
rename from src/AbstractFixer.php
rename to src/Fixer/AbstractFixer.php
index 5d17705..e2581e3 100644
--- a/src/AbstractFixer.php
+++ b/src/Fixer/AbstractFixer.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer;
+namespace ErickSkrauch\PhpCsFixer\Fixer;
 
 abstract class AbstractFixer extends \PhpCsFixer\AbstractFixer {
 
diff --git a/src/ClassNotation/OrderedOverridesFixer.php b/src/Fixer/ClassNotation/OrderedOverridesFixer.php
similarity index 98%
rename from src/ClassNotation/OrderedOverridesFixer.php
rename to src/Fixer/ClassNotation/OrderedOverridesFixer.php
index 46e700b..71fdb35 100644
--- a/src/ClassNotation/OrderedOverridesFixer.php
+++ b/src/Fixer/ClassNotation/OrderedOverridesFixer.php
@@ -1,11 +1,11 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\ClassNotation;
+namespace ErickSkrauch\PhpCsFixer\Fixer\ClassNotation;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
 use ErickSkrauch\PhpCsFixer\Analyzer\ClassElementsAnalyzer;
 use ErickSkrauch\PhpCsFixer\Analyzer\ClassNameAnalyzer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
diff --git a/src/FunctionNotation/AlignMultilineParametersFixer.php b/src/Fixer/FunctionNotation/AlignMultilineParametersFixer.php
similarity index 99%
rename from src/FunctionNotation/AlignMultilineParametersFixer.php
rename to src/Fixer/FunctionNotation/AlignMultilineParametersFixer.php
index a2b1aa1..e7a998a 100644
--- a/src/FunctionNotation/AlignMultilineParametersFixer.php
+++ b/src/Fixer/FunctionNotation/AlignMultilineParametersFixer.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\FunctionNotation;
+namespace ErickSkrauch\PhpCsFixer\Fixer\FunctionNotation;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
diff --git a/src/LanguageConstruct/RemoveClassNameMethodUsagesFixer.php b/src/Fixer/LanguageConstruct/RemoveClassNameMethodUsagesFixer.php
similarity index 96%
rename from src/LanguageConstruct/RemoveClassNameMethodUsagesFixer.php
rename to src/Fixer/LanguageConstruct/RemoveClassNameMethodUsagesFixer.php
index 078afaf..b20d1fc 100644
--- a/src/LanguageConstruct/RemoveClassNameMethodUsagesFixer.php
+++ b/src/Fixer/LanguageConstruct/RemoveClassNameMethodUsagesFixer.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\LanguageConstruct;
+namespace ErickSkrauch\PhpCsFixer\Fixer\LanguageConstruct;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
diff --git a/src/Whitespace/BlankLineAroundClassBodyFixer.php b/src/Fixer/Whitespace/BlankLineAroundClassBodyFixer.php
similarity index 98%
rename from src/Whitespace/BlankLineAroundClassBodyFixer.php
rename to src/Fixer/Whitespace/BlankLineAroundClassBodyFixer.php
index 23e0c1b..dbbc3c5 100644
--- a/src/Whitespace/BlankLineAroundClassBodyFixer.php
+++ b/src/Fixer/Whitespace/BlankLineAroundClassBodyFixer.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
diff --git a/src/Whitespace/BlankLineBeforeReturnFixer.php b/src/Fixer/Whitespace/BlankLineBeforeReturnFixer.php
similarity index 97%
rename from src/Whitespace/BlankLineBeforeReturnFixer.php
rename to src/Fixer/Whitespace/BlankLineBeforeReturnFixer.php
index 3b7eada..9d12b2d 100644
--- a/src/Whitespace/BlankLineBeforeReturnFixer.php
+++ b/src/Fixer/Whitespace/BlankLineBeforeReturnFixer.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
diff --git a/src/Whitespace/LineBreakAfterStatementsFixer.php b/src/Fixer/Whitespace/LineBreakAfterStatementsFixer.php
similarity index 98%
rename from src/Whitespace/LineBreakAfterStatementsFixer.php
rename to src/Fixer/Whitespace/LineBreakAfterStatementsFixer.php
index febce4e..bfba827 100644
--- a/src/Whitespace/LineBreakAfterStatementsFixer.php
+++ b/src/Fixer/Whitespace/LineBreakAfterStatementsFixer.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
diff --git a/src/Whitespace/MultilineIfStatementBracesFixer.php b/src/Fixer/Whitespace/MultilineIfStatementBracesFixer.php
similarity index 97%
rename from src/Whitespace/MultilineIfStatementBracesFixer.php
rename to src/Fixer/Whitespace/MultilineIfStatementBracesFixer.php
index ae32d08..710f5fd 100644
--- a/src/Whitespace/MultilineIfStatementBracesFixer.php
+++ b/src/Fixer/Whitespace/MultilineIfStatementBracesFixer.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
diff --git a/src/Fixers.php b/src/Fixers.php
index 675e876..db6e08d 100644
--- a/src/Fixers.php
+++ b/src/Fixers.php
@@ -19,7 +19,7 @@ final class Fixers implements IteratorAggregate {
      */
     public function getIterator(): Traversable {
         $finder = new Finder();
-        $finder->in(__DIR__)->name('*.php');
+        $finder->in(__DIR__ . '/Fixer')->name('*.php');
         $classes = [];
         /** @var \Symfony\Component\Finder\SplFileInfo $file */
         foreach ($finder as $file) {
diff --git a/tests/ClassNotation/_data/EmptyInterface.php b/tests/ClassNotation/_data/EmptyInterface.php
deleted file mode 100644
index 9edc9e2..0000000
--- a/tests/ClassNotation/_data/EmptyInterface.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
-
-interface EmptyInterface {
-
-}
diff --git a/tests/ClassNotation/OrderedOverridesFixerTest.php b/tests/Fixer/ClassNotation/OrderedOverridesFixerTest.php
similarity index 76%
rename from tests/ClassNotation/OrderedOverridesFixerTest.php
rename to tests/Fixer/ClassNotation/OrderedOverridesFixerTest.php
index 5df0333..cdcde8c 100644
--- a/tests/ClassNotation/OrderedOverridesFixerTest.php
+++ b/tests/Fixer/ClassNotation/OrderedOverridesFixerTest.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation;
 
-use ErickSkrauch\PhpCsFixer\ClassNotation\OrderedOverridesFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\ClassNotation\OrderedOverridesFixer;
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
 
 /**
- * @covers \ErickSkrauch\PhpCsFixer\ClassNotation\OrderedOverridesFixer
+ * @covers \ErickSkrauch\PhpCsFixer\Fixer\ClassNotation\OrderedOverridesFixer
  */
 final class OrderedOverridesFixerTest extends AbstractFixerTestCase {
 
@@ -34,7 +34,7 @@ public function bar(): void {}
 
         yield 'implements empty interface' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\EmptyInterface {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\EmptyInterface {
                 public function foo(): void {}
             }
             ',
@@ -42,13 +42,13 @@ public function foo(): void {}
 
         yield 'single interface implementation' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function foo(): void {}
                 public function bar(): void {}
             }
             ',
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function bar(): void {}
                 public function foo(): void {}
             }
@@ -57,7 +57,7 @@ public function foo(): void {}
 
         yield 'multiple interfaces implementation' => [
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             class A implements _data\InterfaceA, _data\InterfaceB {
                 public function foo(): void {}
@@ -67,7 +67,7 @@ public function qux(): void {}
             }
             ',
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             class A implements _data\InterfaceA, _data\InterfaceB {
                 public function baz(): void {}
@@ -80,7 +80,7 @@ public function foo(): void {}
 
         yield 'abstract class' => [
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             abstract class A implements _data\InterfaceA, _data\InterfaceB {
                 public function bar(): void {}
@@ -89,7 +89,7 @@ public function baz(): void {}
             }
             ',
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             abstract class A implements _data\InterfaceA, _data\InterfaceB {
                 public function baz(): void {}
@@ -101,7 +101,7 @@ public function bar(): void {}
 
         yield 'interface extension' => [
             '<?php
-            interface ExtendedA extends \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            interface ExtendedA extends \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function baz(): void;
             }
             ',
@@ -109,14 +109,14 @@ public function baz(): void;
 
         yield 'non-interface methods' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function foo(): void {}
                 public function nonInterface(): void {}
                 public function bar(): void {}
             }
             ',
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function bar(): void {}
                 public function nonInterface(): void {}
                 public function foo(): void {}
@@ -126,14 +126,14 @@ public function foo(): void {}
 
         yield 'extend abstract class' => [
             '<?php
-            class A extends \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\AbstractA {
+            class A extends \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\AbstractA {
                 public function foo(): void {}
                 public function nonInterface(): void {}
                 public function bar(): void {}
             }
             ',
             '<?php
-            class A extends \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\AbstractA {
+            class A extends \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\AbstractA {
                 public function bar(): void {}
                 public function nonInterface(): void {}
                 public function foo(): void {}
@@ -143,7 +143,7 @@ public function foo(): void {}
 
         yield 'interface with multiple extends' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceAandB {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceAandB {
                 public function foo(): void {}
                 public function nonInterface(): void {}
                 public function bar(): void {}
@@ -153,7 +153,7 @@ public function quux(): void{}
             }
             ',
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceAandB {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceAandB {
                 public function bar(): void {}
                 public function nonInterface(): void {}
                 public function qux() : void{}
@@ -166,7 +166,7 @@ public function baz() : void{}
 
         yield 'mix of extends and interface' => [
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             class A extends _data\AbstractA implements _data\InterfaceB {
                 public function foo(): void {}
@@ -176,7 +176,7 @@ public function qux() : void{}
             }
             ',
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             class A extends _data\AbstractA implements _data\InterfaceB {
                 public function qux() : void{}
@@ -189,7 +189,7 @@ public function baz() : void{}
 
         yield 'function in implementation' => [
             '<?php
-            class A extends \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\AbstractA {
+            class A extends \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\AbstractA {
                 public function bar(): void {
                     $a = function() {
                         // body
@@ -201,13 +201,13 @@ public function bar(): void {
 
         yield 'anonymous class' => [
             '<?php
-            $a = new class implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            $a = new class implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function foo(): void {}
                 public function bar(): void {}
             };
             ',
             '<?php
-            $a = new class implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            $a = new class implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function bar(): void {}
                 public function foo(): void {}
             };
@@ -225,7 +225,7 @@ public function foo(): void {}
 
         yield 'mix of other class elements' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function foo(): void {}
                 private string $a;
                 public function nonInterface(): void {}
@@ -236,7 +236,7 @@ public function qux(): void {}
             }
             ',
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function bar(): void {}
                 private string $a;
                 public function nonInterface(): void {}
@@ -250,13 +250,13 @@ public function qux(): void {}
 
         yield 'use the order of the deepest parent ' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceAReverseOrder {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceAReverseOrder {
                 public function foo(): void {}
                 public function bar(): void {}
             }
             ',
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceAReverseOrder {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceAReverseOrder {
                 public function bar(): void {}
                 public function foo(): void {}
             }
diff --git a/tests/ClassNotation/_data/AbstractA.php b/tests/Fixer/ClassNotation/_data/AbstractA.php
similarity index 65%
rename from tests/ClassNotation/_data/AbstractA.php
rename to tests/Fixer/ClassNotation/_data/AbstractA.php
index 8031279..483413e 100644
--- a/tests/ClassNotation/_data/AbstractA.php
+++ b/tests/Fixer/ClassNotation/_data/AbstractA.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
 abstract class AbstractA implements InterfaceA {
 
diff --git a/tests/Fixer/ClassNotation/_data/EmptyInterface.php b/tests/Fixer/ClassNotation/_data/EmptyInterface.php
new file mode 100644
index 0000000..ddec60a
--- /dev/null
+++ b/tests/Fixer/ClassNotation/_data/EmptyInterface.php
@@ -0,0 +1,8 @@
+<?php
+declare(strict_types=1);
+
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
+
+interface EmptyInterface {
+
+}
diff --git a/tests/ClassNotation/_data/InterfaceA.php b/tests/Fixer/ClassNotation/_data/InterfaceA.php
similarity index 65%
rename from tests/ClassNotation/_data/InterfaceA.php
rename to tests/Fixer/ClassNotation/_data/InterfaceA.php
index cbf7d9c..b6cb320 100644
--- a/tests/ClassNotation/_data/InterfaceA.php
+++ b/tests/Fixer/ClassNotation/_data/InterfaceA.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
 interface InterfaceA {
 
diff --git a/tests/ClassNotation/_data/InterfaceAReverseOrder.php b/tests/Fixer/ClassNotation/_data/InterfaceAReverseOrder.php
similarity index 70%
rename from tests/ClassNotation/_data/InterfaceAReverseOrder.php
rename to tests/Fixer/ClassNotation/_data/InterfaceAReverseOrder.php
index bf271a4..a627a68 100644
--- a/tests/ClassNotation/_data/InterfaceAReverseOrder.php
+++ b/tests/Fixer/ClassNotation/_data/InterfaceAReverseOrder.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
 interface InterfaceAReverseOrder extends InterfaceA {
 
diff --git a/tests/ClassNotation/_data/InterfaceAandB.php b/tests/Fixer/ClassNotation/_data/InterfaceAandB.php
similarity index 65%
rename from tests/ClassNotation/_data/InterfaceAandB.php
rename to tests/Fixer/ClassNotation/_data/InterfaceAandB.php
index 1df6ffd..f1bfab9 100644
--- a/tests/ClassNotation/_data/InterfaceAandB.php
+++ b/tests/Fixer/ClassNotation/_data/InterfaceAandB.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
 interface InterfaceAandB extends InterfaceA, InterfaceB {
 
diff --git a/tests/ClassNotation/_data/InterfaceB.php b/tests/Fixer/ClassNotation/_data/InterfaceB.php
similarity index 65%
rename from tests/ClassNotation/_data/InterfaceB.php
rename to tests/Fixer/ClassNotation/_data/InterfaceB.php
index ca7379d..8fc4471 100644
--- a/tests/ClassNotation/_data/InterfaceB.php
+++ b/tests/Fixer/ClassNotation/_data/InterfaceB.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
 interface InterfaceB {
 
diff --git a/tests/FunctionNotation/AlignMultilineParametersFixerTest.php b/tests/Fixer/FunctionNotation/AlignMultilineParametersFixerTest.php
similarity index 98%
rename from tests/FunctionNotation/AlignMultilineParametersFixerTest.php
rename to tests/Fixer/FunctionNotation/AlignMultilineParametersFixerTest.php
index 9afe1a1..4da1ef8 100644
--- a/tests/FunctionNotation/AlignMultilineParametersFixerTest.php
+++ b/tests/Fixer/FunctionNotation/AlignMultilineParametersFixerTest.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\FunctionNotation;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\FunctionNotation;
 
-use ErickSkrauch\PhpCsFixer\FunctionNotation\AlignMultilineParametersFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\FunctionNotation\AlignMultilineParametersFixer;
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
 
 /**
- * @covers \ErickSkrauch\PhpCsFixer\FunctionNotation\AlignMultilineParametersFixer
+ * @covers \ErickSkrauch\PhpCsFixer\Fixer\FunctionNotation\AlignMultilineParametersFixer
  */
 final class AlignMultilineParametersFixerTest extends AbstractFixerTestCase {
 
diff --git a/tests/LanguageConstruct/RemoveClassNameMethodUsagesFixerTest.php b/tests/Fixer/LanguageConstruct/RemoveClassNameMethodUsagesFixerTest.php
similarity index 83%
rename from tests/LanguageConstruct/RemoveClassNameMethodUsagesFixerTest.php
rename to tests/Fixer/LanguageConstruct/RemoveClassNameMethodUsagesFixerTest.php
index cec698c..df74083 100644
--- a/tests/LanguageConstruct/RemoveClassNameMethodUsagesFixerTest.php
+++ b/tests/Fixer/LanguageConstruct/RemoveClassNameMethodUsagesFixerTest.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\LanguageConstruct;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\LanguageConstruct;
 
-use ErickSkrauch\PhpCsFixer\LanguageConstruct\RemoveClassNameMethodUsagesFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\LanguageConstruct\RemoveClassNameMethodUsagesFixer;
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
 
 /**
- * @covers \ErickSkrauch\PhpCsFixer\LanguageConstruct\RemoveClassNameMethodUsagesFixer
+ * @covers \ErickSkrauch\PhpCsFixer\Fixer\LanguageConstruct\RemoveClassNameMethodUsagesFixer
  */
 final class RemoveClassNameMethodUsagesFixerTest extends AbstractFixerTestCase {
 
diff --git a/tests/Whitespace/BlankLineAroundClassBodyFixerTest.php b/tests/Fixer/Whitespace/BlankLineAroundClassBodyFixerTest.php
similarity index 94%
rename from tests/Whitespace/BlankLineAroundClassBodyFixerTest.php
rename to tests/Fixer/Whitespace/BlankLineAroundClassBodyFixerTest.php
index abcd0ca..dd3d466 100644
--- a/tests/Whitespace/BlankLineAroundClassBodyFixerTest.php
+++ b/tests/Fixer/Whitespace/BlankLineAroundClassBodyFixerTest.php
@@ -1,16 +1,16 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\Whitespace\BlankLineAroundClassBodyFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\Whitespace\BlankLineAroundClassBodyFixer;
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
 use PhpCsFixer\WhitespacesFixerConfig;
 
 /**
- * @property \ErickSkrauch\PhpCsFixer\Whitespace\BlankLineAroundClassBodyFixer $fixer
- * @covers \ErickSkrauch\PhpCsFixer\Whitespace\BlankLineAroundClassBodyFixer
+ * @property \ErickSkrauch\PhpCsFixer\Fixer\Whitespace\BlankLineAroundClassBodyFixer $fixer
+ * @covers \ErickSkrauch\PhpCsFixer\Fixer\Whitespace\BlankLineAroundClassBodyFixer
  */
 final class BlankLineAroundClassBodyFixerTest extends AbstractFixerTestCase {
 
diff --git a/tests/Whitespace/BlankLineBeforeReturnFixerTest.php b/tests/Fixer/Whitespace/BlankLineBeforeReturnFixerTest.php
similarity index 95%
rename from tests/Whitespace/BlankLineBeforeReturnFixerTest.php
rename to tests/Fixer/Whitespace/BlankLineBeforeReturnFixerTest.php
index d031cdd..b04ab76 100644
--- a/tests/Whitespace/BlankLineBeforeReturnFixerTest.php
+++ b/tests/Fixer/Whitespace/BlankLineBeforeReturnFixerTest.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\Whitespace\BlankLineBeforeReturnFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\Whitespace\BlankLineBeforeReturnFixer;
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
 use PhpCsFixer\WhitespacesFixerConfig;
@@ -20,7 +20,7 @@
  *
  * @property BlankLineBeforeReturnFixer $fixer
  *
- * @covers \ErickSkrauch\PhpCsFixer\Whitespace\BlankLineBeforeReturnFixer
+ * @covers \ErickSkrauch\PhpCsFixer\Fixer\Whitespace\BlankLineBeforeReturnFixer
  */
 final class BlankLineBeforeReturnFixerTest extends AbstractFixerTestCase {
 
diff --git a/tests/Whitespace/LineBreakAfterStatementsFixerTest.php b/tests/Fixer/Whitespace/LineBreakAfterStatementsFixerTest.php
similarity index 97%
rename from tests/Whitespace/LineBreakAfterStatementsFixerTest.php
rename to tests/Fixer/Whitespace/LineBreakAfterStatementsFixerTest.php
index 5244dee..8f4c3ac 100644
--- a/tests/Whitespace/LineBreakAfterStatementsFixerTest.php
+++ b/tests/Fixer/Whitespace/LineBreakAfterStatementsFixerTest.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\Whitespace\LineBreakAfterStatementsFixer;
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
 
 /**
- * @covers \ErickSkrauch\PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer
+ * @covers \ErickSkrauch\PhpCsFixer\Fixer\Whitespace\LineBreakAfterStatementsFixer
  */
 final class LineBreakAfterStatementsFixerTest extends AbstractFixerTestCase {
 
diff --git a/tests/Whitespace/MultilineIfStatementBracesFixerTest.php b/tests/Fixer/Whitespace/MultilineIfStatementBracesFixerTest.php
similarity index 87%
rename from tests/Whitespace/MultilineIfStatementBracesFixerTest.php
rename to tests/Fixer/Whitespace/MultilineIfStatementBracesFixerTest.php
index 09423c3..3174218 100644
--- a/tests/Whitespace/MultilineIfStatementBracesFixerTest.php
+++ b/tests/Fixer/Whitespace/MultilineIfStatementBracesFixerTest.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\Whitespace\MultilineIfStatementBracesFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\Whitespace\MultilineIfStatementBracesFixer;
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
 
 /**
- * @covers \ErickSkrauch\PhpCsFixer\Whitespace\MultilineIfStatementBracesFixer
+ * @covers \ErickSkrauch\PhpCsFixer\Fixer\Whitespace\MultilineIfStatementBracesFixer
  */
 final class MultilineIfStatementBracesFixerTest extends AbstractFixerTestCase {