diff --git a/behat/symfony2-extension/2.1/config/bootstrap.php b/behat/symfony2-extension/2.1/config/bootstrap.php
deleted file mode 120000
index 57ba1e6e..00000000
--- a/behat/symfony2-extension/2.1/config/bootstrap.php
+++ /dev/null
@@ -1 +0,0 @@
-../../../../symfony/framework-bundle/3.3/config/bootstrap.php
\ No newline at end of file
diff --git a/behat/symfony2-extension/2.1/features/bootstrap/bootstrap.php b/behat/symfony2-extension/2.1/features/bootstrap/bootstrap.php
index 0f3ad18d..c6d7aa06 100644
--- a/behat/symfony2-extension/2.1/features/bootstrap/bootstrap.php
+++ b/behat/symfony2-extension/2.1/features/bootstrap/bootstrap.php
@@ -1,4 +1,11 @@
 <?php
 
+use Symfony\Component\Dotenv\Dotenv;
+
 putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = 'test');
-require dirname(__DIR__, 2).'/config/bootstrap.php';
+
+if (file_exists(dirname(__DIR__, 2).'/config/bootstrap.php')) {
+    require dirname(__DIR__, 2).'/config/bootstrap.php';
+} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+    (new Dotenv())->bootEnv(dirname(__DIR__, 2).'/.env');
+}
diff --git a/behat/symfony2-extension/2.1/manifest.json b/behat/symfony2-extension/2.1/manifest.json
index 36c58299..73d92320 100644
--- a/behat/symfony2-extension/2.1/manifest.json
+++ b/behat/symfony2-extension/2.1/manifest.json
@@ -1,7 +1,6 @@
 {
     "copy-from-recipe": {
         "behat.yml.dist": "behat.yml.dist",
-        "config/": "%CONFIG_DIR%/",
         "features/": "features/"
     },
     "aliases": ["behat"],
diff --git a/phpunit/phpunit/4.7/config/bootstrap.php b/phpunit/phpunit/4.7/config/bootstrap.php
deleted file mode 120000
index 57ba1e6e..00000000
--- a/phpunit/phpunit/4.7/config/bootstrap.php
+++ /dev/null
@@ -1 +0,0 @@
-../../../../symfony/framework-bundle/3.3/config/bootstrap.php
\ No newline at end of file
diff --git a/phpunit/phpunit/4.7/manifest.json b/phpunit/phpunit/4.7/manifest.json
index ef0eb116..8af7b3b3 100644
--- a/phpunit/phpunit/4.7/manifest.json
+++ b/phpunit/phpunit/4.7/manifest.json
@@ -2,7 +2,6 @@
     "copy-from-recipe": {
         ".env.test": ".env.test",
         "phpunit.xml.dist": "phpunit.xml.dist",
-        "config/": "%CONFIG_DIR%/",
         "tests/": "tests/"
     },
     "gitignore": [
diff --git a/phpunit/phpunit/4.7/phpunit.xml.dist b/phpunit/phpunit/4.7/phpunit.xml.dist
index f50358e2..214665a4 100644
--- a/phpunit/phpunit/4.7/phpunit.xml.dist
+++ b/phpunit/phpunit/4.7/phpunit.xml.dist
@@ -5,7 +5,7 @@
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="config/bootstrap.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/phpunit/phpunit/4.7/tests b/phpunit/phpunit/4.7/tests
new file mode 120000
index 00000000..98911dc6
--- /dev/null
+++ b/phpunit/phpunit/4.7/tests
@@ -0,0 +1 @@
+../../../symfony/phpunit-bridge/3.3/tests/
\ No newline at end of file
diff --git a/phpunit/phpunit/4.7/tests/.gitignore b/phpunit/phpunit/4.7/tests/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/symfony/console/5.1/bin/console b/symfony/console/5.1/bin/console
new file mode 100755
index 00000000..8fe9d494
--- /dev/null
+++ b/symfony/console/5.1/bin/console
@@ -0,0 +1,43 @@
+#!/usr/bin/env php
+<?php
+
+use App\Kernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Dotenv\Dotenv;
+use Symfony\Component\ErrorHandler\Debug;
+
+if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
+    echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
+}
+
+set_time_limit(0);
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+if (!class_exists(Application::class) || !class_exists(Dotenv::class)) {
+    throw new LogicException('You need to add "symfony/framework-bundle" and "symfony/dotenv" as Composer dependencies.');
+}
+
+$input = new ArgvInput();
+if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
+    putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
+}
+
+if ($input->hasParameterOption('--no-debug', true)) {
+    putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
+}
+
+(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+
+if ($_SERVER['APP_DEBUG']) {
+    umask(0000);
+
+    if (class_exists(Debug::class)) {
+        Debug::enable();
+    }
+}
+
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
+$application = new Application($kernel);
+$application->run($input);
diff --git a/symfony/console/5.1/manifest.json b/symfony/console/5.1/manifest.json
new file mode 100644
index 00000000..b0e9e1d4
--- /dev/null
+++ b/symfony/console/5.1/manifest.json
@@ -0,0 +1,6 @@
+{
+    "copy-from-recipe": {
+        "bin/": "%BIN_DIR%/"
+    },
+    "aliases": ["cli"]
+}
diff --git a/symfony/framework-bundle/5.1/config b/symfony/framework-bundle/5.1/config
deleted file mode 120000
index 7c6880c7..00000000
--- a/symfony/framework-bundle/5.1/config
+++ /dev/null
@@ -1 +0,0 @@
-../4.4/config
\ No newline at end of file
diff --git a/symfony/framework-bundle/5.1/config/packages/cache.yaml b/symfony/framework-bundle/5.1/config/packages/cache.yaml
new file mode 120000
index 00000000..a8816e95
--- /dev/null
+++ b/symfony/framework-bundle/5.1/config/packages/cache.yaml
@@ -0,0 +1 @@
+../../../3.3/config/packages/cache.yaml
\ No newline at end of file
diff --git a/symfony/framework-bundle/5.1/config/packages/framework.yaml b/symfony/framework-bundle/5.1/config/packages/framework.yaml
new file mode 100644
index 00000000..f0db032d
--- /dev/null
+++ b/symfony/framework-bundle/5.1/config/packages/framework.yaml
@@ -0,0 +1,15 @@
+framework:
+    #csrf_protection: true
+    #http_method_override: true
+
+    # Enables session support. Note that the session will ONLY be started if you read or write from it.
+    # Remove or comment this section to explicitly disable session support.
+    session:
+        handler_id: null
+        cookie_secure: auto
+        cookie_samesite: lax
+
+    #esi: true
+    #fragments: true
+    php_errors:
+        log: true
diff --git a/symfony/framework-bundle/5.1/config/packages/test b/symfony/framework-bundle/5.1/config/packages/test
new file mode 120000
index 00000000..6e472748
--- /dev/null
+++ b/symfony/framework-bundle/5.1/config/packages/test
@@ -0,0 +1 @@
+../../../4.2/config/packages/test/
\ No newline at end of file
diff --git a/symfony/framework-bundle/5.1/config/routes b/symfony/framework-bundle/5.1/config/routes
new file mode 120000
index 00000000..c4d8e6b9
--- /dev/null
+++ b/symfony/framework-bundle/5.1/config/routes
@@ -0,0 +1 @@
+../../4.4/config/routes/
\ No newline at end of file
diff --git a/symfony/framework-bundle/5.1/config/services.yaml b/symfony/framework-bundle/5.1/config/services.yaml
new file mode 120000
index 00000000..be69bb02
--- /dev/null
+++ b/symfony/framework-bundle/5.1/config/services.yaml
@@ -0,0 +1 @@
+../../4.2/config/services.yaml
\ No newline at end of file
diff --git a/symfony/framework-bundle/5.1/manifest.json b/symfony/framework-bundle/5.1/manifest.json
index 6646fc44..5fe6af0e 120000
--- a/symfony/framework-bundle/5.1/manifest.json
+++ b/symfony/framework-bundle/5.1/manifest.json
@@ -1 +1 @@
-../4.4/manifest.json
\ No newline at end of file
+../4.2/manifest.json
\ No newline at end of file
diff --git a/symfony/framework-bundle/5.1/post-install.txt b/symfony/framework-bundle/5.1/post-install.txt
index a98bd236..943d1280 120000
--- a/symfony/framework-bundle/5.1/post-install.txt
+++ b/symfony/framework-bundle/5.1/post-install.txt
@@ -1 +1 @@
-../4.4/post-install.txt
\ No newline at end of file
+../4.2/post-install.txt
\ No newline at end of file
diff --git a/symfony/framework-bundle/5.1/public b/symfony/framework-bundle/5.1/public
deleted file mode 120000
index 7f72027e..00000000
--- a/symfony/framework-bundle/5.1/public
+++ /dev/null
@@ -1 +0,0 @@
-../4.4/public
\ No newline at end of file
diff --git a/symfony/framework-bundle/5.1/public/index.php b/symfony/framework-bundle/5.1/public/index.php
new file mode 100644
index 00000000..f3b571cf
--- /dev/null
+++ b/symfony/framework-bundle/5.1/public/index.php
@@ -0,0 +1,30 @@
+<?php
+
+use App\Kernel;
+use Symfony\Component\Dotenv\Dotenv;
+use Symfony\Component\ErrorHandler\Debug;
+use Symfony\Component\HttpFoundation\Request;
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+
+if ($_SERVER['APP_DEBUG']) {
+    umask(0000);
+
+    Debug::enable();
+}
+
+if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
+    Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
+}
+
+if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {
+    Request::setTrustedHosts([$trustedHosts]);
+}
+
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
+$request = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);
diff --git a/symfony/phpunit-bridge/3.3/config/bootstrap.php b/symfony/phpunit-bridge/3.3/config/bootstrap.php
deleted file mode 120000
index 57ba1e6e..00000000
--- a/symfony/phpunit-bridge/3.3/config/bootstrap.php
+++ /dev/null
@@ -1 +0,0 @@
-../../../../symfony/framework-bundle/3.3/config/bootstrap.php
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/3.3/phpunit.xml.dist b/symfony/phpunit-bridge/3.3/phpunit.xml.dist
index 57c35335..d04e8ff5 100644
--- a/symfony/phpunit-bridge/3.3/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/3.3/phpunit.xml.dist
@@ -5,7 +5,7 @@
          xsi:noNamespaceSchemaLocation="bin/.phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="config/bootstrap.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/symfony/phpunit-bridge/3.3/tests/.gitignore b/symfony/phpunit-bridge/3.3/tests/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/symfony/phpunit-bridge/3.3/tests/bootstrap.php b/symfony/phpunit-bridge/3.3/tests/bootstrap.php
