diff --git a/x-pack/plugins/reporting/public/index.ts b/x-pack/plugins/reporting/public/index.ts
index 7179a81664b6f..6acdd8fb048e8 100644
--- a/x-pack/plugins/reporting/public/index.ts
+++ b/x-pack/plugins/reporting/public/index.ts
@@ -7,9 +7,9 @@
 
 import { PluginInitializerContext } from 'src/core/public';
 import { getDefaultLayoutSelectors } from '../common';
-import { getSharedComponents } from './components';
 import { ReportingAPIClient } from './lib/reporting_api_client';
 import { ReportingPublicPlugin } from './plugin';
+import { getSharedComponents } from './shared';
 
 export interface ReportingSetup {
   getDefaultLayoutSelectors: typeof getDefaultLayoutSelectors;
diff --git a/x-pack/plugins/reporting/public/components/job_queue_client.test.mocks.ts b/x-pack/plugins/reporting/public/lib/job_queue_client.test.mocks.ts
similarity index 87%
rename from x-pack/plugins/reporting/public/components/job_queue_client.test.mocks.ts
rename to x-pack/plugins/reporting/public/lib/job_queue_client.test.mocks.ts
index 9426ec8d8751d..6c66eada6a825 100644
--- a/x-pack/plugins/reporting/public/components/job_queue_client.test.mocks.ts
+++ b/x-pack/plugins/reporting/public/lib/job_queue_client.test.mocks.ts
@@ -15,4 +15,4 @@ export const mockAPIClient = {
   downloadReport: jest.fn(),
 };
 
-jest.mock('../lib/reporting_api_client', () => mockAPIClient);
+jest.mock('./reporting_api_client', () => mockAPIClient);
diff --git a/x-pack/plugins/reporting/public/lib/reporting_api_client.ts b/x-pack/plugins/reporting/public/lib/reporting_api_client.ts
index 92604de0f4712..4ce9e8760f21f 100644
--- a/x-pack/plugins/reporting/public/lib/reporting_api_client.ts
+++ b/x-pack/plugins/reporting/public/lib/reporting_api_client.ts
@@ -22,7 +22,7 @@ import {
   ReportDocument,
   ReportSource,
 } from '../../common/types';
-import { add } from './job_completion_notifications';
+import { add } from '../notifier/job_completion_notifications';
 
 export interface JobQueueEntry {
   _id: string;
diff --git a/x-pack/plugins/reporting/public/lib/stream_handler.ts b/x-pack/plugins/reporting/public/lib/stream_handler.ts
index 961345aeb592c..53191cacb5ba1 100644
--- a/x-pack/plugins/reporting/public/lib/stream_handler.ts
+++ b/x-pack/plugins/reporting/public/lib/stream_handler.ts
@@ -17,7 +17,7 @@ import {
   getSuccessToast,
   getWarningFormulasToast,
   getWarningMaxSizeToast,
-} from '../components';
+} from '../notifier';
 import { ReportingAPIClient } from './reporting_api_client';
 
 function updateStored(jobIds: JobId[]): void {
diff --git a/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap b/x-pack/plugins/reporting/public/management/__snapshots__/report_info_button.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
rename to x-pack/plugins/reporting/public/management/__snapshots__/report_info_button.test.tsx.snap
diff --git a/x-pack/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap b/x-pack/plugins/reporting/public/management/__snapshots__/report_listing.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
rename to x-pack/plugins/reporting/public/management/__snapshots__/report_listing.test.tsx.snap
diff --git a/x-pack/plugins/reporting/public/components/buttons/index.tsx b/x-pack/plugins/reporting/public/management/index.ts
similarity index 100%
rename from x-pack/plugins/reporting/public/components/buttons/index.tsx
rename to x-pack/plugins/reporting/public/management/index.ts
diff --git a/x-pack/plugins/reporting/public/mount_management_section.tsx b/x-pack/plugins/reporting/public/management/mount_management_section.tsx
similarity index 78%
rename from x-pack/plugins/reporting/public/mount_management_section.tsx
rename to x-pack/plugins/reporting/public/management/mount_management_section.tsx
index bc165badae713..eb1057a9bdfc7 100644
--- a/x-pack/plugins/reporting/public/mount_management_section.tsx
+++ b/x-pack/plugins/reporting/public/management/mount_management_section.tsx
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
+import { I18nProvider } from '@kbn/i18n/react';
 import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { I18nProvider } from '@kbn/i18n/react';
-import { CoreSetup, CoreStart } from 'src/core/public';
 import { Observable } from 'rxjs';
-import { ReportListing } from './components/report_listing';
-import { ManagementAppMountParams } from '../../../../src/plugins/management/public';
-import { ILicense } from '../../licensing/public';
-import { ClientConfigType } from './plugin';
-import { ReportingAPIClient } from './lib/reporting_api_client';
+import { CoreSetup, CoreStart } from 'src/core/public';
+import { ManagementAppMountParams } from '../../../../../src/plugins/management/public';
+import { ILicense } from '../../../licensing/public';
+import { ReportingAPIClient } from '../lib/reporting_api_client';
+import { ClientConfigType } from '../plugin';
+import { ReportListing } from './report_listing';
 
 export async function mountManagementSection(
   coreSetup: CoreSetup,
diff --git a/x-pack/plugins/reporting/public/components/buttons/report_delete_button.tsx b/x-pack/plugins/reporting/public/management/report_delete_button.tsx
similarity index 94%
rename from x-pack/plugins/reporting/public/components/buttons/report_delete_button.tsx
rename to x-pack/plugins/reporting/public/management/report_delete_button.tsx
index cd432758fa767..dfb411fc195e8 100644
--- a/x-pack/plugins/reporting/public/components/buttons/report_delete_button.tsx
+++ b/x-pack/plugins/reporting/public/management/report_delete_button.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { EuiConfirmModal, EuiButton } from '@elastic/eui';
-import React, { PureComponent, Fragment } from 'react';
-import { Job, Props as ListingProps } from '../report_listing';
+import { EuiButton, EuiConfirmModal } from '@elastic/eui';
+import React, { Fragment, PureComponent } from 'react';
+import { Job, Props as ListingProps } from './report_listing';
 
 type DeleteFn = () => Promise<void>;
 type Props = { jobsToDelete: Job[]; performDelete: DeleteFn } & ListingProps;
diff --git a/x-pack/plugins/reporting/public/components/report_diagnostic.tsx b/x-pack/plugins/reporting/public/management/report_diagnostic.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/report_diagnostic.tsx
rename to x-pack/plugins/reporting/public/management/report_diagnostic.tsx
diff --git a/x-pack/plugins/reporting/public/components/buttons/report_download_button.tsx b/x-pack/plugins/reporting/public/management/report_download_button.tsx
similarity index 93%
rename from x-pack/plugins/reporting/public/components/buttons/report_download_button.tsx
rename to x-pack/plugins/reporting/public/management/report_download_button.tsx
index a5e57dafc2867..78022b85e2ff8 100644
--- a/x-pack/plugins/reporting/public/components/buttons/report_download_button.tsx
+++ b/x-pack/plugins/reporting/public/management/report_download_button.tsx
@@ -7,8 +7,8 @@
 
 import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import React, { FunctionComponent } from 'react';
-import { JOB_STATUSES } from '../../../common/constants';
-import { Job as ListingJob, Props as ListingProps } from '../report_listing';
+import { JOB_STATUSES } from '../../common/constants';
+import { Job as ListingJob, Props as ListingProps } from './report_listing';
 
 type Props = { record: ListingJob } & ListingProps;
 
diff --git a/x-pack/plugins/reporting/public/components/buttons/report_error_button.tsx b/x-pack/plugins/reporting/public/management/report_error_button.tsx
similarity index 93%
rename from x-pack/plugins/reporting/public/components/buttons/report_error_button.tsx
rename to x-pack/plugins/reporting/public/management/report_error_button.tsx
index b34463b61253b..0ebdf5ca60b5a 100644
--- a/x-pack/plugins/reporting/public/components/buttons/report_error_button.tsx
+++ b/x-pack/plugins/reporting/public/management/report_error_button.tsx
@@ -8,9 +8,9 @@
 import { EuiButtonIcon, EuiCallOut, EuiPopover } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { Component } from 'react';
-import { JOB_STATUSES } from '../../../common/constants';
-import { JobContent, ReportingAPIClient } from '../../lib/reporting_api_client';
-import { Job as ListingJob } from '../report_listing';
+import { JOB_STATUSES } from '../../common/constants';
+import { JobContent, ReportingAPIClient } from '../lib/reporting_api_client';
+import { Job as ListingJob } from './report_listing';
 
 interface Props {
   intl: InjectedIntl;
diff --git a/x-pack/plugins/reporting/public/components/buttons/report_info_button.test.tsx b/x-pack/plugins/reporting/public/management/report_info_button.test.tsx
similarity index 94%
rename from x-pack/plugins/reporting/public/components/buttons/report_info_button.test.tsx
rename to x-pack/plugins/reporting/public/management/report_info_button.test.tsx
index 785f49646110a..119856042a326 100644
--- a/x-pack/plugins/reporting/public/components/buttons/report_info_button.test.tsx
+++ b/x-pack/plugins/reporting/public/management/report_info_button.test.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test/jest';
 import { ReportInfoButton } from './report_info_button';
 
-jest.mock('../../lib/reporting_api_client');
+jest.mock('../lib/reporting_api_client');
 
-import { ReportingAPIClient } from '../../lib/reporting_api_client';
+import { ReportingAPIClient } from '../lib/reporting_api_client';
 
 const httpSetup = {} as any;
 const apiClient = new ReportingAPIClient(httpSetup);
diff --git a/x-pack/plugins/reporting/public/components/buttons/report_info_button.tsx b/x-pack/plugins/reporting/public/management/report_info_button.tsx
similarity index 97%
rename from x-pack/plugins/reporting/public/components/buttons/report_info_button.tsx
rename to x-pack/plugins/reporting/public/management/report_info_button.tsx
index 7f2d5b6adcc33..719f1ff341daf 100644
--- a/x-pack/plugins/reporting/public/components/buttons/report_info_button.tsx
+++ b/x-pack/plugins/reporting/public/management/report_info_button.tsx
@@ -18,9 +18,9 @@ import {
 } from '@elastic/eui';
 import { get } from 'lodash';
 import React, { Component, Fragment } from 'react';
-import { USES_HEADLESS_JOB_TYPES } from '../../../common/constants';
-import { ReportApiJSON } from '../../../common/types';
-import { ReportingAPIClient } from '../../lib/reporting_api_client';
+import { USES_HEADLESS_JOB_TYPES } from '../../common/constants';
+import { ReportApiJSON } from '../../common/types';
+import { ReportingAPIClient } from '../lib/reporting_api_client';
 
 interface Props {
   jobId: string;
diff --git a/x-pack/plugins/reporting/public/components/report_listing.test.tsx b/x-pack/plugins/reporting/public/management/report_listing.test.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/report_listing.test.tsx
rename to x-pack/plugins/reporting/public/management/report_listing.test.tsx
diff --git a/x-pack/plugins/reporting/public/components/report_listing.tsx b/x-pack/plugins/reporting/public/management/report_listing.tsx
similarity index 99%
rename from x-pack/plugins/reporting/public/components/report_listing.tsx
rename to x-pack/plugins/reporting/public/management/report_listing.tsx
index 618c91fba0715..fffa952be6cb4 100644
--- a/x-pack/plugins/reporting/public/components/report_listing.tsx
+++ b/x-pack/plugins/reporting/public/management/report_listing.tsx
@@ -28,12 +28,7 @@ import { durationToNumber } from '../../common/schema_utils';
 import { checkLicense } from '../lib/license_check';
 import { JobQueueEntry, ReportingAPIClient } from '../lib/reporting_api_client';
 import { ClientConfigType } from '../plugin';
-import {
-  ReportDeleteButton,
-  ReportDownloadButton,
-  ReportErrorButton,
-  ReportInfoButton,
-} from './buttons';
+import { ReportDeleteButton, ReportDownloadButton, ReportErrorButton, ReportInfoButton } from './';
 import { ReportDiagnostic } from './report_diagnostic';
 
 export interface Job {
diff --git a/x-pack/plugins/reporting/public/mocks.ts b/x-pack/plugins/reporting/public/mocks.ts
index 414d1b0ae70fe..a6b6d835499c6 100644
--- a/x-pack/plugins/reporting/public/mocks.ts
+++ b/x-pack/plugins/reporting/public/mocks.ts
@@ -8,7 +8,7 @@
 import { coreMock } from 'src/core/public/mocks';
 import { ReportingSetup } from '.';
 import { getDefaultLayoutSelectors } from '../common';
-import { getSharedComponents } from './components/shared';
+import { getSharedComponents } from './shared';
 
 type Setup = jest.Mocked<ReportingSetup>;
 
diff --git a/x-pack/plugins/reporting/public/components/general_error.tsx b/x-pack/plugins/reporting/public/notifier/general_error.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/general_error.tsx
rename to x-pack/plugins/reporting/public/notifier/general_error.tsx
diff --git a/x-pack/plugins/reporting/public/components/index.ts b/x-pack/plugins/reporting/public/notifier/index.ts
similarity index 81%
rename from x-pack/plugins/reporting/public/components/index.ts
rename to x-pack/plugins/reporting/public/notifier/index.ts
index b8cccda2a6613..b44f1e9169747 100644
--- a/x-pack/plugins/reporting/public/components/index.ts
+++ b/x-pack/plugins/reporting/public/notifier/index.ts
@@ -5,10 +5,8 @@
  * 2.0.
  */
 
-export { getSuccessToast } from './job_success';
 export { getFailureToast } from './job_failure';
+export { getGeneralErrorToast } from './general_error';
+export { getSuccessToast } from './job_success';
 export { getWarningFormulasToast } from './job_warning_formulas';
 export { getWarningMaxSizeToast } from './job_warning_max_size';
-export { getGeneralErrorToast } from './general_error';
-export { ScreenCapturePanelContent } from './screen_capture_panel_content';
-export { getSharedComponents } from './shared';
diff --git a/x-pack/plugins/reporting/public/lib/job_completion_notifications.ts b/x-pack/plugins/reporting/public/notifier/job_completion_notifications.ts
similarity index 100%
rename from x-pack/plugins/reporting/public/lib/job_completion_notifications.ts
rename to x-pack/plugins/reporting/public/notifier/job_completion_notifications.ts
diff --git a/x-pack/plugins/reporting/public/components/job_download_button.tsx b/x-pack/plugins/reporting/public/notifier/job_download_button.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/job_download_button.tsx
rename to x-pack/plugins/reporting/public/notifier/job_download_button.tsx
diff --git a/x-pack/plugins/reporting/public/components/job_failure.tsx b/x-pack/plugins/reporting/public/notifier/job_failure.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/job_failure.tsx
rename to x-pack/plugins/reporting/public/notifier/job_failure.tsx
diff --git a/x-pack/plugins/reporting/public/components/job_success.tsx b/x-pack/plugins/reporting/public/notifier/job_success.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/job_success.tsx
rename to x-pack/plugins/reporting/public/notifier/job_success.tsx
diff --git a/x-pack/plugins/reporting/public/components/job_warning_formulas.tsx b/x-pack/plugins/reporting/public/notifier/job_warning_formulas.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/job_warning_formulas.tsx
rename to x-pack/plugins/reporting/public/notifier/job_warning_formulas.tsx
diff --git a/x-pack/plugins/reporting/public/components/job_warning_max_size.tsx b/x-pack/plugins/reporting/public/notifier/job_warning_max_size.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/job_warning_max_size.tsx
rename to x-pack/plugins/reporting/public/notifier/job_warning_max_size.tsx
diff --git a/x-pack/plugins/reporting/public/components/report_link.tsx b/x-pack/plugins/reporting/public/notifier/report_link.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/report_link.tsx
rename to x-pack/plugins/reporting/public/notifier/report_link.tsx
diff --git a/x-pack/plugins/reporting/public/plugin.ts b/x-pack/plugins/reporting/public/plugin.ts
index 577732fdb1392..a2881af902072 100644
--- a/x-pack/plugins/reporting/public/plugin.ts
+++ b/x-pack/plugins/reporting/public/plugin.ts
@@ -29,10 +29,11 @@ import { constants, getDefaultLayoutSelectors } from '../common';
 import { durationToNumber } from '../common/schema_utils';
 import { JobId, JobSummarySet } from '../common/types';
 import { ReportingSetup, ReportingStart } from './';
-import { getGeneralErrorToast, getSharedComponents } from './components';
 import { ReportingAPIClient } from './lib/reporting_api_client';
 import { ReportingNotifierStreamHandler as StreamHandler } from './lib/stream_handler';
+import { getGeneralErrorToast } from './notifier';
 import { ReportingCsvPanelAction } from './panel_actions/get_csv_panel_action';
+import { getSharedComponents } from './shared';
 import { ReportingCsvShareProvider } from './share_context_menu/register_csv_reporting';
 import { reportingScreenshotShareProvider } from './share_context_menu/register_pdf_png_reporting';
 
@@ -150,7 +151,7 @@ export class ReportingPublicPlugin
         params.setBreadcrumbs([{ text: this.breadcrumbText }]);
         const [[start], { mountManagementSection }] = await Promise.all([
           getStartServices(),
-          import('./mount_management_section'),
+          import('./management/mount_management_section'),
         ]);
         return await mountManagementSection(
           core,
diff --git a/x-pack/plugins/reporting/public/components/__snapshots__/screen_capture_panel_content.test.tsx.snap b/x-pack/plugins/reporting/public/share_context_menu/__snapshots__/screen_capture_panel_content.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/reporting/public/components/__snapshots__/screen_capture_panel_content.test.tsx.snap
rename to x-pack/plugins/reporting/public/share_context_menu/__snapshots__/screen_capture_panel_content.test.tsx.snap
diff --git a/x-pack/plugins/reporting/public/components/panel_spinner.tsx b/x-pack/plugins/reporting/public/share_context_menu/panel_spinner.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/panel_spinner.tsx
rename to x-pack/plugins/reporting/public/share_context_menu/panel_spinner.tsx
diff --git a/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx b/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx
index 7fe5268fc9910..7165fcf6f8681 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx
@@ -16,9 +16,9 @@ import type { ShareContext } from '../../../../../src/plugins/share/public';
 import type { LicensingPluginSetup } from '../../../licensing/public';
 import { CSV_JOB_TYPE } from '../../common/constants';
 import type { JobParamsCSV } from '../../server/export_types/csv_searchsource/types';
-import { ReportingPanelContent } from '../components/reporting_panel_content_lazy';
 import { checkLicense } from '../lib/license_check';
 import type { ReportingAPIClient } from '../lib/reporting_api_client';
+import { ReportingPanelContent } from './reporting_panel_content_lazy';
 
 export const ReportingCsvShareProvider = ({
   apiClient,
diff --git a/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx b/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx
index 42f6ee5fcb898..eb80f64be55e1 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx
@@ -16,9 +16,9 @@ import type { LicensingPluginSetup } from '../../../licensing/public';
 import type { LayoutParams } from '../../common/types';
 import type { JobParamsPNG } from '../../server/export_types/png/types';
 import type { JobParamsPDF } from '../../server/export_types/printable_pdf/types';
-import { ScreenCapturePanelContent } from '../components/screen_capture_panel_content_lazy';
 import { checkLicense } from '../lib/license_check';
 import type { ReportingAPIClient } from '../lib/reporting_api_client';
+import { ScreenCapturePanelContent } from './screen_capture_panel_content_lazy';
 
 interface JobParamsProviderOptions {
   shareableUrl: string;
diff --git a/x-pack/plugins/reporting/public/components/reporting_panel_content.test.tsx b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content.test.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/reporting_panel_content.test.tsx
rename to x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content.test.tsx
diff --git a/x-pack/plugins/reporting/public/components/reporting_panel_content.tsx b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/reporting_panel_content.tsx
rename to x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content.tsx
diff --git a/x-pack/plugins/reporting/public/components/reporting_panel_content_lazy.tsx b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content_lazy.tsx
similarity index 94%
rename from x-pack/plugins/reporting/public/components/reporting_panel_content_lazy.tsx
rename to x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content_lazy.tsx
index 8a937f6d2eb36..a231d7aa881de 100644
--- a/x-pack/plugins/reporting/public/components/reporting_panel_content_lazy.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content_lazy.tsx
@@ -6,7 +6,7 @@
  */
 
 import * as React from 'react';
-import { lazy, Suspense, FC } from 'react';
+import { FC, lazy, Suspense } from 'react';
 import { PanelSpinner } from './panel_spinner';
 import type { Props } from './reporting_panel_content';
 
diff --git a/x-pack/plugins/reporting/public/components/screen_capture_panel_content.test.tsx b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.test.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/screen_capture_panel_content.test.tsx
rename to x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.test.tsx
diff --git a/x-pack/plugins/reporting/public/components/screen_capture_panel_content.tsx b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.tsx
similarity index 100%
rename from x-pack/plugins/reporting/public/components/screen_capture_panel_content.tsx
rename to x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.tsx
diff --git a/x-pack/plugins/reporting/public/components/screen_capture_panel_content_lazy.tsx b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content_lazy.tsx
similarity index 94%
rename from x-pack/plugins/reporting/public/components/screen_capture_panel_content_lazy.tsx
rename to x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content_lazy.tsx
index 253b4fb88dcd4..a162dd749ff02 100644
--- a/x-pack/plugins/reporting/public/components/screen_capture_panel_content_lazy.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content_lazy.tsx
@@ -6,7 +6,7 @@
  */
 
 import * as React from 'react';
-import { lazy, Suspense, FC } from 'react';
+import { FC, lazy, Suspense } from 'react';
 import { PanelSpinner } from './panel_spinner';
 import type { Props } from './screen_capture_panel_content';
 
diff --git a/x-pack/plugins/reporting/public/components/shared/get_shared_components.tsx b/x-pack/plugins/reporting/public/shared/get_shared_components.tsx
similarity index 79%
rename from x-pack/plugins/reporting/public/components/shared/get_shared_components.tsx
rename to x-pack/plugins/reporting/public/shared/get_shared_components.tsx
index 12d70c8701975..87ddf0cfdb389 100644
--- a/x-pack/plugins/reporting/public/components/shared/get_shared_components.tsx
+++ b/x-pack/plugins/reporting/public/shared/get_shared_components.tsx
@@ -7,10 +7,10 @@
 
 import { CoreSetup } from 'kibana/public';
 import React from 'react';
-import { ReportingAPIClient } from '../..';
-import { PDF_REPORT_TYPE } from '../../../common/constants';
-import type { Props as PanelPropsScreenCapture } from '../screen_capture_panel_content';
-import { ScreenCapturePanelContent } from '../screen_capture_panel_content_lazy';
+import { ReportingAPIClient } from '../';
+import { PDF_REPORT_TYPE } from '../../common/constants';
+import type { Props as PanelPropsScreenCapture } from '../share_context_menu/screen_capture_panel_content';
+import { ScreenCapturePanelContent } from '../share_context_menu/screen_capture_panel_content_lazy';
 
 interface IncludeOnCloseFn {
   onClose: () => void;
diff --git a/x-pack/plugins/reporting/public/components/shared/index.tsx b/x-pack/plugins/reporting/public/shared/index.ts
similarity index 100%
rename from x-pack/plugins/reporting/public/components/shared/index.tsx
rename to x-pack/plugins/reporting/public/shared/index.ts