diff --git a/extra/cssinliner-extra/.gitattributes b/extra/cssinliner-extra/.gitattributes
index 3a3ce6e7c..aa02dc651 100644
--- a/extra/cssinliner-extra/.gitattributes
+++ b/extra/cssinliner-extra/.gitattributes
@@ -1,2 +1,2 @@
-/tests export-ignore
+/Tests export-ignore
 /phpunit.xml.dist export-ignore
diff --git a/extra/cssinliner-extra/src/CssInlinerExtension.php b/extra/cssinliner-extra/CssInlinerExtension.php
similarity index 100%
rename from extra/cssinliner-extra/src/CssInlinerExtension.php
rename to extra/cssinliner-extra/CssInlinerExtension.php
diff --git a/extra/cssinliner-extra/tests/Fixtures/inline_css.test b/extra/cssinliner-extra/Tests/Fixtures/inline_css.test
similarity index 100%
rename from extra/cssinliner-extra/tests/Fixtures/inline_css.test
rename to extra/cssinliner-extra/Tests/Fixtures/inline_css.test
diff --git a/extra/cssinliner-extra/tests/IntegrationTest.php b/extra/cssinliner-extra/Tests/IntegrationTest.php
similarity index 100%
rename from extra/cssinliner-extra/tests/IntegrationTest.php
rename to extra/cssinliner-extra/Tests/IntegrationTest.php
diff --git a/extra/cssinliner-extra/composer.json b/extra/cssinliner-extra/composer.json
index 48b711028..0eb87ec8b 100644
--- a/extra/cssinliner-extra/composer.json
+++ b/extra/cssinliner-extra/composer.json
@@ -23,14 +23,10 @@
         "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
     },
     "autoload": {
-        "psr-4" : {
-            "Twig\\Extra\\CssInliner\\" : "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4" : {
-            "Twig\\Extra\\CssInliner\\Tests\\" : "test/"
-        }
+        "psr-4" : { "Twig\\Extra\\CssInliner\\" : "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
     },
     "extra": {
         "branch-alias": {
diff --git a/extra/cssinliner-extra/phpunit.xml.dist b/extra/cssinliner-extra/phpunit.xml.dist
index b911420cf..78ead58f5 100644
--- a/extra/cssinliner-extra/phpunit.xml.dist
+++ b/extra/cssinliner-extra/phpunit.xml.dist
@@ -14,7 +14,7 @@
 
     <testsuites>
         <testsuite name="Twig CssInlinder Extension Test Suite">
-            <directory>./tests/</directory>
+            <directory>./Tests/</directory>
         </testsuite>
     </testsuites>
 
@@ -22,7 +22,7 @@
         <whitelist>
             <directory>./</directory>
             <exclude>
-                <directory>./tests</directory>
+                <directory>./Tests</directory>
                 <directory>./vendor</directory>
             </exclude>
         </whitelist>
diff --git a/extra/html-extra/.gitattributes b/extra/html-extra/.gitattributes
index 3a3ce6e7c..aa02dc651 100644
--- a/extra/html-extra/.gitattributes
+++ b/extra/html-extra/.gitattributes
@@ -1,2 +1,2 @@
-/tests export-ignore
+/Tests export-ignore
 /phpunit.xml.dist export-ignore
diff --git a/extra/html-extra/src/HtmlExtension.php b/extra/html-extra/HtmlExtension.php
similarity index 100%
rename from extra/html-extra/src/HtmlExtension.php
rename to extra/html-extra/HtmlExtension.php
diff --git a/extra/html-extra/tests/Fixtures/data_uri.test b/extra/html-extra/Tests/Fixtures/data_uri.test
similarity index 100%
rename from extra/html-extra/tests/Fixtures/data_uri.test
rename to extra/html-extra/Tests/Fixtures/data_uri.test
diff --git a/extra/html-extra/tests/Fixtures/html_classes.test b/extra/html-extra/Tests/Fixtures/html_classes.test
similarity index 100%
rename from extra/html-extra/tests/Fixtures/html_classes.test
rename to extra/html-extra/Tests/Fixtures/html_classes.test
diff --git a/extra/html-extra/tests/Fixtures/html_classes_with_unsupported_arg.test b/extra/html-extra/Tests/Fixtures/html_classes_with_unsupported_arg.test
similarity index 100%
rename from extra/html-extra/tests/Fixtures/html_classes_with_unsupported_arg.test
rename to extra/html-extra/Tests/Fixtures/html_classes_with_unsupported_arg.test
diff --git a/extra/html-extra/tests/Fixtures/html_classes_with_unsupported_key.test b/extra/html-extra/Tests/Fixtures/html_classes_with_unsupported_key.test
similarity index 100%
rename from extra/html-extra/tests/Fixtures/html_classes_with_unsupported_key.test
rename to extra/html-extra/Tests/Fixtures/html_classes_with_unsupported_key.test
diff --git a/extra/html-extra/tests/IntegrationTest.php b/extra/html-extra/Tests/IntegrationTest.php
similarity index 100%
rename from extra/html-extra/tests/IntegrationTest.php
rename to extra/html-extra/Tests/IntegrationTest.php
diff --git a/extra/html-extra/composer.json b/extra/html-extra/composer.json
index da1e3ba33..6471bbb64 100644
--- a/extra/html-extra/composer.json
+++ b/extra/html-extra/composer.json
@@ -23,14 +23,10 @@
         "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
     },
     "autoload": {
-        "psr-4" : {
-            "Twig\\Extra\\Html\\" : "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4" : {
-            "Twig\\Extra\\Html\\Tests\\" : "tests/"
-        }
+        "psr-4" : { "Twig\\Extra\\Html\\" : "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
     },
     "extra": {
         "branch-alias": {
diff --git a/extra/html-extra/phpunit.xml.dist b/extra/html-extra/phpunit.xml.dist
index f722fa69e..83a13c728 100644
--- a/extra/html-extra/phpunit.xml.dist
+++ b/extra/html-extra/phpunit.xml.dist
@@ -14,7 +14,7 @@
 
     <testsuites>
         <testsuite name="Twig HTML Extension Test Suite">
-            <directory>./tests/</directory>
+            <directory>./Tests/</directory>
         </testsuite>
     </testsuites>
 
@@ -22,7 +22,7 @@
         <whitelist>
             <directory>./</directory>
             <exclude>
-                <directory>./tests</directory>
+                <directory>./Tests</directory>
                 <directory>./vendor</directory>
             </exclude>
         </whitelist>
diff --git a/extra/inky-extra/.gitattributes b/extra/inky-extra/.gitattributes
index 3a3ce6e7c..aa02dc651 100644
--- a/extra/inky-extra/.gitattributes
+++ b/extra/inky-extra/.gitattributes
@@ -1,2 +1,2 @@
-/tests export-ignore
+/Tests export-ignore
 /phpunit.xml.dist export-ignore
diff --git a/extra/inky-extra/src/InkyExtension.php b/extra/inky-extra/InkyExtension.php
similarity index 100%
rename from extra/inky-extra/src/InkyExtension.php
rename to extra/inky-extra/InkyExtension.php
diff --git a/extra/inky-extra/tests/Fixtures/inky.test b/extra/inky-extra/Tests/Fixtures/inky.test
similarity index 100%
rename from extra/inky-extra/tests/Fixtures/inky.test
rename to extra/inky-extra/Tests/Fixtures/inky.test
diff --git a/extra/inky-extra/tests/IntegrationTest.php b/extra/inky-extra/Tests/IntegrationTest.php
similarity index 100%
rename from extra/inky-extra/tests/IntegrationTest.php
rename to extra/inky-extra/Tests/IntegrationTest.php
diff --git a/extra/inky-extra/composer.json b/extra/inky-extra/composer.json
index 023206bfc..1ec8754e2 100644
--- a/extra/inky-extra/composer.json
+++ b/extra/inky-extra/composer.json
@@ -23,14 +23,10 @@
         "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
     },
     "autoload": {
-        "psr-4" : {
-            "Twig\\Extra\\Inky\\" : "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4" : {
-            "Twig\\Extra\\Inky\\Tests\\" : "test/"
-        }
+        "psr-4" : { "Twig\\Extra\\Inky\\" : "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
     },
     "extra": {
         "branch-alias": {
diff --git a/extra/inky-extra/phpunit.xml.dist b/extra/inky-extra/phpunit.xml.dist
index e8d48d53e..1a317bf68 100644
--- a/extra/inky-extra/phpunit.xml.dist
+++ b/extra/inky-extra/phpunit.xml.dist
@@ -14,7 +14,7 @@
 
     <testsuites>
         <testsuite name="Twig Inky Extension Test Suite">
-            <directory>./tests/</directory>
+            <directory>./Tests/</directory>
         </testsuite>
     </testsuites>
 
@@ -22,7 +22,7 @@
         <whitelist>
             <directory>./</directory>
             <exclude>
-                <directory>./tests</directory>
+                <directory>./Tests</directory>
                 <directory>./vendor</directory>
             </exclude>
         </whitelist>
diff --git a/extra/intl-extra/.gitattributes b/extra/intl-extra/.gitattributes
index 3a3ce6e7c..aa02dc651 100644
--- a/extra/intl-extra/.gitattributes
+++ b/extra/intl-extra/.gitattributes
@@ -1,2 +1,2 @@
-/tests export-ignore
+/Tests export-ignore
 /phpunit.xml.dist export-ignore
diff --git a/extra/intl-extra/src/IntlExtension.php b/extra/intl-extra/IntlExtension.php
similarity index 100%
rename from extra/intl-extra/src/IntlExtension.php
rename to extra/intl-extra/IntlExtension.php
diff --git a/extra/intl-extra/tests/Fixtures/country_name.test b/extra/intl-extra/Tests/Fixtures/country_name.test
similarity index 100%
rename from extra/intl-extra/tests/Fixtures/country_name.test
rename to extra/intl-extra/Tests/Fixtures/country_name.test
diff --git a/extra/intl-extra/tests/Fixtures/country_timezones.test b/extra/intl-extra/Tests/Fixtures/country_timezones.test
similarity index 100%
rename from extra/intl-extra/tests/Fixtures/country_timezones.test
rename to extra/intl-extra/Tests/Fixtures/country_timezones.test
diff --git a/extra/intl-extra/tests/Fixtures/currency_name.test b/extra/intl-extra/Tests/Fixtures/currency_name.test
similarity index 100%
rename from extra/intl-extra/tests/Fixtures/currency_name.test
rename to extra/intl-extra/Tests/Fixtures/currency_name.test
diff --git a/extra/intl-extra/tests/Fixtures/currency_symbol.test b/extra/intl-extra/Tests/Fixtures/currency_symbol.test
similarity index 100%
rename from extra/intl-extra/tests/Fixtures/currency_symbol.test
rename to extra/intl-extra/Tests/Fixtures/currency_symbol.test
diff --git a/extra/intl-extra/tests/Fixtures/format_currency.test b/extra/intl-extra/Tests/Fixtures/format_currency.test
similarity index 100%
rename from extra/intl-extra/tests/Fixtures/format_currency.test
rename to extra/intl-extra/Tests/Fixtures/format_currency.test
diff --git a/extra/intl-extra/tests/Fixtures/format_date.test b/extra/intl-extra/Tests/Fixtures/format_date.test
similarity index 100%
rename from extra/intl-extra/tests/Fixtures/format_date.test
rename to extra/intl-extra/Tests/Fixtures/format_date.test
diff --git a/extra/intl-extra/tests/Fixtures/format_number.test b/extra/intl-extra/Tests/Fixtures/format_number.test
similarity index 100%
rename from extra/intl-extra/tests/Fixtures/format_number.test
rename to extra/intl-extra/Tests/Fixtures/format_number.test
diff --git a/extra/intl-extra/tests/Fixtures/language_name.test b/extra/intl-extra/Tests/Fixtures/language_name.test
similarity index 100%
rename from extra/intl-extra/tests/Fixtures/language_name.test
rename to extra/intl-extra/Tests/Fixtures/language_name.test
diff --git a/extra/intl-extra/tests/Fixtures/locale_name.test b/extra/intl-extra/Tests/Fixtures/locale_name.test
similarity index 100%
rename from extra/intl-extra/tests/Fixtures/locale_name.test
rename to extra/intl-extra/Tests/Fixtures/locale_name.test
diff --git a/extra/intl-extra/tests/Fixtures/timezone_name.test b/extra/intl-extra/Tests/Fixtures/timezone_name.test
similarity index 100%
rename from extra/intl-extra/tests/Fixtures/timezone_name.test
rename to extra/intl-extra/Tests/Fixtures/timezone_name.test
diff --git a/extra/intl-extra/tests/IntegrationTest.php b/extra/intl-extra/Tests/IntegrationTest.php
similarity index 100%
rename from extra/intl-extra/tests/IntegrationTest.php
rename to extra/intl-extra/Tests/IntegrationTest.php
diff --git a/extra/intl-extra/tests/IntlExtensionTest.php b/extra/intl-extra/Tests/IntlExtensionTest.php
similarity index 100%
rename from extra/intl-extra/tests/IntlExtensionTest.php
rename to extra/intl-extra/Tests/IntlExtensionTest.php
diff --git a/extra/intl-extra/composer.json b/extra/intl-extra/composer.json
index 85be0d3db..f8dc96c93 100644
--- a/extra/intl-extra/composer.json
+++ b/extra/intl-extra/composer.json
@@ -23,14 +23,10 @@
         "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
     },
     "autoload": {
-        "psr-4" : {
-            "Twig\\Extra\\Intl\\" : "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4" : {
-            "Twig\\Extra\\Intl\\Tests\\" : "tests/"
-        }
+        "psr-4" : { "Twig\\Extra\\Intl\\" : "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
     },
     "extra": {
         "branch-alias": {
diff --git a/extra/intl-extra/phpunit.xml.dist b/extra/intl-extra/phpunit.xml.dist
index 3b89aba5b..be06f3797 100644
--- a/extra/intl-extra/phpunit.xml.dist
+++ b/extra/intl-extra/phpunit.xml.dist
@@ -15,7 +15,7 @@
 
     <testsuites>
         <testsuite name="Twig Intl Extension Test Suite">
-            <directory>./tests/</directory>
+            <directory>./Tests/</directory>
         </testsuite>
     </testsuites>
 
@@ -23,7 +23,7 @@
         <whitelist>
             <directory>./</directory>
             <exclude>
-                <directory>./tests</directory>
+                <directory>./Tests</directory>
                 <directory>./vendor</directory>
             </exclude>
         </whitelist>
diff --git a/extra/markdown-extra/.gitattributes b/extra/markdown-extra/.gitattributes
index 3a3ce6e7c..aa02dc651 100644
--- a/extra/markdown-extra/.gitattributes
+++ b/extra/markdown-extra/.gitattributes
@@ -1,2 +1,2 @@
-/tests export-ignore
+/Tests export-ignore
 /phpunit.xml.dist export-ignore
diff --git a/extra/markdown-extra/src/DefaultMarkdown.php b/extra/markdown-extra/DefaultMarkdown.php
similarity index 100%
rename from extra/markdown-extra/src/DefaultMarkdown.php
rename to extra/markdown-extra/DefaultMarkdown.php
diff --git a/extra/markdown-extra/src/ErusevMarkdown.php b/extra/markdown-extra/ErusevMarkdown.php
similarity index 100%
rename from extra/markdown-extra/src/ErusevMarkdown.php
rename to extra/markdown-extra/ErusevMarkdown.php
diff --git a/extra/markdown-extra/src/LeagueMarkdown.php b/extra/markdown-extra/LeagueMarkdown.php
similarity index 100%
rename from extra/markdown-extra/src/LeagueMarkdown.php
rename to extra/markdown-extra/LeagueMarkdown.php
diff --git a/extra/markdown-extra/src/MarkdownExtension.php b/extra/markdown-extra/MarkdownExtension.php
similarity index 100%
rename from extra/markdown-extra/src/MarkdownExtension.php
rename to extra/markdown-extra/MarkdownExtension.php
diff --git a/extra/markdown-extra/src/MarkdownInterface.php b/extra/markdown-extra/MarkdownInterface.php
similarity index 100%
rename from extra/markdown-extra/src/MarkdownInterface.php
rename to extra/markdown-extra/MarkdownInterface.php
diff --git a/extra/markdown-extra/src/MarkdownRuntime.php b/extra/markdown-extra/MarkdownRuntime.php
similarity index 100%
rename from extra/markdown-extra/src/MarkdownRuntime.php
rename to extra/markdown-extra/MarkdownRuntime.php
diff --git a/extra/markdown-extra/src/MichelfMarkdown.php b/extra/markdown-extra/MichelfMarkdown.php
similarity index 100%
rename from extra/markdown-extra/src/MichelfMarkdown.php
rename to extra/markdown-extra/MichelfMarkdown.php
diff --git a/extra/markdown-extra/tests/Fixtures/html_to_markdown.test b/extra/markdown-extra/Tests/Fixtures/html_to_markdown.test
similarity index 100%
rename from extra/markdown-extra/tests/Fixtures/html_to_markdown.test
rename to extra/markdown-extra/Tests/Fixtures/html_to_markdown.test
diff --git a/extra/markdown-extra/tests/FunctionalTest.php b/extra/markdown-extra/Tests/FunctionalTest.php
similarity index 100%
rename from extra/markdown-extra/tests/FunctionalTest.php
rename to extra/markdown-extra/Tests/FunctionalTest.php
diff --git a/extra/markdown-extra/tests/IntegrationTest.php b/extra/markdown-extra/Tests/IntegrationTest.php
similarity index 100%
rename from extra/markdown-extra/tests/IntegrationTest.php
rename to extra/markdown-extra/Tests/IntegrationTest.php
diff --git a/extra/markdown-extra/composer.json b/extra/markdown-extra/composer.json
index 074659961..4b1ee3f87 100644
--- a/extra/markdown-extra/composer.json
+++ b/extra/markdown-extra/composer.json
@@ -26,14 +26,10 @@
         "michelf/php-markdown": "^1.8"
     },
     "autoload": {
-        "psr-4" : {
-            "Twig\\Extra\\Markdown\\" : "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4" : {
-            "Twig\\Extra\\Markdown\\Tests\\" : "tests/"
-        }
+        "psr-4" : { "Twig\\Extra\\Markdown\\" : "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
     },
     "extra": {
         "branch-alias": {
diff --git a/extra/markdown-extra/phpunit.xml.dist b/extra/markdown-extra/phpunit.xml.dist
index 4b84ca9c2..cc7b8577d 100644
--- a/extra/markdown-extra/phpunit.xml.dist
+++ b/extra/markdown-extra/phpunit.xml.dist
@@ -14,7 +14,7 @@
 
     <testsuites>
         <testsuite name="Twig Markdown Extension Test Suite">
-            <directory>./tests/</directory>
+            <directory>./Tests/</directory>
         </testsuite>
     </testsuites>
 
@@ -22,7 +22,7 @@
         <whitelist>
             <directory>./</directory>
             <exclude>
-                <directory>./tests</directory>
+                <directory>./Tests</directory>
                 <directory>./vendor</directory>
             </exclude>
         </whitelist>
diff --git a/extra/string-extra/.gitattributes b/extra/string-extra/.gitattributes
index 3a3ce6e7c..aa02dc651 100644
--- a/extra/string-extra/.gitattributes
+++ b/extra/string-extra/.gitattributes
@@ -1,2 +1,2 @@
-/tests export-ignore
+/Tests export-ignore
 /phpunit.xml.dist export-ignore
diff --git a/extra/string-extra/src/StringExtension.php b/extra/string-extra/StringExtension.php
similarity index 100%
rename from extra/string-extra/src/StringExtension.php
rename to extra/string-extra/StringExtension.php
diff --git a/extra/string-extra/tests/Fixtures/string.test b/extra/string-extra/Tests/Fixtures/string.test
similarity index 100%
rename from extra/string-extra/tests/Fixtures/string.test
rename to extra/string-extra/Tests/Fixtures/string.test
diff --git a/extra/string-extra/tests/IntegrationTest.php b/extra/string-extra/Tests/IntegrationTest.php
similarity index 100%
rename from extra/string-extra/tests/IntegrationTest.php
rename to extra/string-extra/Tests/IntegrationTest.php
diff --git a/extra/string-extra/composer.json b/extra/string-extra/composer.json
index 23174ecdd..aacd0a21f 100644
--- a/extra/string-extra/composer.json
+++ b/extra/string-extra/composer.json
@@ -23,14 +23,10 @@
         "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
     },
     "autoload": {
-        "psr-4" : {
-            "Twig\\Extra\\String\\" : "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4" : {
-            "Twig\\Extra\\String\\Tests\\" : "tests/"
-        }
+        "psr-4" : { "Twig\\Extra\\String\\" : "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
     },
     "extra": {
         "branch-alias": {
diff --git a/extra/string-extra/phpunit.xml.dist b/extra/string-extra/phpunit.xml.dist
index 29f08c8fd..930cc0ab1 100644
--- a/extra/string-extra/phpunit.xml.dist
+++ b/extra/string-extra/phpunit.xml.dist
@@ -14,7 +14,7 @@
 
     <testsuites>
         <testsuite name="Twig String Extension Test Suite">
-            <directory>./tests/</directory>
+            <directory>./Tests/</directory>
         </testsuite>
     </testsuites>
 
@@ -22,7 +22,7 @@
         <whitelist>
             <directory>./</directory>
             <exclude>
-                <directory>./tests</directory>
+                <directory>./Tests</directory>
                 <directory>./vendor</directory>
             </exclude>
         </whitelist>
diff --git a/extra/twig-extra-bundle/.gitattributes b/extra/twig-extra-bundle/.gitattributes
index 3a3ce6e7c..aa02dc651 100644
--- a/extra/twig-extra-bundle/.gitattributes
+++ b/extra/twig-extra-bundle/.gitattributes
@@ -1,2 +1,2 @@
-/tests export-ignore
+/Tests export-ignore
 /phpunit.xml.dist export-ignore
diff --git a/extra/twig-extra-bundle/src/DependencyInjection/Compiler/MissingExtensionSuggestorPass.php b/extra/twig-extra-bundle/DependencyInjection/Compiler/MissingExtensionSuggestorPass.php
similarity index 100%
rename from extra/twig-extra-bundle/src/DependencyInjection/Compiler/MissingExtensionSuggestorPass.php
rename to extra/twig-extra-bundle/DependencyInjection/Compiler/MissingExtensionSuggestorPass.php
diff --git a/extra/twig-extra-bundle/src/DependencyInjection/Configuration.php b/extra/twig-extra-bundle/DependencyInjection/Configuration.php
similarity index 100%
rename from extra/twig-extra-bundle/src/DependencyInjection/Configuration.php
rename to extra/twig-extra-bundle/DependencyInjection/Configuration.php
diff --git a/extra/twig-extra-bundle/src/DependencyInjection/TwigExtraExtension.php b/extra/twig-extra-bundle/DependencyInjection/TwigExtraExtension.php
similarity index 100%
rename from extra/twig-extra-bundle/src/DependencyInjection/TwigExtraExtension.php
rename to extra/twig-extra-bundle/DependencyInjection/TwigExtraExtension.php
diff --git a/extra/twig-extra-bundle/src/Extensions.php b/extra/twig-extra-bundle/Extensions.php
similarity index 100%
rename from extra/twig-extra-bundle/src/Extensions.php
rename to extra/twig-extra-bundle/Extensions.php
diff --git a/extra/twig-extra-bundle/src/MissingExtensionSuggestor.php b/extra/twig-extra-bundle/MissingExtensionSuggestor.php
similarity index 100%
rename from extra/twig-extra-bundle/src/MissingExtensionSuggestor.php
rename to extra/twig-extra-bundle/MissingExtensionSuggestor.php
diff --git a/extra/twig-extra-bundle/src/Resources/config/cssinliner.php b/extra/twig-extra-bundle/Resources/config/cssinliner.php
similarity index 100%
rename from extra/twig-extra-bundle/src/Resources/config/cssinliner.php
rename to extra/twig-extra-bundle/Resources/config/cssinliner.php
diff --git a/extra/twig-extra-bundle/src/Resources/config/html.php b/extra/twig-extra-bundle/Resources/config/html.php
similarity index 100%
rename from extra/twig-extra-bundle/src/Resources/config/html.php
rename to extra/twig-extra-bundle/Resources/config/html.php
diff --git a/extra/twig-extra-bundle/src/Resources/config/inky.php b/extra/twig-extra-bundle/Resources/config/inky.php
similarity index 100%
rename from extra/twig-extra-bundle/src/Resources/config/inky.php
rename to extra/twig-extra-bundle/Resources/config/inky.php
diff --git a/extra/twig-extra-bundle/src/Resources/config/intl.php b/extra/twig-extra-bundle/Resources/config/intl.php
similarity index 100%
rename from extra/twig-extra-bundle/src/Resources/config/intl.php
rename to extra/twig-extra-bundle/Resources/config/intl.php
diff --git a/extra/twig-extra-bundle/src/Resources/config/markdown.php b/extra/twig-extra-bundle/Resources/config/markdown.php
similarity index 100%
rename from extra/twig-extra-bundle/src/Resources/config/markdown.php
rename to extra/twig-extra-bundle/Resources/config/markdown.php
diff --git a/extra/twig-extra-bundle/src/Resources/config/string.php b/extra/twig-extra-bundle/Resources/config/string.php
similarity index 100%
rename from extra/twig-extra-bundle/src/Resources/config/string.php
rename to extra/twig-extra-bundle/Resources/config/string.php
diff --git a/extra/twig-extra-bundle/src/Resources/config/suggestor.php b/extra/twig-extra-bundle/Resources/config/suggestor.php
similarity index 100%
rename from extra/twig-extra-bundle/src/Resources/config/suggestor.php
rename to extra/twig-extra-bundle/Resources/config/suggestor.php
diff --git a/extra/twig-extra-bundle/src/Tests/DependencyInjection/TwigExtraExtensionTest.php b/extra/twig-extra-bundle/Tests/DependencyInjection/TwigExtraExtensionTest.php
similarity index 100%
rename from extra/twig-extra-bundle/src/Tests/DependencyInjection/TwigExtraExtensionTest.php
rename to extra/twig-extra-bundle/Tests/DependencyInjection/TwigExtraExtensionTest.php
diff --git a/extra/twig-extra-bundle/src/TwigExtraBundle.php b/extra/twig-extra-bundle/TwigExtraBundle.php
similarity index 100%
rename from extra/twig-extra-bundle/src/TwigExtraBundle.php
rename to extra/twig-extra-bundle/TwigExtraBundle.php
diff --git a/extra/twig-extra-bundle/composer.json b/extra/twig-extra-bundle/composer.json
index b574da097..367ca1e76 100644
--- a/extra/twig-extra-bundle/composer.json
+++ b/extra/twig-extra-bundle/composer.json
@@ -30,7 +30,7 @@
         "twig/string-extra": "^2.12|^3.0"
     },
     "autoload": {
-        "psr-4" : { "Twig\\Extra\\TwigExtraBundle\\" : "src/" },
+        "psr-4" : { "Twig\\Extra\\TwigExtraBundle\\" : "" },
         "exclude-from-classmap": [
             "/Tests/"
         ]
diff --git a/extra/twig-extra-bundle/phpunit.xml.dist b/extra/twig-extra-bundle/phpunit.xml.dist
index 6a09ac388..901246f1a 100644
--- a/extra/twig-extra-bundle/phpunit.xml.dist
+++ b/extra/twig-extra-bundle/phpunit.xml.dist
@@ -14,13 +14,17 @@
 
     <testsuites>
         <testsuite name="Twig Extra bundle Test Suite">
-            <directory>./tests/</directory>
+            <directory>./Tests/</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>./src/</directory>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
         </whitelist>
     </filter>
 </phpunit>