diff --git a/.gitattributes b/.gitattributes
index b49d35bd..84821a86 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,4 +5,3 @@
 .travis.yml export-
 phpunit.xml export-ignore
 *.md export-ignore
-/packages-tests export-ignore
diff --git a/.github/workflows/downgraded_release.yaml b/.github/workflows/downgraded_release.yaml
index 7e637b34..2dbbb502 100644
--- a/.github/workflows/downgraded_release.yaml
+++ b/.github/workflows/downgraded_release.yaml
@@ -37,7 +37,7 @@ jobs:
             -   run: rector-local/vendor/bin/rector process src packages config --config build/rector-downgrade-php-72.php --ansi
 
             # clear the dev files
-            -   run: rm -rf tests packages-tests rector-local ecs.php phpstan.neon phpunit.xml .editorconfig
+            -   run: rm -rf tests rector-local ecs.php phpstan.neon phpunit.xml .editorconfig
 
             # copy PHP 7.2 composer + workflows
             -   run: cp -r build/target-repository/. .
diff --git a/composer.json b/composer.json
index 2301078d..8ae0d3e5 100644
--- a/composer.json
+++ b/composer.json
@@ -36,10 +36,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Symplify\\PHPStanRules\\Tests\\": [
-                "tests",
-                "packages-tests"
-            ]
+            "Symplify\\PHPStanRules\\Tests\\": "tests"
         },
         "classmap": [
             "stubs"
diff --git a/ecs.php b/ecs.php
index a90ac74a..2d795b27 100644
--- a/ecs.php
+++ b/ecs.php
@@ -10,9 +10,7 @@
         __DIR__ . '/ecs.php',
         __DIR__ . '/rector.php',
         __DIR__ . '/config',
-        __DIR__ . '/packages',
         __DIR__ . '/src',
-        __DIR__ . '/packages-tests',
         __DIR__ . '/tests',
     ]);
 
diff --git a/phpstan.neon b/phpstan.neon
index f2348a4d..7a6c169f 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -9,10 +9,8 @@ parameters:
         - src
         - config
         - tests
-        - packages
-        - packages-tests
 
-    # reportUnmatchedIgnoredErrors: false
+    reportUnmatchedIgnoredErrors: false
 
     excludePaths:
         # parallel
