diff --git a/packages/dev-utils/api-report.md b/packages/dev-utils/api-report.md
index d3e6447cd5..d3852b1c95 100644
--- a/packages/dev-utils/api-report.md
+++ b/packages/dev-utils/api-report.md
@@ -4,12 +4,12 @@
 
 ```ts
 
-import { ApiFactory } from '@backstage/core';
+import { ApiFactory } from '@backstage/core-plugin-api';
 import { ComponentType } from 'react';
-import { createPlugin } from '@backstage/core';
+import { createPlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { GridProps } from '@material-ui/core';
-import { IconComponent } from '@backstage/core';
+import { IconComponent } from '@backstage/core-plugin-api';
 import { ReactNode } from 'react';
 
 // @public
diff --git a/packages/integration-react/api-report.md b/packages/integration-react/api-report.md
index 63a538213c..fee08efe6f 100644
--- a/packages/integration-react/api-report.md
+++ b/packages/integration-react/api-report.md
@@ -4,7 +4,7 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
 import { Config } from '@backstage/config';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 
diff --git a/packages/test-utils/api-report.md b/packages/test-utils/api-report.md
index dcac9b64a7..078fa14399 100644
--- a/packages/test-utils/api-report.md
+++ b/packages/test-utils/api-report.md
@@ -5,16 +5,16 @@
 ```ts
 
 import { ComponentType } from 'react';
-import { ErrorApi } from '@backstage/core-api';
-import { ErrorContext } from '@backstage/core-api';
-import { ExternalRouteRef } from '@backstage/core-api';
-import { Observable } from '@backstage/core-api';
+import { ErrorApi } from '@backstage/core-plugin-api';
+import { ErrorContext } from '@backstage/core-plugin-api';
+import { ExternalRouteRef } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/core-plugin-api';
 import { ReactElement } from 'react';
 import { ReactNode } from 'react';
 import { RenderResult } from '@testing-library/react';
