diff --git a/.gitignore b/.gitignore
index 71cad70a..50c90073 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.cache
 .Build
 .DS_Store
+.php-cs-fixer.php
 /.buildpath
 /.idea/
 /.project
@@ -15,7 +16,3 @@ typo3temp
 uploads
 var
 vendor
-composer.lock
-.Build
-tika_pid
-*.cache
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
deleted file mode 100644
index cf5fd2b4..00000000
--- a/.php-cs-fixer.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$config = \TYPO3\CodingStandards\CsFixerConfig::create();
-$config
-    ->addRules(
-        [
-            'ordered_imports' => [
-                'imports_order' => ['class', 'function', 'const'],
-                'sort_algorithm' => 'alpha'
-            ]
-        ],
-    )
-    ->getFinder()
-    ->exclude([
-        '.Build'
-    ])
-    ->in(__DIR__);
-return $config;
diff --git a/composer.json b/composer.json
index f6cd237b..186c6ffb 100644
--- a/composer.json
+++ b/composer.json
@@ -71,8 +71,8 @@
   },
   "scripts": {
     "post-autoload-dump": [
-      "mkdir -p .Build/Web/typo3conf/ext/",
-      "[ -L .Build/Web/typo3conf/ext/tika ] || ln -snvf ../../../../. .Build/Web/typo3conf/ext/tika"
+      "mkdir -p .Build/vendor/apache-solr-for-typo3",
+      "[ -L .Build/vendor/apache-solr-for-typo3/tika ] || ln -snvf ../../../. .Build/vendor/apache-solr-for-typo3/tika"
     ],
     "tika:download": [ "CALLED_VIA_COMPOSER=1 REQUIRED_TIKA_VERSION=$($COMPOSER_BINARY tika:req:tika) ./Build/Helpers/download_tika_binaries.sh"],
     "tika:download:app": [ "@tika:download -a" ],
@@ -90,6 +90,8 @@
       "@composer req --update-with-all-dependencies typo3/cms-core:${TYPO3_VERSION}",
       "@composer reinstall --prefer-source typo3/cms-core apache-solr-for-typo3/solr",
       "@composer dump-autoload",
+      "cp .Build/vendor/apache-solr-for-typo3/solr/.php-cs-fixer.php .",
+      "@composer global require sclable/xml-lint scrutinizer/ocular",
       "echo \"Restoring composer.json to initial state:\" && git checkout composer.json"
     ],
     "tests:unit": [ "phpunit --colors -c Build/Test/UnitTests.xml --bootstrap=Build/Test/UnitTestsBootstrap.php" ],