diff --git a/.gitattributes b/.gitattributes
index 79ecf3ae..d62bb983 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
 /.github/                       export-ignore
+/.phive/                        export-ignore
 /test/                          export-ignore
-/tools/                         export-ignore
 /.editorconfig                  export-ignore
 /.gitattributes                 export-ignore
 /.gitignore                     export-ignore
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index b56cbeb9..091b42da 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -120,7 +120,7 @@ jobs:
           dependencies: "${{ matrix.dependencies }}"
 
       - name: "Run maglnet/composer-require-checker"
-        run: "tools/composer-require-checker check --config-file=$(pwd)/composer-require-checker.json"
+        run: ".phive/composer-require-checker check --config-file=$(pwd)/composer-require-checker.json"
 
   static-code-analysis:
     name: "Static Code Analysis"
@@ -285,7 +285,7 @@ jobs:
           dependencies: "${{ matrix.dependencies }}"
 
       - name: "Collect code coverage with pcov and phpunit/phpunit"
-        run: "vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --coverage-clover=.build/logs/clover.xml"
+        run: "vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --coverage-clover=.build/phpunit/logs/clover.xml"
 
       - name: "Send code coverage report to Codecov.io"
         env:
diff --git a/.phive/composer-require-checker b/.phive/composer-require-checker
new file mode 100755
index 00000000..5b513986
Binary files /dev/null and b/.phive/composer-require-checker differ
diff --git a/Makefile b/Makefile
index 6adf3f20..d985dad4 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-norm
 
 .PHONY: dependency-analysis
 dependency-analysis: vendor ## Runs a dependency analysis with maglnet/composer-require-checker
-	tools/composer-require-checker check --config-file=$(shell pwd)/composer-require-checker.json
+	.phive/composer-require-checker check --config-file=$(shell pwd)/composer-require-checker.json
 
 .PHONY: help
 help: ## Displays this list of targets with descriptions
diff --git a/phive.xml b/phive.xml
index a88a0a03..b7a46302 100644
--- a/phive.xml
+++ b/phive.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="composer-require-checker" version="^2.1.0" installed="2.1.0" location="./tools/composer-require-checker" copy="true"/>
+  <phar name="composer-require-checker" version="^2.1.0" installed="2.1.0" location="./.phive/composer-require-checker" copy="true"/>
 </phive>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 87b01d35..ae1876ab 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.16@d03e5ef057d6adc656c0ff7e166c50b73b4f48f3">
+<files psalm-version="3.18.2@19aa905f7c3c7350569999a93c40ae91ae4e1626">
   <file src="test/Unit/FactoryTest.php">
     <MixedInferredReturnType occurrences="1">
       <code>\Generator</code>