diff --git a/components/BlockParser/class-wp-block-parser.php b/components/BlockParser/class-wpblockparser.php
similarity index 98%
rename from components/BlockParser/class-wp-block-parser.php
rename to components/BlockParser/class-wpblockparser.php
index 38eaa8aad..1a4f6d89c 100644
--- a/components/BlockParser/class-wp-block-parser.php
+++ b/components/BlockParser/class-wpblockparser.php
@@ -410,11 +410,11 @@ public function add_block_from_stack( $end_offset = null ) {
  *
  * Required for backward compatibility in WordPress Core.
  */
-require_once __DIR__ . '/class-wp-block-parser-block.php';
+require_once __DIR__ . '/class-wpblockparserblock.php';
 
 /**
  * WP_Block_Parser_Frame class.
  *
  * Required for backward compatibility in WordPress Core.
  */
-require_once __DIR__ . '/class-wp-block-parser-frame.php';
+require_once __DIR__ . '/class-wpblockparserframe.php';
diff --git a/components/BlockParser/class-wp-block-parser-block.php b/components/BlockParser/class-wpblockparserblock.php
similarity index 100%
rename from components/BlockParser/class-wp-block-parser-block.php
rename to components/BlockParser/class-wpblockparserblock.php
diff --git a/components/BlockParser/class-wp-block-parser-error.php b/components/BlockParser/class-wpblockparsererror.php
similarity index 100%
rename from components/BlockParser/class-wp-block-parser-error.php
rename to components/BlockParser/class-wpblockparsererror.php
diff --git a/components/BlockParser/class-wp-block-parser-frame.php b/components/BlockParser/class-wpblockparserframe.php
similarity index 100%
rename from components/BlockParser/class-wp-block-parser-frame.php
rename to components/BlockParser/class-wpblockparserframe.php
diff --git a/components/Blueprints/DataReference/AbsoluteLocalPath.php b/components/Blueprints/DataReference/class-absolutelocalpath.php
similarity index 100%
rename from components/Blueprints/DataReference/AbsoluteLocalPath.php
rename to components/Blueprints/DataReference/class-absolutelocalpath.php
diff --git a/components/Blueprints/DataReference/DataReference.php b/components/Blueprints/DataReference/class-datareference.php
similarity index 100%
rename from components/Blueprints/DataReference/DataReference.php
rename to components/Blueprints/DataReference/class-datareference.php
diff --git a/components/Blueprints/DataReference/DataReferenceResolver.php b/components/Blueprints/DataReference/class-datareferenceresolver.php
similarity index 100%
rename from components/Blueprints/DataReference/DataReferenceResolver.php
rename to components/Blueprints/DataReference/class-datareferenceresolver.php
diff --git a/components/Blueprints/DataReference/Directory.php b/components/Blueprints/DataReference/class-directory.php
similarity index 100%
rename from components/Blueprints/DataReference/Directory.php
rename to components/Blueprints/DataReference/class-directory.php
diff --git a/components/Blueprints/DataReference/ExecutionContextPath.php b/components/Blueprints/DataReference/class-executioncontextpath.php
similarity index 100%
rename from components/Blueprints/DataReference/ExecutionContextPath.php
rename to components/Blueprints/DataReference/class-executioncontextpath.php
diff --git a/components/Blueprints/DataReference/File.php b/components/Blueprints/DataReference/class-file.php
similarity index 100%
rename from components/Blueprints/DataReference/File.php
rename to components/Blueprints/DataReference/class-file.php
diff --git a/components/Blueprints/DataReference/GitPath.php b/components/Blueprints/DataReference/class-gitpath.php
similarity index 100%
rename from components/Blueprints/DataReference/GitPath.php
rename to components/Blueprints/DataReference/class-gitpath.php
diff --git a/components/Blueprints/DataReference/InlineDirectory.php b/components/Blueprints/DataReference/class-inlinedirectory.php
similarity index 100%
rename from components/Blueprints/DataReference/InlineDirectory.php
rename to components/Blueprints/DataReference/class-inlinedirectory.php
diff --git a/components/Blueprints/DataReference/InlineFile.php b/components/Blueprints/DataReference/class-inlinefile.php
similarity index 100%
rename from components/Blueprints/DataReference/InlineFile.php
rename to components/Blueprints/DataReference/class-inlinefile.php
diff --git a/components/Blueprints/DataReference/RemoteFile.php b/components/Blueprints/DataReference/class-remotefile.php
similarity index 100%
rename from components/Blueprints/DataReference/RemoteFile.php
rename to components/Blueprints/DataReference/class-remotefile.php
diff --git a/components/Blueprints/DataReference/URLReference.php b/components/Blueprints/DataReference/class-urlreference.php
similarity index 100%
rename from components/Blueprints/DataReference/URLReference.php
rename to components/Blueprints/DataReference/class-urlreference.php
diff --git a/components/Blueprints/DataReference/WordPressOrgPlugin.php b/components/Blueprints/DataReference/class-wordpressorgplugin.php
similarity index 100%
rename from components/Blueprints/DataReference/WordPressOrgPlugin.php
rename to components/Blueprints/DataReference/class-wordpressorgplugin.php
diff --git a/components/Blueprints/DataReference/WordPressOrgTheme.php b/components/Blueprints/DataReference/class-wordpressorgtheme.php
similarity index 100%
rename from components/Blueprints/DataReference/WordPressOrgTheme.php
rename to components/Blueprints/DataReference/class-wordpressorgtheme.php
diff --git a/components/Blueprints/Exception/BlueprintExecutionException.php b/components/Blueprints/Exception/class-blueprintexecutionexception.php
similarity index 100%
rename from components/Blueprints/Exception/BlueprintExecutionException.php
rename to components/Blueprints/Exception/class-blueprintexecutionexception.php
diff --git a/components/Blueprints/Exception/DataResolutionException.php b/components/Blueprints/Exception/class-dataresolutionexception.php
similarity index 100%
rename from components/Blueprints/Exception/DataResolutionException.php
rename to components/Blueprints/Exception/class-dataresolutionexception.php
diff --git a/components/Blueprints/Exception/PermissionsException.php b/components/Blueprints/Exception/class-permissionsexception.php
similarity index 100%
rename from components/Blueprints/Exception/PermissionsException.php
rename to components/Blueprints/Exception/class-permissionsexception.php
diff --git a/components/Blueprints/Logger/CLILogger.php b/components/Blueprints/Logger/class-clilogger.php
similarity index 100%
rename from components/Blueprints/Logger/CLILogger.php
rename to components/Blueprints/Logger/class-clilogger.php
diff --git a/components/Blueprints/Logger/NoopLogger.php b/components/Blueprints/Logger/class-nooplogger.php
similarity index 100%
rename from components/Blueprints/Logger/NoopLogger.php
rename to components/Blueprints/Logger/class-nooplogger.php
diff --git a/components/Blueprints/Progress/DoneEvent.php b/components/Blueprints/Progress/class-doneevent.php
similarity index 100%
rename from components/Blueprints/Progress/DoneEvent.php
rename to components/Blueprints/Progress/class-doneevent.php
diff --git a/components/Blueprints/Progress/ProgressEvent.php b/components/Blueprints/Progress/class-progressevent.php
similarity index 100%
rename from components/Blueprints/Progress/ProgressEvent.php
rename to components/Blueprints/Progress/class-progressevent.php
diff --git a/components/Blueprints/Progress/ProgressTrackedReadStream.php b/components/Blueprints/Progress/class-progresstrackedreadstream.php
similarity index 100%
rename from components/Blueprints/Progress/ProgressTrackedReadStream.php
rename to components/Blueprints/Progress/class-progresstrackedreadstream.php
diff --git a/components/Blueprints/Progress/Tracker.php b/components/Blueprints/Progress/class-tracker.php
similarity index 100%
rename from components/Blueprints/Progress/Tracker.php
rename to components/Blueprints/Progress/class-tracker.php
diff --git a/components/Blueprints/SiteResolver/ExistingSiteResolver.php b/components/Blueprints/SiteResolver/class-existingsiteresolver.php
similarity index 100%
rename from components/Blueprints/SiteResolver/ExistingSiteResolver.php
rename to components/Blueprints/SiteResolver/class-existingsiteresolver.php
diff --git a/components/Blueprints/SiteResolver/NewSiteResolver.php b/components/Blueprints/SiteResolver/class-newsiteresolver.php
similarity index 100%
rename from components/Blueprints/SiteResolver/NewSiteResolver.php
rename to components/Blueprints/SiteResolver/class-newsiteresolver.php
diff --git a/components/Blueprints/Steps/ActivatePluginStep.php b/components/Blueprints/Steps/class-activatepluginstep.php
similarity index 100%
rename from components/Blueprints/Steps/ActivatePluginStep.php
rename to components/Blueprints/Steps/class-activatepluginstep.php
diff --git a/components/Blueprints/Steps/ActivateThemeStep.php b/components/Blueprints/Steps/class-activatethemestep.php
similarity index 100%
rename from components/Blueprints/Steps/ActivateThemeStep.php
rename to components/Blueprints/Steps/class-activatethemestep.php
diff --git a/components/Blueprints/Steps/CpStep.php b/components/Blueprints/Steps/class-cpstep.php
similarity index 100%
rename from components/Blueprints/Steps/CpStep.php
rename to components/Blueprints/Steps/class-cpstep.php
diff --git a/components/Blueprints/Steps/DefineConstantsStep.php b/components/Blueprints/Steps/class-defineconstantsstep.php
similarity index 100%
rename from components/Blueprints/Steps/DefineConstantsStep.php
rename to components/Blueprints/Steps/class-defineconstantsstep.php
diff --git a/components/Blueprints/Steps/EnableMultisiteStep.php b/components/Blueprints/Steps/class-enablemultisitestep.php
similarity index 100%
rename from components/Blueprints/Steps/EnableMultisiteStep.php
rename to components/Blueprints/Steps/class-enablemultisitestep.php
diff --git a/components/Blueprints/Steps/ImportContentStep.php b/components/Blueprints/Steps/class-importcontentstep.php
similarity index 100%
rename from components/Blueprints/Steps/ImportContentStep.php
rename to components/Blueprints/Steps/class-importcontentstep.php
diff --git a/components/Blueprints/Steps/ImportMediaStep.php b/components/Blueprints/Steps/class-importmediastep.php
similarity index 100%
rename from components/Blueprints/Steps/ImportMediaStep.php
rename to components/Blueprints/Steps/class-importmediastep.php
diff --git a/components/Blueprints/Steps/ImportThemeStarterContentStep.php b/components/Blueprints/Steps/class-importthemestartercontentstep.php
similarity index 100%
rename from components/Blueprints/Steps/ImportThemeStarterContentStep.php
rename to components/Blueprints/Steps/class-importthemestartercontentstep.php
diff --git a/components/Blueprints/Steps/InstallPluginStep.php b/components/Blueprints/Steps/class-installpluginstep.php
similarity index 100%
rename from components/Blueprints/Steps/InstallPluginStep.php
rename to components/Blueprints/Steps/class-installpluginstep.php
diff --git a/components/Blueprints/Steps/InstallThemeStep.php b/components/Blueprints/Steps/class-installthemestep.php
similarity index 100%
rename from components/Blueprints/Steps/InstallThemeStep.php
rename to components/Blueprints/Steps/class-installthemestep.php
diff --git a/components/Blueprints/Steps/MkdirStep.php b/components/Blueprints/Steps/class-mkdirstep.php
similarity index 100%
rename from components/Blueprints/Steps/MkdirStep.php
rename to components/Blueprints/Steps/class-mkdirstep.php
diff --git a/components/Blueprints/Steps/MvStep.php b/components/Blueprints/Steps/class-mvstep.php
similarity index 100%
rename from components/Blueprints/Steps/MvStep.php
rename to components/Blueprints/Steps/class-mvstep.php
diff --git a/components/Blueprints/Steps/RmDirStep.php b/components/Blueprints/Steps/class-rmdirstep.php
similarity index 100%
rename from components/Blueprints/Steps/RmDirStep.php
rename to components/Blueprints/Steps/class-rmdirstep.php
diff --git a/components/Blueprints/Steps/RmStep.php b/components/Blueprints/Steps/class-rmstep.php
similarity index 100%
rename from components/Blueprints/Steps/RmStep.php
rename to components/Blueprints/Steps/class-rmstep.php
diff --git a/components/Blueprints/Steps/RunPHPStep.php b/components/Blueprints/Steps/class-runphpstep.php
similarity index 100%
rename from components/Blueprints/Steps/RunPHPStep.php
rename to components/Blueprints/Steps/class-runphpstep.php
diff --git a/components/Blueprints/Steps/RunSqlStep.php b/components/Blueprints/Steps/class-runsqlstep.php
similarity index 100%
rename from components/Blueprints/Steps/RunSqlStep.php
rename to components/Blueprints/Steps/class-runsqlstep.php
diff --git a/components/Blueprints/Steps/SetSiteLanguageStep.php b/components/Blueprints/Steps/class-setsitelanguagestep.php
similarity index 100%
rename from components/Blueprints/Steps/SetSiteLanguageStep.php
rename to components/Blueprints/Steps/class-setsitelanguagestep.php
diff --git a/components/Blueprints/Steps/SetSiteOptionsStep.php b/components/Blueprints/Steps/class-setsiteoptionsstep.php
similarity index 100%
rename from components/Blueprints/Steps/SetSiteOptionsStep.php
rename to components/Blueprints/Steps/class-setsiteoptionsstep.php
diff --git a/components/Blueprints/Steps/UnzipStep.php b/components/Blueprints/Steps/class-unzipstep.php
similarity index 100%
rename from components/Blueprints/Steps/UnzipStep.php
rename to components/Blueprints/Steps/class-unzipstep.php
diff --git a/components/Blueprints/Steps/WPCLIStep.php b/components/Blueprints/Steps/class-wpclistep.php
similarity index 100%
rename from components/Blueprints/Steps/WPCLIStep.php
rename to components/Blueprints/Steps/class-wpclistep.php
diff --git a/components/Blueprints/Steps/WriteFilesStep.php b/components/Blueprints/Steps/class-writefilesstep.php
similarity index 100%
rename from components/Blueprints/Steps/WriteFilesStep.php
rename to components/Blueprints/Steps/class-writefilesstep.php
diff --git a/components/Blueprints/Steps/StepInterface.php b/components/Blueprints/Steps/interface-step-interface.php
similarity index 100%
rename from components/Blueprints/Steps/StepInterface.php
rename to components/Blueprints/Steps/interface-step-interface.php
diff --git a/components/Blueprints/Tests/Unit/Steps/CpStepTest.php b/components/Blueprints/Tests/Unit/Steps/CpStepTest.php
index 2763a5373..2761659db 100644
--- a/components/Blueprints/Tests/Unit/Steps/CpStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/CpStepTest.php
@@ -6,6 +6,8 @@
 use WordPress\Blueprints\Steps\CpStep;
 use WordPress\Filesystem\FilesystemException;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class CpStepTest extends StepTestCase {
 	public function testCopyFile() {
 		$this->runtime->getTargetFilesystem()->put_contents( 'source_file.txt', 'test content' );
diff --git a/components/Blueprints/Tests/Unit/Steps/DefineConstantsStepTest.php b/components/Blueprints/Tests/Unit/Steps/DefineConstantsStepTest.php
index a1d385e3e..7a4f285a4 100644
--- a/components/Blueprints/Tests/Unit/Steps/DefineConstantsStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/DefineConstantsStepTest.php
@@ -6,6 +6,8 @@
 use WordPress\Blueprints\Progress\Tracker;
 use WordPress\Blueprints\Steps\DefineConstantsStep;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class DefineConstantsStepTest extends StepTestCase {
 	/**
 	 * Test updating existing constants
diff --git a/components/Blueprints/Tests/Unit/Steps/EnableMultisiteStepTest.php b/components/Blueprints/Tests/Unit/Steps/EnableMultisiteStepTest.php
index c7439c9b2..b9e122494 100644
--- a/components/Blueprints/Tests/Unit/Steps/EnableMultisiteStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/EnableMultisiteStepTest.php
@@ -7,6 +7,8 @@
 use WordPress\Blueprints\Progress\Tracker;
 use WordPress\Blueprints\Steps\EnableMultisiteStep;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class EnableMultisiteStepTest extends StepTestCase {
 	public function setUp(): void {
 		parent::setUp();
diff --git a/components/Blueprints/Tests/Unit/Steps/InstallPluginStepTest.php b/components/Blueprints/Tests/Unit/Steps/InstallPluginStepTest.php
index 7074708f1..71bf0b914 100644
--- a/components/Blueprints/Tests/Unit/Steps/InstallPluginStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/InstallPluginStepTest.php
@@ -11,6 +11,8 @@
 
 use function WordPress\Filesystem\wp_join_unix_paths;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class InstallPluginStepTest extends StepTestCase {
 	const PLUGIN_FILE_CONTENT = <<<'PHP'
 <?php
diff --git a/components/Blueprints/Tests/Unit/Steps/InstallThemeStepTest.php b/components/Blueprints/Tests/Unit/Steps/InstallThemeStepTest.php
index b33a673ae..0fe046a36 100644
--- a/components/Blueprints/Tests/Unit/Steps/InstallThemeStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/InstallThemeStepTest.php
@@ -11,6 +11,8 @@
 
 use function WordPress\Filesystem\wp_join_unix_paths;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class InstallThemeStepTest extends StepTestCase {
 	const THEME_STYLE_CSS_CONTENT = <<<'CSS'
 /*
diff --git a/components/Blueprints/Tests/Unit/Steps/MkdirStepTest.php b/components/Blueprints/Tests/Unit/Steps/MkdirStepTest.php
index b2c13ee6a..09659ce51 100644
--- a/components/Blueprints/Tests/Unit/Steps/MkdirStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/MkdirStepTest.php
@@ -7,6 +7,8 @@
 use WordPress\Blueprints\Steps\MkdirStep;
 use WordPress\Filesystem\FilesystemException;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class MkdirStepTest extends StepTestCase {
 
 	public function testCreateDirectoryWhenUsingRelativePath() {
diff --git a/components/Blueprints/Tests/Unit/Steps/MvStepTest.php b/components/Blueprints/Tests/Unit/Steps/MvStepTest.php
index 4f4a32734..5ae3abcc1 100644
--- a/components/Blueprints/Tests/Unit/Steps/MvStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/MvStepTest.php
@@ -6,6 +6,8 @@
 use WordPress\Blueprints\Steps\MvStep;
 use WordPress\Filesystem\FilesystemException;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class MvStepTest extends StepTestCase {
 
 	public function testMoveFile() {
diff --git a/components/Blueprints/Tests/Unit/Steps/RmDirStepTest.php b/components/Blueprints/Tests/Unit/Steps/RmDirStepTest.php
index 95998ea06..209fa0cb2 100644
--- a/components/Blueprints/Tests/Unit/Steps/RmDirStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/RmDirStepTest.php
@@ -6,6 +6,8 @@
 use WordPress\Blueprints\Steps\RmDirStep;
 use WordPress\Filesystem\FilesystemException;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class RmDirStepTest extends StepTestCase {
 
 	public function testRemoveEmptyDirectory() {
diff --git a/components/Blueprints/Tests/Unit/Steps/RmStepTest.php b/components/Blueprints/Tests/Unit/Steps/RmStepTest.php
index 6c95afd79..74047a6d1 100644
--- a/components/Blueprints/Tests/Unit/Steps/RmStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/RmStepTest.php
@@ -6,6 +6,8 @@
 use WordPress\Blueprints\Steps\RmStep;
 use WordPress\Filesystem\FilesystemException;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class RmStepTest extends StepTestCase {
 
 	public function testRemoveFile() {
diff --git a/components/Blueprints/Tests/Unit/Steps/RunPHPStepTest.php b/components/Blueprints/Tests/Unit/Steps/RunPHPStepTest.php
index 39a731384..0a5fe2ff5 100644
--- a/components/Blueprints/Tests/Unit/Steps/RunPHPStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/RunPHPStepTest.php
@@ -9,6 +9,8 @@
 
 use function WordPress\Filesystem\wp_join_unix_paths;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class RunPHPStepTest extends StepTestCase {
 
 	/**
diff --git a/components/Blueprints/Tests/Unit/Steps/RunSQLStepTest.php b/components/Blueprints/Tests/Unit/Steps/RunSQLStepTest.php
index d0391d536..f87444da0 100644
--- a/components/Blueprints/Tests/Unit/Steps/RunSQLStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/RunSQLStepTest.php
@@ -7,6 +7,8 @@
 use WordPress\Blueprints\Progress\Tracker;
 use WordPress\Blueprints\Steps\RunSqlStep;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class RunSQLStepTest extends StepTestCase {
 	/**
 	 * Test running a simple SQL query
diff --git a/components/Blueprints/Tests/Unit/Steps/SetSiteOptionsStepTest.php b/components/Blueprints/Tests/Unit/Steps/SetSiteOptionsStepTest.php
index aa82cd97f..e6cf79bba 100644
--- a/components/Blueprints/Tests/Unit/Steps/SetSiteOptionsStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/SetSiteOptionsStepTest.php
@@ -5,6 +5,8 @@
 use WordPress\Blueprints\Progress\Tracker;
 use WordPress\Blueprints\Steps\SetSiteOptionsStep;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class SetSiteOptionsStepTest extends StepTestCase {
 	/**
 	 * Helper to verify options in WordPress
diff --git a/components/Blueprints/Tests/Unit/Steps/UnzipStepTest.php b/components/Blueprints/Tests/Unit/Steps/UnzipStepTest.php
index b4d230dc4..5f30261c6 100644
--- a/components/Blueprints/Tests/Unit/Steps/UnzipStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/UnzipStepTest.php
@@ -12,6 +12,8 @@
 
 use function WordPress\Filesystem\wp_join_unix_paths;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class UnzipStepTest extends StepTestCase {
 
 	public function setUp(): void {
diff --git a/components/Blueprints/Tests/Unit/Steps/WriteFilesStepTest.php b/components/Blueprints/Tests/Unit/Steps/WriteFilesStepTest.php
index 6cee14a93..e4fa7b995 100644
--- a/components/Blueprints/Tests/Unit/Steps/WriteFilesStepTest.php
+++ b/components/Blueprints/Tests/Unit/Steps/WriteFilesStepTest.php
@@ -8,6 +8,8 @@
 use WordPress\Blueprints\Progress\Tracker;
 use WordPress\Blueprints\Steps\WriteFilesStep;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class WriteFilesStepTest extends StepTestCase {
 	/**
 	 * Test writing a file with string data
diff --git a/components/Blueprints/Validator/HumanFriendlySchemaValidator.php b/components/Blueprints/Validator/class-humanfriendlyschemavalidator.php
similarity index 100%
rename from components/Blueprints/Validator/HumanFriendlySchemaValidator.php
rename to components/Blueprints/Validator/class-humanfriendlyschemavalidator.php
diff --git a/components/Blueprints/Validator/UnsupportedSchemaException.php b/components/Blueprints/Validator/class-unsupportedschemaexception.php
similarity index 100%
rename from components/Blueprints/Validator/UnsupportedSchemaException.php
rename to components/Blueprints/Validator/class-unsupportedschemaexception.php
diff --git a/components/Blueprints/Validator/ValidationError.php b/components/Blueprints/Validator/class-validationerror.php
similarity index 100%
rename from components/Blueprints/Validator/ValidationError.php
rename to components/Blueprints/Validator/class-validationerror.php
diff --git a/components/Blueprints/VersionStrings/PHPVersion.php b/components/Blueprints/VersionStrings/class-phpversion.php
similarity index 100%
rename from components/Blueprints/VersionStrings/PHPVersion.php
rename to components/Blueprints/VersionStrings/class-phpversion.php
diff --git a/components/Blueprints/VersionStrings/Version.php b/components/Blueprints/VersionStrings/class-version.php
similarity index 100%
rename from components/Blueprints/VersionStrings/Version.php
rename to components/Blueprints/VersionStrings/class-version.php
diff --git a/components/Blueprints/VersionStrings/VersionConstraint.php b/components/Blueprints/VersionStrings/class-versionconstraint.php
similarity index 100%
rename from components/Blueprints/VersionStrings/VersionConstraint.php
rename to components/Blueprints/VersionStrings/class-versionconstraint.php
diff --git a/components/Blueprints/VersionStrings/WordPressVersion.php b/components/Blueprints/VersionStrings/class-wordpressversion.php
similarity index 100%
rename from components/Blueprints/VersionStrings/WordPressVersion.php
rename to components/Blueprints/VersionStrings/class-wordpressversion.php
diff --git a/components/Blueprints/Versions/Version1/V1ToV2Transpiler.php b/components/Blueprints/Versions/Version1/class-v1tov2transpiler.php
similarity index 100%
rename from components/Blueprints/Versions/Version1/V1ToV2Transpiler.php
rename to components/Blueprints/Versions/Version1/class-v1tov2transpiler.php
diff --git a/components/Blueprints/MediaFileDefinition.php b/components/Blueprints/class-mediafiledefinition.php
similarity index 100%
rename from components/Blueprints/MediaFileDefinition.php
rename to components/Blueprints/class-mediafiledefinition.php
diff --git a/components/Blueprints/Metadata.php b/components/Blueprints/class-metadata.php
similarity index 100%
rename from components/Blueprints/Metadata.php
rename to components/Blueprints/class-metadata.php
diff --git a/components/Blueprints/Process.php b/components/Blueprints/class-process.php
similarity index 100%
rename from components/Blueprints/Process.php
rename to components/Blueprints/class-process.php
diff --git a/components/Blueprints/ProcessFailedException.php b/components/Blueprints/class-processfailedexception.php
similarity index 100%
rename from components/Blueprints/ProcessFailedException.php
rename to components/Blueprints/class-processfailedexception.php
diff --git a/components/Blueprints/ProgressObserver.php b/components/Blueprints/class-progressobserver.php
similarity index 100%
rename from components/Blueprints/ProgressObserver.php
rename to components/Blueprints/class-progressobserver.php
diff --git a/components/Blueprints/Runner.php b/components/Blueprints/class-runner.php
similarity index 100%
rename from components/Blueprints/Runner.php
rename to components/Blueprints/class-runner.php
diff --git a/components/Blueprints/RunnerConfiguration.php b/components/Blueprints/class-runnerconfiguration.php
similarity index 100%
rename from components/Blueprints/RunnerConfiguration.php
rename to components/Blueprints/class-runnerconfiguration.php
diff --git a/components/Blueprints/Runtime.php b/components/Blueprints/class-runtime.php
similarity index 100%
rename from components/Blueprints/Runtime.php
rename to components/Blueprints/class-runtime.php
diff --git a/components/ByteStream/ByteTransformer/ByteTransformer.php b/components/ByteStream/ByteTransformer/class-bytetransformer.php
similarity index 100%
rename from components/ByteStream/ByteTransformer/ByteTransformer.php
rename to components/ByteStream/ByteTransformer/class-bytetransformer.php
diff --git a/components/ByteStream/ByteTransformer/ChecksumTransformer.php b/components/ByteStream/ByteTransformer/class-checksumtransformer.php
similarity index 100%
rename from components/ByteStream/ByteTransformer/ChecksumTransformer.php
rename to components/ByteStream/ByteTransformer/class-checksumtransformer.php
diff --git a/components/ByteStream/ByteTransformer/DeflateTransformer.php b/components/ByteStream/ByteTransformer/class-deflatetransformer.php
similarity index 100%
rename from components/ByteStream/ByteTransformer/DeflateTransformer.php
rename to components/ByteStream/ByteTransformer/class-deflatetransformer.php
diff --git a/components/ByteStream/ByteTransformer/InflateTransformer.php b/components/ByteStream/ByteTransformer/class-inflatetransformer.php
similarity index 100%
rename from components/ByteStream/ByteTransformer/InflateTransformer.php
rename to components/ByteStream/ByteTransformer/class-inflatetransformer.php
diff --git a/components/ByteStream/ReadStream/BaseByteReadStream.php b/components/ByteStream/ReadStream/class-basebytereadstream.php
similarity index 100%
rename from components/ByteStream/ReadStream/BaseByteReadStream.php
rename to components/ByteStream/ReadStream/class-basebytereadstream.php
diff --git a/components/ByteStream/ReadStream/ByteReadStream.php b/components/ByteStream/ReadStream/class-bytereadstream.php
similarity index 100%
rename from components/ByteStream/ReadStream/ByteReadStream.php
rename to components/ByteStream/ReadStream/class-bytereadstream.php
diff --git a/components/ByteStream/ReadStream/DeflateReadStream.php b/components/ByteStream/ReadStream/class-deflatereadstream.php
similarity index 100%
rename from components/ByteStream/ReadStream/DeflateReadStream.php
rename to components/ByteStream/ReadStream/class-deflatereadstream.php
diff --git a/components/ByteStream/ReadStream/FileReadStream.php b/components/ByteStream/ReadStream/class-filereadstream.php
similarity index 100%
rename from components/ByteStream/ReadStream/FileReadStream.php
rename to components/ByteStream/ReadStream/class-filereadstream.php
diff --git a/components/ByteStream/ReadStream/InflateReadStream.php b/components/ByteStream/ReadStream/class-inflatereadstream.php
similarity index 100%
rename from components/ByteStream/ReadStream/InflateReadStream.php
rename to components/ByteStream/ReadStream/class-inflatereadstream.php
diff --git a/components/ByteStream/ReadStream/LimitedByteReadStream.php b/components/ByteStream/ReadStream/class-limitedbytereadstream.php
similarity index 100%
rename from components/ByteStream/ReadStream/LimitedByteReadStream.php
rename to components/ByteStream/ReadStream/class-limitedbytereadstream.php
diff --git a/components/ByteStream/ReadStream/TransformedReadStream.php b/components/ByteStream/ReadStream/class-transformedreadstream.php
similarity index 100%
rename from components/ByteStream/ReadStream/TransformedReadStream.php
rename to components/ByteStream/ReadStream/class-transformedreadstream.php
diff --git a/components/ByteStream/WriteStream/ByteWriteStream.php b/components/ByteStream/WriteStream/class-bytewritestream.php
similarity index 100%
rename from components/ByteStream/WriteStream/ByteWriteStream.php
rename to components/ByteStream/WriteStream/class-bytewritestream.php
diff --git a/components/ByteStream/WriteStream/FileWriteStream.php b/components/ByteStream/WriteStream/class-filewritestream.php
similarity index 100%
rename from components/ByteStream/WriteStream/FileWriteStream.php
rename to components/ByteStream/WriteStream/class-filewritestream.php
diff --git a/components/ByteStream/WriteStream/TransformedWriteStream.php b/components/ByteStream/WriteStream/class-transformedwritestream.php
similarity index 100%
rename from components/ByteStream/WriteStream/TransformedWriteStream.php
rename to components/ByteStream/WriteStream/class-transformedwritestream.php
diff --git a/components/ByteStream/BytePipe.php b/components/ByteStream/class-bytepipe.php
similarity index 100%
rename from components/ByteStream/BytePipe.php
rename to components/ByteStream/class-bytepipe.php
diff --git a/components/ByteStream/ByteStreamException.php b/components/ByteStream/class-bytestreamexception.php
similarity index 100%
rename from components/ByteStream/ByteStreamException.php
rename to components/ByteStream/class-bytestreamexception.php
diff --git a/components/ByteStream/FileReadWriteStream.php b/components/ByteStream/class-filereadwritestream.php
similarity index 100%
rename from components/ByteStream/FileReadWriteStream.php
rename to components/ByteStream/class-filereadwritestream.php
diff --git a/components/ByteStream/MemoryPipe.php b/components/ByteStream/class-memorypipe.php
similarity index 100%
rename from components/ByteStream/MemoryPipe.php
rename to components/ByteStream/class-memorypipe.php
diff --git a/components/ByteStream/NotEnoughDataException.php b/components/ByteStream/class-notenoughdataexception.php
similarity index 100%
rename from components/ByteStream/NotEnoughDataException.php
rename to components/ByteStream/class-notenoughdataexception.php
diff --git a/components/ByteStream/composer.json b/components/ByteStream/composer.json
index 9ce8293a9..10f12d20a 100644
--- a/components/ByteStream/composer.json
+++ b/components/ByteStream/composer.json
@@ -16,9 +16,9 @@
 		"php": ">=7.2"
 	},
 	"autoload": {
-		"psr-4": {
-			"WordPress\\ByteStream\\": ""
-		},
+		"classmap": [
+			"./"
+		],
 		"exclude-from-classmap": [
 			"/Tests/"
 		]
diff --git a/components/CLI/CLI.php b/components/CLI/class-cli.php
similarity index 100%
rename from components/CLI/CLI.php
rename to components/CLI/class-cli.php
diff --git a/components/DataLiberation/BlockMarkup/BlockMarkupProcessor.php b/components/DataLiberation/BlockMarkup/class-blockmarkupprocessor.php
similarity index 100%
rename from components/DataLiberation/BlockMarkup/BlockMarkupProcessor.php
rename to components/DataLiberation/BlockMarkup/class-blockmarkupprocessor.php
diff --git a/components/DataLiberation/BlockMarkup/BlockMarkupUrlProcessor.php b/components/DataLiberation/BlockMarkup/class-blockmarkupurlprocessor.php
similarity index 100%
rename from components/DataLiberation/BlockMarkup/BlockMarkupUrlProcessor.php
rename to components/DataLiberation/BlockMarkup/class-blockmarkupurlprocessor.php
diff --git a/components/DataLiberation/BlockMarkup/BlockObject.php b/components/DataLiberation/BlockMarkup/class-blockobject.php
similarity index 100%
rename from components/DataLiberation/BlockMarkup/BlockObject.php
rename to components/DataLiberation/BlockMarkup/class-blockobject.php
diff --git a/components/DataLiberation/DataFormatConsumer/AnnotatedBlockMarkupConsumer.php b/components/DataLiberation/DataFormatConsumer/class-annotatedblockmarkupconsumer.php
similarity index 100%
rename from components/DataLiberation/DataFormatConsumer/AnnotatedBlockMarkupConsumer.php
rename to components/DataLiberation/DataFormatConsumer/class-annotatedblockmarkupconsumer.php
diff --git a/components/DataLiberation/DataFormatConsumer/BlocksWithMetadata.php b/components/DataLiberation/DataFormatConsumer/class-blockswithmetadata.php
similarity index 100%
rename from components/DataLiberation/DataFormatConsumer/BlocksWithMetadata.php
rename to components/DataLiberation/DataFormatConsumer/class-blockswithmetadata.php
diff --git a/components/DataLiberation/DataFormatConsumer/MarkupProcessorConsumer.php b/components/DataLiberation/DataFormatConsumer/class-markupprocessorconsumer.php
similarity index 100%
rename from components/DataLiberation/DataFormatConsumer/MarkupProcessorConsumer.php
rename to components/DataLiberation/DataFormatConsumer/class-markupprocessorconsumer.php
diff --git a/components/DataLiberation/DataFormatConsumer/DataFormatConsumer.php b/components/DataLiberation/DataFormatConsumer/interface-data-format-consumer.php
similarity index 100%
rename from components/DataLiberation/DataFormatConsumer/DataFormatConsumer.php
rename to components/DataLiberation/DataFormatConsumer/interface-data-format-consumer.php
diff --git a/components/DataLiberation/DataFormatProducer/AnnotatedBlockMarkupProducer.php b/components/DataLiberation/DataFormatProducer/class-annotatedblockmarkupproducer.php
similarity index 100%
rename from components/DataLiberation/DataFormatProducer/AnnotatedBlockMarkupProducer.php
rename to components/DataLiberation/DataFormatProducer/class-annotatedblockmarkupproducer.php
diff --git a/components/DataLiberation/DataFormatProducer/DataFormatProducer.php b/components/DataLiberation/DataFormatProducer/interface-data-format-producer.php
similarity index 100%
rename from components/DataLiberation/DataFormatProducer/DataFormatProducer.php
rename to components/DataLiberation/DataFormatProducer/interface-data-format-producer.php
diff --git a/components/DataLiberation/EntityReader/BlocksWithMetadataEntityReader.php b/components/DataLiberation/EntityReader/class-blockswithmetadataentityreader.php
similarity index 100%
rename from components/DataLiberation/EntityReader/BlocksWithMetadataEntityReader.php
rename to components/DataLiberation/EntityReader/class-blockswithmetadataentityreader.php
diff --git a/components/DataLiberation/EntityReader/DatabaseContentEntityReader.php b/components/DataLiberation/EntityReader/class-databasecontententityreader.php
similarity index 100%
rename from components/DataLiberation/EntityReader/DatabaseContentEntityReader.php
rename to components/DataLiberation/EntityReader/class-databasecontententityreader.php
diff --git a/components/DataLiberation/EntityReader/DatabaseRowsEntityReader.php b/components/DataLiberation/EntityReader/class-databaserowsentityreader.php
similarity index 100%
rename from components/DataLiberation/EntityReader/DatabaseRowsEntityReader.php
rename to components/DataLiberation/EntityReader/class-databaserowsentityreader.php
diff --git a/components/DataLiberation/EntityReader/EntityReaderIterator.php b/components/DataLiberation/EntityReader/class-entityreaderiterator.php
similarity index 100%
rename from components/DataLiberation/EntityReader/EntityReaderIterator.php
rename to components/DataLiberation/EntityReader/class-entityreaderiterator.php
diff --git a/components/DataLiberation/EntityReader/EPubEntityReader.php b/components/DataLiberation/EntityReader/class-epubentityreader.php
similarity index 100%
rename from components/DataLiberation/EntityReader/EPubEntityReader.php
rename to components/DataLiberation/EntityReader/class-epubentityreader.php
diff --git a/components/DataLiberation/EntityReader/FilesystemEntityReader.php b/components/DataLiberation/EntityReader/class-filesystementityreader.php
similarity index 100%
rename from components/DataLiberation/EntityReader/FilesystemEntityReader.php
rename to components/DataLiberation/EntityReader/class-filesystementityreader.php
diff --git a/components/DataLiberation/EntityReader/HTMLEntityReader.php b/components/DataLiberation/EntityReader/class-htmlentityreader.php
similarity index 100%
rename from components/DataLiberation/EntityReader/HTMLEntityReader.php
rename to components/DataLiberation/EntityReader/class-htmlentityreader.php
diff --git a/components/DataLiberation/EntityReader/WXREntityReader.php b/components/DataLiberation/EntityReader/class-wxrentityreader.php
similarity index 100%
rename from components/DataLiberation/EntityReader/WXREntityReader.php
rename to components/DataLiberation/EntityReader/class-wxrentityreader.php
diff --git a/components/DataLiberation/EntityReader/EntityReader.php b/components/DataLiberation/EntityReader/interface-entity-reader.php
similarity index 100%
rename from components/DataLiberation/EntityReader/EntityReader.php
rename to components/DataLiberation/EntityReader/interface-entity-reader.php
diff --git a/components/DataLiberation/EntityWriter/MySQLDumpWriter.php b/components/DataLiberation/EntityWriter/class-mysqldumpwriter.php
similarity index 100%
rename from components/DataLiberation/EntityWriter/MySQLDumpWriter.php
rename to components/DataLiberation/EntityWriter/class-mysqldumpwriter.php
diff --git a/components/DataLiberation/EntityWriter/StaticPostFilesWriter.php b/components/DataLiberation/EntityWriter/class-staticpostfileswriter.php
similarity index 100%
rename from components/DataLiberation/EntityWriter/StaticPostFilesWriter.php
rename to components/DataLiberation/EntityWriter/class-staticpostfileswriter.php
diff --git a/components/DataLiberation/EntityWriter/WXRWriter.php b/components/DataLiberation/EntityWriter/class-wxrwriter.php
similarity index 100%
rename from components/DataLiberation/EntityWriter/WXRWriter.php
rename to components/DataLiberation/EntityWriter/class-wxrwriter.php
diff --git a/components/DataLiberation/EntityWriter/EntityWriter.php b/components/DataLiberation/EntityWriter/interface-entity-writer.php
similarity index 100%
rename from components/DataLiberation/EntityWriter/EntityWriter.php
rename to components/DataLiberation/EntityWriter/interface-entity-writer.php
diff --git a/components/DataLiberation/Importer/AttachmentDownloader.php b/components/DataLiberation/Importer/class-attachmentdownloader.php
similarity index 100%
rename from components/DataLiberation/Importer/AttachmentDownloader.php
rename to components/DataLiberation/Importer/class-attachmentdownloader.php
diff --git a/components/DataLiberation/Importer/AttachmentDownloaderEvent.php b/components/DataLiberation/Importer/class-attachmentdownloaderevent.php
similarity index 100%
rename from components/DataLiberation/Importer/AttachmentDownloaderEvent.php
rename to components/DataLiberation/Importer/class-attachmentdownloaderevent.php
diff --git a/components/DataLiberation/Importer/EntityImporter.php b/components/DataLiberation/Importer/class-entityimporter.php
similarity index 100%
rename from components/DataLiberation/Importer/EntityImporter.php
rename to components/DataLiberation/Importer/class-entityimporter.php
diff --git a/components/DataLiberation/Importer/EntityIteratorChain.php b/components/DataLiberation/Importer/class-entityiteratorchain.php
similarity index 100%
rename from components/DataLiberation/Importer/EntityIteratorChain.php
rename to components/DataLiberation/Importer/class-entityiteratorchain.php
diff --git a/components/DataLiberation/Importer/FileVisitorEvent.php b/components/DataLiberation/Importer/class-filevisitorevent.php
similarity index 100%
rename from components/DataLiberation/Importer/FileVisitorEvent.php
rename to components/DataLiberation/Importer/class-filevisitorevent.php
diff --git a/components/DataLiberation/Importer/ImportSession.php b/components/DataLiberation/Importer/class-importsession.php
similarity index 100%
rename from components/DataLiberation/Importer/ImportSession.php
rename to components/DataLiberation/Importer/class-importsession.php
diff --git a/components/DataLiberation/Importer/ImportUtils.php b/components/DataLiberation/Importer/class-importutils.php
similarity index 100%
rename from components/DataLiberation/Importer/ImportUtils.php
rename to components/DataLiberation/Importer/class-importutils.php
diff --git a/components/DataLiberation/Importer/RetryFrontloadingIterator.php b/components/DataLiberation/Importer/class-retryfrontloadingiterator.php
similarity index 100%
rename from components/DataLiberation/Importer/RetryFrontloadingIterator.php
rename to components/DataLiberation/Importer/class-retryfrontloadingiterator.php
diff --git a/components/DataLiberation/Importer/StreamImporter.php b/components/DataLiberation/Importer/class-streamimporter.php
similarity index 100%
rename from components/DataLiberation/Importer/StreamImporter.php
rename to components/DataLiberation/Importer/class-streamimporter.php
diff --git a/components/DataLiberation/URL/URLInTextProcessor.php b/components/DataLiberation/URL/class-urlintextprocessor.php
similarity index 100%
rename from components/DataLiberation/URL/URLInTextProcessor.php
rename to components/DataLiberation/URL/class-urlintextprocessor.php
diff --git a/components/DataLiberation/URL/WPURL.php b/components/DataLiberation/URL/class-wpurl.php
similarity index 100%
rename from components/DataLiberation/URL/WPURL.php
rename to components/DataLiberation/URL/class-wpurl.php
diff --git a/components/DataLiberation/DataLiberationException.php b/components/DataLiberation/class-dataliberationexception.php
similarity index 100%
rename from components/DataLiberation/DataLiberationException.php
rename to components/DataLiberation/class-dataliberationexception.php
diff --git a/components/DataLiberation/DataLiberationHTMLProcessor.php b/components/DataLiberation/class-dataliberationhtmlprocessor.php
similarity index 100%
rename from components/DataLiberation/DataLiberationHTMLProcessor.php
rename to components/DataLiberation/class-dataliberationhtmlprocessor.php
diff --git a/components/DataLiberation/ImportEntity.php b/components/DataLiberation/class-importentity.php
similarity index 100%
rename from components/DataLiberation/ImportEntity.php
rename to components/DataLiberation/class-importentity.php
diff --git a/components/DataLiberation/composer.json b/components/DataLiberation/composer.json
index e4d117ae9..c81328c22 100644
--- a/components/DataLiberation/composer.json
+++ b/components/DataLiberation/composer.json
@@ -17,16 +17,12 @@
 	},
 	"autoload": {
 		"classmap": [
+			"./",
 			"vendor-patched/"
 		],
 		"files": [
 			"URL/functions.php"
 		],
-		"psr-4": {
-			"WordPress\\DataLiberation\\": "",
-			"Rowbot\\": "vendor-patched/",
-			"Brick\\": "vendor-patched/"
-		},
 		"exclude-from-classmap": [
 			"/Tests/"
 		]
diff --git a/components/Filesystem/ByteStream/FilesystemWriteStream.php b/components/Filesystem/ByteStream/class-filesystemwritestream.php
similarity index 100%
rename from components/Filesystem/ByteStream/FilesystemWriteStream.php
rename to components/Filesystem/ByteStream/class-filesystemwritestream.php
diff --git a/components/Filesystem/Layer/ChrootLayer.php b/components/Filesystem/Layer/class-chrootlayer.php
similarity index 100%
rename from components/Filesystem/Layer/ChrootLayer.php
rename to components/Filesystem/Layer/class-chrootlayer.php
diff --git a/components/Filesystem/Layer/Layer.php b/components/Filesystem/Layer/class-layer.php
similarity index 100%
rename from components/Filesystem/Layer/Layer.php
rename to components/Filesystem/Layer/class-layer.php
diff --git a/components/Filesystem/Mixin/Interfaces/InternalizedWriteStream.php b/components/Filesystem/Mixin/Interfaces/interface-internalizedwritestream.php
similarity index 100%
rename from components/Filesystem/Mixin/Interfaces/InternalizedWriteStream.php
rename to components/Filesystem/Mixin/Interfaces/interface-internalizedwritestream.php
diff --git a/components/Filesystem/Mixin/BufferedWriteStreamViaPutContents.php b/components/Filesystem/Mixin/trait-bufferedwritestreamviaputcontents.php
similarity index 100%
rename from components/Filesystem/Mixin/BufferedWriteStreamViaPutContents.php
rename to components/Filesystem/Mixin/trait-bufferedwritestreamviaputcontents.php
diff --git a/components/Filesystem/Mixin/CopyDirectoryRecursive.php b/components/Filesystem/Mixin/trait-copydirectoryrecursive.php
similarity index 100%
rename from components/Filesystem/Mixin/CopyDirectoryRecursive.php
rename to components/Filesystem/Mixin/trait-copydirectoryrecursive.php
diff --git a/components/Filesystem/Mixin/CopyFileViaStreaming.php b/components/Filesystem/Mixin/trait-copyfileviastreaming.php
similarity index 100%
rename from components/Filesystem/Mixin/CopyFileViaStreaming.php
rename to components/Filesystem/Mixin/trait-copyfileviastreaming.php
diff --git a/components/Filesystem/Mixin/CopyRecursiveViaStreaming.php b/components/Filesystem/Mixin/trait-copyrecursiveviastreaming.php
similarity index 100%
rename from components/Filesystem/Mixin/CopyRecursiveViaStreaming.php
rename to components/Filesystem/Mixin/trait-copyrecursiveviastreaming.php
diff --git a/components/Filesystem/Mixin/GetContentsViaReadStream.php b/components/Filesystem/Mixin/trait-getcontentsviareadstream.php
similarity index 100%
rename from components/Filesystem/Mixin/GetContentsViaReadStream.php
rename to components/Filesystem/Mixin/trait-getcontentsviareadstream.php
diff --git a/components/Filesystem/Mixin/InternalizeWriteStream.php b/components/Filesystem/Mixin/trait-internalizewritestream.php
similarity index 100%
rename from components/Filesystem/Mixin/InternalizeWriteStream.php
rename to components/Filesystem/Mixin/trait-internalizewritestream.php
diff --git a/components/Filesystem/Mixin/MkdirRecursive.php b/components/Filesystem/Mixin/trait-mkdirrecursive.php
similarity index 100%
rename from components/Filesystem/Mixin/MkdirRecursive.php
rename to components/Filesystem/Mixin/trait-mkdirrecursive.php
diff --git a/components/Filesystem/Mixin/PutContentsViaWriteStream.php b/components/Filesystem/Mixin/trait-putcontentsviawritestream.php
similarity index 100%
rename from components/Filesystem/Mixin/PutContentsViaWriteStream.php
rename to components/Filesystem/Mixin/trait-putcontentsviawritestream.php
diff --git a/components/Filesystem/Mixin/ReadOnlyFilesystem.php b/components/Filesystem/Mixin/trait-readonlyfilesystem.php
similarity index 100%
rename from components/Filesystem/Mixin/ReadOnlyFilesystem.php
rename to components/Filesystem/Mixin/trait-readonlyfilesystem.php
diff --git a/components/Filesystem/Mixin/RenameFileViaCopyAndRm.php b/components/Filesystem/Mixin/trait-renamefileviacopyandrm.php
similarity index 100%
rename from components/Filesystem/Mixin/RenameFileViaCopyAndRm.php
rename to components/Filesystem/Mixin/trait-renamefileviacopyandrm.php
diff --git a/components/Filesystem/Mixin/RmdirRecursive.php b/components/Filesystem/Mixin/trait-rmdirrecursive.php
similarity index 100%
rename from components/Filesystem/Mixin/RmdirRecursive.php
rename to components/Filesystem/Mixin/trait-rmdirrecursive.php
diff --git a/components/Filesystem/Path/WindowsPath.php b/components/Filesystem/Path/class-windowspath.php
similarity index 100%
rename from components/Filesystem/Path/WindowsPath.php
rename to components/Filesystem/Path/class-windowspath.php
diff --git a/components/Filesystem/Visitor/FileVisitorEvent.php b/components/Filesystem/Visitor/class-filevisitorevent.php
similarity index 100%
rename from components/Filesystem/Visitor/FileVisitorEvent.php
rename to components/Filesystem/Visitor/class-filevisitorevent.php
diff --git a/components/Filesystem/Visitor/FilesystemVisitor.php b/components/Filesystem/Visitor/interface-filesystem-visitor.php
similarity index 100%
rename from components/Filesystem/Visitor/FilesystemVisitor.php
rename to components/Filesystem/Visitor/interface-filesystem-visitor.php
diff --git a/components/Filesystem/FilesystemException.php b/components/Filesystem/class-filesystemexception.php
similarity index 100%
rename from components/Filesystem/FilesystemException.php
rename to components/Filesystem/class-filesystemexception.php
diff --git a/components/Filesystem/InMemoryFilesystem.php b/components/Filesystem/class-inmemoryfilesystem.php
similarity index 100%
rename from components/Filesystem/InMemoryFilesystem.php
rename to components/Filesystem/class-inmemoryfilesystem.php
diff --git a/components/Filesystem/LocalFilesystem.php b/components/Filesystem/class-localfilesystem.php
similarity index 100%
rename from components/Filesystem/LocalFilesystem.php
rename to components/Filesystem/class-localfilesystem.php
diff --git a/components/Filesystem/SQLiteFilesystem.php b/components/Filesystem/class-sqlitefilesystem.php
similarity index 100%
rename from components/Filesystem/SQLiteFilesystem.php
rename to components/Filesystem/class-sqlitefilesystem.php
diff --git a/components/Filesystem/UploadedFilesystem.php b/components/Filesystem/class-uploadedfilesystem.php
similarity index 100%
rename from components/Filesystem/UploadedFilesystem.php
rename to components/Filesystem/class-uploadedfilesystem.php
diff --git a/components/Filesystem/Filesystem.php b/components/Filesystem/interface-filesystem.php
similarity index 100%
rename from components/Filesystem/Filesystem.php
rename to components/Filesystem/interface-filesystem.php
diff --git a/components/Git/Model/Commit.php b/components/Git/Model/class-commit.php
similarity index 100%
rename from components/Git/Model/Commit.php
rename to components/Git/Model/class-commit.php
diff --git a/components/Git/Model/Tree.php b/components/Git/Model/class-tree.php
similarity index 100%
rename from components/Git/Model/Tree.php
rename to components/Git/Model/class-tree.php
diff --git a/components/Git/Model/TreeEntry.php b/components/Git/Model/class-treeentry.php
similarity index 100%
rename from components/Git/Model/TreeEntry.php
rename to components/Git/Model/class-treeentry.php
diff --git a/components/Git/Protocol/Parser/CommitParser.php b/components/Git/Protocol/Parser/class-commitparser.php
similarity index 100%
rename from components/Git/Protocol/Parser/CommitParser.php
rename to components/Git/Protocol/Parser/class-commitparser.php
diff --git a/components/Git/Protocol/Parser/DeltaResolver.php b/components/Git/Protocol/Parser/class-deltaresolver.php
similarity index 100%
rename from components/Git/Protocol/Parser/DeltaResolver.php
rename to components/Git/Protocol/Parser/class-deltaresolver.php
diff --git a/components/Git/Protocol/Parser/GitProtocolDecoder.php b/components/Git/Protocol/Parser/class-gitprotocoldecoder.php
similarity index 100%
rename from components/Git/Protocol/Parser/GitProtocolDecoder.php
rename to components/Git/Protocol/Parser/class-gitprotocoldecoder.php
diff --git a/components/Git/Protocol/Parser/PacketParser.php b/components/Git/Protocol/Parser/class-packetparser.php
similarity index 100%
rename from components/Git/Protocol/Parser/PacketParser.php
rename to components/Git/Protocol/Parser/class-packetparser.php
diff --git a/components/Git/Protocol/Parser/PackParser.php b/components/Git/Protocol/Parser/class-packparser.php
similarity index 100%
rename from components/Git/Protocol/Parser/PackParser.php
rename to components/Git/Protocol/Parser/class-packparser.php
diff --git a/components/Git/Protocol/Parser/ProtocolDemultiplexer.php b/components/Git/Protocol/Parser/class-protocoldemultiplexer.php
similarity index 100%
rename from components/Git/Protocol/Parser/ProtocolDemultiplexer.php
rename to components/Git/Protocol/Parser/class-protocoldemultiplexer.php
diff --git a/components/Git/Protocol/Parser/TreeParser.php b/components/Git/Protocol/Parser/class-treeparser.php
similarity index 100%
rename from components/Git/Protocol/Parser/TreeParser.php
rename to components/Git/Protocol/Parser/class-treeparser.php
diff --git a/components/Git/Protocol/GitProtocolEncoderPipe.php b/components/Git/Protocol/class-gitprotocolencoderpipe.php
similarity index 100%
rename from components/Git/Protocol/GitProtocolEncoderPipe.php
rename to components/Git/Protocol/class-gitprotocolencoderpipe.php
diff --git a/components/Git/Protocol/PackfileEncoderReadStream.php b/components/Git/Protocol/class-packfileencoderreadstream.php
similarity index 100%
rename from components/Git/Protocol/PackfileEncoderReadStream.php
rename to components/Git/Protocol/class-packfileencoderreadstream.php
diff --git a/components/Git/GitEndpoint.php b/components/Git/class-gitendpoint.php
similarity index 100%
rename from components/Git/GitEndpoint.php
rename to components/Git/class-gitendpoint.php
diff --git a/components/Git/GitException.php b/components/Git/class-gitexception.php
similarity index 100%
rename from components/Git/GitException.php
rename to components/Git/class-gitexception.php
diff --git a/components/Git/GitFilesystem.php b/components/Git/class-gitfilesystem.php
similarity index 100%
rename from components/Git/GitFilesystem.php
rename to components/Git/class-gitfilesystem.php
diff --git a/components/Git/GitObjectDecoder.php b/components/Git/class-gitobjectdecoder.php
similarity index 100%
rename from components/Git/GitObjectDecoder.php
rename to components/Git/class-gitobjectdecoder.php
diff --git a/components/Git/GitObjectEncoder.php b/components/Git/class-gitobjectencoder.php
similarity index 100%
rename from components/Git/GitObjectEncoder.php
rename to components/Git/class-gitobjectencoder.php
diff --git a/components/Git/GitPathDoesNotExistException.php b/components/Git/class-gitpathdoesnotexistexception.php
similarity index 100%
rename from components/Git/GitPathDoesNotExistException.php
rename to components/Git/class-gitpathdoesnotexistexception.php
diff --git a/components/Git/GitRemote.php b/components/Git/class-gitremote.php
similarity index 100%
rename from components/Git/GitRemote.php
rename to components/Git/class-gitremote.php
diff --git a/components/Git/GitRemoteException.php b/components/Git/class-gitremoteexception.php
similarity index 100%
rename from components/Git/GitRemoteException.php
rename to components/Git/class-gitremoteexception.php
diff --git a/components/Git/GitRepository.php b/components/Git/class-gitrepository.php
similarity index 100%
rename from components/Git/GitRepository.php
rename to components/Git/class-gitrepository.php
diff --git a/components/HTML/class-wp-html-active-formatting-elements.php b/components/HTML/class-wphtmlactiveformattingelements.php
similarity index 100%
rename from components/HTML/class-wp-html-active-formatting-elements.php
rename to components/HTML/class-wphtmlactiveformattingelements.php
diff --git a/components/HTML/class-wp-html-attribute-token.php b/components/HTML/class-wphtmlattributetoken.php
similarity index 100%
rename from components/HTML/class-wp-html-attribute-token.php
rename to components/HTML/class-wphtmlattributetoken.php
diff --git a/components/HTML/class-wp-html-decoder.php b/components/HTML/class-wphtmldecoder.php
similarity index 100%
rename from components/HTML/class-wp-html-decoder.php
rename to components/HTML/class-wphtmldecoder.php
diff --git a/components/HTML/class-wp-html-doctype-info.php b/components/HTML/class-wphtmldoctypeinfo.php
similarity index 100%
rename from components/HTML/class-wp-html-doctype-info.php
rename to components/HTML/class-wphtmldoctypeinfo.php
diff --git a/components/HTML/class-wp-html-open-elements.php b/components/HTML/class-wphtmlopenelements.php
similarity index 100%
rename from components/HTML/class-wp-html-open-elements.php
rename to components/HTML/class-wphtmlopenelements.php
diff --git a/components/HTML/class-wp-html-processor.php b/components/HTML/class-wphtmlprocessor.php
similarity index 100%
rename from components/HTML/class-wp-html-processor.php
rename to components/HTML/class-wphtmlprocessor.php
diff --git a/components/HTML/class-wp-html-processor-state.php b/components/HTML/class-wphtmlprocessorstate.php
similarity index 100%
rename from components/HTML/class-wp-html-processor-state.php
rename to components/HTML/class-wphtmlprocessorstate.php
diff --git a/components/HTML/class-wp-html-span.php b/components/HTML/class-wphtmlspan.php
similarity index 100%
rename from components/HTML/class-wp-html-span.php
rename to components/HTML/class-wphtmlspan.php
diff --git a/components/HTML/class-wp-html-stack-event.php b/components/HTML/class-wphtmlstackevent.php
similarity index 100%
rename from components/HTML/class-wp-html-stack-event.php
rename to components/HTML/class-wphtmlstackevent.php
diff --git a/components/HTML/class-wp-html-tag-processor.php b/components/HTML/class-wphtmltagprocessor.php
similarity index 100%
rename from components/HTML/class-wp-html-tag-processor.php
rename to components/HTML/class-wphtmltagprocessor.php
diff --git a/components/HTML/class-wp-html-text-replacement.php b/components/HTML/class-wphtmltextreplacement.php
similarity index 100%
rename from components/HTML/class-wp-html-text-replacement.php
rename to components/HTML/class-wphtmltextreplacement.php
diff --git a/components/HTML/class-wp-html-token.php b/components/HTML/class-wphtmltoken.php
similarity index 100%
rename from components/HTML/class-wp-html-token.php
rename to components/HTML/class-wphtmltoken.php
diff --git a/components/HTML/class-wp-html-unsupported-exception.php b/components/HTML/class-wphtmlunsupportedexception.php
similarity index 100%
rename from components/HTML/class-wp-html-unsupported-exception.php
rename to components/HTML/class-wphtmlunsupportedexception.php
diff --git a/components/HTML/class-wp-token-map.php b/components/HTML/class-wptokenmap.php
similarity index 100%
rename from components/HTML/class-wp-token-map.php
rename to components/HTML/class-wptokenmap.php
diff --git a/components/HttpClient/ByteStream/ChunkedDecoderReadStream.php b/components/HttpClient/ByteStream/class-chunkeddecoderreadstream.php
similarity index 100%
rename from components/HttpClient/ByteStream/ChunkedDecoderReadStream.php
rename to components/HttpClient/ByteStream/class-chunkeddecoderreadstream.php
diff --git a/components/HttpClient/ByteStream/ChunkedEncoderByteTransformer.php b/components/HttpClient/ByteStream/class-chunkedencoderbytetransformer.php
similarity index 100%
rename from components/HttpClient/ByteStream/ChunkedEncoderByteTransformer.php
rename to components/HttpClient/ByteStream/class-chunkedencoderbytetransformer.php
diff --git a/components/HttpClient/ByteStream/RequestReadStream.php b/components/HttpClient/ByteStream/class-requestreadstream.php
similarity index 100%
rename from components/HttpClient/ByteStream/RequestReadStream.php
rename to components/HttpClient/ByteStream/class-requestreadstream.php
diff --git a/components/HttpClient/ByteStream/SeekableRequestReadStream.php b/components/HttpClient/ByteStream/class-seekablerequestreadstream.php
similarity index 100%
rename from components/HttpClient/ByteStream/SeekableRequestReadStream.php
rename to components/HttpClient/ByteStream/class-seekablerequestreadstream.php
diff --git a/components/HttpClient/Middleware/CacheMiddleware.php b/components/HttpClient/Middleware/class-cachemiddleware.php
similarity index 100%
rename from components/HttpClient/Middleware/CacheMiddleware.php
rename to components/HttpClient/Middleware/class-cachemiddleware.php
diff --git a/components/HttpClient/Middleware/HttpMiddleware.php b/components/HttpClient/Middleware/class-httpmiddleware.php
similarity index 100%
rename from components/HttpClient/Middleware/HttpMiddleware.php
rename to components/HttpClient/Middleware/class-httpmiddleware.php
diff --git a/components/HttpClient/Middleware/RedirectionMiddleware.php b/components/HttpClient/Middleware/class-redirectionmiddleware.php
similarity index 100%
rename from components/HttpClient/Middleware/RedirectionMiddleware.php
rename to components/HttpClient/Middleware/class-redirectionmiddleware.php
diff --git a/components/HttpClient/Middleware/MiddlewareInterface.php b/components/HttpClient/Middleware/middleware-interface.php
similarity index 100%
rename from components/HttpClient/Middleware/MiddlewareInterface.php
rename to components/HttpClient/Middleware/middleware-interface.php
diff --git a/components/HttpClient/Tests/CacheMiddlewareIntegrationTest.php b/components/HttpClient/Tests/CacheMiddlewareIntegrationTest.php
index 25fb1dbd7..ce7c2659d 100644
--- a/components/HttpClient/Tests/CacheMiddlewareIntegrationTest.php
+++ b/components/HttpClient/Tests/CacheMiddlewareIntegrationTest.php
@@ -7,6 +7,8 @@
 use WordPress\HttpClient\Client;
 use WordPress\HttpClient\Request;
 
+require_once __DIR__ . '/WithServerTrait.php';
+
 class CacheMiddlewareIntegrationTest extends TestCase {
 
 	use WithServerTrait;
diff --git a/components/HttpClient/Tests/CurlTransportTest.php b/components/HttpClient/Tests/CurlTransportTest.php
index a8d97c7c7..2eba1e8d5 100644
--- a/components/HttpClient/Tests/CurlTransportTest.php
+++ b/components/HttpClient/Tests/CurlTransportTest.php
@@ -6,6 +6,8 @@
 use WordPress\HttpClient\HttpError;
 use WordPress\HttpClient\Request;
 
+require_once __DIR__ . '/ClientTestBase.php';
+
 class CurlTransportTest extends ClientTestBase {
 
     public function test_unsupported_encoding() {
diff --git a/components/HttpClient/Tests/SocketTransportTest.php b/components/HttpClient/Tests/SocketTransportTest.php
index 05038b450..ef35d699b 100644
--- a/components/HttpClient/Tests/SocketTransportTest.php
+++ b/components/HttpClient/Tests/SocketTransportTest.php
@@ -5,6 +5,8 @@
 use WordPress\HttpClient\Client;
 use WordPress\HttpClient\Request;
 
+require_once __DIR__ . '/ClientTestBase.php';
+
 class SocketTransportTest extends ClientTestBase {
 
     public function test_unsupported_encoding() {
diff --git a/components/HttpClient/Transport/CurlTransport.php b/components/HttpClient/Transport/class-curltransport.php
similarity index 100%
rename from components/HttpClient/Transport/CurlTransport.php
rename to components/HttpClient/Transport/class-curltransport.php
diff --git a/components/HttpClient/Transport/SocketTransport.php b/components/HttpClient/Transport/class-sockettransport.php
similarity index 100%
rename from components/HttpClient/Transport/SocketTransport.php
rename to components/HttpClient/Transport/class-sockettransport.php
diff --git a/components/HttpClient/Transport/TransportInterface.php b/components/HttpClient/Transport/interface-transportinterface.php
similarity index 100%
rename from components/HttpClient/Transport/TransportInterface.php
rename to components/HttpClient/Transport/interface-transportinterface.php
diff --git a/components/HttpClient/Client.php b/components/HttpClient/class-client.php
similarity index 100%
rename from components/HttpClient/Client.php
rename to components/HttpClient/class-client.php
diff --git a/components/HttpClient/ClientState.php b/components/HttpClient/class-clientstate.php
similarity index 100%
rename from components/HttpClient/ClientState.php
rename to components/HttpClient/class-clientstate.php
diff --git a/components/HttpClient/Connection.php b/components/HttpClient/class-connection.php
similarity index 100%
rename from components/HttpClient/Connection.php
rename to components/HttpClient/class-connection.php
diff --git a/components/HttpClient/Crawler.php b/components/HttpClient/class-crawler.php
similarity index 100%
rename from components/HttpClient/Crawler.php
rename to components/HttpClient/class-crawler.php
diff --git a/components/HttpClient/HttpClientException.php b/components/HttpClient/class-httpclientexception.php
similarity index 100%
rename from components/HttpClient/HttpClientException.php
rename to components/HttpClient/class-httpclientexception.php
diff --git a/components/HttpClient/HttpError.php b/components/HttpClient/class-httperror.php
similarity index 100%
rename from components/HttpClient/HttpError.php
rename to components/HttpClient/class-httperror.php
diff --git a/components/HttpClient/Request.php b/components/HttpClient/class-request.php
similarity index 100%
rename from components/HttpClient/Request.php
rename to components/HttpClient/class-request.php
diff --git a/components/HttpClient/Response.php b/components/HttpClient/class-response.php
similarity index 100%
rename from components/HttpClient/Response.php
rename to components/HttpClient/class-response.php
diff --git a/components/HttpServer/Response/BufferingResponseWriter.php b/components/HttpServer/Response/class-bufferingresponsewriter.php
similarity index 100%
rename from components/HttpServer/Response/BufferingResponseWriter.php
rename to components/HttpServer/Response/class-bufferingresponsewriter.php
diff --git a/components/HttpServer/Response/ResponseWriteStream.php b/components/HttpServer/Response/class-responsewritestream.php
similarity index 100%
rename from components/HttpServer/Response/ResponseWriteStream.php
rename to components/HttpServer/Response/class-responsewritestream.php
diff --git a/components/HttpServer/Response/StreamingResponseWriter.php b/components/HttpServer/Response/class-streamingresponsewriter.php
similarity index 100%
rename from components/HttpServer/Response/StreamingResponseWriter.php
rename to components/HttpServer/Response/class-streamingresponsewriter.php
diff --git a/components/HttpServer/Response/TcpResponseWriteStream.php b/components/HttpServer/Response/class-tcpresponsewritestream.php
similarity index 100%
rename from components/HttpServer/Response/TcpResponseWriteStream.php
rename to components/HttpServer/Response/class-tcpresponsewritestream.php
diff --git a/components/HttpServer/IncomingRequest.php b/components/HttpServer/class-incomingrequest.php
similarity index 100%
rename from components/HttpServer/IncomingRequest.php
rename to components/HttpServer/class-incomingrequest.php
diff --git a/components/HttpServer/StatusCode.php b/components/HttpServer/class-statuscode.php
similarity index 100%
rename from components/HttpServer/StatusCode.php
rename to components/HttpServer/class-statuscode.php
diff --git a/components/HttpServer/TcpServer.php b/components/HttpServer/class-tcpserver.php
similarity index 100%
rename from components/HttpServer/TcpServer.php
rename to components/HttpServer/class-tcpserver.php
diff --git a/components/Markdown/MarkdownConsumer.php b/components/Markdown/class-markdownconsumer.php
similarity index 100%
rename from components/Markdown/MarkdownConsumer.php
rename to components/Markdown/class-markdownconsumer.php
diff --git a/components/Markdown/MarkdownImporter.php b/components/Markdown/class-markdownimporter.php
similarity index 100%
rename from components/Markdown/MarkdownImporter.php
rename to components/Markdown/class-markdownimporter.php
diff --git a/components/Markdown/MarkdownProducer.php b/components/Markdown/class-markdownproducer.php
similarity index 100%
rename from components/Markdown/MarkdownProducer.php
rename to components/Markdown/class-markdownproducer.php
diff --git a/components/Merge/Diff/Diff.php b/components/Merge/Diff/class-diff.php
similarity index 100%
rename from components/Merge/Diff/Diff.php
rename to components/Merge/Diff/class-diff.php
diff --git a/components/Merge/Diff/Differ.php b/components/Merge/Diff/class-differ.php
similarity index 100%
rename from components/Merge/Diff/Differ.php
rename to components/Merge/Diff/class-differ.php
diff --git a/components/Merge/Diff/LineDiffer.php b/components/Merge/Diff/class-linediffer.php
similarity index 100%
rename from components/Merge/Diff/LineDiffer.php
rename to components/Merge/Diff/class-linediffer.php
diff --git a/components/Merge/Diff/MyersDiffer.php b/components/Merge/Diff/class-myersdiffer.php
similarity index 100%
rename from components/Merge/Diff/MyersDiffer.php
rename to components/Merge/Diff/class-myersdiffer.php
diff --git a/components/Merge/Merge/Chunk.php b/components/Merge/Merge/class-chunk.php
similarity index 100%
rename from components/Merge/Merge/Chunk.php
rename to components/Merge/Merge/class-chunk.php
diff --git a/components/Merge/Merge/ChunkMerger.php b/components/Merge/Merge/class-chunkmerger.php
similarity index 100%
rename from components/Merge/Merge/ChunkMerger.php
rename to components/Merge/Merge/class-chunkmerger.php
diff --git a/components/Merge/Merge/LineMerger.php b/components/Merge/Merge/class-linemerger.php
similarity index 100%
rename from components/Merge/Merge/LineMerger.php
rename to components/Merge/Merge/class-linemerger.php
diff --git a/components/Merge/Merge/MergeConflict.php b/components/Merge/Merge/class-mergeconflict.php
similarity index 100%
rename from components/Merge/Merge/MergeConflict.php
rename to components/Merge/Merge/class-mergeconflict.php
diff --git a/components/Merge/Merge/Merger.php b/components/Merge/Merge/class-merger.php
similarity index 100%
rename from components/Merge/Merge/Merger.php
rename to components/Merge/Merge/class-merger.php
diff --git a/components/Merge/Merge/MergeResult.php b/components/Merge/Merge/class-mergeresult.php
similarity index 100%
rename from components/Merge/Merge/MergeResult.php
rename to components/Merge/Merge/class-mergeresult.php
diff --git a/components/Merge/Validate/BlockMarkupMergeValidator.php b/components/Merge/Validate/class-blockmarkupmergevalidator.php
similarity index 100%
rename from components/Merge/Validate/BlockMarkupMergeValidator.php
rename to components/Merge/Validate/class-blockmarkupmergevalidator.php
diff --git a/components/Merge/Validate/InvalidMergeException.php b/components/Merge/Validate/class-invalidmergeexception.php
similarity index 100%
rename from components/Merge/Validate/InvalidMergeException.php
rename to components/Merge/Validate/class-invalidmergeexception.php
diff --git a/components/Merge/Validate/MergeValidator.php b/components/Merge/Validate/class-mergevalidator.php
similarity index 100%
rename from components/Merge/Validate/MergeValidator.php
rename to components/Merge/Validate/class-mergevalidator.php
diff --git a/components/Merge/__ExperimentalDiffRebaser.php b/components/Merge/class-experimentaldiffrebaser.php
similarity index 100%
rename from components/Merge/__ExperimentalDiffRebaser.php
rename to components/Merge/class-experimentaldiffrebaser.php
diff --git a/components/Merge/MergeException.php b/components/Merge/class-mergeexception.php
similarity index 100%
rename from components/Merge/MergeException.php
rename to components/Merge/class-mergeexception.php
diff --git a/components/Merge/MergeStrategy.php b/components/Merge/class-mergestrategy.php
similarity index 100%
rename from components/Merge/MergeStrategy.php
rename to components/Merge/class-mergestrategy.php
diff --git a/components/XML/XMLAttributeToken.php b/components/XML/class-xmlattributetoken.php
similarity index 100%
rename from components/XML/XMLAttributeToken.php
rename to components/XML/class-xmlattributetoken.php
diff --git a/components/XML/XMLDecoder.php b/components/XML/class-xmldecoder.php
similarity index 100%
rename from components/XML/XMLDecoder.php
rename to components/XML/class-xmldecoder.php
diff --git a/components/XML/XMLElement.php b/components/XML/class-xmlelement.php
similarity index 100%
rename from components/XML/XMLElement.php
rename to components/XML/class-xmlelement.php
diff --git a/components/XML/XMLProcessor.php b/components/XML/class-xmlprocessor.php
similarity index 100%
rename from components/XML/XMLProcessor.php
rename to components/XML/class-xmlprocessor.php
diff --git a/components/XML/XMLUnsupportedException.php b/components/XML/class-xmlunsupportedexception.php
similarity index 100%
rename from components/XML/XMLUnsupportedException.php
rename to components/XML/class-xmlunsupportedexception.php
diff --git a/components/XML/composer.json b/components/XML/composer.json
index 686172949..7e630088d 100644
--- a/components/XML/composer.json
+++ b/components/XML/composer.json
@@ -16,9 +16,9 @@
 		"php": ">=7.2"
 	},
 	"autoload": {
-		"psr-4": {
-			"WordPress\\XML\\": ""
-		},
+		"classmap": [
+			"./"
+		],
 		"exclude-from-classmap": [
 			"/Tests/"
 		]
diff --git a/components/Zip/CentralDirectoryEntry.php b/components/Zip/class-centraldirectoryentry.php
similarity index 100%
rename from components/Zip/CentralDirectoryEntry.php
rename to components/Zip/class-centraldirectoryentry.php
diff --git a/components/Zip/EndCentralDirectoryEntry.php b/components/Zip/class-endcentraldirectoryentry.php
similarity index 100%
rename from components/Zip/EndCentralDirectoryEntry.php
rename to components/Zip/class-endcentraldirectoryentry.php
diff --git a/components/Zip/FileEntry.php b/components/Zip/class-fileentry.php
similarity index 100%
rename from components/Zip/FileEntry.php
rename to components/Zip/class-fileentry.php
diff --git a/components/Zip/ZipDecoder.php b/components/Zip/class-zipdecoder.php
similarity index 100%
rename from components/Zip/ZipDecoder.php
rename to components/Zip/class-zipdecoder.php
diff --git a/components/Zip/ZipEncoder.php b/components/Zip/class-zipencoder.php
similarity index 100%
rename from components/Zip/ZipEncoder.php
rename to components/Zip/class-zipencoder.php
diff --git a/components/Zip/ZipFilesystem.php b/components/Zip/class-zipfilesystem.php
similarity index 100%
rename from components/Zip/ZipFilesystem.php
rename to components/Zip/class-zipfilesystem.php
diff --git a/composer-ci-matrix-tests.json b/composer-ci-matrix-tests.json
index add983e9a..c1ff7bf24 100644
--- a/composer-ci-matrix-tests.json
+++ b/composer-ci-matrix-tests.json
@@ -35,11 +35,23 @@
         ],
         "classmap": [
             "components/BlockParser/",
+            "components/Blueprints/",
             "components/Blueprints/vendor-patched/",
+            "components/CLI/",
+            "components/DataLiberation/",
             "components/DataLiberation/vendor-patched/",
+            "components/Filesystem/",
+            "components/Git/",
+            "components/HTML/./",
+            "components/HttpClient/",
+            "components/HttpServer/",
+            "components/Markdown/",
             "components/Markdown/vendor-patched",
+            "components/Merge/",
             "components/Merge/vendor-patched",
-            "components/HTML/./"
+            "components/ByteStream/",
+            "components/XML/",
+            "components/Zip/"
         ],
         "files": [
             "components/DataLiberation/URL/functions.php",
@@ -52,20 +64,9 @@
             "components/Git/functions.php"
         ],
         "psr-4": {
-            "WordPress\\Blueprints\\": "components/Blueprints/",
-            "WordPress\\DataLiberation\\": "components/DataLiberation/",
             "Rowbot\\": "components/DataLiberation/vendor-patched/",
             "Brick\\": "components/DataLiberation/vendor-patched/",
-            "WordPress\\HttpClient\\": "components/HttpClient/",
-            "WordPress\\Merge\\": "components/Merge/",
-            "WordPress\\Markdown\\": "components/Markdown/",
-            "WordPress\\Filesystem\\": "components/Filesystem/",
-            "WordPress\\XML\\": "components/XML/",
-            "WordPress\\ByteStream\\": "components/ByteStream/",
-            "WordPress\\Zip\\": "components/Zip/",
-            "WordPress\\HttpServer\\": "components/HttpServer/",
-            "WordPress\\CORSProxy\\": "components/CORSProxy/",
-            "WordPress\\Git\\": "components/Git/"
+            "WordPress\\CORSProxy\\": "components/CORSProxy/"
         }
     },
     "scripts": {
diff --git a/composer.json b/composer.json
index c955b166f..ba5366ef7 100644
--- a/composer.json
+++ b/composer.json
@@ -38,11 +38,23 @@
         ],
         "classmap": [
             "components/BlockParser/",
+            "components/Blueprints/",
             "components/Blueprints/vendor-patched/",
+            "components/CLI/",
+            "components/DataLiberation/",
             "components/DataLiberation/vendor-patched/",
+            "components/Filesystem/",
+            "components/Git/",
+            "components/HTML/./",
+            "components/HttpClient/",
+            "components/HttpServer/",
+            "components/Markdown/",
             "components/Markdown/vendor-patched",
+            "components/Merge/",
             "components/Merge/vendor-patched",
-            "components/HTML/./"
+            "components/ByteStream/",
+            "components/XML/",
+            "components/Zip/"
         ],
         "files": [
             "components/DataLiberation/URL/functions.php",
@@ -56,21 +68,9 @@
             "components/Git/functions.php"
         ],
         "psr-4": {
-            "WordPress\\Blueprints\\": "components/Blueprints/",
-            "WordPress\\CLI\\": "components/CLI/",
-            "WordPress\\DataLiberation\\": "components/DataLiberation/",
             "Rowbot\\": "components/DataLiberation/vendor-patched/",
             "Brick\\": "components/DataLiberation/vendor-patched/",
-            "WordPress\\HttpClient\\": "components/HttpClient/",
-            "WordPress\\Merge\\": "components/Merge/",
-            "WordPress\\Markdown\\": "components/Markdown/",
-            "WordPress\\Filesystem\\": "components/Filesystem/",
-            "WordPress\\XML\\": "components/XML/",
-            "WordPress\\ByteStream\\": "components/ByteStream/",
-            "WordPress\\Zip\\": "components/Zip/",
-            "WordPress\\HttpServer\\": "components/HttpServer/",
-            "WordPress\\CORSProxy\\": "components/CORSProxy/",
-            "WordPress\\Git\\": "components/Git/"
+            "WordPress\\CORSProxy\\": "components/CORSProxy/"
         }
     },
     "scripts": {