new file mode 100644
index 00000000..469dccee
--- /dev/null
+++ b/symfony/phpunit-bridge/3.3/tests/bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Dotenv\Dotenv;
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) {
+    require dirname(__DIR__).'/config/bootstrap.php';
+} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+    (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+}
diff --git a/symfony/phpunit-bridge/4.1/config b/symfony/phpunit-bridge/4.1/config
new file mode 120000
index 00000000..5b435e97
--- /dev/null
+++ b/symfony/phpunit-bridge/4.1/config
@@ -0,0 +1 @@
+../3.3/config/
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.1/config/bootstrap.php b/symfony/phpunit-bridge/4.1/config/bootstrap.php
deleted file mode 120000
index 57ba1e6e..00000000
--- a/symfony/phpunit-bridge/4.1/config/bootstrap.php
+++ /dev/null
@@ -1 +0,0 @@
-../../../../symfony/framework-bundle/3.3/config/bootstrap.php
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.1/manifest.json b/symfony/phpunit-bridge/4.1/manifest.json
deleted file mode 100644
index a0437e54..00000000
--- a/symfony/phpunit-bridge/4.1/manifest.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "copy-from-recipe": {
-        ".env.test": ".env.test",
-        "bin/": "%BIN_DIR%/",
-        "config/": "%CONFIG_DIR%/",
-        "phpunit.xml.dist": "phpunit.xml.dist",
-        "tests/": "tests/"
-    },
-    "gitignore": [
-        ".phpunit",
-        ".phpunit.result.cache",
-        "/phpunit.xml"
-    ],
-    "aliases": ["simple-phpunit"]
-}
diff --git a/symfony/phpunit-bridge/4.1/manifest.json b/symfony/phpunit-bridge/4.1/manifest.json
new file mode 120000
index 00000000..ae0cf233
--- /dev/null
+++ b/symfony/phpunit-bridge/4.1/manifest.json
@@ -0,0 +1 @@
+../3.3/manifest.json
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.1/phpunit.xml.dist b/symfony/phpunit-bridge/4.1/phpunit.xml.dist
index 7ad83637..d81f0c30 100644
--- a/symfony/phpunit-bridge/4.1/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/4.1/phpunit.xml.dist
@@ -5,7 +5,7 @@
          xsi:noNamespaceSchemaLocation="bin/.phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="config/bootstrap.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/symfony/phpunit-bridge/4.1/post-install.txt b/symfony/phpunit-bridge/4.1/post-install.txt
