diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md
index 9f4a630d8ba..81ac1b22f67 100644
--- a/docs/AllRectorsOverview.md
+++ b/docs/AllRectorsOverview.md
@@ -4242,13 +4242,13 @@ Changes pow(val, val2) to ** (exp) parameter
 
 ### `PreferThisOrSelfMethodCallRector`
 
-- class: `Rector\Php\Rector\MethodCall\PreferThisOrSelfMethodCallRector`
+- class: `Rector\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector`
 
 Changes $this->... to self:: or vise versa for specific types
 
 ```yaml
 services:
-    Rector\Php\Rector\MethodCall\PreferThisOrSelfMethodCallRector:
+    Rector\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector:
         PHPUnit\TestCase: self
 ```
 
diff --git a/packages/Php/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php b/packages/CodingStyle/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php
similarity index 95%
rename from packages/Php/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php
rename to packages/CodingStyle/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php
index 935632dae86..74bcdbbe1c1 100644
--- a/packages/Php/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php
+++ b/packages/CodingStyle/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Rector\MethodCall;
+namespace Rector\CodingStyle\Rector\MethodCall;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
@@ -11,7 +11,7 @@ use Rector\RectorDefinition\ConfiguredCodeSample;
 use Rector\RectorDefinition\RectorDefinition;
 
 /**
- * @see \Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\PreferThisOrSelfMethodCallRectorTest
+ * @see \Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\PreferThisOrSelfMethodCallRectorTest
  */
 final class PreferThisOrSelfMethodCallRector extends AbstractRector
 {
diff --git a/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_self.php.inc b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_self.php.inc
new file mode 100644
index 00000000000..090cf9cc1f8
--- /dev/null
+++ b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_self.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Fixture;
+
+use Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\AbstractTestCase;
+
+class ToSelf extends AbstractTestCase
+{
+    public function run()
+    {
+        $this->assertThis();
+        self::assertThis();
+        parent::assertThis();
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Fixture;
+
+use Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\AbstractTestCase;
+
+class ToSelf extends AbstractTestCase
+{
+    public function run()
+    {
+        self::assertThis();
+        self::assertThis();
+        parent::assertThis();
+    }
+}
+
+?>
diff --git a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc
similarity index 53%
rename from packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc
rename to packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc
index 280b911b218..735f551f913 100644
--- a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc
+++ b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Fixture;
+namespace Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Fixture;
 
-use Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\BeLocalClass;
+use Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\BeLocalClass;
 
 final class ToThis extends BeLocalClass
 {
@@ -19,9 +19,9 @@ final class ToThis extends BeLocalClass
 -----
 <?php
 
-namespace Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Fixture;
+namespace Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Fixture;
 
-use Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\BeLocalClass;
+use Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\BeLocalClass;
 
 final class ToThis extends BeLocalClass
 {
diff --git a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php
similarity index 71%
rename from packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php
rename to packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php
index 4432c880248..efb3b1bbbf0 100644
--- a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php
+++ b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector;
+namespace Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector;
 
-use Rector\Php\Rector\MethodCall\PreferThisOrSelfMethodCallRector;
-use Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\AbstractTestCase;
-use Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\BeLocalClass;
+use Rector\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector;
+use Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\AbstractTestCase;
+use Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\BeLocalClass;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class PreferThisOrSelfMethodCallRectorTest extends AbstractRectorTestCase
diff --git a/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/AbstractTestCase.php b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/AbstractTestCase.php
new file mode 100644
index 00000000000..4a6be219756
--- /dev/null
+++ b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/AbstractTestCase.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source;
+
+abstract class AbstractTestCase
+{
+
+}
diff --git a/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/BeLocalClass.php b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/BeLocalClass.php
new file mode 100644
index 00000000000..cbc5d6150cb
--- /dev/null
+++ b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/BeLocalClass.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Rector\CodingStyle\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source;
+
+class BeLocalClass
+{
+
+}
diff --git a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_self.php.inc b/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_self.php.inc
deleted file mode 100644
index d8107ae08cf..00000000000
--- a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_self.php.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Fixture;
-
-use Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\AbstractTestCase;
-
-class ToSelf extends AbstractTestCase
-{
-    public function run()
-    {
-        $this->assertThis();
-        self::assertThis();
-        parent::assertThis();
-    }
-}
-
-?>
------
-<?php
-
-namespace Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Fixture;
-
-use Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\AbstractTestCase;
-
-class ToSelf extends AbstractTestCase
-{
-    public function run()
-    {
-        self::assertThis();
-        self::assertThis();
-        parent::assertThis();
-    }
-}
-
-?>
diff --git a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/AbstractTestCase.php b/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/AbstractTestCase.php
deleted file mode 100644
index 26d3cbd5f33..00000000000
--- a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/AbstractTestCase.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source;
-
-abstract class AbstractTestCase
-{
-
-}
diff --git a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/BeLocalClass.php b/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/BeLocalClass.php
deleted file mode 100644
index faf9220059d..00000000000
--- a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/BeLocalClass.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Rector\Php\Tests\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source;
-
-class BeLocalClass
-{
-
-}
\ No newline at end of file
diff --git a/src/Php70/Exception/InvalidEregException.php b/packages/Php70/src/Exception/InvalidEregException.php
similarity index 100%
rename from src/Php70/Exception/InvalidEregException.php
rename to packages/Php70/src/Exception/InvalidEregException.php
diff --git a/packages/Php71/config/config.yaml b/packages/Php71/config/config.yaml
new file mode 100644
index 00000000000..fc09184b1b2
--- /dev/null
+++ b/packages/Php71/config/config.yaml
@@ -0,0 +1,8 @@
+services:
+    _defaults:
+        public: true
+        autowire: true
+
+    Rector\Php71\:
+        resource: '../src'
+        exclude: '../src/{Rector/**/*Rector.php}'
diff --git a/src/Php71/Rector/Name/ReservedObjectRector.php b/packages/Php71/src/Rector/Name/ReservedObjectRector.php
similarity index 96%
rename from src/Php71/Rector/Name/ReservedObjectRector.php
rename to packages/Php71/src/Rector/Name/ReservedObjectRector.php
index 814fbbdf196..fe91e8f73ad 100644
--- a/src/Php71/Rector/Name/ReservedObjectRector.php
+++ b/packages/Php71/src/Rector/Name/ReservedObjectRector.php
@@ -14,7 +14,7 @@ use Rector\RectorDefinition\RectorDefinition;
 /**
  * @see https://wiki.php.net/rfc/object-typehint
  * @see https://github.com/cebe/yii2/commit/9548a212ecf6e50fcdb0e5ba6daad88019cfc544
- * @see \Rector\Php\Tests\Rector\Name\ReservedObjectRector\ReservedObjectRectorTest
+ * @see \Rector\Php71\Tests\Rector\Name\ReservedObjectRector\ReservedObjectRectorTest
  */
 final class ReservedObjectRector extends AbstractRector
 {