diff --git a/core/modules/system/core.api.php b/core/core.api.php
similarity index 100%
rename from core/modules/system/core.api.php
rename to core/core.api.php
diff --git a/core/modules/system/database.api.php b/core/lib/Drupal/Core/Database/database.api.php
similarity index 100%
rename from core/modules/system/database.api.php
rename to core/lib/Drupal/Core/Database/database.api.php
diff --git a/core/modules/system/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
similarity index 100%
rename from core/modules/system/entity.api.php
rename to core/lib/Drupal/Core/Entity/entity.api.php
diff --git a/core/modules/system/module.api.php b/core/lib/Drupal/Core/Extension/module.api.php
similarity index 100%
rename from core/modules/system/module.api.php
rename to core/lib/Drupal/Core/Extension/module.api.php
diff --git a/core/modules/system/file.api.php b/core/lib/Drupal/Core/File/file.api.php
similarity index 100%
rename from core/modules/system/file.api.php
rename to core/lib/Drupal/Core/File/file.api.php
diff --git a/core/modules/system/form.api.php b/core/lib/Drupal/Core/Form/form.api.php
similarity index 100%
rename from core/modules/system/form.api.php
rename to core/lib/Drupal/Core/Form/form.api.php
diff --git a/core/modules/system/language.api.php b/core/lib/Drupal/Core/Language/language.api.php
similarity index 100%
rename from core/modules/system/language.api.php
rename to core/lib/Drupal/Core/Language/language.api.php
diff --git a/core/modules/system/menu.api.php b/core/lib/Drupal/Core/Menu/menu.api.php
similarity index 100%
rename from core/modules/system/menu.api.php
rename to core/lib/Drupal/Core/Menu/menu.api.php
diff --git a/core/modules/system/theme.api.php b/core/lib/Drupal/Core/Render/theme.api.php
similarity index 100%
rename from core/modules/system/theme.api.php
rename to core/lib/Drupal/Core/Render/theme.api.php
diff --git a/core/modules/system/token.api.php b/core/lib/Drupal/Core/Utility/token.api.php
similarity index 100%
rename from core/modules/system/token.api.php
rename to core/lib/Drupal/Core/Utility/token.api.php