diff --git a/typo3/sysext/core/Classes/Extension/ExtensionManager.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
similarity index 100%
rename from typo3/sysext/core/Classes/Extension/ExtensionManager.php
rename to typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
diff --git a/typo3/sysext/core/Tests/Unit/Extension/ExtensionManagerTest.php b/typo3/sysext/core/Tests/Unit/Utility/ExtensionMangementUtilityTest.php
similarity index 100%
rename from typo3/sysext/core/Tests/Unit/Extension/ExtensionManagerTest.php
rename to typo3/sysext/core/Tests/Unit/Utility/ExtensionMangementUtilityTest.php
diff --git a/typo3/sysext/core/Tests/Unit/Extension/Fixtures/ext_emconf.php b/typo3/sysext/core/Tests/Unit/Utility/Fixtures/ext_emconf.php
similarity index 100%
rename from typo3/sysext/core/Tests/Unit/Extension/Fixtures/ext_emconf.php
rename to typo3/sysext/core/Tests/Unit/Utility/Fixtures/ext_emconf.php