deleted file mode 100644
index 6dd929f7..00000000
--- a/symfony/phpunit-bridge/4.1/post-install.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-<bg=blue;fg=white>              </>
-<bg=blue;fg=white> How to test? </>
-<bg=blue;fg=white>              </>
-
-  * <fg=blue>Write</> test cases in the <comment>tests/</> folder
-  * <fg=blue>Run</> <comment>php bin/phpunit</>
diff --git a/symfony/phpunit-bridge/4.1/post-install.txt b/symfony/phpunit-bridge/4.1/post-install.txt
new file mode 120000
index 00000000..bba626e0
--- /dev/null
+++ b/symfony/phpunit-bridge/4.1/post-install.txt
@@ -0,0 +1 @@
+../3.3/post-install.txt
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.1/tests b/symfony/phpunit-bridge/4.1/tests
new file mode 120000
index 00000000..1f30e2be
--- /dev/null
+++ b/symfony/phpunit-bridge/4.1/tests
@@ -0,0 +1 @@
+../3.3/tests/
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.1/tests/.gitignore b/symfony/phpunit-bridge/4.1/tests/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/symfony/phpunit-bridge/4.2/.env.test b/symfony/phpunit-bridge/4.2/.env.test
deleted file mode 120000
index ba1559e9..00000000
--- a/symfony/phpunit-bridge/4.2/.env.test
+++ /dev/null
@@ -1 +0,0 @@
-../4.1/.env.test
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.2/bin b/symfony/phpunit-bridge/4.2/bin
deleted file mode 120000
index 7aedead0..00000000
--- a/symfony/phpunit-bridge/4.2/bin
+++ /dev/null
@@ -1 +0,0 @@
-../4.1/bin
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.2/config/bootstrap.php b/symfony/phpunit-bridge/4.2/config/bootstrap.php
deleted file mode 120000
index df20375d..00000000
--- a/symfony/phpunit-bridge/4.2/config/bootstrap.php
+++ /dev/null
@@ -1 +0,0 @@
-../../../framework-bundle/4.2/config/bootstrap.php
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.2/manifest.json b/symfony/phpunit-bridge/4.2/manifest.json
deleted file mode 120000
index 39fa2e74..00000000
--- a/symfony/phpunit-bridge/4.2/manifest.json
+++ /dev/null
@@ -1 +0,0 @@
-../4.1/manifest.json
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.2/phpunit.xml.dist b/symfony/phpunit-bridge/4.2/phpunit.xml.dist
deleted file mode 120000
index 87fc0532..00000000
--- a/symfony/phpunit-bridge/4.2/phpunit.xml.dist
+++ /dev/null
@@ -1 +0,0 @@
-../4.1/phpunit.xml.dist
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.2/post-install.txt b/symfony/phpunit-bridge/4.2/post-install.txt
deleted file mode 120000
index 62244d6b..00000000
--- a/symfony/phpunit-bridge/4.2/post-install.txt
+++ /dev/null
@@ -1 +0,0 @@
-../4.1/post-install.txt
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.2/tests b/symfony/phpunit-bridge/4.2/tests
deleted file mode 120000
index 1b0fd3bb..00000000
--- a/symfony/phpunit-bridge/4.2/tests
+++ /dev/null
@@ -1 +0,0 @@
-../4.1/tests
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.3/config b/symfony/phpunit-bridge/4.3/config
new file mode 120000
index 00000000..5b435e97
--- /dev/null
+++ b/symfony/phpunit-bridge/4.3/config
@@ -0,0 +1 @@
+../3.3/config/
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.3/config/bootstrap.php b/symfony/phpunit-bridge/4.3/config/bootstrap.php
deleted file mode 120000
index a1c12047..00000000
--- a/symfony/phpunit-bridge/4.3/config/bootstrap.php
+++ /dev/null
@@ -1 +0,0 @@
-../../4.2/config/bootstrap.php
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.3/manifest.json b/symfony/phpunit-bridge/4.3/manifest.json
index 5fe6af0e..ae0cf233 120000
--- a/symfony/phpunit-bridge/4.3/manifest.json
+++ b/symfony/phpunit-bridge/4.3/manifest.json
@@ -1 +1 @@
-../4.2/manifest.json
\ No newline at end of file
+../3.3/manifest.json
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.3/phpunit.xml.dist b/symfony/phpunit-bridge/4.3/phpunit.xml.dist
index 9144dcd1..87fc0532 120000
--- a/symfony/phpunit-bridge/4.3/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/4.3/phpunit.xml.dist
@@ -1 +1 @@
-../4.2/phpunit.xml.dist
\ No newline at end of file
+../4.1/phpunit.xml.dist
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.3/post-install.txt b/symfony/phpunit-bridge/4.3/post-install.txt
index 943d1280..bba626e0 120000
--- a/symfony/phpunit-bridge/4.3/post-install.txt
+++ b/symfony/phpunit-bridge/4.3/post-install.txt
@@ -1 +1 @@
-../4.2/post-install.txt
\ No newline at end of file
+../3.3/post-install.txt
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.3/tests b/symfony/phpunit-bridge/4.3/tests
new file mode 120000
index 00000000..1f30e2be
--- /dev/null
+++ b/symfony/phpunit-bridge/4.3/tests
@@ -0,0 +1 @@
+../3.3/tests/
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/4.3/tests/.gitignore b/symfony/phpunit-bridge/4.3/tests/.gitignore
deleted file mode 100644
index e69de29b..00000000