diff --git a/.gitignore b/.gitignore
index 0b15e407d..7695184bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 logs/
 reports/
 dist/
-tests/Doctrine/Tests/Common/Proxy/generated/
+tests/Common/Proxy/generated/
 composer.lock
 vendor/
 doctrine-common-*.tar
diff --git a/composer.json b/composer.json
index 6e62405bc..4a1dca305 100644
--- a/composer.json
+++ b/composer.json
@@ -33,12 +33,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Doctrine\\Common\\": "lib/Doctrine/Common"
+            "Doctrine\\Common\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Doctrine\\Tests\\": "tests/Doctrine/Tests"
+            "Doctrine\\Tests\\": "tests"
         }
     },
     "config": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index d701f43fc..718f72be4 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -11,12 +11,12 @@
     <!-- Ignore warnings and show progress of the run -->
     <arg value="np"/>
 
-    <file>lib</file>
+    <file>src</file>
     <file>tests</file>
 
-    <exclude-pattern>tests/Doctrine/Tests/Common/Proxy/*</exclude-pattern>
-    <exclude-pattern>tests/Doctrine/Tests/Common/ClassLoaderTest/*</exclude-pattern>
-    <exclude-pattern>tests/Doctrine/Tests/Common/Util/TestAsset/*</exclude-pattern>
+    <exclude-pattern>tests/Common/Proxy/*</exclude-pattern>
+    <exclude-pattern>tests/Common/ClassLoaderTest/*</exclude-pattern>
+    <exclude-pattern>tests/Common/Util/TestAsset/*</exclude-pattern>
 
     <rule ref="Doctrine">
         <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"/>
@@ -37,7 +37,7 @@
     </rule>
 
     <rule ref="Squiz.Classes.ClassFileName.NoMatch">
-        <exclude-pattern>*/tests/Doctrine/Tests/Common/Util/ClassUtilsTest.php</exclude-pattern>
+        <exclude-pattern>*/tests/Common/Util/ClassUtilsTest.php</exclude-pattern>
     </rule>
 
     <!-- Disable the rules that will require PHP 7.4 -->
@@ -48,7 +48,7 @@
     </rule>
 
     <rule ref="Squiz.Classes.ClassFileName.NoMatch">
-        <exclude-pattern>*/tests/Doctrine/Tests/Common/Util/ClassUtilsTest.php</exclude-pattern>
+        <exclude-pattern>*/tests/Common/Util/ClassUtilsTest.php</exclude-pattern>
     </rule>
 
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
@@ -56,20 +56,20 @@
     </rule>
 
     <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace">