@@ -22,8 +20,6 @@ parameters:
         - '*/tests/**/Source/*'
         - '*/tests/**/Fixture/*'
         - */stubs/*
-        - */packages-tests/**/Fixture/*
-        - */packages-tests/**/Source/*
 
     ignoreErrors:
         -
diff --git a/phpunit.xml b/phpunit.xml
index ffa12aca..4ffeae8e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,7 +2,6 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" cacheDirectory=".phpunit.cache">
     <testsuite name="all">
         <directory>tests</directory>
-        <directory>packages-tests</directory>
         <exclude>tests/Rules/NoConstructorInTestRule/Fixture</exclude>
         <exclude>tests/Rules/ClassNameRespectsParentSuffixRule/Fixture/</exclude>
         <exclude>tests/Rules/CheckNotTestsNamespaceOutsideTestsDirectoryRule/Fixture</exclude>
diff --git a/rector.php b/rector.php
index 7d81d00e..a3dc82c5 100644
--- a/rector.php
+++ b/rector.php
@@ -24,8 +24,6 @@
     $rectorConfig->paths([
         __DIR__ . '/config',
         __DIR__ . '/src',
-        __DIR__ . '/packages',
-        __DIR__ . '/packages-tests',
         __DIR__ . '/tests',
     ]);
 
diff --git a/packages/ObjectCalisthenics/Rules/NoShortNameRule.php b/src/ObjectCalisthenics/Rules/NoShortNameRule.php
similarity index 100%
rename from packages/ObjectCalisthenics/Rules/NoShortNameRule.php
rename to src/ObjectCalisthenics/Rules/NoShortNameRule.php
diff --git a/packages/Symfony/NodeAnalyzer/SymfonyControllerAnalyzer.php b/src/Symfony/NodeAnalyzer/SymfonyControllerAnalyzer.php
similarity index 100%
rename from packages/Symfony/NodeAnalyzer/SymfonyControllerAnalyzer.php
rename to src/Symfony/NodeAnalyzer/SymfonyControllerAnalyzer.php
diff --git a/packages/Symfony/Rules/RequireInvokableControllerRule.php b/src/Symfony/Rules/RequireInvokableControllerRule.php
similarity index 100%
rename from packages/Symfony/Rules/RequireInvokableControllerRule.php
rename to src/Symfony/Rules/RequireInvokableControllerRule.php
diff --git a/packages/Testing/StaticPHPUnitEnvironment.php b/src/Testing/StaticPHPUnitEnvironment.php
similarity index 100%
rename from packages/Testing/StaticPHPUnitEnvironment.php
rename to src/Testing/StaticPHPUnitEnvironment.php
diff --git a/packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortAssignParameter.php b/tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortAssignParameter.php
similarity index 100%
rename from packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortAssignParameter.php
rename to tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortAssignParameter.php
diff --git a/packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortClosureParam.php b/tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortClosureParam.php
similarity index 100%
rename from packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortClosureParam.php
rename to tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortClosureParam.php
diff --git a/packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortNamingClass.php b/tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortNamingClass.php
similarity index 100%
rename from packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortNamingClass.php
rename to tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortNamingClass.php
diff --git a/packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortParam.php b/tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortParam.php
similarity index 100%
rename from packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortParam.php
rename to tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/ShortParam.php
diff --git a/packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/SkipId.php b/tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/SkipId.php
similarity index 100%
rename from packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/SkipId.php
rename to tests/ObjectCalisthenics/Rules/NoShortNameRule/Fixture/SkipId.php
diff --git a/packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/NoShortNameRuleTest.php b/tests/ObjectCalisthenics/Rules/NoShortNameRule/NoShortNameRuleTest.php
similarity index 100%
rename from packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/NoShortNameRuleTest.php
rename to tests/ObjectCalisthenics/Rules/NoShortNameRule/NoShortNameRuleTest.php
diff --git a/packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/config/configured_rule.neon b/tests/ObjectCalisthenics/Rules/NoShortNameRule/config/configured_rule.neon
similarity index 100%
rename from packages-tests/ObjectCalisthenics/Rules/NoShortNameRule/config/configured_rule.neon
rename to tests/ObjectCalisthenics/Rules/NoShortNameRule/config/configured_rule.neon
diff --git a/packages-tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/MissnamedController.php b/tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/MissnamedController.php
similarity index 100%
rename from packages-tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/MissnamedController.php
rename to tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/MissnamedController.php
diff --git a/packages-tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/MissnamedRouteAttributeController.php b/tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/MissnamedRouteAttributeController.php
similarity index 100%
rename from packages-tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/MissnamedRouteAttributeController.php
rename to tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/MissnamedRouteAttributeController.php
diff --git a/packages-tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/SkipInvokableController.php b/tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/SkipInvokableController.php
similarity index 100%
rename from packages-tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/SkipInvokableController.php
rename to tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/SkipInvokableController.php
diff --git a/packages-tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/SkipRandomPublicMethodController.php b/tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/SkipRandomPublicMethodController.php
similarity index 100%
rename from packages-tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/SkipRandomPublicMethodController.php
rename to tests/Symfony/Rules/RequireInvokableControllerRule/Fixture/SkipRandomPublicMethodController.php
diff --git a/packages-tests/Symfony/Rules/RequireInvokableControllerRule/RequireInvokableControllerRulePhp80Test.php b/tests/Symfony/Rules/RequireInvokableControllerRule/RequireInvokableControllerRulePhp80Test.php
similarity index 100%
rename from packages-tests/Symfony/Rules/RequireInvokableControllerRule/RequireInvokableControllerRulePhp80Test.php
rename to tests/Symfony/Rules/RequireInvokableControllerRule/RequireInvokableControllerRulePhp80Test.php
diff --git a/packages-tests/Symfony/Rules/RequireInvokableControllerRule/RequireInvokableControllerRuleTest.php b/tests/Symfony/Rules/RequireInvokableControllerRule/RequireInvokableControllerRuleTest.php
similarity index 100%
rename from packages-tests/Symfony/Rules/RequireInvokableControllerRule/RequireInvokableControllerRuleTest.php
rename to tests/Symfony/Rules/RequireInvokableControllerRule/RequireInvokableControllerRuleTest.php
diff --git a/packages-tests/Symfony/Rules/RequireInvokableControllerRule/config/configured_rule.neon b/tests/Symfony/Rules/RequireInvokableControllerRule/config/configured_rule.neon
similarity index 100%
rename from packages-tests/Symfony/Rules/RequireInvokableControllerRule/config/configured_rule.neon
rename to tests/Symfony/Rules/RequireInvokableControllerRule/config/configured_rule.neon