-import { RouteRef } from '@backstage/core-api';
-import { StorageApi } from '@backstage/core-api';
-import { StorageValueChange } from '@backstage/core-api';
+import { RouteRef } from '@backstage/core-plugin-api';
+import { StorageApi } from '@backstage/core-plugin-api';
+import { StorageValueChange } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export function mockBreakpoint(initialBreakpoint?: Breakpoint): {
diff --git a/plugins/api-docs/api-report.md b/plugins/api-docs/api-report.md
index 5a09cfceea..c7d3fdc694 100644
--- a/plugins/api-docs/api-report.md
+++ b/plugins/api-docs/api-report.md
@@ -5,14 +5,14 @@
 ```ts
 
 import { ApiEntity } from '@backstage/catalog-model';
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CatalogTableRow } from '@backstage/plugin-catalog';
 import { Entity } from '@backstage/catalog-model';
-import { ExternalRouteRef } from '@backstage/core';
+import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { default as React_2 } from 'react';
-import { RouteRef } from '@backstage/core';
-import { TableColumn } from '@backstage/core';
+import { RouteRef } from '@backstage/core-plugin-api';
+import { TableColumn } from '@backstage/core-components';
 import { UserListFilterKind } from '@backstage/plugin-catalog-react';
 
 // @public (undocumented)
diff --git a/plugins/badges/api-report.md b/plugins/badges/api-report.md
index dfe7cbdae8..1dbb256fd1 100644
--- a/plugins/badges/api-report.md
+++ b/plugins/badges/api-report.md
@@ -4,7 +4,7 @@
 
 ```ts
 
-import { BackstagePlugin } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const badgesPlugin: BackstagePlugin<{}, {}>;
diff --git a/plugins/bitrise/api-report.md b/plugins/bitrise/api-report.md
index c07178111d..15c3c74c99 100644
--- a/plugins/bitrise/api-report.md
+++ b/plugins/bitrise/api-report.md
@@ -4,7 +4,7 @@
 
 ```ts
 
-import { BackstagePlugin } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 
 // @public (undocumented)
diff --git a/plugins/catalog-import/api-report.md b/plugins/catalog-import/api-report.md
index 34baed46b5..f388c24a55 100644
--- a/plugins/catalog-import/api-report.md
+++ b/plugins/catalog-import/api-report.md
@@ -4,20 +4,20 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
-import { ConfigApi } from '@backstage/core';
+import { ConfigApi } from '@backstage/core-plugin-api';
 import { Control } from 'react-hook-form';
-import { DiscoveryApi } from '@backstage/core';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
 import { FieldErrors } from 'react-hook-form';
-import { IdentityApi } from '@backstage/core';
-import { InfoCardVariants } from '@backstage/core';
-import { OAuthApi } from '@backstage/core';
+import { IdentityApi } from '@backstage/core-plugin-api';
+import { InfoCardVariants } from '@backstage/core-components';
+import { OAuthApi } from '@backstage/core-plugin-api';
 import { default as React_2 } from 'react';
-import { RouteRef } from '@backstage/core';
+import { RouteRef } from '@backstage/core-plugin-api';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { SubmitHandler } from 'react-hook-form';
 import { TextFieldProps } from '@material-ui/core/TextField/TextField';
diff --git a/plugins/circleci/api-report.md b/plugins/circleci/api-report.md
index 6c774cc6b0..00b575efb8 100644
--- a/plugins/circleci/api-report.md
+++ b/plugins/circleci/api-report.md
@@ -4,18 +4,18 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { BuildStepAction } from 'circleci-api';
 import { BuildSummary } from 'circleci-api';
 import { BuildSummaryResponse } from 'circleci-api';
 import { BuildWithSteps } from 'circleci-api';
 import { CircleCIOptions } from 'circleci-api';
-import { DiscoveryApi } from '@backstage/core';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { GitType } from 'circleci-api';
 import { Me } from 'circleci-api';
-import { RouteRef } from '@backstage/core';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 export { BuildStepAction }
 
diff --git a/plugins/cloudbuild/api-report.md b/plugins/cloudbuild/api-report.md
index 58dc59c175..2ebc1eb737 100644
--- a/plugins/cloudbuild/api-report.md
+++ b/plugins/cloudbuild/api-report.md
@@ -4,11 +4,11 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { OAuthApi } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { OAuthApi } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export type ActionsGetWorkflowResponseData = {
diff --git a/plugins/code-coverage/api-report.md b/plugins/code-coverage/api-report.md
index bade5ddb8a..dffbaeec2a 100644
--- a/plugins/code-coverage/api-report.md
+++ b/plugins/code-coverage/api-report.md
@@ -4,9 +4,9 @@
 
 ```ts
 
-import { BackstagePlugin } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { RouteRef } from '@backstage/core';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const codeCoveragePlugin: BackstagePlugin<{
diff --git a/plugins/config-schema/api-report.md b/plugins/config-schema/api-report.md
index 67497be6b6..f623789076 100644
--- a/plugins/config-schema/api-report.md
+++ b/plugins/config-schema/api-report.md
@@ -4,10 +4,10 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { Observable } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 import { Schema } from 'jsonschema';
 
 // @public (undocumented)
diff --git a/plugins/cost-insights/api-report.md b/plugins/cost-insights/api-report.md
index 7476f75cad..d21159a845 100644
--- a/plugins/cost-insights/api-report.md
+++ b/plugins/cost-insights/api-report.md
@@ -4,9 +4,9 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePalette } from '@backstage/theme';
-import { BackstagePlugin } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { BackstageTheme } from '@backstage/theme';
 import { ContentRenderer } from 'recharts';
 import { Dispatch } from 'react';
@@ -16,7 +16,7 @@ import { PropsWithChildren } from 'react';
 import { ReactNode } from 'react';
 import { RechartsFunction } from 'recharts';
 import { RefAttributes } from 'react';
-import { RouteRef } from '@backstage/core';
+import { RouteRef } from '@backstage/core-plugin-api';
 import { SetStateAction } from 'react';
 import { TooltipProps } from 'recharts';
 import { TypographyProps } from '@material-ui/core';
diff --git a/plugins/explore-react/api-report.md b/plugins/explore-react/api-report.md
index aaf272a06a..cb09408f4b 100644
--- a/plugins/explore-react/api-report.md
+++ b/plugins/explore-react/api-report.md
@@ -4,7 +4,7 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export type ExploreTool = {
diff --git a/plugins/explore/api-report.md b/plugins/explore/api-report.md
index 4116247061..6755b0cfc2 100644
--- a/plugins/explore/api-report.md
+++ b/plugins/explore/api-report.md
@@ -4,10 +4,10 @@
 
 ```ts
 
-import { BackstagePlugin } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { default } from 'react';
-import { ExternalRouteRef } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { ExternalRouteRef } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 import { TabProps } from '@material-ui/core';
 
 // @public (undocumented)
diff --git a/plugins/fossa/api-report.md b/plugins/fossa/api-report.md
index edb2cfdd0a..a02fba732f 100644
--- a/plugins/fossa/api-report.md
+++ b/plugins/fossa/api-report.md
@@ -4,9 +4,9 @@
 
 ```ts
 
-import { BackstagePlugin } from '@backstage/core';
-import { InfoCardVariants } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { InfoCardVariants } from '@backstage/core-components';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const EntityFossaCard: ({ variant }: {
diff --git a/plugins/gcp-projects/api-report.md b/plugins/gcp-projects/api-report.md
index 22812822c0..bbe8d3edac 100644
--- a/plugins/gcp-projects/api-report.md
+++ b/plugins/gcp-projects/api-report.md
@@ -4,10 +4,10 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { OAuthApi } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { OAuthApi } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export type GcpApi = {
diff --git a/plugins/git-release-manager/api-report.md b/plugins/git-release-manager/api-report.md
index d898f83dd6..2948f441bc 100644
--- a/plugins/git-release-manager/api-report.md
+++ b/plugins/git-release-manager/api-report.md
@@ -4,9 +4,9 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const gitReleaseManagerApiRef: ApiRef<GitReleaseApi>;
diff --git a/plugins/github-actions/api-report.md b/plugins/github-actions/api-report.md
index 1795bbdbea..d3fe532c7b 100644
--- a/plugins/github-actions/api-report.md
+++ b/plugins/github-actions/api-report.md
@@ -4,14 +4,14 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { ConfigApi } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { ConfigApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { InfoCardVariants } from '@backstage/core';
-import { OAuthApi } from '@backstage/core';
+import { InfoCardVariants } from '@backstage/core-components';
+import { OAuthApi } from '@backstage/core-plugin-api';
 import { RestEndpointMethodTypes } from '@octokit/rest';
-import { RouteRef } from '@backstage/core';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export enum BuildStatus {
diff --git a/plugins/gitops-profiles/api-report.md b/plugins/gitops-profiles/api-report.md
index aad08f2b43..4690e41414 100644
--- a/plugins/gitops-profiles/api-report.md
+++ b/plugins/gitops-profiles/api-report.md
@@ -4,9 +4,9 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export interface ApplyProfileRequest {
diff --git a/plugins/graphiql/api-report.md b/plugins/graphiql/api-report.md
index 7c73b6a985..4e78e34f6a 100644
--- a/plugins/graphiql/api-report.md
+++ b/plugins/graphiql/api-report.md
@@ -7,7 +7,7 @@
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { ErrorApi } from '@backstage/core-plugin-api';
-import { IconComponent } from '@backstage/core';
+import { IconComponent } from '@backstage/core-plugin-api';
 import { OAuthApi } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
diff --git a/plugins/ilert/api-report.md b/plugins/ilert/api-report.md
index f61b43b90b..376e7e4dfd 100644
--- a/plugins/ilert/api-report.md
+++ b/plugins/ilert/api-report.md
@@ -4,13 +4,13 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { ConfigApi } from '@backstage/core';
-import { DiscoveryApi } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { ConfigApi } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { IconComponent } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { IconComponent } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const EntityILertCard: () => JSX.Element;
diff --git a/plugins/jenkins/api-report.md b/plugins/jenkins/api-report.md
index 4c88aab70c..1a1c77479d 100644
--- a/plugins/jenkins/api-report.md
+++ b/plugins/jenkins/api-report.md
@@ -4,12 +4,12 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { DiscoveryApi } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { InfoCardVariants } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { InfoCardVariants } from '@backstage/core-components';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const EntityJenkinsContent: (_props: {
diff --git a/plugins/kafka/api-report.md b/plugins/kafka/api-report.md
index acb213fd53..66551aa71e 100644
--- a/plugins/kafka/api-report.md
+++ b/plugins/kafka/api-report.md
@@ -4,9 +4,9 @@
 
 ```ts
 
-import { BackstagePlugin } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { RouteRef } from '@backstage/core';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const EntityKafkaContent: (_props: {
diff --git a/plugins/kubernetes/api-report.md b/plugins/kubernetes/api-report.md
index 2f1b5155fd..9c8a1fe537 100644
--- a/plugins/kubernetes/api-report.md
+++ b/plugins/kubernetes/api-report.md
@@ -4,12 +4,12 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { KubernetesRequestBody } from '@backstage/plugin-kubernetes-common';
-import { OAuthApi } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { OAuthApi } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const EntityKubernetesContent: (_props: {
diff --git a/plugins/lighthouse/api-report.md b/plugins/lighthouse/api-report.md
index 18d8358257..1a2295f891 100644
--- a/plugins/lighthouse/api-report.md
+++ b/plugins/lighthouse/api-report.md
@@ -4,12 +4,12 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Config } from '@backstage/config';
 import { Entity } from '@backstage/catalog-model';
-import { InfoCardVariants } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { InfoCardVariants } from '@backstage/core-components';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export type Audit = AuditRunning | AuditFailed | AuditCompleted;
diff --git a/plugins/newrelic/api-report.md b/plugins/newrelic/api-report.md
index e472405e22..db5dd073df 100644
--- a/plugins/newrelic/api-report.md
+++ b/plugins/newrelic/api-report.md
@@ -4,8 +4,8 @@
 
 ```ts
 
-import { BackstagePlugin } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const NewRelicPage: () => JSX.Element;
diff --git a/plugins/org/api-report.md b/plugins/org/api-report.md
index cb3fa445f0..fa8d3ea80e 100644
--- a/plugins/org/api-report.md
+++ b/plugins/org/api-report.md
@@ -4,10 +4,10 @@
 
 ```ts
 
-import { BackstagePlugin } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { GroupEntity } from '@backstage/catalog-model';
-import { InfoCardVariants } from '@backstage/core';
+import { InfoCardVariants } from '@backstage/core-components';
 import { UserEntity } from '@backstage/catalog-model';
 
 // @public (undocumented)
diff --git a/plugins/pagerduty/api-report.md b/plugins/pagerduty/api-report.md
index b3457ccb12..bb3853ae49 100644
--- a/plugins/pagerduty/api-report.md
+++ b/plugins/pagerduty/api-report.md
@@ -4,10 +4,10 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { ConfigApi } from '@backstage/core';
-import { DiscoveryApi } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { ConfigApi } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { PropsWithChildren } from 'react';
 
diff --git a/plugins/register-component/api-report.md b/plugins/register-component/api-report.md
index 401031d0ac..b41bf50f05 100644
--- a/plugins/register-component/api-report.md
+++ b/plugins/register-component/api-report.md
@@ -4,8 +4,8 @@
 
 ```ts
 
-import { BackstagePlugin } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const RegisterComponentPage: ({ catalogRouteRef, }: {
diff --git a/plugins/rollbar/api-report.md b/plugins/rollbar/api-report.md
index 7049414389..44bd9d0d5e 100644
--- a/plugins/rollbar/api-report.md
+++ b/plugins/rollbar/api-report.md
@@ -4,12 +4,12 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { DiscoveryApi } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { IdentityApi } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { IdentityApi } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const EntityPageRollbar: (_props: Props) => JSX.Element;
diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 85c2142d5e..5da1869fc2 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -4,21 +4,21 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { DiscoveryApi } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { EntityName } from '@backstage/catalog-model';
-import { Extension } from '@backstage/core';
-import { ExternalRouteRef } from '@backstage/core';
+import { Extension } from '@backstage/core-plugin-api';
+import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { FieldProps } from '@rjsf/core';
 import { FieldValidation } from '@rjsf/core';
-import { IdentityApi } from '@backstage/core';
+import { IdentityApi } from '@backstage/core-plugin-api';
 import { JsonObject } from '@backstage/config';
 import { JSONSchema } from '@backstage/catalog-model';
 import { JsonValue } from '@backstage/config';
-import { Observable } from '@backstage/core';
+import { Observable } from '@backstage/core-plugin-api';
 import { default as React_2 } from 'react';
-import { RouteRef } from '@backstage/core';
+import { RouteRef } from '@backstage/core-plugin-api';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 
 // @public (undocumented)
diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index 181f049f63..5451ed9adb 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -4,14 +4,14 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
 import { AsyncState } from 'react-use/lib/useAsync';
-import { BackstagePlugin } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { IndexableDocument } from '@backstage/search-common';
 import { JsonObject } from '@backstage/config';
 import { default as React_2 } from 'react';
 import { ReactElement } from 'react';
-import { RouteRef } from '@backstage/core';
+import { RouteRef } from '@backstage/core-plugin-api';
 import { SearchQuery } from '@backstage/search-common';
 import { SearchResult as SearchResult_2 } from '@backstage/search-common';
 import { SearchResultSet } from '@backstage/search-common';
diff --git a/plugins/sentry/api-report.md b/plugins/sentry/api-report.md
index ffd3071b92..c3cce9ed7c 100644
--- a/plugins/sentry/api-report.md
+++ b/plugins/sentry/api-report.md
@@ -4,12 +4,12 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { DiscoveryApi } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { InfoCardVariants } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { InfoCardVariants } from '@backstage/core-components';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const EntitySentryCard: () => JSX.Element;
diff --git a/plugins/shortcuts/api-report.md b/plugins/shortcuts/api-report.md
index 4c0b3132d6..b29328d2e6 100644
--- a/plugins/shortcuts/api-report.md
+++ b/plugins/shortcuts/api-report.md
@@ -4,11 +4,11 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { Observable } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/core-plugin-api';
 import ObservableImpl from 'zen-observable';
-import { StorageApi } from '@backstage/core';
+import { StorageApi } from '@backstage/core-plugin-api';
 
 // @public
 export class LocalStoredShortcuts implements ShortcutApi {
diff --git a/plugins/sonarqube/api-report.md b/plugins/sonarqube/api-report.md
index 6d4af3d548..46bffb0a44 100644
--- a/plugins/sonarqube/api-report.md
+++ b/plugins/sonarqube/api-report.md
@@ -4,9 +4,9 @@
 
 ```ts
 
-import { BackstagePlugin } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { InfoCardVariants } from '@backstage/core';
+import { InfoCardVariants } from '@backstage/core-components';
 
 // @public (undocumented)
 export const EntitySonarQubeCard: ({ variant, duplicationRatings, }: {
diff --git a/plugins/splunk-on-call/api-report.md b/plugins/splunk-on-call/api-report.md
index 3a2f085b0b..8ffe13660d 100644
--- a/plugins/splunk-on-call/api-report.md
+++ b/plugins/splunk-on-call/api-report.md
@@ -4,12 +4,12 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { ConfigApi } from '@backstage/core';
-import { DiscoveryApi } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { ConfigApi } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { RouteRef } from '@backstage/core';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const EntitySplunkOnCallCard: () => JSX.Element;
diff --git a/plugins/tech-radar/api-report.md b/plugins/tech-radar/api-report.md
index 20367c5525..f8bcc84d3a 100644
--- a/plugins/tech-radar/api-report.md
+++ b/plugins/tech-radar/api-report.md
@@ -4,9 +4,9 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export interface RadarEntry {
diff --git a/plugins/techdocs/api-report.md b/plugins/techdocs/api-report.md
index 69a62b4362..dbd5e3ab26 100644
--- a/plugins/techdocs/api-report.md
+++ b/plugins/techdocs/api-report.md
@@ -4,16 +4,16 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Config } from '@backstage/config';
 import { CSSProperties } from '@material-ui/styles';
-import { DiscoveryApi } from '@backstage/core';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
-import { IdentityApi } from '@backstage/core';
+import { IdentityApi } from '@backstage/core-plugin-api';
 import { Location as Location_2 } from '@backstage/catalog-model';
-import { RouteRef } from '@backstage/core';
+import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const DocsCardGrid: ({ entities, }: {
diff --git a/plugins/user-settings/api-report.md b/plugins/user-settings/api-report.md
index 2f882f3742..3c417f7a0b 100644
--- a/plugins/user-settings/api-report.md
+++ b/plugins/user-settings/api-report.md
@@ -4,11 +4,11 @@
 
 ```ts
 
-import { ApiRef } from '@backstage/core';
-import { BackstagePlugin } from '@backstage/core';
-import { IconComponent } from '@backstage/core';
-import { RouteRef } from '@backstage/core';
-import { SessionApi } from '@backstage/core';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { IconComponent } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
+import { SessionApi } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const AuthProviders: ({ providerSettings }: Props_2) => JSX.Element;
diff --git a/plugins/welcome/api-report.md b/plugins/welcome/api-report.md
index 8d6e1cb156..727be3ad75 100644
--- a/plugins/welcome/api-report.md
+++ b/plugins/welcome/api-report.md
@@ -4,7 +4,7 @@
 
 ```ts
 
-import { BackstagePlugin } from '@backstage/core';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const WelcomePage: () => JSX.Element;