-        <exclude-pattern>tests/Doctrine/Tests/Common/ClassLoaderTest/*.class.php</exclude-pattern>
+        <exclude-pattern>tests/Common/ClassLoaderTest/*.class.php</exclude-pattern>
     </rule>
     <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
-        <exclude-pattern>tests/Doctrine/Tests/Common/Util/ClassUtilsTest.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/Common/ClassLoaderTest/*.class.php</exclude-pattern>
+        <exclude-pattern>tests/Common/Util/ClassUtilsTest.php</exclude-pattern>
+        <exclude-pattern>tests/Common/ClassLoaderTest/*.class.php</exclude-pattern>
     </rule>
     <rule ref="PEAR.Functions.ValidDefaultValue.NotAtEnd">
-        <exclude-pattern>tests/Doctrine/Tests/Common/Proxy/*HintClass.php</exclude-pattern>
+        <exclude-pattern>tests/Common/Proxy/*HintClass.php</exclude-pattern>
     </rule>
 
     <rule ref="Squiz.Classes.ClassFileName.NoMatch">
         <exclude-pattern>tests/*</exclude-pattern>
     </rule>
     <rule ref="Squiz.Commenting.FunctionComment.InvalidNoReturn">
-        <exclude-pattern>tests/Doctrine/Tests/Common/Proxy/InvalidReturnTypeClass.php</exclude-pattern>
+        <exclude-pattern>tests/Common/Proxy/InvalidReturnTypeClass.php</exclude-pattern>
     </rule>
 </ruleset>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 7e0aac35f..3eebb2540 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -2,57 +2,57 @@ parameters:
     phpVersion: 80100
     level: 3
     paths:
-        - lib
+        - src
         - tests
     excludePaths:
-        - tests/Doctrine/Tests/Common/Proxy/InvalidReturnTypeClass.php
-        - tests/Doctrine/Tests/Common/Proxy/InvalidTypeHintClass.php
-        - tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypedProperties.php
-        - tests/Doctrine/Tests/Common/Proxy/MagicIssetClassWithInteger.php
-        - tests/Doctrine/Tests/Common/Proxy/NullableNonOptionalHintClass.php
-        - tests/Doctrine/Tests/Common/Proxy/PHP81NeverType.php
-        - tests/Doctrine/Tests/Common/Proxy/PHP81IntersectionTypes.php
-        - tests/Doctrine/Tests/Common/Proxy/Php8UnionTypes.php
-        - tests/Doctrine/Tests/Common/Proxy/Php8StaticType.php
-        - tests/Doctrine/Tests/Common/Proxy/ProxyGeneratorTest.php
-        - tests/Doctrine/Tests/Common/Proxy/ProxyLogicTypedPropertiesTest.php
-        - tests/Doctrine/Tests/Common/Proxy/SerializedClass.php
-        - tests/Doctrine/Tests/Common/Proxy/VariadicTypeHintClass.php
-        - tests/Doctrine/Tests/Common/Proxy/Php71NullableDefaultedNonOptionalHintClass.php
-        - tests/Doctrine/Tests/Common/Proxy/generated
+        - tests/Common/Proxy/InvalidReturnTypeClass.php
+        - tests/Common/Proxy/InvalidTypeHintClass.php
+        - tests/Common/Proxy/LazyLoadableObjectWithTypedProperties.php
+        - tests/Common/Proxy/MagicIssetClassWithInteger.php
+        - tests/Common/Proxy/NullableNonOptionalHintClass.php
+        - tests/Common/Proxy/PHP81NeverType.php
+        - tests/Common/Proxy/PHP81IntersectionTypes.php
+        - tests/Common/Proxy/Php8UnionTypes.php
+        - tests/Common/Proxy/Php8StaticType.php
+        - tests/Common/Proxy/ProxyGeneratorTest.php
+        - tests/Common/Proxy/ProxyLogicTypedPropertiesTest.php
+        - tests/Common/Proxy/SerializedClass.php
+        - tests/Common/Proxy/VariadicTypeHintClass.php
+        - tests/Common/Proxy/Php71NullableDefaultedNonOptionalHintClass.php
+        - tests/Common/Proxy/generated
     ignoreErrors:
         - '#Access to an undefined property Doctrine\\Common\\Proxy\\Proxy::\$publicField#'
         -
             message: '#^Result of method Doctrine\\Tests\\Common\\Proxy\\LazyLoadableObjectWithVoid::(adding|incrementing)AndReturningVoid\(\) \(void\) is used\.$#'
-            path: 'tests/Doctrine/Tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
+            path: 'tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
         -
             message: '#^Property Doctrine\\Tests\\Common\\Proxy\\ProxyLogicTest::\$initializerCallbackMock \(callable\(\): mixed&PHPUnit\\Framework\\MockObject\\MockObject\) does not accept PHPUnit\\Framework\\MockObject\\MockObject&stdClass\.$#'
-            path: 'tests/Doctrine/Tests/Common/Proxy/ProxyLogicTest.php'
+            path: 'tests/Common/Proxy/ProxyLogicTest.php'
         -
             message: '#.*LazyLoadableObject.*#'
             paths:
-               - 'tests/Doctrine/Tests/Common/Proxy/ProxyLogicTest.php'
-               - 'tests/Doctrine/Tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
+               - 'tests/Common/Proxy/ProxyLogicTest.php'
+               - 'tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
         -
             message: '#^Instantiated class Doctrine\\Tests\\Common\\ProxyProxy\\__CG__\\Doctrine\\Tests\\Common\\Proxy\\.* not found.$#'
-            path: 'tests/Doctrine/Tests/Common/Proxy/ProxyLogicTest.php'
+            path: 'tests/Common/Proxy/ProxyLogicTest.php'
         -
             message: '#^Instantiated class Doctrine\\Tests\\Common\\ProxyProxy\\__CG__\\Doctrine\\Tests\\Common\\Proxy\\.* not found.$#'
-            path: 'tests/Doctrine/Tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
+            path: 'tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
         -
             message: '#^Property Doctrine\\Tests\\Common\\Proxy\\ProxyLogicVoidReturnTypeTest::\$initializerCallbackMock \(callable\(\): mixed&PHPUnit\\Framework\\MockObject\\MockObject\) does not accept PHPUnit\\Framework\\MockObject\\MockObject&stdClass\.$#'
-            path: 'tests/Doctrine/Tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
+            path: 'tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
         -
             message: '#^Method Doctrine\\Tests\\Common\\Proxy\\MagicIssetClassWithInteger::__isset\(\) should return bool but returns int\.$#'
-            path: 'tests/Doctrine/Tests/Common/Proxy/MagicIssetClassWithInteger.php'
+            path: 'tests/Common/Proxy/MagicIssetClassWithInteger.php'
         -
             message: '#^Access to an undefined property Doctrine\\Tests\\Common\\Proxy\\MagicGetByRefClass\:\:\$nonExisting\.$#'
-            path: 'tests/Doctrine/Tests/Common/Proxy/ProxyMagicMethodsTest.php'
+            path: 'tests/Common/Proxy/ProxyMagicMethodsTest.php'
 
         -
             message: "#^Class Doctrine\\\\Tests\\\\Common\\\\Proxy\\\\MagicIssetClassWithInteger not found\\.$#"
             count: 1
-            path: tests/Doctrine/Tests/Common/Proxy/ProxyMagicMethodsTest.php
+            path: tests/Common/Proxy/ProxyMagicMethodsTest.php
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index edd8c53a6..7ad4cba93 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -7,13 +7,13 @@
 >
     <testsuites>
         <testsuite name="Doctrine Common Test Suite">
-            <directory>./tests/Doctrine/</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>./lib/Doctrine/</directory>
+            <directory>./src</directory>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
index 3785c9361..67e099a79 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -8,9 +8,9 @@
     phpVersion="8.1"
 >
     <projectFiles>
-        <directory name="lib/Doctrine/Common" />
+        <directory name="src" />
         <ignoreFiles>
-            <file name="lib/Doctrine/Common/Proxy/ProxyGenerator.php" />
+            <file name="src/Proxy/ProxyGenerator.php" />
         </ignoreFiles>
     </projectFiles>
 </psalm>
diff --git a/lib/Doctrine/Common/ClassLoader.php b/src/ClassLoader.php
similarity index 100%
rename from lib/Doctrine/Common/ClassLoader.php
rename to src/ClassLoader.php
diff --git a/lib/Doctrine/Common/CommonException.php b/src/CommonException.php
similarity index 100%
rename from lib/Doctrine/Common/CommonException.php
rename to src/CommonException.php
diff --git a/lib/Doctrine/Common/Comparable.php b/src/Comparable.php
similarity index 100%
rename from lib/Doctrine/Common/Comparable.php
rename to src/Comparable.php
diff --git a/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php b/src/Proxy/AbstractProxyFactory.php
similarity index 100%
rename from lib/Doctrine/Common/Proxy/AbstractProxyFactory.php
rename to src/Proxy/AbstractProxyFactory.php
diff --git a/lib/Doctrine/Common/Proxy/Autoloader.php b/src/Proxy/Autoloader.php
similarity index 100%
rename from lib/Doctrine/Common/Proxy/Autoloader.php
rename to src/Proxy/Autoloader.php
diff --git a/lib/Doctrine/Common/Proxy/Exception/InvalidArgumentException.php b/src/Proxy/Exception/InvalidArgumentException.php
similarity index 100%
rename from lib/Doctrine/Common/Proxy/Exception/InvalidArgumentException.php
rename to src/Proxy/Exception/InvalidArgumentException.php
diff --git a/lib/Doctrine/Common/Proxy/Exception/OutOfBoundsException.php b/src/Proxy/Exception/OutOfBoundsException.php
similarity index 100%
rename from lib/Doctrine/Common/Proxy/Exception/OutOfBoundsException.php
rename to src/Proxy/Exception/OutOfBoundsException.php
diff --git a/lib/Doctrine/Common/Proxy/Exception/ProxyException.php b/src/Proxy/Exception/ProxyException.php
similarity index 100%
rename from lib/Doctrine/Common/Proxy/Exception/ProxyException.php
rename to src/Proxy/Exception/ProxyException.php
diff --git a/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php b/src/Proxy/Exception/UnexpectedValueException.php
similarity index 100%
rename from lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
rename to src/Proxy/Exception/UnexpectedValueException.php
diff --git a/lib/Doctrine/Common/Proxy/Proxy.php b/src/Proxy/Proxy.php
similarity index 100%
rename from lib/Doctrine/Common/Proxy/Proxy.php
rename to src/Proxy/Proxy.php
diff --git a/lib/Doctrine/Common/Proxy/ProxyDefinition.php b/src/Proxy/ProxyDefinition.php
similarity index 100%
rename from lib/Doctrine/Common/Proxy/ProxyDefinition.php
rename to src/Proxy/ProxyDefinition.php
diff --git a/lib/Doctrine/Common/Proxy/ProxyGenerator.php b/src/Proxy/ProxyGenerator.php
similarity index 100%
rename from lib/Doctrine/Common/Proxy/ProxyGenerator.php
rename to src/Proxy/ProxyGenerator.php
diff --git a/lib/Doctrine/Common/Util/ClassUtils.php b/src/Util/ClassUtils.php
similarity index 100%
rename from lib/Doctrine/Common/Util/ClassUtils.php
rename to src/Util/ClassUtils.php
diff --git a/lib/Doctrine/Common/Util/Debug.php b/src/Util/Debug.php
similarity index 100%
rename from lib/Doctrine/Common/Util/Debug.php
rename to src/Util/Debug.php
diff --git a/tests/.gitignore b/tests/.gitignore
index 721040526..80bd331ce 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,3 +1,3 @@
-Doctrine/Tests/Proxies/
-Doctrine/Tests/ORM/Proxy/generated/
-Doctrine/Tests/ORM/Tools/Export/export
+Proxies/
+ORM/Proxy/generated/
+ORM/Tools/Export/export
diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest.php b/tests/Common/ClassLoaderTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/ClassLoaderTest.php
rename to tests/Common/ClassLoaderTest.php
diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassA.class.php b/tests/Common/ClassLoaderTest/ClassA.class.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/ClassLoaderTest/ClassA.class.php
rename to tests/Common/ClassLoaderTest/ClassA.class.php
diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassB.class.php b/tests/Common/ClassLoaderTest/ClassB.class.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/ClassLoaderTest/ClassB.class.php
rename to tests/Common/ClassLoaderTest/ClassB.class.php
diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassC.class.php b/tests/Common/ClassLoaderTest/ClassC.class.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/ClassLoaderTest/ClassC.class.php
rename to tests/Common/ClassLoaderTest/ClassC.class.php
diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassD.php b/tests/Common/ClassLoaderTest/ClassD.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/ClassLoaderTest/ClassD.php
rename to tests/Common/ClassLoaderTest/ClassD.php
diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassE.php b/tests/Common/ClassLoaderTest/ClassE.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/ClassLoaderTest/ClassE.php
rename to tests/Common/ClassLoaderTest/ClassE.php
diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest/EmptyFile.class.php b/tests/Common/ClassLoaderTest/EmptyFile.class.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/ClassLoaderTest/EmptyFile.class.php
rename to tests/Common/ClassLoaderTest/EmptyFile.class.php
diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest/ExternalLoader.php b/tests/Common/ClassLoaderTest/ExternalLoader.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/ClassLoaderTest/ExternalLoader.php
rename to tests/Common/ClassLoaderTest/ExternalLoader.php
diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest/InterfaceA.class.php b/tests/Common/ClassLoaderTest/InterfaceA.class.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/ClassLoaderTest/InterfaceA.class.php
rename to tests/Common/ClassLoaderTest/InterfaceA.class.php
diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest/TraitA.class.php b/tests/Common/ClassLoaderTest/TraitA.class.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/ClassLoaderTest/TraitA.class.php
rename to tests/Common/ClassLoaderTest/TraitA.class.php
diff --git a/tests/Doctrine/Tests/Common/DoctrineExceptionTest.php b/tests/Common/DoctrineExceptionTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/DoctrineExceptionTest.php
rename to tests/Common/DoctrineExceptionTest.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/AbstractClass.php b/tests/Common/Proxy/AbstractClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/AbstractClass.php
rename to tests/Common/Proxy/AbstractClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/AbstractProxyFactoryTest.php b/tests/Common/Proxy/AbstractProxyFactoryTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/AbstractProxyFactoryTest.php
rename to tests/Common/Proxy/AbstractProxyFactoryTest.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/AutoloaderTest.php b/tests/Common/Proxy/AutoloaderTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/AutoloaderTest.php
rename to tests/Common/Proxy/AutoloaderTest.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/CallableTypeHintClass.php b/tests/Common/Proxy/CallableTypeHintClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/CallableTypeHintClass.php
rename to tests/Common/Proxy/CallableTypeHintClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/FinalClass.php b/tests/Common/Proxy/FinalClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/FinalClass.php
rename to tests/Common/Proxy/FinalClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/IdentifierField.php b/tests/Common/Proxy/IdentifierField.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/IdentifierField.php
rename to tests/Common/Proxy/IdentifierField.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/InvalidReturnTypeClass.php b/tests/Common/Proxy/InvalidReturnTypeClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/InvalidReturnTypeClass.php
rename to tests/Common/Proxy/InvalidReturnTypeClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/InvalidTypeHintClass.php b/tests/Common/Proxy/InvalidTypeHintClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/InvalidTypeHintClass.php
rename to tests/Common/Proxy/InvalidTypeHintClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/InvokationSpy.php b/tests/Common/Proxy/InvokationSpy.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/InvokationSpy.php
rename to tests/Common/Proxy/InvokationSpy.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/IterableTypeHintClass.php b/tests/Common/Proxy/IterableTypeHintClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/IterableTypeHintClass.php
rename to tests/Common/Proxy/IterableTypeHintClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObject.php b/tests/Common/Proxy/LazyLoadableObject.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObject.php
rename to tests/Common/Proxy/LazyLoadableObject.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectClassMetadata.php b/tests/Common/Proxy/LazyLoadableObjectClassMetadata.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectClassMetadata.php
rename to tests/Common/Proxy/LazyLoadableObjectClassMetadata.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithNullableTypehints.php b/tests/Common/Proxy/LazyLoadableObjectWithNullableTypehints.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithNullableTypehints.php
rename to tests/Common/Proxy/LazyLoadableObjectWithNullableTypehints.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithNullableTypehintsClassMetadata.php b/tests/Common/Proxy/LazyLoadableObjectWithNullableTypehintsClassMetadata.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithNullableTypehintsClassMetadata.php
rename to tests/Common/Proxy/LazyLoadableObjectWithNullableTypehintsClassMetadata.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTrait.php b/tests/Common/Proxy/LazyLoadableObjectWithTrait.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTrait.php
rename to tests/Common/Proxy/LazyLoadableObjectWithTrait.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTraitClassMetadata.php b/tests/Common/Proxy/LazyLoadableObjectWithTraitClassMetadata.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTraitClassMetadata.php
rename to tests/Common/Proxy/LazyLoadableObjectWithTraitClassMetadata.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypedProperties.php b/tests/Common/Proxy/LazyLoadableObjectWithTypedProperties.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypedProperties.php
rename to tests/Common/Proxy/LazyLoadableObjectWithTypedProperties.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypedPropertiesClassMetadata.php b/tests/Common/Proxy/LazyLoadableObjectWithTypedPropertiesClassMetadata.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypedPropertiesClassMetadata.php
rename to tests/Common/Proxy/LazyLoadableObjectWithTypedPropertiesClassMetadata.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypehints.php b/tests/Common/Proxy/LazyLoadableObjectWithTypehints.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypehints.php
rename to tests/Common/Proxy/LazyLoadableObjectWithTypehints.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypehintsClassMetadata.php b/tests/Common/Proxy/LazyLoadableObjectWithTypehintsClassMetadata.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypehintsClassMetadata.php
rename to tests/Common/Proxy/LazyLoadableObjectWithTypehintsClassMetadata.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithVoid.php b/tests/Common/Proxy/LazyLoadableObjectWithVoid.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithVoid.php
rename to tests/Common/Proxy/LazyLoadableObjectWithVoid.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithVoidClassMetadata.php b/tests/Common/Proxy/LazyLoadableObjectWithVoidClassMetadata.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithVoidClassMetadata.php
rename to tests/Common/Proxy/LazyLoadableObjectWithVoidClassMetadata.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicCloneClass.php b/tests/Common/Proxy/MagicCloneClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicCloneClass.php
rename to tests/Common/Proxy/MagicCloneClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicGetByRefClass.php b/tests/Common/Proxy/MagicGetByRefClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicGetByRefClass.php
rename to tests/Common/Proxy/MagicGetByRefClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicGetClass.php b/tests/Common/Proxy/MagicGetClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicGetClass.php
rename to tests/Common/Proxy/MagicGetClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicGetClassWithScalarType.php b/tests/Common/Proxy/MagicGetClassWithScalarType.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicGetClassWithScalarType.php
rename to tests/Common/Proxy/MagicGetClassWithScalarType.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicGetClassWithScalarTypeAndRenamedParameter.php b/tests/Common/Proxy/MagicGetClassWithScalarTypeAndRenamedParameter.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicGetClassWithScalarTypeAndRenamedParameter.php
rename to tests/Common/Proxy/MagicGetClassWithScalarTypeAndRenamedParameter.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicGetClassWithVoid.php b/tests/Common/Proxy/MagicGetClassWithVoid.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicGetClassWithVoid.php
rename to tests/Common/Proxy/MagicGetClassWithVoid.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicIssetClass.php b/tests/Common/Proxy/MagicIssetClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicIssetClass.php
rename to tests/Common/Proxy/MagicIssetClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicIssetClassWithBoolean.php b/tests/Common/Proxy/MagicIssetClassWithBoolean.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicIssetClassWithBoolean.php
rename to tests/Common/Proxy/MagicIssetClassWithBoolean.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicIssetClassWithInteger.php b/tests/Common/Proxy/MagicIssetClassWithInteger.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicIssetClassWithInteger.php
rename to tests/Common/Proxy/MagicIssetClassWithInteger.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicSetClass.php b/tests/Common/Proxy/MagicSetClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicSetClass.php
rename to tests/Common/Proxy/MagicSetClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicSetClassWithScalarType.php b/tests/Common/Proxy/MagicSetClassWithScalarType.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicSetClassWithScalarType.php
rename to tests/Common/Proxy/MagicSetClassWithScalarType.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicSetClassWithScalarTypeAndRenamedParameters.php b/tests/Common/Proxy/MagicSetClassWithScalarTypeAndRenamedParameters.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicSetClassWithScalarTypeAndRenamedParameters.php
rename to tests/Common/Proxy/MagicSetClassWithScalarTypeAndRenamedParameters.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicSetClassWithScalarTypeAndVoidReturnType.php b/tests/Common/Proxy/MagicSetClassWithScalarTypeAndVoidReturnType.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicSetClassWithScalarTypeAndVoidReturnType.php
rename to tests/Common/Proxy/MagicSetClassWithScalarTypeAndVoidReturnType.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicSleepClass.php b/tests/Common/Proxy/MagicSleepClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicSleepClass.php
rename to tests/Common/Proxy/MagicSleepClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicSleepClassTypehinted.php b/tests/Common/Proxy/MagicSleepClassTypehinted.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicSleepClassTypehinted.php
rename to tests/Common/Proxy/MagicSleepClassTypehinted.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicWakeupClass.php b/tests/Common/Proxy/MagicWakeupClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicWakeupClass.php
rename to tests/Common/Proxy/MagicWakeupClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/MagicWakeupClassTypehinted.php b/tests/Common/Proxy/MagicWakeupClassTypehinted.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/MagicWakeupClassTypehinted.php
rename to tests/Common/Proxy/MagicWakeupClassTypehinted.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/NullableNonOptionalHintClass.php b/tests/Common/Proxy/NullableNonOptionalHintClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/NullableNonOptionalHintClass.php
rename to tests/Common/Proxy/NullableNonOptionalHintClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/NullableTypeHintsClass.php b/tests/Common/Proxy/NullableTypeHintsClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/NullableTypeHintsClass.php
rename to tests/Common/Proxy/NullableTypeHintsClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/PHP81IntersectionTypes.php b/tests/Common/Proxy/PHP81IntersectionTypes.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/PHP81IntersectionTypes.php
rename to tests/Common/Proxy/PHP81IntersectionTypes.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/PHP81NeverType.php b/tests/Common/Proxy/PHP81NeverType.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/PHP81NeverType.php
rename to tests/Common/Proxy/PHP81NeverType.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/PHP81NewInInitializers.php b/tests/Common/Proxy/PHP81NewInInitializers.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/PHP81NewInInitializers.php
rename to tests/Common/Proxy/PHP81NewInInitializers.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/Php71NullableDefaultedNonOptionalHintClass.php b/tests/Common/Proxy/Php71NullableDefaultedNonOptionalHintClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/Php71NullableDefaultedNonOptionalHintClass.php
rename to tests/Common/Proxy/Php71NullableDefaultedNonOptionalHintClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/Php81EnumPublicPropertyType.php b/tests/Common/Proxy/Php81EnumPublicPropertyType.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/Php81EnumPublicPropertyType.php
rename to tests/Common/Proxy/Php81EnumPublicPropertyType.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/Php8MagicCloneClass.php b/tests/Common/Proxy/Php8MagicCloneClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/Php8MagicCloneClass.php
rename to tests/Common/Proxy/Php8MagicCloneClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/Php8MixedType.php b/tests/Common/Proxy/Php8MixedType.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/Php8MixedType.php
rename to tests/Common/Proxy/Php8MixedType.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/Php8StaticType.php b/tests/Common/Proxy/Php8StaticType.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/Php8StaticType.php
rename to tests/Common/Proxy/Php8StaticType.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/Php8UnionTypes.php b/tests/Common/Proxy/Php8UnionTypes.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/Php8UnionTypes.php
rename to tests/Common/Proxy/Php8UnionTypes.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/ProxyGeneratorTest.php b/tests/Common/Proxy/ProxyGeneratorTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/ProxyGeneratorTest.php
rename to tests/Common/Proxy/ProxyGeneratorTest.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/ProxyLogicIdentifierGetterTest.php b/tests/Common/Proxy/ProxyLogicIdentifierGetterTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/ProxyLogicIdentifierGetterTest.php
rename to tests/Common/Proxy/ProxyLogicIdentifierGetterTest.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/ProxyLogicTest.php b/tests/Common/Proxy/ProxyLogicTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/ProxyLogicTest.php
rename to tests/Common/Proxy/ProxyLogicTest.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/ProxyLogicTypedPropertiesTest.php b/tests/Common/Proxy/ProxyLogicTypedPropertiesTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/ProxyLogicTypedPropertiesTest.php
rename to tests/Common/Proxy/ProxyLogicTypedPropertiesTest.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php b/tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php
rename to tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/ProxyMagicMethodsTest.php b/tests/Common/Proxy/ProxyMagicMethodsTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/ProxyMagicMethodsTest.php
rename to tests/Common/Proxy/ProxyMagicMethodsTest.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/ReturnTypesClass.php b/tests/Common/Proxy/ReturnTypesClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/ReturnTypesClass.php
rename to tests/Common/Proxy/ReturnTypesClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/ScalarTypeHintsClass.php b/tests/Common/Proxy/ScalarTypeHintsClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/ScalarTypeHintsClass.php
rename to tests/Common/Proxy/ScalarTypeHintsClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/SerializedClass.php b/tests/Common/Proxy/SerializedClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/SerializedClass.php
rename to tests/Common/Proxy/SerializedClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/SleepClass.php b/tests/Common/Proxy/SleepClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/SleepClass.php
rename to tests/Common/Proxy/SleepClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/StaticPropertyClass.php b/tests/Common/Proxy/StaticPropertyClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/StaticPropertyClass.php
rename to tests/Common/Proxy/StaticPropertyClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/VariadicTypeHintClass.php b/tests/Common/Proxy/VariadicTypeHintClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/VariadicTypeHintClass.php
rename to tests/Common/Proxy/VariadicTypeHintClass.php
diff --git a/tests/Doctrine/Tests/Common/Proxy/VoidReturnTypeClass.php b/tests/Common/Proxy/VoidReturnTypeClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Proxy/VoidReturnTypeClass.php
rename to tests/Common/Proxy/VoidReturnTypeClass.php
diff --git a/tests/Doctrine/Tests/Common/Util/ClassUtilsTest.php b/tests/Common/Util/ClassUtilsTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Util/ClassUtilsTest.php
rename to tests/Common/Util/ClassUtilsTest.php
diff --git a/tests/Doctrine/Tests/Common/Util/DebugTest.php b/tests/Common/Util/DebugTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Util/DebugTest.php
rename to tests/Common/Util/DebugTest.php
diff --git a/tests/Doctrine/Tests/Common/Util/TestAsset/ChildClass.php b/tests/Common/Util/TestAsset/ChildClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Util/TestAsset/ChildClass.php
rename to tests/Common/Util/TestAsset/ChildClass.php
diff --git a/tests/Doctrine/Tests/Common/Util/TestAsset/ChildWithSameAttributesClass.php b/tests/Common/Util/TestAsset/ChildWithSameAttributesClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Util/TestAsset/ChildWithSameAttributesClass.php
rename to tests/Common/Util/TestAsset/ChildWithSameAttributesClass.php
diff --git a/tests/Doctrine/Tests/Common/Util/TestAsset/ParentClass.php b/tests/Common/Util/TestAsset/ParentClass.php
similarity index 100%
rename from tests/Doctrine/Tests/Common/Util/TestAsset/ParentClass.php
rename to tests/Common/Util/TestAsset/ParentClass.php
diff --git a/tests/Doctrine/Tests/DoctrineTestCase.php b/tests/DoctrineTestCase.php
similarity index 100%
rename from tests/Doctrine/Tests/DoctrineTestCase.php
rename to tests/DoctrineTestCase.php