diff --git a/composer.json b/composer.json
index d533f3fb79..6a8dfef4ba 100644
--- a/composer.json
+++ b/composer.json
@@ -59,12 +59,12 @@
},
"autoload": {
"psr-4": {
- "Doctrine\\Migrations\\": "lib/Doctrine/Migrations"
+ "Doctrine\\Migrations\\": "src"
}
},
"autoload-dev": {
"psr-4": {
- "Doctrine\\Migrations\\Tests\\": "tests/Doctrine/Migrations/Tests"
+ "Doctrine\\Migrations\\Tests\\": "tests"
}
},
"bin": [
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 6ff16dc580..fbb09a1c74 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -12,13 +12,13 @@
bin
- lib
+ srctests
- */lib/*
+ */src/*
@@ -30,25 +30,25 @@
- lib/Doctrine/Migrations/Events.php
+ src/Events.php
- lib/Doctrine/Migrations/MigrationsVersion.php
+ src/MigrationsVersion.php
- tests/Doctrine/Migrations/Tests/TestLogger.php
- lib/Doctrine/Migrations/Tools/Console/ConsoleLogger.php
+ tests/TestLogger.php
+ src/Tools/Console/ConsoleLogger.php
- lib/Doctrine/Migrations/AbstractMigration.php
- lib/Doctrine/Migrations/Configuration/Loader/AbstractFileLoader.php
+ src/AbstractMigration.php
+ src/Configuration/Loader/AbstractFileLoader.php
- tests/Doctrine/Migrations/Tests/Stub/DoctrineRegistry.php
+ tests/Stub/DoctrineRegistry.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index fff3d8c7d2..392651e6e9 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,38 +1,38 @@
parameters:
level: 7
paths:
- - lib
+ - src
- tests
excludePaths:
- - tests/Doctrine/Migrations/Tests/Configuration/ConfigurationTestSource/Migrations/Version123.php
+ - tests/Configuration/ConfigurationTestSource/Migrations/Version123.php
ignoreErrors:
- '~Variable method call on Doctrine\\Migrations\\AbstractMigration~'
-
message: '~^Call to function in_array\(\) requires parameter #3 to be true\.$~'
- path: lib/Doctrine/Migrations/Version/SortedMigrationPlanCalculator.php
+ path: src/Version/SortedMigrationPlanCalculator.php
-
message: '~^Variable property access on SimpleXMLElement\.$~'
- path: lib/Doctrine/Migrations/Configuration/Migration/XmlFile.php
+ path: src/Configuration/Migration/XmlFile.php
-
message: '~^Call to function is_bool\(\) with bool will always evaluate to true\.$~'
- path: lib/Doctrine/Migrations/InlineParameterFormatter.php
+ path: src/InlineParameterFormatter.php
-
message: '~^Call to an undefined method Symfony\\Component\\Console\\Output\\OutputInterface\:\:getErrorOutput\(\)\.$~'
- path: lib/Doctrine/Migrations/Tools/Console/ConsoleLogger.php
+ path: src/Tools/Console/ConsoleLogger.php
-
message: '~^Method Doctrine\\Migrations\\Tests\\Stub\\DoctrineRegistry::getService\(\) should return Doctrine\\Persistence\\ObjectManager but returns Doctrine\\DBAL\\Connection\|Doctrine\\ORM\\EntityManager~'
- path: tests/Doctrine/Migrations/Tests/Stub/DoctrineRegistry.php
+ path: tests/Stub/DoctrineRegistry.php
# https://github.com/phpstan/phpstan/issues/5982
-
message: '~^Cannot call method getWrappedConnection\(\) on class-string\|object\.~'
- path: lib/Doctrine/Migrations/Tools/TransactionHelper.php
+ path: src/Tools/TransactionHelper.php
# TODO: Be more precise about class-strings
-
message: '~^Method Doctrine\\Migrations\\Version\\DbalMigrationFactory::createVersion\(\) should return Doctrine\\Migrations\\AbstractMigration but returns object\.$~'
paths:
- - lib/Doctrine/Migrations/Version/DbalMigrationFactory.php
+ - src/Version/DbalMigrationFactory.php
# We're testing legacy functionality here.
-
@@ -41,20 +41,20 @@ parameters:
This class will be removed in ORM 3\\.0 without replacement\\.$#
"""
count: 1
- path: tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-orm/cli-config.php
+ path: tests/Tools/Console/legacy-config-orm/cli-config.php
-
message: """
#^Fetching class constant class of deprecated class Doctrine\\\\ORM\\\\Tools\\\\Console\\\\Helper\\\\EntityManagerHelper\\:
This class will be removed in ORM 3\\.0 without replacement\\.$#
"""
count: 1
- path: tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php
+ path: tests/Tools/Console/ConsoleRunnerTest.php
# TODO: deprecate using the connection event manager and expose
# our own event manager instead.
-
message: '~^Call to deprecated method getEventManager\(\) of class Doctrine\\DBAL\\Connection\.$~'
- path: lib/Doctrine/Migrations/DependencyFactory.php
+ path: src/DependencyFactory.php
# DBAL 4 forward compatibility
- '~^Call to function method_exists\(\) with ''Doctrine\\\\DBAL\\\\Connection'' and ''getEventManager'' will always evaluate to true\.$~'
@@ -63,7 +63,7 @@ parameters:
- '~^Access to constant class on an unknown class Doctrine\\DBAL\\Platforms\\SQLitePlatform\.$~'
- '~expects Doctrine\\DBAL\\Platforms\\AbstractPlatform, Doctrine\\DBAL\\Platforms\\SQLitePlatform given\.$~'
symfony:
- console_application_loader: tests/Doctrine/Migrations/Tests/doctrine-migrations-phpstan-app.php
+ console_application_loader: tests/doctrine-migrations-phpstan-app.php
includes:
- vendor/phpstan/phpstan-deprecation-rules/rules.neon
- vendor/phpstan/phpstan-phpunit/extension.neon
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index db722617f7..7ff1df2a55 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,13 +11,13 @@
- ./tests/Doctrine/
+ tests
diff --git a/lib/Doctrine/Migrations/AbstractMigration.php b/src/AbstractMigration.php
similarity index 100%
rename from lib/Doctrine/Migrations/AbstractMigration.php
rename to src/AbstractMigration.php
diff --git a/lib/Doctrine/Migrations/Configuration/Configuration.php b/src/Configuration/Configuration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Configuration.php
rename to src/Configuration/Configuration.php
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/ConfigurationFile.php b/src/Configuration/Connection/ConfigurationFile.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Connection/ConfigurationFile.php
rename to src/Configuration/Connection/ConfigurationFile.php
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/ConnectionLoader.php b/src/Configuration/Connection/ConnectionLoader.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Connection/ConnectionLoader.php
rename to src/Configuration/Connection/ConnectionLoader.php
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/ConnectionRegistryConnection.php b/src/Configuration/Connection/ConnectionRegistryConnection.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Connection/ConnectionRegistryConnection.php
rename to src/Configuration/Connection/ConnectionRegistryConnection.php
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/Exception/ConnectionNotSpecified.php b/src/Configuration/Connection/Exception/ConnectionNotSpecified.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Connection/Exception/ConnectionNotSpecified.php
rename to src/Configuration/Connection/Exception/ConnectionNotSpecified.php
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/Exception/FileNotFound.php b/src/Configuration/Connection/Exception/FileNotFound.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Connection/Exception/FileNotFound.php
rename to src/Configuration/Connection/Exception/FileNotFound.php
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/Exception/InvalidConfiguration.php b/src/Configuration/Connection/Exception/InvalidConfiguration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Connection/Exception/InvalidConfiguration.php
rename to src/Configuration/Connection/Exception/InvalidConfiguration.php
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/Exception/LoaderException.php b/src/Configuration/Connection/Exception/LoaderException.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Connection/Exception/LoaderException.php
rename to src/Configuration/Connection/Exception/LoaderException.php
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/ExistingConnection.php b/src/Configuration/Connection/ExistingConnection.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Connection/ExistingConnection.php
rename to src/Configuration/Connection/ExistingConnection.php
diff --git a/lib/Doctrine/Migrations/Configuration/EntityManager/ConfigurationFile.php b/src/Configuration/EntityManager/ConfigurationFile.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/EntityManager/ConfigurationFile.php
rename to src/Configuration/EntityManager/ConfigurationFile.php
diff --git a/lib/Doctrine/Migrations/Configuration/EntityManager/EntityManagerLoader.php b/src/Configuration/EntityManager/EntityManagerLoader.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/EntityManager/EntityManagerLoader.php
rename to src/Configuration/EntityManager/EntityManagerLoader.php
diff --git a/lib/Doctrine/Migrations/Configuration/EntityManager/Exception/FileNotFound.php b/src/Configuration/EntityManager/Exception/FileNotFound.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/EntityManager/Exception/FileNotFound.php
rename to src/Configuration/EntityManager/Exception/FileNotFound.php
diff --git a/lib/Doctrine/Migrations/Configuration/EntityManager/Exception/InvalidConfiguration.php b/src/Configuration/EntityManager/Exception/InvalidConfiguration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/EntityManager/Exception/InvalidConfiguration.php
rename to src/Configuration/EntityManager/Exception/InvalidConfiguration.php
diff --git a/lib/Doctrine/Migrations/Configuration/EntityManager/Exception/LoaderException.php b/src/Configuration/EntityManager/Exception/LoaderException.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/EntityManager/Exception/LoaderException.php
rename to src/Configuration/EntityManager/Exception/LoaderException.php
diff --git a/lib/Doctrine/Migrations/Configuration/EntityManager/ExistingEntityManager.php b/src/Configuration/EntityManager/ExistingEntityManager.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/EntityManager/ExistingEntityManager.php
rename to src/Configuration/EntityManager/ExistingEntityManager.php
diff --git a/lib/Doctrine/Migrations/Configuration/EntityManager/ManagerRegistryEntityManager.php b/src/Configuration/EntityManager/ManagerRegistryEntityManager.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/EntityManager/ManagerRegistryEntityManager.php
rename to src/Configuration/EntityManager/ManagerRegistryEntityManager.php
diff --git a/lib/Doctrine/Migrations/Configuration/Exception/ConfigurationException.php b/src/Configuration/Exception/ConfigurationException.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Exception/ConfigurationException.php
rename to src/Configuration/Exception/ConfigurationException.php
diff --git a/lib/Doctrine/Migrations/Configuration/Exception/FileNotFound.php b/src/Configuration/Exception/FileNotFound.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Exception/FileNotFound.php
rename to src/Configuration/Exception/FileNotFound.php
diff --git a/lib/Doctrine/Migrations/Configuration/Exception/FrozenConfiguration.php b/src/Configuration/Exception/FrozenConfiguration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Exception/FrozenConfiguration.php
rename to src/Configuration/Exception/FrozenConfiguration.php
diff --git a/lib/Doctrine/Migrations/Configuration/Exception/InvalidLoader.php b/src/Configuration/Exception/InvalidLoader.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Exception/InvalidLoader.php
rename to src/Configuration/Exception/InvalidLoader.php
diff --git a/lib/Doctrine/Migrations/Configuration/Exception/UnknownConfigurationValue.php b/src/Configuration/Exception/UnknownConfigurationValue.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Exception/UnknownConfigurationValue.php
rename to src/Configuration/Exception/UnknownConfigurationValue.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationArray.php b/src/Configuration/Migration/ConfigurationArray.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/ConfigurationArray.php
rename to src/Configuration/Migration/ConfigurationArray.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFile.php b/src/Configuration/Migration/ConfigurationFile.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFile.php
rename to src/Configuration/Migration/ConfigurationFile.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFileWithFallback.php b/src/Configuration/Migration/ConfigurationFileWithFallback.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFileWithFallback.php
rename to src/Configuration/Migration/ConfigurationFileWithFallback.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationLoader.php b/src/Configuration/Migration/ConfigurationLoader.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/ConfigurationLoader.php
rename to src/Configuration/Migration/ConfigurationLoader.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/Exception/InvalidConfigurationFormat.php b/src/Configuration/Migration/Exception/InvalidConfigurationFormat.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/Exception/InvalidConfigurationFormat.php
rename to src/Configuration/Migration/Exception/InvalidConfigurationFormat.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/Exception/InvalidConfigurationKey.php b/src/Configuration/Migration/Exception/InvalidConfigurationKey.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/Exception/InvalidConfigurationKey.php
rename to src/Configuration/Migration/Exception/InvalidConfigurationKey.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/Exception/JsonNotValid.php b/src/Configuration/Migration/Exception/JsonNotValid.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/Exception/JsonNotValid.php
rename to src/Configuration/Migration/Exception/JsonNotValid.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/Exception/MissingConfigurationFile.php b/src/Configuration/Migration/Exception/MissingConfigurationFile.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/Exception/MissingConfigurationFile.php
rename to src/Configuration/Migration/Exception/MissingConfigurationFile.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/Exception/XmlNotValid.php b/src/Configuration/Migration/Exception/XmlNotValid.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/Exception/XmlNotValid.php
rename to src/Configuration/Migration/Exception/XmlNotValid.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/Exception/YamlNotAvailable.php b/src/Configuration/Migration/Exception/YamlNotAvailable.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/Exception/YamlNotAvailable.php
rename to src/Configuration/Migration/Exception/YamlNotAvailable.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/Exception/YamlNotValid.php b/src/Configuration/Migration/Exception/YamlNotValid.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/Exception/YamlNotValid.php
rename to src/Configuration/Migration/Exception/YamlNotValid.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/ExistingConfiguration.php b/src/Configuration/Migration/ExistingConfiguration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/ExistingConfiguration.php
rename to src/Configuration/Migration/ExistingConfiguration.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/FormattedFile.php b/src/Configuration/Migration/FormattedFile.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/FormattedFile.php
rename to src/Configuration/Migration/FormattedFile.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/JsonFile.php b/src/Configuration/Migration/JsonFile.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/JsonFile.php
rename to src/Configuration/Migration/JsonFile.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/PhpFile.php b/src/Configuration/Migration/PhpFile.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/PhpFile.php
rename to src/Configuration/Migration/PhpFile.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/XML/configuration.xsd b/src/Configuration/Migration/XML/configuration.xsd
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/XML/configuration.xsd
rename to src/Configuration/Migration/XML/configuration.xsd
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/XmlFile.php b/src/Configuration/Migration/XmlFile.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/XmlFile.php
rename to src/Configuration/Migration/XmlFile.php
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/YamlFile.php b/src/Configuration/Migration/YamlFile.php
similarity index 100%
rename from lib/Doctrine/Migrations/Configuration/Migration/YamlFile.php
rename to src/Configuration/Migration/YamlFile.php
diff --git a/lib/Doctrine/Migrations/DbalMigrator.php b/src/DbalMigrator.php
similarity index 100%
rename from lib/Doctrine/Migrations/DbalMigrator.php
rename to src/DbalMigrator.php
diff --git a/lib/Doctrine/Migrations/DependencyFactory.php b/src/DependencyFactory.php
similarity index 100%
rename from lib/Doctrine/Migrations/DependencyFactory.php
rename to src/DependencyFactory.php
diff --git a/lib/Doctrine/Migrations/Event/Listeners/AutoCommitListener.php b/src/Event/Listeners/AutoCommitListener.php
similarity index 100%
rename from lib/Doctrine/Migrations/Event/Listeners/AutoCommitListener.php
rename to src/Event/Listeners/AutoCommitListener.php
diff --git a/lib/Doctrine/Migrations/Event/MigrationsEventArgs.php b/src/Event/MigrationsEventArgs.php
similarity index 100%
rename from lib/Doctrine/Migrations/Event/MigrationsEventArgs.php
rename to src/Event/MigrationsEventArgs.php
diff --git a/lib/Doctrine/Migrations/Event/MigrationsVersionEventArgs.php b/src/Event/MigrationsVersionEventArgs.php
similarity index 100%
rename from lib/Doctrine/Migrations/Event/MigrationsVersionEventArgs.php
rename to src/Event/MigrationsVersionEventArgs.php
diff --git a/lib/Doctrine/Migrations/EventDispatcher.php b/src/EventDispatcher.php
similarity index 100%
rename from lib/Doctrine/Migrations/EventDispatcher.php
rename to src/EventDispatcher.php
diff --git a/lib/Doctrine/Migrations/Events.php b/src/Events.php
similarity index 100%
rename from lib/Doctrine/Migrations/Events.php
rename to src/Events.php
diff --git a/lib/Doctrine/Migrations/Exception/AbortMigration.php b/src/Exception/AbortMigration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/AbortMigration.php
rename to src/Exception/AbortMigration.php
diff --git a/lib/Doctrine/Migrations/Exception/AlreadyAtVersion.php b/src/Exception/AlreadyAtVersion.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/AlreadyAtVersion.php
rename to src/Exception/AlreadyAtVersion.php
diff --git a/lib/Doctrine/Migrations/Exception/ControlException.php b/src/Exception/ControlException.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/ControlException.php
rename to src/Exception/ControlException.php
diff --git a/lib/Doctrine/Migrations/Exception/DependencyException.php b/src/Exception/DependencyException.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/DependencyException.php
rename to src/Exception/DependencyException.php
diff --git a/lib/Doctrine/Migrations/Exception/DuplicateMigrationVersion.php b/src/Exception/DuplicateMigrationVersion.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/DuplicateMigrationVersion.php
rename to src/Exception/DuplicateMigrationVersion.php
diff --git a/lib/Doctrine/Migrations/Exception/FrozenDependencies.php b/src/Exception/FrozenDependencies.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/FrozenDependencies.php
rename to src/Exception/FrozenDependencies.php
diff --git a/lib/Doctrine/Migrations/Exception/IrreversibleMigration.php b/src/Exception/IrreversibleMigration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/IrreversibleMigration.php
rename to src/Exception/IrreversibleMigration.php
diff --git a/lib/Doctrine/Migrations/Exception/MetadataStorageError.php b/src/Exception/MetadataStorageError.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/MetadataStorageError.php
rename to src/Exception/MetadataStorageError.php
diff --git a/lib/Doctrine/Migrations/Exception/MigrationClassNotFound.php b/src/Exception/MigrationClassNotFound.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/MigrationClassNotFound.php
rename to src/Exception/MigrationClassNotFound.php
diff --git a/lib/Doctrine/Migrations/Exception/MigrationConfigurationConflict.php b/src/Exception/MigrationConfigurationConflict.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/MigrationConfigurationConflict.php
rename to src/Exception/MigrationConfigurationConflict.php
diff --git a/lib/Doctrine/Migrations/Exception/MigrationException.php b/src/Exception/MigrationException.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/MigrationException.php
rename to src/Exception/MigrationException.php
diff --git a/lib/Doctrine/Migrations/Exception/MigrationNotAvailable.php b/src/Exception/MigrationNotAvailable.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/MigrationNotAvailable.php
rename to src/Exception/MigrationNotAvailable.php
diff --git a/lib/Doctrine/Migrations/Exception/MigrationNotExecuted.php b/src/Exception/MigrationNotExecuted.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/MigrationNotExecuted.php
rename to src/Exception/MigrationNotExecuted.php
diff --git a/lib/Doctrine/Migrations/Exception/MissingDependency.php b/src/Exception/MissingDependency.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/MissingDependency.php
rename to src/Exception/MissingDependency.php
diff --git a/lib/Doctrine/Migrations/Exception/NoMigrationsFoundWithCriteria.php b/src/Exception/NoMigrationsFoundWithCriteria.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/NoMigrationsFoundWithCriteria.php
rename to src/Exception/NoMigrationsFoundWithCriteria.php
diff --git a/lib/Doctrine/Migrations/Exception/NoMigrationsToExecute.php b/src/Exception/NoMigrationsToExecute.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/NoMigrationsToExecute.php
rename to src/Exception/NoMigrationsToExecute.php
diff --git a/lib/Doctrine/Migrations/Exception/NoTablesFound.php b/src/Exception/NoTablesFound.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/NoTablesFound.php
rename to src/Exception/NoTablesFound.php
diff --git a/lib/Doctrine/Migrations/Exception/PlanAlreadyExecuted.php b/src/Exception/PlanAlreadyExecuted.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/PlanAlreadyExecuted.php
rename to src/Exception/PlanAlreadyExecuted.php
diff --git a/lib/Doctrine/Migrations/Exception/RollupFailed.php b/src/Exception/RollupFailed.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/RollupFailed.php
rename to src/Exception/RollupFailed.php
diff --git a/lib/Doctrine/Migrations/Exception/SkipMigration.php b/src/Exception/SkipMigration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/SkipMigration.php
rename to src/Exception/SkipMigration.php
diff --git a/lib/Doctrine/Migrations/Exception/UnknownMigrationVersion.php b/src/Exception/UnknownMigrationVersion.php
similarity index 100%
rename from lib/Doctrine/Migrations/Exception/UnknownMigrationVersion.php
rename to src/Exception/UnknownMigrationVersion.php
diff --git a/lib/Doctrine/Migrations/FileQueryWriter.php b/src/FileQueryWriter.php
similarity index 100%
rename from lib/Doctrine/Migrations/FileQueryWriter.php
rename to src/FileQueryWriter.php
diff --git a/lib/Doctrine/Migrations/FilesystemMigrationsRepository.php b/src/FilesystemMigrationsRepository.php
similarity index 100%
rename from lib/Doctrine/Migrations/FilesystemMigrationsRepository.php
rename to src/FilesystemMigrationsRepository.php
diff --git a/lib/Doctrine/Migrations/Finder/Exception/FinderException.php b/src/Finder/Exception/FinderException.php
similarity index 100%
rename from lib/Doctrine/Migrations/Finder/Exception/FinderException.php
rename to src/Finder/Exception/FinderException.php
diff --git a/lib/Doctrine/Migrations/Finder/Exception/InvalidDirectory.php b/src/Finder/Exception/InvalidDirectory.php
similarity index 100%
rename from lib/Doctrine/Migrations/Finder/Exception/InvalidDirectory.php
rename to src/Finder/Exception/InvalidDirectory.php
diff --git a/lib/Doctrine/Migrations/Finder/Exception/NameIsReserved.php b/src/Finder/Exception/NameIsReserved.php
similarity index 100%
rename from lib/Doctrine/Migrations/Finder/Exception/NameIsReserved.php
rename to src/Finder/Exception/NameIsReserved.php
diff --git a/lib/Doctrine/Migrations/Finder/Finder.php b/src/Finder/Finder.php
similarity index 100%
rename from lib/Doctrine/Migrations/Finder/Finder.php
rename to src/Finder/Finder.php
diff --git a/lib/Doctrine/Migrations/Finder/GlobFinder.php b/src/Finder/GlobFinder.php
similarity index 100%
rename from lib/Doctrine/Migrations/Finder/GlobFinder.php
rename to src/Finder/GlobFinder.php
diff --git a/lib/Doctrine/Migrations/Finder/MigrationFinder.php b/src/Finder/MigrationFinder.php
similarity index 100%
rename from lib/Doctrine/Migrations/Finder/MigrationFinder.php
rename to src/Finder/MigrationFinder.php
diff --git a/lib/Doctrine/Migrations/Finder/RecursiveRegexFinder.php b/src/Finder/RecursiveRegexFinder.php
similarity index 100%
rename from lib/Doctrine/Migrations/Finder/RecursiveRegexFinder.php
rename to src/Finder/RecursiveRegexFinder.php
diff --git a/lib/Doctrine/Migrations/Generator/ClassNameGenerator.php b/src/Generator/ClassNameGenerator.php
similarity index 100%
rename from lib/Doctrine/Migrations/Generator/ClassNameGenerator.php
rename to src/Generator/ClassNameGenerator.php
diff --git a/lib/Doctrine/Migrations/Generator/ConcatenationFileBuilder.php b/src/Generator/ConcatenationFileBuilder.php
similarity index 100%
rename from lib/Doctrine/Migrations/Generator/ConcatenationFileBuilder.php
rename to src/Generator/ConcatenationFileBuilder.php
diff --git a/lib/Doctrine/Migrations/Generator/DiffGenerator.php b/src/Generator/DiffGenerator.php
similarity index 100%
rename from lib/Doctrine/Migrations/Generator/DiffGenerator.php
rename to src/Generator/DiffGenerator.php
diff --git a/lib/Doctrine/Migrations/Generator/Exception/GeneratorException.php b/src/Generator/Exception/GeneratorException.php
similarity index 100%
rename from lib/Doctrine/Migrations/Generator/Exception/GeneratorException.php
rename to src/Generator/Exception/GeneratorException.php
diff --git a/lib/Doctrine/Migrations/Generator/Exception/InvalidTemplateSpecified.php b/src/Generator/Exception/InvalidTemplateSpecified.php
similarity index 100%
rename from lib/Doctrine/Migrations/Generator/Exception/InvalidTemplateSpecified.php
rename to src/Generator/Exception/InvalidTemplateSpecified.php
diff --git a/lib/Doctrine/Migrations/Generator/Exception/NoChangesDetected.php b/src/Generator/Exception/NoChangesDetected.php
similarity index 100%
rename from lib/Doctrine/Migrations/Generator/Exception/NoChangesDetected.php
rename to src/Generator/Exception/NoChangesDetected.php
diff --git a/lib/Doctrine/Migrations/Generator/FileBuilder.php b/src/Generator/FileBuilder.php
similarity index 100%
rename from lib/Doctrine/Migrations/Generator/FileBuilder.php
rename to src/Generator/FileBuilder.php
diff --git a/lib/Doctrine/Migrations/Generator/Generator.php b/src/Generator/Generator.php
similarity index 100%
rename from lib/Doctrine/Migrations/Generator/Generator.php
rename to src/Generator/Generator.php
diff --git a/lib/Doctrine/Migrations/Generator/SqlGenerator.php b/src/Generator/SqlGenerator.php
similarity index 100%
rename from lib/Doctrine/Migrations/Generator/SqlGenerator.php
rename to src/Generator/SqlGenerator.php
diff --git a/lib/Doctrine/Migrations/InlineParameterFormatter.php b/src/InlineParameterFormatter.php
similarity index 100%
rename from lib/Doctrine/Migrations/InlineParameterFormatter.php
rename to src/InlineParameterFormatter.php
diff --git a/lib/Doctrine/Migrations/Metadata/AvailableMigration.php b/src/Metadata/AvailableMigration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Metadata/AvailableMigration.php
rename to src/Metadata/AvailableMigration.php
diff --git a/lib/Doctrine/Migrations/Metadata/AvailableMigrationsList.php b/src/Metadata/AvailableMigrationsList.php
similarity index 100%
rename from lib/Doctrine/Migrations/Metadata/AvailableMigrationsList.php
rename to src/Metadata/AvailableMigrationsList.php
diff --git a/lib/Doctrine/Migrations/Metadata/AvailableMigrationsSet.php b/src/Metadata/AvailableMigrationsSet.php
similarity index 100%
rename from lib/Doctrine/Migrations/Metadata/AvailableMigrationsSet.php
rename to src/Metadata/AvailableMigrationsSet.php
diff --git a/lib/Doctrine/Migrations/Metadata/ExecutedMigration.php b/src/Metadata/ExecutedMigration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Metadata/ExecutedMigration.php
rename to src/Metadata/ExecutedMigration.php
diff --git a/lib/Doctrine/Migrations/Metadata/ExecutedMigrationsList.php b/src/Metadata/ExecutedMigrationsList.php
similarity index 100%
rename from lib/Doctrine/Migrations/Metadata/ExecutedMigrationsList.php
rename to src/Metadata/ExecutedMigrationsList.php
diff --git a/lib/Doctrine/Migrations/Metadata/MigrationPlan.php b/src/Metadata/MigrationPlan.php
similarity index 100%
rename from lib/Doctrine/Migrations/Metadata/MigrationPlan.php
rename to src/Metadata/MigrationPlan.php
diff --git a/lib/Doctrine/Migrations/Metadata/MigrationPlanList.php b/src/Metadata/MigrationPlanList.php
similarity index 100%
rename from lib/Doctrine/Migrations/Metadata/MigrationPlanList.php
rename to src/Metadata/MigrationPlanList.php
diff --git a/lib/Doctrine/Migrations/Metadata/Storage/MetadataStorage.php b/src/Metadata/Storage/MetadataStorage.php
similarity index 100%
rename from lib/Doctrine/Migrations/Metadata/Storage/MetadataStorage.php
rename to src/Metadata/Storage/MetadataStorage.php
diff --git a/lib/Doctrine/Migrations/Metadata/Storage/MetadataStorageConfiguration.php b/src/Metadata/Storage/MetadataStorageConfiguration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Metadata/Storage/MetadataStorageConfiguration.php
rename to src/Metadata/Storage/MetadataStorageConfiguration.php
diff --git a/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php b/src/Metadata/Storage/TableMetadataStorage.php
similarity index 100%
rename from lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php
rename to src/Metadata/Storage/TableMetadataStorage.php
diff --git a/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorageConfiguration.php b/src/Metadata/Storage/TableMetadataStorageConfiguration.php
similarity index 100%
rename from lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorageConfiguration.php
rename to src/Metadata/Storage/TableMetadataStorageConfiguration.php
diff --git a/lib/Doctrine/Migrations/MigrationsRepository.php b/src/MigrationsRepository.php
similarity index 100%
rename from lib/Doctrine/Migrations/MigrationsRepository.php
rename to src/MigrationsRepository.php
diff --git a/lib/Doctrine/Migrations/Migrator.php b/src/Migrator.php
similarity index 100%
rename from lib/Doctrine/Migrations/Migrator.php
rename to src/Migrator.php
diff --git a/lib/Doctrine/Migrations/MigratorConfiguration.php b/src/MigratorConfiguration.php
similarity index 100%
rename from lib/Doctrine/Migrations/MigratorConfiguration.php
rename to src/MigratorConfiguration.php
diff --git a/lib/Doctrine/Migrations/ParameterFormatter.php b/src/ParameterFormatter.php
similarity index 100%
rename from lib/Doctrine/Migrations/ParameterFormatter.php
rename to src/ParameterFormatter.php
diff --git a/lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php b/src/Provider/DBALSchemaDiffProvider.php
similarity index 100%
rename from lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php
rename to src/Provider/DBALSchemaDiffProvider.php
diff --git a/lib/Doctrine/Migrations/Provider/EmptySchemaProvider.php b/src/Provider/EmptySchemaProvider.php
similarity index 100%
rename from lib/Doctrine/Migrations/Provider/EmptySchemaProvider.php
rename to src/Provider/EmptySchemaProvider.php
diff --git a/lib/Doctrine/Migrations/Provider/Exception/NoMappingFound.php b/src/Provider/Exception/NoMappingFound.php
similarity index 100%
rename from lib/Doctrine/Migrations/Provider/Exception/NoMappingFound.php
rename to src/Provider/Exception/NoMappingFound.php
diff --git a/lib/Doctrine/Migrations/Provider/Exception/ProviderException.php b/src/Provider/Exception/ProviderException.php
similarity index 100%
rename from lib/Doctrine/Migrations/Provider/Exception/ProviderException.php
rename to src/Provider/Exception/ProviderException.php
diff --git a/lib/Doctrine/Migrations/Provider/LazySchema.php b/src/Provider/LazySchema.php
similarity index 100%
rename from lib/Doctrine/Migrations/Provider/LazySchema.php
rename to src/Provider/LazySchema.php
diff --git a/lib/Doctrine/Migrations/Provider/LazySchemaDiffProvider.php b/src/Provider/LazySchemaDiffProvider.php
similarity index 100%
rename from lib/Doctrine/Migrations/Provider/LazySchemaDiffProvider.php
rename to src/Provider/LazySchemaDiffProvider.php
diff --git a/lib/Doctrine/Migrations/Provider/OrmSchemaProvider.php b/src/Provider/OrmSchemaProvider.php
similarity index 100%
rename from lib/Doctrine/Migrations/Provider/OrmSchemaProvider.php
rename to src/Provider/OrmSchemaProvider.php
diff --git a/lib/Doctrine/Migrations/Provider/SchemaDiffProvider.php b/src/Provider/SchemaDiffProvider.php
similarity index 100%
rename from lib/Doctrine/Migrations/Provider/SchemaDiffProvider.php
rename to src/Provider/SchemaDiffProvider.php
diff --git a/lib/Doctrine/Migrations/Provider/SchemaProvider.php b/src/Provider/SchemaProvider.php
similarity index 100%
rename from lib/Doctrine/Migrations/Provider/SchemaProvider.php
rename to src/Provider/SchemaProvider.php
diff --git a/lib/Doctrine/Migrations/Provider/StubSchemaProvider.php b/src/Provider/StubSchemaProvider.php
similarity index 100%
rename from lib/Doctrine/Migrations/Provider/StubSchemaProvider.php
rename to src/Provider/StubSchemaProvider.php
diff --git a/lib/Doctrine/Migrations/Query/Exception/InvalidArguments.php b/src/Query/Exception/InvalidArguments.php
similarity index 100%
rename from lib/Doctrine/Migrations/Query/Exception/InvalidArguments.php
rename to src/Query/Exception/InvalidArguments.php
diff --git a/lib/Doctrine/Migrations/Query/Query.php b/src/Query/Query.php
similarity index 100%
rename from lib/Doctrine/Migrations/Query/Query.php
rename to src/Query/Query.php
diff --git a/lib/Doctrine/Migrations/QueryWriter.php b/src/QueryWriter.php
similarity index 100%
rename from lib/Doctrine/Migrations/QueryWriter.php
rename to src/QueryWriter.php
diff --git a/lib/Doctrine/Migrations/Rollup.php b/src/Rollup.php
similarity index 100%
rename from lib/Doctrine/Migrations/Rollup.php
rename to src/Rollup.php
diff --git a/lib/Doctrine/Migrations/SchemaDumper.php b/src/SchemaDumper.php
similarity index 100%
rename from lib/Doctrine/Migrations/SchemaDumper.php
rename to src/SchemaDumper.php
diff --git a/lib/Doctrine/Migrations/Tools/BooleanStringFormatter.php b/src/Tools/BooleanStringFormatter.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/BooleanStringFormatter.php
rename to src/Tools/BooleanStringFormatter.php
diff --git a/lib/Doctrine/Migrations/Tools/BytesFormatter.php b/src/Tools/BytesFormatter.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/BytesFormatter.php
rename to src/Tools/BytesFormatter.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/CurrentCommand.php b/src/Tools/Console/Command/CurrentCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/CurrentCommand.php
rename to src/Tools/Console/Command/CurrentCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/DiffCommand.php b/src/Tools/Console/Command/DiffCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/DiffCommand.php
rename to src/Tools/Console/Command/DiffCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/DoctrineCommand.php b/src/Tools/Console/Command/DoctrineCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/DoctrineCommand.php
rename to src/Tools/Console/Command/DoctrineCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/DumpSchemaCommand.php b/src/Tools/Console/Command/DumpSchemaCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/DumpSchemaCommand.php
rename to src/Tools/Console/Command/DumpSchemaCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/ExecuteCommand.php b/src/Tools/Console/Command/ExecuteCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/ExecuteCommand.php
rename to src/Tools/Console/Command/ExecuteCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/GenerateCommand.php b/src/Tools/Console/Command/GenerateCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/GenerateCommand.php
rename to src/Tools/Console/Command/GenerateCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/LatestCommand.php b/src/Tools/Console/Command/LatestCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/LatestCommand.php
rename to src/Tools/Console/Command/LatestCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/ListCommand.php b/src/Tools/Console/Command/ListCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/ListCommand.php
rename to src/Tools/Console/Command/ListCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/MigrateCommand.php b/src/Tools/Console/Command/MigrateCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/MigrateCommand.php
rename to src/Tools/Console/Command/MigrateCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/RollupCommand.php b/src/Tools/Console/Command/RollupCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/RollupCommand.php
rename to src/Tools/Console/Command/RollupCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/StatusCommand.php b/src/Tools/Console/Command/StatusCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/StatusCommand.php
rename to src/Tools/Console/Command/StatusCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/SyncMetadataCommand.php b/src/Tools/Console/Command/SyncMetadataCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/SyncMetadataCommand.php
rename to src/Tools/Console/Command/SyncMetadataCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/UpToDateCommand.php b/src/Tools/Console/Command/UpToDateCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/UpToDateCommand.php
rename to src/Tools/Console/Command/UpToDateCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/VersionCommand.php b/src/Tools/Console/Command/VersionCommand.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Command/VersionCommand.php
rename to src/Tools/Console/Command/VersionCommand.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/ConsoleInputMigratorConfigurationFactory.php b/src/Tools/Console/ConsoleInputMigratorConfigurationFactory.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/ConsoleInputMigratorConfigurationFactory.php
rename to src/Tools/Console/ConsoleInputMigratorConfigurationFactory.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/ConsoleLogger.php b/src/Tools/Console/ConsoleLogger.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/ConsoleLogger.php
rename to src/Tools/Console/ConsoleLogger.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php b/src/Tools/Console/ConsoleRunner.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php
rename to src/Tools/Console/ConsoleRunner.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Exception/ConsoleException.php b/src/Tools/Console/Exception/ConsoleException.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Exception/ConsoleException.php
rename to src/Tools/Console/Exception/ConsoleException.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Exception/DependenciesNotSatisfied.php b/src/Tools/Console/Exception/DependenciesNotSatisfied.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Exception/DependenciesNotSatisfied.php
rename to src/Tools/Console/Exception/DependenciesNotSatisfied.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Exception/DirectoryDoesNotExist.php b/src/Tools/Console/Exception/DirectoryDoesNotExist.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Exception/DirectoryDoesNotExist.php
rename to src/Tools/Console/Exception/DirectoryDoesNotExist.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Exception/FileTypeNotSupported.php b/src/Tools/Console/Exception/FileTypeNotSupported.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Exception/FileTypeNotSupported.php
rename to src/Tools/Console/Exception/FileTypeNotSupported.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Exception/InvalidOptionUsage.php b/src/Tools/Console/Exception/InvalidOptionUsage.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Exception/InvalidOptionUsage.php
rename to src/Tools/Console/Exception/InvalidOptionUsage.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Exception/SchemaDumpRequiresNoMigrations.php b/src/Tools/Console/Exception/SchemaDumpRequiresNoMigrations.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Exception/SchemaDumpRequiresNoMigrations.php
rename to src/Tools/Console/Exception/SchemaDumpRequiresNoMigrations.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Exception/VersionAlreadyExists.php b/src/Tools/Console/Exception/VersionAlreadyExists.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Exception/VersionAlreadyExists.php
rename to src/Tools/Console/Exception/VersionAlreadyExists.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Exception/VersionDoesNotExist.php b/src/Tools/Console/Exception/VersionDoesNotExist.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Exception/VersionDoesNotExist.php
rename to src/Tools/Console/Exception/VersionDoesNotExist.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Helper/ConfigurationHelper.php b/src/Tools/Console/Helper/ConfigurationHelper.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Helper/ConfigurationHelper.php
rename to src/Tools/Console/Helper/ConfigurationHelper.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Helper/MigrationDirectoryHelper.php b/src/Tools/Console/Helper/MigrationDirectoryHelper.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Helper/MigrationDirectoryHelper.php
rename to src/Tools/Console/Helper/MigrationDirectoryHelper.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/Helper/MigrationStatusInfosHelper.php b/src/Tools/Console/Helper/MigrationStatusInfosHelper.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/Helper/MigrationStatusInfosHelper.php
rename to src/Tools/Console/Helper/MigrationStatusInfosHelper.php
diff --git a/lib/Doctrine/Migrations/Tools/Console/MigratorConfigurationFactory.php b/src/Tools/Console/MigratorConfigurationFactory.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/Console/MigratorConfigurationFactory.php
rename to src/Tools/Console/MigratorConfigurationFactory.php
diff --git a/lib/Doctrine/Migrations/Tools/TransactionHelper.php b/src/Tools/TransactionHelper.php
similarity index 100%
rename from lib/Doctrine/Migrations/Tools/TransactionHelper.php
rename to src/Tools/TransactionHelper.php
diff --git a/lib/Doctrine/Migrations/Version/AliasResolver.php b/src/Version/AliasResolver.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/AliasResolver.php
rename to src/Version/AliasResolver.php
diff --git a/lib/Doctrine/Migrations/Version/AlphabeticalComparator.php b/src/Version/AlphabeticalComparator.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/AlphabeticalComparator.php
rename to src/Version/AlphabeticalComparator.php
diff --git a/lib/Doctrine/Migrations/Version/Comparator.php b/src/Version/Comparator.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/Comparator.php
rename to src/Version/Comparator.php
diff --git a/lib/Doctrine/Migrations/Version/CurrentMigrationStatusCalculator.php b/src/Version/CurrentMigrationStatusCalculator.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/CurrentMigrationStatusCalculator.php
rename to src/Version/CurrentMigrationStatusCalculator.php
diff --git a/lib/Doctrine/Migrations/Version/DbalExecutor.php b/src/Version/DbalExecutor.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/DbalExecutor.php
rename to src/Version/DbalExecutor.php
diff --git a/lib/Doctrine/Migrations/Version/DbalMigrationFactory.php b/src/Version/DbalMigrationFactory.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/DbalMigrationFactory.php
rename to src/Version/DbalMigrationFactory.php
diff --git a/lib/Doctrine/Migrations/Version/DefaultAliasResolver.php b/src/Version/DefaultAliasResolver.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/DefaultAliasResolver.php
rename to src/Version/DefaultAliasResolver.php
diff --git a/lib/Doctrine/Migrations/Version/Direction.php b/src/Version/Direction.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/Direction.php
rename to src/Version/Direction.php
diff --git a/lib/Doctrine/Migrations/Version/ExecutionResult.php b/src/Version/ExecutionResult.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/ExecutionResult.php
rename to src/Version/ExecutionResult.php
diff --git a/lib/Doctrine/Migrations/Version/Executor.php b/src/Version/Executor.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/Executor.php
rename to src/Version/Executor.php
diff --git a/lib/Doctrine/Migrations/Version/MigrationFactory.php b/src/Version/MigrationFactory.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/MigrationFactory.php
rename to src/Version/MigrationFactory.php
diff --git a/lib/Doctrine/Migrations/Version/MigrationPlanCalculator.php b/src/Version/MigrationPlanCalculator.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/MigrationPlanCalculator.php
rename to src/Version/MigrationPlanCalculator.php
diff --git a/lib/Doctrine/Migrations/Version/MigrationStatusCalculator.php b/src/Version/MigrationStatusCalculator.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/MigrationStatusCalculator.php
rename to src/Version/MigrationStatusCalculator.php
diff --git a/lib/Doctrine/Migrations/Version/SortedMigrationPlanCalculator.php b/src/Version/SortedMigrationPlanCalculator.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/SortedMigrationPlanCalculator.php
rename to src/Version/SortedMigrationPlanCalculator.php
diff --git a/lib/Doctrine/Migrations/Version/State.php b/src/Version/State.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/State.php
rename to src/Version/State.php
diff --git a/lib/Doctrine/Migrations/Version/Version.php b/src/Version/Version.php
similarity index 100%
rename from lib/Doctrine/Migrations/Version/Version.php
rename to src/Version/Version.php
diff --git a/tests/Doctrine/Migrations/Tests/AbstractMigrationTest.php b/tests/AbstractMigrationTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/AbstractMigrationTest.php
rename to tests/AbstractMigrationTest.php
diff --git a/tests/Doctrine/Migrations/Tests/BoxPharCompileTest.php b/tests/BoxPharCompileTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/BoxPharCompileTest.php
rename to tests/BoxPharCompileTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/ConfigurationTest.php b/tests/Configuration/ConfigurationTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/ConfigurationTest.php
rename to tests/Configuration/ConfigurationTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/ConfigurationTestSource/Migrations/Version123.php b/tests/Configuration/ConfigurationTestSource/Migrations/Version123.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/ConfigurationTestSource/Migrations/Version123.php
rename to tests/Configuration/ConfigurationTestSource/Migrations/Version123.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Connection/ConnectionLoaderTest.php b/tests/Configuration/Connection/ConnectionLoaderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Connection/ConnectionLoaderTest.php
rename to tests/Configuration/Connection/ConnectionLoaderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Connection/ConnectionRegistryLoaderTest.php b/tests/Configuration/Connection/ConnectionRegistryLoaderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Connection/ConnectionRegistryLoaderTest.php
rename to tests/Configuration/Connection/ConnectionRegistryLoaderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Connection/_files/migrations-db.php b/tests/Configuration/Connection/_files/migrations-db.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Connection/_files/migrations-db.php
rename to tests/Configuration/Connection/_files/migrations-db.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Connection/_files/sqlite-connection-instance.php b/tests/Configuration/Connection/_files/sqlite-connection-instance.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Connection/_files/sqlite-connection-instance.php
rename to tests/Configuration/Connection/_files/sqlite-connection-instance.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Connection/_files/sqlite-connection-invalid.php b/tests/Configuration/Connection/_files/sqlite-connection-invalid.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Connection/_files/sqlite-connection-invalid.php
rename to tests/Configuration/Connection/_files/sqlite-connection-invalid.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Connection/_files/sqlite-connection.php b/tests/Configuration/Connection/_files/sqlite-connection.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Connection/_files/sqlite-connection.php
rename to tests/Configuration/Connection/_files/sqlite-connection.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/EntityManagerRegistryLoaderTest.php b/tests/Configuration/EntityManager/EntityManagerRegistryLoaderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/EntityManager/EntityManagerRegistryLoaderTest.php
rename to tests/Configuration/EntityManager/EntityManagerRegistryLoaderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/EntityManagerTest.php b/tests/Configuration/EntityManager/EntityManagerTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/EntityManager/EntityManagerTest.php
rename to tests/Configuration/EntityManager/EntityManagerTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/_files/em-invalid.php b/tests/Configuration/EntityManager/_files/em-invalid.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/EntityManager/_files/em-invalid.php
rename to tests/Configuration/EntityManager/_files/em-invalid.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/_files/em-loader.php b/tests/Configuration/EntityManager/_files/em-loader.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/EntityManager/_files/em-loader.php
rename to tests/Configuration/EntityManager/_files/em-loader.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/_files/migrations-em.php b/tests/Configuration/EntityManager/_files/migrations-em.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/EntityManager/_files/migrations-em.php
rename to tests/Configuration/EntityManager/_files/migrations-em.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/ArrayLoaderTest.php b/tests/Configuration/Migration/ArrayLoaderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Migration/ArrayLoaderTest.php
rename to tests/Configuration/Migration/ArrayLoaderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/ConfigurationFileWithFallbackTest.php b/tests/Configuration/Migration/ConfigurationFileWithFallbackTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Migration/ConfigurationFileWithFallbackTest.php
rename to tests/Configuration/Migration/ConfigurationFileWithFallbackTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/FormattedFileTest.php b/tests/Configuration/Migration/FormattedFileTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Migration/FormattedFileTest.php
rename to tests/Configuration/Migration/FormattedFileTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/JsonLoaderTest.php b/tests/Configuration/Migration/JsonLoaderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Migration/JsonLoaderTest.php
rename to tests/Configuration/Migration/JsonLoaderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/LoaderTestCase.php b/tests/Configuration/Migration/LoaderTestCase.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Migration/LoaderTestCase.php
rename to tests/Configuration/Migration/LoaderTestCase.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/PhpLoaderTest.php b/tests/Configuration/Migration/PhpLoaderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Migration/PhpLoaderTest.php
rename to tests/Configuration/Migration/PhpLoaderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/XmlLoaderTest.php b/tests/Configuration/Migration/XmlLoaderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Migration/XmlLoaderTest.php
rename to tests/Configuration/Migration/XmlLoaderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/YamlLoaderTest.php b/tests/Configuration/Migration/YamlLoaderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/Migration/YamlLoaderTest.php
rename to tests/Configuration/Migration/YamlLoaderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config.json b/tests/Configuration/_files/config.json
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config.json
rename to tests/Configuration/_files/config.json
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config.php b/tests/Configuration/_files/config.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config.php
rename to tests/Configuration/_files/config.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config.xml b/tests/Configuration/_files/config.xml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config.xml
rename to tests/Configuration/_files/config.xml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config.yml b/tests/Configuration/_files/config.yml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config.yml
rename to tests/Configuration/_files/config.yml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_basic.json b/tests/Configuration/_files/config_basic.json
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_basic.json
rename to tests/Configuration/_files/config_basic.json
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_basic.php b/tests/Configuration/_files/config_basic.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_basic.php
rename to tests/Configuration/_files/config_basic.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_basic.xml b/tests/Configuration/_files/config_basic.xml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_basic.xml
rename to tests/Configuration/_files/config_basic.xml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_basic.yml b/tests/Configuration/_files/config_basic.yml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_basic.yml
rename to tests/Configuration/_files/config_basic.yml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_custom_template.json b/tests/Configuration/_files/config_custom_template.json
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_custom_template.json
rename to tests/Configuration/_files/config_custom_template.json
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_custom_template.php b/tests/Configuration/_files/config_custom_template.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_custom_template.php
rename to tests/Configuration/_files/config_custom_template.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_custom_template.xml b/tests/Configuration/_files/config_custom_template.xml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_custom_template.xml
rename to tests/Configuration/_files/config_custom_template.xml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_custom_template.yml b/tests/Configuration/_files/config_custom_template.yml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_custom_template.yml
rename to tests/Configuration/_files/config_custom_template.yml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_instance.php b/tests/Configuration/_files/config_instance.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_instance.php
rename to tests/Configuration/_files/config_instance.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_invalid.json b/tests/Configuration/_files/config_invalid.json
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_invalid.json
rename to tests/Configuration/_files/config_invalid.json
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_invalid.php b/tests/Configuration/_files/config_invalid.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_invalid.php
rename to tests/Configuration/_files/config_invalid.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_invalid.xml b/tests/Configuration/_files/config_invalid.xml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_invalid.xml
rename to tests/Configuration/_files/config_invalid.xml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_invalid.yml b/tests/Configuration/_files/config_invalid.yml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_invalid.yml
rename to tests/Configuration/_files/config_invalid.yml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_malformed.json b/tests/Configuration/_files/config_malformed.json
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_malformed.json
rename to tests/Configuration/_files/config_malformed.json
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_malformed.xml b/tests/Configuration/_files/config_malformed.xml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_malformed.xml
rename to tests/Configuration/_files/config_malformed.xml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_malformed.yml b/tests/Configuration/_files/config_malformed.yml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_malformed.yml
rename to tests/Configuration/_files/config_malformed.yml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year.json b/tests/Configuration/_files/config_organize_by_year.json
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year.json
rename to tests/Configuration/_files/config_organize_by_year.json
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year.php b/tests/Configuration/_files/config_organize_by_year.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year.php
rename to tests/Configuration/_files/config_organize_by_year.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year.xml b/tests/Configuration/_files/config_organize_by_year.xml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year.xml
rename to tests/Configuration/_files/config_organize_by_year.xml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year.yml b/tests/Configuration/_files/config_organize_by_year.yml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year.yml
rename to tests/Configuration/_files/config_organize_by_year.yml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year_and_month.json b/tests/Configuration/_files/config_organize_by_year_and_month.json
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year_and_month.json
rename to tests/Configuration/_files/config_organize_by_year_and_month.json
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year_and_month.php b/tests/Configuration/_files/config_organize_by_year_and_month.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year_and_month.php
rename to tests/Configuration/_files/config_organize_by_year_and_month.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year_and_month.xml b/tests/Configuration/_files/config_organize_by_year_and_month.xml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year_and_month.xml
rename to tests/Configuration/_files/config_organize_by_year_and_month.xml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year_and_month.yml b/tests/Configuration/_files/config_organize_by_year_and_month.yml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_by_year_and_month.yml
rename to tests/Configuration/_files/config_organize_by_year_and_month.yml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_invalid.json b/tests/Configuration/_files/config_organize_invalid.json
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_invalid.json
rename to tests/Configuration/_files/config_organize_invalid.json
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_invalid.php b/tests/Configuration/_files/config_organize_invalid.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_invalid.php
rename to tests/Configuration/_files/config_organize_invalid.php
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_invalid.xml b/tests/Configuration/_files/config_organize_invalid.xml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_invalid.xml
rename to tests/Configuration/_files/config_organize_invalid.xml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_invalid.yml b/tests/Configuration/_files/config_organize_invalid.yml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files/config_organize_invalid.yml
rename to tests/Configuration/_files/config_organize_invalid.yml
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files_loader/migrations.php b/tests/Configuration/_files_loader/migrations.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Configuration/_files_loader/migrations.php
rename to tests/Configuration/_files_loader/migrations.php
diff --git a/tests/Doctrine/Migrations/Tests/DependencyFactoryTest.php b/tests/DependencyFactoryTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/DependencyFactoryTest.php
rename to tests/DependencyFactoryTest.php
diff --git a/tests/Doctrine/Migrations/Tests/DependencyFactoryWithConnectionRegistryTest.php b/tests/DependencyFactoryWithConnectionRegistryTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/DependencyFactoryWithConnectionRegistryTest.php
rename to tests/DependencyFactoryWithConnectionRegistryTest.php
diff --git a/tests/Doctrine/Migrations/Tests/DependencyFactoryWithEntityManagerRegistryTest.php b/tests/DependencyFactoryWithEntityManagerRegistryTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/DependencyFactoryWithEntityManagerRegistryTest.php
rename to tests/DependencyFactoryWithEntityManagerRegistryTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Event/EventArgsTest.php b/tests/Event/EventArgsTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Event/EventArgsTest.php
rename to tests/Event/EventArgsTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Event/Listeners/AutoCommitListenerTest.php b/tests/Event/Listeners/AutoCommitListenerTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Event/Listeners/AutoCommitListenerTest.php
rename to tests/Event/Listeners/AutoCommitListenerTest.php
diff --git a/tests/Doctrine/Migrations/Tests/FileQueryWriterTest.php b/tests/FileQueryWriterTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/FileQueryWriterTest.php
rename to tests/FileQueryWriterTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/FinderTestCase.php b/tests/Finder/FinderTestCase.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/FinderTestCase.php
rename to tests/Finder/FinderTestCase.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/GlobFinderTest.php b/tests/Finder/GlobFinderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/GlobFinderTest.php
rename to tests/Finder/GlobFinderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/RecursiveRegexFinderTest.php b/tests/Finder/RecursiveRegexFinderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/RecursiveRegexFinderTest.php
rename to tests/Finder/RecursiveRegexFinderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_features/MultiNamespace/Version0001.php b/tests/Finder/_features/MultiNamespace/Version0001.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_features/MultiNamespace/Version0001.php
rename to tests/Finder/_features/MultiNamespace/Version0001.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_features/MultiNamespace/Version0002.php b/tests/Finder/_features/MultiNamespace/Version0002.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_features/MultiNamespace/Version0002.php
rename to tests/Finder/_features/MultiNamespace/Version0002.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_features/MultiNamespaceNested/Deep/Version0002.php b/tests/Finder/_features/MultiNamespaceNested/Deep/Version0002.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_features/MultiNamespaceNested/Deep/Version0002.php
rename to tests/Finder/_features/MultiNamespaceNested/Deep/Version0002.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_features/MultiNamespaceNested/Version0001.php b/tests/Finder/_features/MultiNamespaceNested/Version0001.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_features/MultiNamespaceNested/Version0001.php
rename to tests/Finder/_features/MultiNamespaceNested/Version0001.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/DifferentNamingSchema.php b/tests/Finder/_files/DifferentNamingSchema.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/DifferentNamingSchema.php
rename to tests/Finder/_files/DifferentNamingSchema.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/InvalidVersion20150502000002.php b/tests/Finder/_files/InvalidVersion20150502000002.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/InvalidVersion20150502000002.php
rename to tests/Finder/_files/InvalidVersion20150502000002.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/NotAVersion.php b/tests/Finder/_files/NotAVersion.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/NotAVersion.php
rename to tests/Finder/_files/NotAVersion.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/Version20150502000000.php b/tests/Finder/_files/Version20150502000000.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/Version20150502000000.php
rename to tests/Finder/_files/Version20150502000000.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/Version20150502000001.php b/tests/Finder/_files/Version20150502000001.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/Version20150502000001.php
rename to tests/Finder/_files/Version20150502000001.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/Version20150502000006.sql b/tests/Finder/_files/Version20150502000006.sql
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/Version20150502000006.sql
rename to tests/Finder/_files/Version20150502000006.sql
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/Version20150502000007 b/tests/Finder/_files/Version20150502000007
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/Version20150502000007
rename to tests/Finder/_files/Version20150502000007
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/Version20150502000008aphp b/tests/Finder/_files/Version20150502000008aphp
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/Version20150502000008aphp
rename to tests/Finder/_files/Version20150502000008aphp
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/_symlinked_files b/tests/Finder/_files/_symlinked_files
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/_symlinked_files
rename to tests/Finder/_files/_symlinked_files
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/deep/InvalidVersion20150502000002.php b/tests/Finder/_files/deep/InvalidVersion20150502000002.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/deep/InvalidVersion20150502000002.php
rename to tests/Finder/_files/deep/InvalidVersion20150502000002.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/deep/Version1ResetVersions.php b/tests/Finder/_files/deep/Version1ResetVersions.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/deep/Version1ResetVersions.php
rename to tests/Finder/_files/deep/Version1ResetVersions.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/deep/Version20150502000003.php b/tests/Finder/_files/deep/Version20150502000003.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/deep/Version20150502000003.php
rename to tests/Finder/_files/deep/Version20150502000003.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/deep/Version20150502000003/ARandomClass.php b/tests/Finder/_files/deep/Version20150502000003/ARandomClass.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/deep/Version20150502000003/ARandomClass.php
rename to tests/Finder/_files/deep/Version20150502000003/ARandomClass.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/deep/Version20150502000003/AnotherRandomClassNotStartingWithVersion.php b/tests/Finder/_files/deep/Version20150502000003/AnotherRandomClassNotStartingWithVersion.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/deep/Version20150502000003/AnotherRandomClassNotStartingWithVersion.php
rename to tests/Finder/_files/deep/Version20150502000003/AnotherRandomClassNotStartingWithVersion.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/deep/Version20150502000003/Version20150502000005.php b/tests/Finder/_files/deep/Version20150502000003/Version20150502000005.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/deep/Version20150502000003/Version20150502000005.php
rename to tests/Finder/_files/deep/Version20150502000003/Version20150502000005.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/deep/deeper/ADeeperRandomClass.php b/tests/Finder/_files/deep/deeper/ADeeperRandomClass.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/deep/deeper/ADeeperRandomClass.php
rename to tests/Finder/_files/deep/deeper/ADeeperRandomClass.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_files/deep/deeper/Version20150502000004.php b/tests/Finder/_files/deep/deeper/Version20150502000004.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_files/deep/deeper/Version20150502000004.php
rename to tests/Finder/_files/deep/deeper/Version20150502000004.php
diff --git a/tests/Doctrine/Migrations/Tests/Finder/_symlinked_files/Version1SymlinkedFile.php b/tests/Finder/_symlinked_files/Version1SymlinkedFile.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Finder/_symlinked_files/Version1SymlinkedFile.php
rename to tests/Finder/_symlinked_files/Version1SymlinkedFile.php
diff --git a/tests/Doctrine/Migrations/Tests/Generator/ClassNameGeneratorTest.php b/tests/Generator/ClassNameGeneratorTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Generator/ClassNameGeneratorTest.php
rename to tests/Generator/ClassNameGeneratorTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Generator/ConcatenationFileBuilderTest.php b/tests/Generator/ConcatenationFileBuilderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Generator/ConcatenationFileBuilderTest.php
rename to tests/Generator/ConcatenationFileBuilderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Generator/DiffGeneratorTest.php b/tests/Generator/DiffGeneratorTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Generator/DiffGeneratorTest.php
rename to tests/Generator/DiffGeneratorTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Generator/GeneratorTest.php b/tests/Generator/GeneratorTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Generator/GeneratorTest.php
rename to tests/Generator/GeneratorTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Generator/SqlGeneratorTest.php b/tests/Generator/SqlGeneratorTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Generator/SqlGeneratorTest.php
rename to tests/Generator/SqlGeneratorTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Helper.php b/tests/Helper.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Helper.php
rename to tests/Helper.php
diff --git a/tests/Doctrine/Migrations/Tests/InlineParameterFormatterTest.php b/tests/InlineParameterFormatterTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/InlineParameterFormatterTest.php
rename to tests/InlineParameterFormatterTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/AvailableMigrationListTest.php b/tests/Metadata/AvailableMigrationListTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Metadata/AvailableMigrationListTest.php
rename to tests/Metadata/AvailableMigrationListTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/ExecutedMigrationSetTest.php b/tests/Metadata/ExecutedMigrationSetTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Metadata/ExecutedMigrationSetTest.php
rename to tests/Metadata/ExecutedMigrationSetTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/MigrationPlanListTest.php b/tests/Metadata/MigrationPlanListTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Metadata/MigrationPlanListTest.php
rename to tests/Metadata/MigrationPlanListTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/Storage/DebugLogger.php b/tests/Metadata/Storage/DebugLogger.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Metadata/Storage/DebugLogger.php
rename to tests/Metadata/Storage/DebugLogger.php
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/Storage/ExistingTableMetadataStorageTest.php b/tests/Metadata/Storage/ExistingTableMetadataStorageTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Metadata/Storage/ExistingTableMetadataStorageTest.php
rename to tests/Metadata/Storage/ExistingTableMetadataStorageTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageConfigurationTest.php b/tests/Metadata/Storage/TableMetadataStorageConfigurationTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageConfigurationTest.php
rename to tests/Metadata/Storage/TableMetadataStorageConfigurationTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageTest.php b/tests/Metadata/Storage/TableMetadataStorageTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageTest.php
rename to tests/Metadata/Storage/TableMetadataStorageTest.php
diff --git a/tests/Doctrine/Migrations/Tests/MigrationRepository/FilesystemMigrationsRepositoryTest.php b/tests/MigrationRepository/FilesystemMigrationsRepositoryTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/MigrationRepository/FilesystemMigrationsRepositoryTest.php
rename to tests/MigrationRepository/FilesystemMigrationsRepositoryTest.php
diff --git a/tests/Doctrine/Migrations/Tests/MigrationRepository/Migrations/A/A.php b/tests/MigrationRepository/Migrations/A/A.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/MigrationRepository/Migrations/A/A.php
rename to tests/MigrationRepository/Migrations/A/A.php
diff --git a/tests/Doctrine/Migrations/Tests/MigrationRepository/Migrations/A/B.php b/tests/MigrationRepository/Migrations/A/B.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/MigrationRepository/Migrations/A/B.php
rename to tests/MigrationRepository/Migrations/A/B.php
diff --git a/tests/Doctrine/Migrations/Tests/MigrationRepository/Migrations/B/C.php b/tests/MigrationRepository/Migrations/B/C.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/MigrationRepository/Migrations/B/C.php
rename to tests/MigrationRepository/Migrations/B/C.php
diff --git a/tests/Doctrine/Migrations/Tests/MigrationRepository/NoMigrations/.gitkeep b/tests/MigrationRepository/NoMigrations/.gitkeep
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/MigrationRepository/NoMigrations/.gitkeep
rename to tests/MigrationRepository/NoMigrations/.gitkeep
diff --git a/tests/Doctrine/Migrations/Tests/MigrationTestCase.php b/tests/MigrationTestCase.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/MigrationTestCase.php
rename to tests/MigrationTestCase.php
diff --git a/tests/Doctrine/Migrations/Tests/MigratorConfigurationTest.php b/tests/MigratorConfigurationTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/MigratorConfigurationTest.php
rename to tests/MigratorConfigurationTest.php
diff --git a/tests/Doctrine/Migrations/Tests/MigratorTest.php b/tests/MigratorTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/MigratorTest.php
rename to tests/MigratorTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Provider/A.php b/tests/Provider/A.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Provider/A.php
rename to tests/Provider/A.php
diff --git a/tests/Doctrine/Migrations/Tests/Provider/B.php b/tests/Provider/B.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Provider/B.php
rename to tests/Provider/B.php
diff --git a/tests/Doctrine/Migrations/Tests/Provider/C.php b/tests/Provider/C.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Provider/C.php
rename to tests/Provider/C.php
diff --git a/tests/Doctrine/Migrations/Tests/Provider/ClassMetadataFactory.php b/tests/Provider/ClassMetadataFactory.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Provider/ClassMetadataFactory.php
rename to tests/Provider/ClassMetadataFactory.php
diff --git a/tests/Doctrine/Migrations/Tests/Provider/EmptySchemaProviderTest.php b/tests/Provider/EmptySchemaProviderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Provider/EmptySchemaProviderTest.php
rename to tests/Provider/EmptySchemaProviderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Provider/OrmSchemaProviderTest.php b/tests/Provider/OrmSchemaProviderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Provider/OrmSchemaProviderTest.php
rename to tests/Provider/OrmSchemaProviderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Provider/SchemaDiffProviderTest.php b/tests/Provider/SchemaDiffProviderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Provider/SchemaDiffProviderTest.php
rename to tests/Provider/SchemaDiffProviderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Provider/StubSchemaProviderTest.php b/tests/Provider/StubSchemaProviderTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Provider/StubSchemaProviderTest.php
rename to tests/Provider/StubSchemaProviderTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Provider/_files/Doctrine.Migrations.Tests.Provider.A.dcm.xml b/tests/Provider/_files/Doctrine.Migrations.Tests.Provider.A.dcm.xml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Provider/_files/Doctrine.Migrations.Tests.Provider.A.dcm.xml
rename to tests/Provider/_files/Doctrine.Migrations.Tests.Provider.A.dcm.xml
diff --git a/tests/Doctrine/Migrations/Tests/Provider/_files/Doctrine.Migrations.Tests.Provider.B.dcm.xml b/tests/Provider/_files/Doctrine.Migrations.Tests.Provider.B.dcm.xml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Provider/_files/Doctrine.Migrations.Tests.Provider.B.dcm.xml
rename to tests/Provider/_files/Doctrine.Migrations.Tests.Provider.B.dcm.xml
diff --git a/tests/Doctrine/Migrations/Tests/Provider/_files/Doctrine.Migrations.Tests.Provider.C.dcm.xml b/tests/Provider/_files/Doctrine.Migrations.Tests.Provider.C.dcm.xml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Provider/_files/Doctrine.Migrations.Tests.Provider.C.dcm.xml
rename to tests/Provider/_files/Doctrine.Migrations.Tests.Provider.C.dcm.xml
diff --git a/tests/Doctrine/Migrations/Tests/Query/QueryTest.php b/tests/Query/QueryTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Query/QueryTest.php
rename to tests/Query/QueryTest.php
diff --git a/tests/Doctrine/Migrations/Tests/RollupTest.php b/tests/RollupTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/RollupTest.php
rename to tests/RollupTest.php
diff --git a/tests/Doctrine/Migrations/Tests/SchemaDumperTest.php b/tests/SchemaDumperTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/SchemaDumperTest.php
rename to tests/SchemaDumperTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Stub/AbstractMigrationStub.php b/tests/Stub/AbstractMigrationStub.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Stub/AbstractMigrationStub.php
rename to tests/Stub/AbstractMigrationStub.php
diff --git a/tests/Doctrine/Migrations/Tests/Stub/AbstractMigrationWithoutDownStub.php b/tests/Stub/AbstractMigrationWithoutDownStub.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Stub/AbstractMigrationWithoutDownStub.php
rename to tests/Stub/AbstractMigrationWithoutDownStub.php
diff --git a/tests/Doctrine/Migrations/Tests/Stub/CustomClassNameMigrationFactory.php b/tests/Stub/CustomClassNameMigrationFactory.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Stub/CustomClassNameMigrationFactory.php
rename to tests/Stub/CustomClassNameMigrationFactory.php
diff --git a/tests/Doctrine/Migrations/Tests/Stub/DoctrineRegistry.php b/tests/Stub/DoctrineRegistry.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Stub/DoctrineRegistry.php
rename to tests/Stub/DoctrineRegistry.php
diff --git a/tests/Doctrine/Migrations/Tests/Stub/Functional/MigrateNotTouchingTheSchema.php b/tests/Stub/Functional/MigrateNotTouchingTheSchema.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Stub/Functional/MigrateNotTouchingTheSchema.php
rename to tests/Stub/Functional/MigrateNotTouchingTheSchema.php
diff --git a/tests/Doctrine/Migrations/Tests/Stub/Functional/MigrationThrowsError.php b/tests/Stub/Functional/MigrationThrowsError.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Stub/Functional/MigrationThrowsError.php
rename to tests/Stub/Functional/MigrationThrowsError.php
diff --git a/tests/Doctrine/Migrations/Tests/Stub/NonTransactional/MigrationNonTransactional.php b/tests/Stub/NonTransactional/MigrationNonTransactional.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Stub/NonTransactional/MigrationNonTransactional.php
rename to tests/Stub/NonTransactional/MigrationNonTransactional.php
diff --git a/tests/Doctrine/Migrations/Tests/TestLogger.php b/tests/TestLogger.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/TestLogger.php
rename to tests/TestLogger.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/BooleanStringFormatterTest.php b/tests/Tools/BooleanStringFormatterTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/BooleanStringFormatterTest.php
rename to tests/Tools/BooleanStringFormatterTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/BytesFormatterTest.php b/tests/Tools/BytesFormatterTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/BytesFormatterTest.php
rename to tests/Tools/BytesFormatterTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/CurrentCommandTest.php b/tests/Tools/Console/Command/CurrentCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/CurrentCommandTest.php
rename to tests/Tools/Console/Command/CurrentCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DiffCommandTest.php b/tests/Tools/Console/Command/DiffCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/DiffCommandTest.php
rename to tests/Tools/Console/Command/DiffCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DoctrineCommandTest.php b/tests/Tools/Console/Command/DoctrineCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/DoctrineCommandTest.php
rename to tests/Tools/Console/Command/DoctrineCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DumpSchemaCommandTest.php b/tests/Tools/Console/Command/DumpSchemaCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/DumpSchemaCommandTest.php
rename to tests/Tools/Console/Command/DumpSchemaCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ExecuteCommandTest.php b/tests/Tools/Console/Command/ExecuteCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/ExecuteCommandTest.php
rename to tests/Tools/Console/Command/ExecuteCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/GenerateCommandTest.php b/tests/Tools/Console/Command/GenerateCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/GenerateCommandTest.php
rename to tests/Tools/Console/Command/GenerateCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/LatestCommandTest.php b/tests/Tools/Console/Command/LatestCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/LatestCommandTest.php
rename to tests/Tools/Console/Command/LatestCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ListCommandTest.php b/tests/Tools/Console/Command/ListCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/ListCommandTest.php
rename to tests/Tools/Console/Command/ListCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php b/tests/Tools/Console/Command/MigrateCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php
rename to tests/Tools/Console/Command/MigrateCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationVersionTest.php b/tests/Tools/Console/Command/MigrationVersionTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationVersionTest.php
rename to tests/Tools/Console/Command/MigrationVersionTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/RollupCommandTest.php b/tests/Tools/Console/Command/RollupCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/RollupCommandTest.php
rename to tests/Tools/Console/Command/RollupCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/StatusCommandTest.php b/tests/Tools/Console/Command/StatusCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/StatusCommandTest.php
rename to tests/Tools/Console/Command/StatusCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/SyncMetadataCommandTest.php b/tests/Tools/Console/Command/SyncMetadataCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/SyncMetadataCommandTest.php
rename to tests/Tools/Console/Command/SyncMetadataCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php b/tests/Tools/Console/Command/UpToDateCommandTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php
rename to tests/Tools/Console/Command/UpToDateCommandTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/_files/config.yml b/tests/Tools/Console/Command/_files/config.yml
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Command/_files/config.yml
rename to tests/Tools/Console/Command/_files/config.yml
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleLoggerTest.php b/tests/Tools/Console/ConsoleLoggerTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleLoggerTest.php
rename to tests/Tools/Console/ConsoleLoggerTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php b/tests/Tools/Console/ConsoleRunnerTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php
rename to tests/Tools/Console/ConsoleRunnerTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/MigrationDirectoryHelperTest.php b/tests/Tools/Console/Helper/MigrationDirectoryHelperTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/Helper/MigrationDirectoryHelperTest.php
rename to tests/Tools/Console/Helper/MigrationDirectoryHelperTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/_wrong-config/cli-config.php b/tests/Tools/Console/_wrong-config/cli-config.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/_wrong-config/cli-config.php
rename to tests/Tools/Console/_wrong-config/cli-config.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/config/cli-config.php b/tests/Tools/Console/config/cli-config.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/config/cli-config.php
rename to tests/Tools/Console/config/cli-config.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-orm/cli-config.php b/tests/Tools/Console/legacy-config-orm/cli-config.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-orm/cli-config.php
rename to tests/Tools/Console/legacy-config-orm/cli-config.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-orm/migrations.php b/tests/Tools/Console/legacy-config-orm/migrations.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-orm/migrations.php
rename to tests/Tools/Console/legacy-config-orm/migrations.php
diff --git a/tests/Doctrine/Migrations/Tests/Tools/TransactionHelperTest.php b/tests/Tools/TransactionHelperTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Tools/TransactionHelperTest.php
rename to tests/Tools/TransactionHelperTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Version/AliasResolverTest.php b/tests/Version/AliasResolverTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Version/AliasResolverTest.php
rename to tests/Version/AliasResolverTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Version/DbalFactoryTest.php b/tests/Version/DbalFactoryTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Version/DbalFactoryTest.php
rename to tests/Version/DbalFactoryTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Version/ExecutionResultTest.php b/tests/Version/ExecutionResultTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Version/ExecutionResultTest.php
rename to tests/Version/ExecutionResultTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Version/ExecutorTest.php b/tests/Version/ExecutorTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Version/ExecutorTest.php
rename to tests/Version/ExecutorTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Version/Fixture/EmptyTestMigration.php b/tests/Version/Fixture/EmptyTestMigration.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Version/Fixture/EmptyTestMigration.php
rename to tests/Version/Fixture/EmptyTestMigration.php
diff --git a/tests/Doctrine/Migrations/Tests/Version/Fixture/VersionExecutorTestMigration.php b/tests/Version/Fixture/VersionExecutorTestMigration.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Version/Fixture/VersionExecutorTestMigration.php
rename to tests/Version/Fixture/VersionExecutorTestMigration.php
diff --git a/tests/Doctrine/Migrations/Tests/Version/MigrationPlanCalculatorTest.php b/tests/Version/MigrationPlanCalculatorTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Version/MigrationPlanCalculatorTest.php
rename to tests/Version/MigrationPlanCalculatorTest.php
diff --git a/tests/Doctrine/Migrations/Tests/Version/MigrationStatusCalculatorTest.php b/tests/Version/MigrationStatusCalculatorTest.php
similarity index 100%
rename from tests/Doctrine/Migrations/Tests/Version/MigrationStatusCalculatorTest.php
rename to tests/Version/MigrationStatusCalculatorTest.php
diff --git a/tests/Doctrine/Migrations/Tests/doctrine-migrations-phpstan-app.php b/tests/doctrine-migrations-phpstan-app.php
similarity index 80%
rename from tests/Doctrine/Migrations/Tests/doctrine-migrations-phpstan-app.php
rename to tests/doctrine-migrations-phpstan-app.php
index c5e0d3b72e..d2aeb6ad88 100644
--- a/tests/Doctrine/Migrations/Tests/doctrine-migrations-phpstan-app.php
+++ b/tests/doctrine-migrations-phpstan-app.php
@@ -7,6 +7,6 @@
use Doctrine\Migrations\Tools\Console\Command\DiffCommand;
use Doctrine\Migrations\Tools\Console\ConsoleRunner;
-require_once __DIR__ . '/../../../../vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
return ConsoleRunner::createApplication([new DiffCommand()]);