diff --git a/.gitattributes b/.gitattributes
index 9e7b1a00..bd650c54 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,4 @@ stubs export-ignore
 tests export-ignore
 rules-tests export-ignore
 rector.php export-ignore
+structarmed.php export-ignore
diff --git a/.github/workflows/code_analysis.yaml b/.github/workflows/code_analysis.yaml
index 6f6f9f0d..b5d58010 100644
--- a/.github/workflows/code_analysis.yaml
+++ b/.github/workflows/code_analysis.yaml
@@ -36,6 +36,10 @@ jobs:
                         name: 'Tests'
                         run: vendor/bin/phpunit
 
+                    -
+                        name: 'Run StructArmed'
+                        run: vendor/bin/structarmed analyze
+
         name: ${{ matrix.actions.name }}
         runs-on: ubuntu-latest
         timeout-minutes: 10
diff --git a/composer.json b/composer.json
index d19863c9..dfbd41a1 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,7 @@
         "php": ">=8.3"
     },
     "require-dev": {
+        "boundwize/structarmed": "^0.7.7",
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^2.1.38",
         "phpstan/phpstan-deprecation-rules": "^2.0",
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/ReplaceTestFunctionPrefixWithAttributeRector/ReplaceTestFunctionPrefixWithAttributeRectorTest.php b/rules-tests/CodeQuality/Rector/ClassMethod/ReplaceTestFunctionPrefixWithAttributeRector/ReplaceTestFunctionPrefixWithAttributeRectorTest.php
index f3030c08..487abf75 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReplaceTestFunctionPrefixWithAttributeRector/ReplaceTestFunctionPrefixWithAttributeRectorTest.php
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/ReplaceTestFunctionPrefixWithAttributeRector/ReplaceTestFunctionPrefixWithAttributeRectorTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CodeQuality\Rector\ClassMethod\ReplaceTestFunctionPrefixWithAttributeRector;
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\ReplaceTestFunctionPrefixWithAttributeRector;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;
diff --git a/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Fixture/assert_make_empty.php.inc b/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Fixture/assert_make_empty.php.inc
index c0649330..06b0ca19 100644
--- a/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Fixture/assert_make_empty.php.inc
+++ b/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Fixture/assert_make_empty.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Fixture;
 
-use CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
+use Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
 use PHPUnit\Framework\TestCase;
 
 final class AssertMakeEmpty extends TestCase
@@ -25,7 +25,7 @@ final class AssertMakeEmpty extends TestCase
 
 namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Fixture;
 
-use CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
+use Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
 use PHPUnit\Framework\TestCase;
 
 final class AssertMakeEmpty extends TestCase
@@ -38,7 +38,7 @@ final class AssertMakeEmpty extends TestCase
             $someObject = new SomeTypeObject();
         }
 
-        $this->assertNotInstanceOf(\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject::class, $someObject);
+        $this->assertNotInstanceOf(\Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject::class, $someObject);
     }
 }
 
diff --git a/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Source/SomeTypeObject.php b/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Source/SomeTypeObject.php
index 19dcb9e0..5305ec62 100644
--- a/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Source/SomeTypeObject.php
+++ b/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Source/SomeTypeObject.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source;
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source;
 
 class SomeTypeObject
 {
diff --git a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_abstract_class.php.inc b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_abstract_class.php.inc
index 75764a68..293d68a0 100644
--- a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_abstract_class.php.inc
+++ b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_abstract_class.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Fixture;
 
-use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source\AnotherAbstractClass;
+use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source\AnotherAbstractClass;
 
 final class RespectParentAbstractClass extends AnotherAbstractClass
 {
@@ -20,7 +20,7 @@ final class RespectParentAbstractClass extends AnotherAbstractClass
 
 namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Fixture;
 
-use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source\AnotherAbstractClass;
+use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source\AnotherAbstractClass;
 
 final class RespectParentAbstractClass extends AnotherAbstractClass
 {
diff --git a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_data_provider.php.inc b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_data_provider.php.inc
index cf501447..09036aef 100644
--- a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_data_provider.php.inc
+++ b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_data_provider.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Fixture;
 
-use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source\AbstractClassWithDataProvider;
+use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source\AbstractClassWithDataProvider;
 
 final class RespectParentDataProvider extends AbstractClassWithDataProvider
 {
@@ -18,7 +18,7 @@ final class RespectParentDataProvider extends AbstractClassWithDataProvider
 
 namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Fixture;
 
-use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source\AbstractClassWithDataProvider;
+use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source\AbstractClassWithDataProvider;
 
 final class RespectParentDataProvider extends AbstractClassWithDataProvider
 {
diff --git a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AbstractClassWithDataProvider.php b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AbstractClassWithDataProvider.php
index f69c650e..e7962ccd 100644
--- a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AbstractClassWithDataProvider.php
+++ b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AbstractClassWithDataProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source;
+namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AnotherAbstractClass.php b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AnotherAbstractClass.php
index 1d458561..c84ad281 100644
--- a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AnotherAbstractClass.php
+++ b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AnotherAbstractClass.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source;
+namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/SomeClassToMock.php b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/SomeClassToMock.php
deleted file mode 100644
index 87aca259..00000000
--- a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/SomeClassToMock.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source;
-
-class SomeClassToMock {}
diff --git a/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/CacheAdapter.php b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/CachedAdapter.php
similarity index 100%
rename from rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/CacheAdapter.php
rename to rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/CachedAdapter.php
diff --git a/structarmed.php b/structarmed.php
new file mode 100644
index 00000000..2cd501fd
--- /dev/null
+++ b/structarmed.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Boundwize\StructArmed\Architecture;
+use Boundwize\StructArmed\Preset\Preset;
+
+return Architecture::define()
+    ->withPreset(Preset::PSR4());
diff --git a/tests/Issues/AnnotationParsing/AnnotationParsingTest.php b/tests/Issues/AnnotationParsing/AnnotationParsingTest.php
index b915b2ad..dc247249 100644
--- a/tests/Issues/AnnotationParsing/AnnotationParsingTest.php
+++ b/tests/Issues/AnnotationParsing/AnnotationParsingTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\PHPUnit\Tests\Issues\WrongAnnotation;
+namespace Rector\PHPUnit\Tests\Issues\AnnotationParsing;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;