diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
index 3d4292cef27f4..06424ea48a40f 100644
--- a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
+++ b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -148,6 +148,8 @@ export const npStart = {
       legacy: {
         getSection: () => ({
           register: sinon.fake(),
+          deregister: sinon.fake(),
+          hasItem: sinon.fake(),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
index 92dace65d466c..962487312c83d 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
@@ -23,7 +23,7 @@ import {
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
-import { SpaceAvatar } from '../../../../../../../../../spaces/public/components';
+import { SpaceAvatar } from '../../../../../../../../../spaces/public/space_avatar';
 import { Feature } from '../../../../../../../../../../../plugins/features/public';
 import { FeaturesPrivileges, Role } from '../../../../../../../../common/model';
 import { CalculatedPrivilege } from '../../../../../../../lib/kibana_privilege_calculator';
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
index e54b5ff9c45da..65a3df9fb47a1 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
@@ -14,7 +14,7 @@ import {
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { Component } from 'react';
-import { getSpaceColor } from '../../../../../../../../../spaces/public/lib/space_attributes';
+import { getSpaceColor } from '../../../../../../../../../spaces/public/space_avatar';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
 import {
   FeaturesPrivileges,
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
index e6e206e5fc7f4..0eb9cf0b0ee9d 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
@@ -8,7 +8,7 @@ import { EuiComboBox, EuiComboBoxOptionProps, EuiHealth, EuiHighlight } from '@e
 import { InjectedIntl } from '@kbn/i18n/react';
 import React, { Component } from 'react';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
-import { getSpaceColor } from '../../../../../../../../../spaces/public/lib/space_attributes';
+import { getSpaceColor } from '../../../../../../../../../spaces/public/space_avatar';
 
 const spaceToOption = (space?: Space, currentSelection?: 'global' | 'spaces') => {
   if (!space) {
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx
index 1ab2a27220eee..a99e389044eaa 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx
@@ -14,9 +14,9 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { Component } from 'react';
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../../../../spaces/common/constants';
-import { Space } from '../../../../../../../spaces/common/model/space';
-import { SpaceAvatar } from '../../../../../../../spaces/public/components';
+import { SpaceAvatar } from '../../../../../../../spaces/public/space_avatar';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../../../../../../plugins/spaces/common/constants';
+import { Space } from '../../../../../../../../../plugins/spaces/common/model/space';
 
 interface Props {
   spaces: Space[];
diff --git a/x-pack/legacy/plugins/spaces/index.ts b/x-pack/legacy/plugins/spaces/index.ts
index 0083847cfb441..934b44b4accaf 100644
--- a/x-pack/legacy/plugins/spaces/index.ts
+++ b/x-pack/legacy/plugins/spaces/index.ts
@@ -49,12 +49,12 @@ export const spaces = (kibana: Record<string, any>) =>
 
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-      managementSections: ['plugins/spaces/views/management'],
+      managementSections: [],
       apps: [
         {
           id: 'space_selector',
           title: 'Spaces',
-          main: 'plugins/spaces/views/space_selector',
+          main: 'plugins/spaces/space_selector',
           url: 'space_selector',
           hidden: true,
         },
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
new file mode 100644
index 0000000000000..aa3c6acf26236
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { AdvancedSettingsService } from './advanced_settings_service';
+jest.mock('ui/management', () => {
+  return {
+    PAGE_TITLE_COMPONENT: 'page_title_component',
+    PAGE_SUBTITLE_COMPONENT: 'page_subtitle_component',
+  };
+});
+
+describe('Advanced Settings Service', () => {
+  describe('#setup', () => {
+    it('registers space-aware components to augment the advanced settings screen', () => {
+      const deps = {
+        getActiveSpace: jest.fn().mockResolvedValue({ id: 'foo', name: 'foo-space' }),
+        registerSettingsComponent: jest.fn(),
+      };
+
+      const advancedSettingsService = new AdvancedSettingsService();
+      advancedSettingsService.setup(deps);
+
+      expect(deps.registerSettingsComponent).toHaveBeenCalledTimes(2);
+      expect(deps.registerSettingsComponent).toHaveBeenCalledWith(
+        'page_title_component',
+        expect.any(Function),
+        true
+      );
+
+      expect(deps.registerSettingsComponent).toHaveBeenCalledWith(
+        'page_subtitle_component',
+        expect.any(Function),
+        true
+      );
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
new file mode 100644
index 0000000000000..9c6c2fcc2cdda
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { PAGE_TITLE_COMPONENT, PAGE_SUBTITLE_COMPONENT } from 'ui/management';
+import { Space } from '../../common/model/space';
+import { AdvancedSettingsTitle, AdvancedSettingsSubtitle } from './components';
+
+interface SetupDeps {
+  getActiveSpace: () => Promise<Space>;
+  registerSettingsComponent: (
+    id: string,
+    component: string | React.FC<any>,
+    allowOverride: boolean
+  ) => void;
+}
+
+export class AdvancedSettingsService {
+  public setup({ getActiveSpace, registerSettingsComponent }: SetupDeps) {
+    const PageTitle = () => <AdvancedSettingsTitle getActiveSpace={getActiveSpace} />;
+    const SubTitle = () => <AdvancedSettingsSubtitle getActiveSpace={getActiveSpace} />;
+
+    registerSettingsComponent(PAGE_TITLE_COMPONENT, PageTitle, true);
+    registerSettingsComponent(PAGE_SUBTITLE_COMPONENT, SubTitle, true);
+  }
+}
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
index 433f8a8ccf0a2..e35d67c7214cf 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
@@ -7,7 +7,7 @@
 import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Fragment, useState, useEffect } from 'react';
-import { Space } from '../../../../../common/model/space';
+import { Space } from '../../../../common/model/space';
 
 interface Props {
   getActiveSpace: () => Promise<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/index.ts
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.test.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.test.tsx
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx
index bf792ca2cdacf..b772ff433abec 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx
@@ -6,7 +6,7 @@
 import React from 'react';
 import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
 import { AdvancedSettingsTitle } from './advanced_settings_title';
-import { SpaceAvatar } from '../../../../components';
+import { SpaceAvatar } from '../../../space_avatar';
 import { act } from '@testing-library/react';
 
 describe('AdvancedSettingsTitle', () => {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.tsx
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.tsx
index af6fa42cce07b..b74524db81d81 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.tsx
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.tsx
@@ -7,8 +7,8 @@
 import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { useState, useEffect } from 'react';
-import { Space } from '../../../../../common/model/space';
-import { SpaceAvatar } from '../../../../components';
+import { Space } from '../../../../../../../plugins/spaces/common/model/space';
+import { SpaceAvatar } from '../../../space_avatar';
 
 interface Props {
   getActiveSpace: () => Promise<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/index.ts
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/components/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/index.ts
new file mode 100644
index 0000000000000..6678be7fa34e4
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { AdvancedSettingsSubtitle } from './advanced_settings_subtitle';
+export { AdvancedSettingsTitle } from './advanced_settings_title';
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/index.ts
new file mode 100644
index 0000000000000..546831a84fa82
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { AdvancedSettingsService } from './advanced_settings_service';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/constants.ts b/x-pack/legacy/plugins/spaces/public/constants.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/constants.ts
rename to x-pack/legacy/plugins/spaces/public/constants.ts
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/_index.scss b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/_index.scss
new file mode 100644
index 0000000000000..30ac0c9fe9b27
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/_index.scss
@@ -0,0 +1 @@
+@import './components/index';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/_index.scss b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_copy_to_space.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/_index.scss
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_copy_to_space.scss
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_index.scss b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_index.scss
new file mode 100644
index 0000000000000..92b19a8c8c6a3
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_index.scss
@@ -0,0 +1 @@
+@import './copy_to_space';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_indicator.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_indicator.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
index f9da25409d60e..ff9035ff02be5 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_indicator.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
@@ -7,10 +7,7 @@
 import React from 'react';
 import { EuiLoadingSpinner, EuiText, EuiIconTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  SummarizedCopyToSpaceResult,
-  SummarizedSavedObjectResult,
-} from '../../../../lib/copy_saved_objects_to_space';
+import { SummarizedCopyToSpaceResult, SummarizedSavedObjectResult } from '..';
 
 interface Props {
   summarizedCopyResult: SummarizedCopyToSpaceResult;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_summary_indicator.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_summary_indicator.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
index 0ad5f72ba3e45..9d73c216c73ce 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_summary_indicator.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { EuiLoadingSpinner, EuiIconTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Space } from '../../../../../common/model/space';
-import { SummarizedCopyToSpaceResult } from '../../../../lib/copy_saved_objects_to_space';
+import { Space } from '../../../common/model/space';
+import { SummarizedCopyToSpaceResult } from '..';
 
 interface Props {
   space: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.test.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.test.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
index b3fd345b1d2b4..28011911e212e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
@@ -6,20 +6,20 @@
 import React from 'react';
 import Boom from 'boom';
 import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
-import { mockManagementPlugin } from '../../../../../../../../../src/legacy/core_plugins/management/public/np_ready/mocks';
+import { mockManagementPlugin } from '../../../../../../../src/legacy/core_plugins/management/public/np_ready/mocks';
 import { CopySavedObjectsToSpaceFlyout } from './copy_to_space_flyout';
 import { CopyToSpaceForm } from './copy_to_space_form';
 import { EuiLoadingSpinner, EuiEmptyPrompt } from '@elastic/eui';
-import { Space } from '../../../../../common/model/space';
+import { Space } from '../../../common/model/space';
 import { findTestSubject } from 'test_utils/find_test_subject';
 import { SelectableSpacesControl } from './selectable_spaces_control';
 import { act } from '@testing-library/react';
 import { ProcessingCopyToSpace } from './processing_copy_to_space';
-import { spacesManagerMock } from '../../../../lib/mocks';
-import { SpacesManager } from '../../../../lib';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 import { ToastNotifications } from 'ui/notify/toasts/toast_notifications';
 
-jest.mock('../../../../../../../../../src/legacy/core_plugins/management/public/legacy', () => ({
+jest.mock('../../../../../../../src/legacy/core_plugins/management/public/legacy', () => ({
   setup: mockManagementPlugin.createSetupContract(),
   start: mockManagementPlugin.createStartContract(),
 }));
@@ -404,6 +404,7 @@ describe('CopyToSpaceFlyout', () => {
             id: 'my-viz',
             error: {
               type: 'missing_references',
+              blocking: [],
               references: [{ type: 'index-pattern', id: 'missing-index-pattern' }],
             },
           },
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
index 5a43e5878ab83..f486f2f24f13d 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
@@ -22,17 +22,17 @@ import { mapValues } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { ToastNotifications } from 'ui/notify/toasts/toast_notifications';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
 import {
   ProcessedImportResponse,
   processImportResponse,
-} from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { Space } from '../../../../../common/model/space';
-import { SpacesManager } from '../../../../lib';
+} from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
+import { SpacesManager } from '../../spaces_manager';
 import { ProcessingCopyToSpace } from './processing_copy_to_space';
 import { CopyToSpaceFlyoutFooter } from './copy_to_space_flyout_footer';
 import { CopyToSpaceForm } from './copy_to_space_form';
-import { CopyOptions, ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { CopyOptions, ImportRetry } from '../types';
 
 interface Props {
   onClose: () => void;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout_footer.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout_footer.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
index 5853bebe3c669..56f39ce3ed4fb 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout_footer.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
@@ -8,8 +8,8 @@ import React, { Fragment } from 'react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiStat, EuiHorizontalRule } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { ProcessedImportResponse } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { ImportRetry } from '../types';
 
 interface Props {
   copyInProgress: boolean;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_form.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_form.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
index 2a7e17c253f0b..f680793e27fe0 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_form.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
@@ -14,8 +14,8 @@ import {
   EuiListGroupItem,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { CopyOptions } from '../../../../lib/copy_saved_objects_to_space/types';
-import { Space } from '../../../../../common/model/space';
+import { CopyOptions } from '../types';
+import { Space } from '../../../common/model/space';
 import { SelectableSpacesControl } from './selectable_spaces_control';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/index.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/index.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/processing_copy_to_space.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/processing_copy_to_space.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
index b04c9598559b3..285abb828a011 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/processing_copy_to_space.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
@@ -13,12 +13,12 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { ProcessedImportResponse } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { summarizeCopyResult } from '../../../../lib/copy_saved_objects_to_space';
-import { Space } from '../../../../../common/model/space';
-import { CopyOptions, ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
+import { CopyOptions, ImportRetry } from '../types';
 import { SpaceResult } from './space_result';
+import { summarizeCopyResult } from '..';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/selectable_spaces_control.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/selectable_spaces_control.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
index 42d5707531380..9cf81b1cc4486 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/selectable_spaces_control.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
@@ -6,8 +6,8 @@
 
 import React, { Fragment, useState } from 'react';
 import { EuiSelectable, EuiLoadingSpinner } from '@elastic/eui';
-import { SpaceAvatar } from '../../../../components';
-import { Space } from '../../../../../common/model/space';
+import { SpaceAvatar } from '../../space_avatar';
+import { Space } from '../../../common/model/space';
 
 interface Props {
   spaces: Space[];
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
similarity index 86%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
index f71be12276be5..22f0767ba196e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
@@ -6,13 +6,13 @@
 
 import React from 'react';
 import { EuiAccordion, EuiFlexGroup, EuiFlexItem, EuiText, EuiSpacer } from '@elastic/eui';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { SummarizedCopyToSpaceResult } from '../../../../lib/copy_saved_objects_to_space';
-import { SpaceAvatar } from '../../../../components';
-import { Space } from '../../../../../common/model/space';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { SummarizedCopyToSpaceResult } from '../index';
+import { SpaceAvatar } from '../../space_avatar';
+import { Space } from '../../../common/model/space';
 import { CopyStatusSummaryIndicator } from './copy_status_summary_indicator';
 import { SpaceCopyResultDetails } from './space_result_details';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ImportRetry } from '../types';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result_details.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
similarity index 93%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result_details.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
index 66ec38331c89a..d3ab406b87c3e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result_details.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
@@ -5,13 +5,13 @@
  */
 
 import React from 'react';
-import { SummarizedCopyToSpaceResult } from 'plugins/spaces/lib/copy_saved_objects_to_space';
 import { EuiText, EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { Space } from '../../../../../common/model/space';
+import { SummarizedCopyToSpaceResult } from '../index';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
 import { CopyStatusIndicator } from './copy_status_indicator';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ImportRetry } from '../types';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
similarity index 89%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
index 3b0fffa38e785..c016494a4cdf9 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
@@ -9,8 +9,8 @@ import { toastNotifications } from 'ui/notify';
 import {
   SavedObjectsManagementAction,
   SavedObjectsManagementRecord,
-} from '../../../../../../../src/legacy/core_plugins/management/public';
-import { CopySavedObjectsToSpaceFlyout } from '../../views/management/components/copy_saved_objects_to_space';
+} from '../../../../../../src/legacy/core_plugins/management/public';
+import { CopySavedObjectsToSpaceFlyout } from './components';
 import { SpacesManager } from '../spaces_manager';
 
 export class CopyToSpaceSavedObjectsManagementAction extends SavedObjectsManagementAction {
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts
new file mode 100644
index 0000000000000..63a59344dfe5d
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ManagementSetup } from 'src/legacy/core_plugins/management/public';
+import { CopyToSpaceSavedObjectsManagementAction } from './copy_saved_objects_to_space_action';
+import { spacesManagerMock } from '../spaces_manager/mocks';
+import { CopySavedObjectsToSpaceService } from '.';
+
+describe('CopySavedObjectsToSpaceService', () => {
+  describe('#setup', () => {
+    it('registers the CopyToSpaceSavedObjectsManagementAction', () => {
+      const deps = {
+        spacesManager: spacesManagerMock.create(),
+        // we don't have a proper NP mock for this yet
+        managementSetup: ({
+          savedObjects: {
+            registry: {
+              has: jest.fn().mockReturnValue(false),
+              register: jest.fn(),
+            },
+          },
+        } as unknown) as ManagementSetup,
+      };
+
+      const service = new CopySavedObjectsToSpaceService();
+      service.setup(deps);
+
+      expect(deps.managementSetup.savedObjects.registry.register).toHaveBeenCalledTimes(1);
+      expect(deps.managementSetup.savedObjects.registry.register).toHaveBeenCalledWith(
+        expect.any(CopyToSpaceSavedObjectsManagementAction)
+      );
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts
new file mode 100644
index 0000000000000..37354f985a2fc
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ManagementSetup } from 'src/legacy/core_plugins/management/public';
+import { CopyToSpaceSavedObjectsManagementAction } from './copy_saved_objects_to_space_action';
+import { SpacesManager } from '../spaces_manager';
+
+interface SetupDeps {
+  spacesManager: SpacesManager;
+  managementSetup: ManagementSetup;
+}
+
+export class CopySavedObjectsToSpaceService {
+  public setup({ spacesManager, managementSetup }: SetupDeps) {
+    const action = new CopyToSpaceSavedObjectsManagementAction(spacesManager);
+    managementSetup.savedObjects.registry.register(action);
+  }
+}
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/index.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/index.ts
similarity index 74%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/index.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/index.ts
index be23d90cc242a..06969a52a3d8d 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/index.ts
@@ -5,4 +5,4 @@
  */
 
 export * from './summarize_copy_result';
-export { CopyToSpaceSavedObjectsManagementAction } from './copy_saved_objects_to_space_action';
+export { CopySavedObjectsToSpaceService } from './copy_saved_objects_to_space_service';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.test.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.test.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
index 0352902072790..0244a35711e6f 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.test.ts
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { summarizeCopyResult } from './summarize_copy_result';
-import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { ProcessedImportResponse } from '../../../../../../src/legacy/core_plugins/management/public';
 
 const createSavedObjectsManagementRecord = () => ({
   type: 'dashboard',
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
index 8807489157d71..7bc47d35efc6c 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.ts
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
-import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { SavedObjectsManagementRecord } from '../../../../../../src/legacy/core_plugins/management/public';
+import { ProcessedImportResponse } from '../../../../../../src/legacy/core_plugins/management/public';
 
 export interface SummarizedSavedObjectResult {
   type: string;
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/types.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/types.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/types.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/types.ts
diff --git a/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts b/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts
index 1f41bb89d7707..464066d2221de 100644
--- a/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts
+++ b/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts
@@ -9,7 +9,7 @@ import {
   FeatureCatalogueEntry,
   FeatureCatalogueCategory,
 } from '../../../../../src/plugins/home/public';
-import { getSpacesFeatureDescription } from './lib/constants';
+import { getSpacesFeatureDescription } from './constants';
 
 export const createSpacesFeatureCatalogueEntry = (): FeatureCatalogueEntry => {
   return {
diff --git a/x-pack/legacy/plugins/spaces/public/index.scss b/x-pack/legacy/plugins/spaces/public/index.scss
index 7a40872b760cb..26269f1d31aa3 100644
--- a/x-pack/legacy/plugins/spaces/public/index.scss
+++ b/x-pack/legacy/plugins/spaces/public/index.scss
@@ -10,4 +10,7 @@
 //   spcChart__legend--small
 //   spcChart__legend-isLoading
 
-@import './views/index';
+@import './management/index';
+@import './nav_control/index';
+@import './space_selector/index';
+@import './copy_saved_objects_to_space/index';
diff --git a/x-pack/legacy/plugins/spaces/public/index.ts b/x-pack/legacy/plugins/spaces/public/index.ts
index 9233aae9fb12f..53cb906a619d3 100644
--- a/x-pack/legacy/plugins/spaces/public/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/index.ts
@@ -5,6 +5,8 @@
  */
 import { SpacesPlugin } from './plugin';
 
+export { SpaceAvatar } from './space_avatar';
+
 export const plugin = () => {
   return new SpacesPlugin();
 };
diff --git a/x-pack/legacy/plugins/spaces/public/legacy.ts b/x-pack/legacy/plugins/spaces/public/legacy.ts
index 99419206093e9..1dffbd2661714 100644
--- a/x-pack/legacy/plugins/spaces/public/legacy.ts
+++ b/x-pack/legacy/plugins/spaces/public/legacy.ts
@@ -4,15 +4,26 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { registerSettingsComponent } from 'ui/management';
 import { npSetup, npStart } from 'ui/new_platform';
+import { setup as managementSetup } from '../../../../../src/legacy/core_plugins/management/public/legacy';
 import { plugin } from '.';
-import { SpacesPlugin, PluginsSetup } from './plugin';
+import { SpacesPlugin, PluginsSetup, PluginsStart } from './plugin';
+import './management/legacy_page_routes';
 
 const spacesPlugin: SpacesPlugin = plugin();
 
-const plugins: PluginsSetup = {
+const pluginsSetup: PluginsSetup = {
   home: npSetup.plugins.home,
+  management: managementSetup,
+  __managementLegacyCompat: {
+    registerSettingsComponent,
+  },
 };
 
-export const setup = spacesPlugin.setup(npSetup.core, plugins);
-export const start = spacesPlugin.start(npStart.core);
+const pluginsStart: PluginsStart = {
+  management: npStart.plugins.management,
+};
+
+export const setup = spacesPlugin.setup(npSetup.core, pluginsSetup);
+export const start = spacesPlugin.start(npStart.core, pluginsStart);
diff --git a/x-pack/legacy/plugins/spaces/public/management/_index.scss b/x-pack/legacy/plugins/spaces/public/management/_index.scss
new file mode 100644
index 0000000000000..72deb1f1cde8d
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/_index.scss
@@ -0,0 +1,4 @@
+@import './components/confirm_delete_modal/confirm_delete_modal';
+@import './edit_space/enabled_features/index';
+@import './edit_space/section_panel/section_panel';
+
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/confirm_delete_modal.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/__snapshots__/confirm_delete_modal.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/confirm_delete_modal.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/__snapshots__/confirm_delete_modal.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/_confirm_delete_modal.scss b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/_confirm_delete_modal.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/_confirm_delete_modal.scss
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/_confirm_delete_modal.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.test.tsx b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
index f0ab2c99ac2e2..331435b54edb7 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { ConfirmDeleteModal } from './confirm_delete_modal';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { spacesManagerMock } from '../../../spaces_manager/mocks';
+import { SpacesManager } from '../../../spaces_manager';
 
 describe('ConfirmDeleteModal', () => {
   it('renders as expected', () => {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.tsx b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
index 0c76cb4a828fe..6eed58a784212 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
@@ -25,8 +25,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { ChangeEvent, Component } from 'react';
-import { Space } from '../../../../common/model/space';
-import { SpacesManager } from '../../../lib';
+import { SpacesManager } from '../../../spaces_manager';
+import { Space } from '../../../../../../plugins/spaces/common/model/space';
 
 interface Props {
   space: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/index.ts
new file mode 100644
index 0000000000000..651455d00e9f2
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { ConfirmDeleteModal } from './confirm_delete_modal';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/index.ts
similarity index 85%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/components/index.ts
index 91f4964e1da06..7f9f80f470d12 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/components/index.ts
@@ -6,3 +6,4 @@
 
 export { ConfirmDeleteModal } from './confirm_delete_modal';
 export { UnauthorizedPrompt } from './unauthorized_prompt';
+export { SecureSpaceMessage } from './secure_space_message';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.test.tsx b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.test.tsx
similarity index 93%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.test.tsx
index 1cc6f6c1f72be..b43010fe5f326 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.test.tsx
@@ -8,7 +8,7 @@ import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { SecureSpaceMessage } from './secure_space_message';
 
 let mockShowLinks: boolean = true;
-jest.mock('../../../../../../xpack_main/public/services/xpack_info', () => {
+jest.mock('../../../../../xpack_main/public/services/xpack_info', () => {
   return {
     xpackInfo: {
       get: jest.fn().mockImplementation((key: string) => {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.tsx
index 6bbc423968b4b..746b7e2ac4c98 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.tsx
@@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment } from 'react';
 // @ts-ignore
-import { xpackInfo } from '../../../../../../xpack_main/public/services/xpack_info';
+import { xpackInfo } from '../../../../../xpack_main/public/services/xpack_info';
 
 export const SecureSpaceMessage = ({}) => {
   const showSecurityLinks = xpackInfo.get('features.security.showLinks');
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/unauthorized_prompt.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/__snapshots__/unauthorized_prompt.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/unauthorized_prompt.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/__snapshots__/unauthorized_prompt.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/index.ts
new file mode 100644
index 0000000000000..5a8120a77804b
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { UnauthorizedPrompt } from './unauthorized_prompt';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.test.tsx b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.tsx b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
index 8a7e384d44b35..b0d74afaa90aa 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
@@ -18,9 +18,9 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { ChangeEvent, Component, Fragment } from 'react';
-import { isReservedSpace } from '../../../../../common';
-import { Space } from '../../../../../common/model/space';
-import { SpaceAvatar } from '../../../../components';
+import { isReservedSpace } from '../../../../common';
+import { Space } from '../../../../common/model/space';
+import { SpaceAvatar } from '../../../space_avatar';
 import { SpaceValidator, toSpaceIdentifier } from '../../lib';
 import { SectionPanel } from '../section_panel';
 import { CustomizeSpaceAvatar } from './customize_space_avatar';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx
index 12fa0193b59a4..c3207c82bf95e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx
@@ -17,12 +17,10 @@ import {
   isValidHex,
 } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
-
-import { getSpaceColor, getSpaceInitials } from '../../../../lib/space_attributes';
-import { encode, imageTypes } from '../../../../../common/lib/dataurl';
-
-import { MAX_SPACE_INITIALS } from '../../../../../common/constants';
-import { Space } from '../../../../../common/model/space';
+import { imageTypes, encode } from '../../../../common/lib/dataurl';
+import { getSpaceColor, getSpaceInitials } from '../../../space_avatar';
+import { Space } from '../../../../../../../plugins/spaces/common/model/space';
+import { MAX_SPACE_INITIALS } from '../../../../../../../plugins/spaces/common';
 
 interface Props {
   space: Partial<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.tsx
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.tsx
index a717570b19c5d..1d6664273d21e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.tsx
@@ -7,7 +7,7 @@
 import { EuiFieldText, EuiFormRow, EuiLink } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { ChangeEvent, Component, Fragment } from 'react';
-import { Space } from '../../../../../common/model/space';
+import { Space } from '../../../../common/model/space';
 import { SpaceValidator, toSpaceIdentifier } from '../../lib';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
similarity index 88%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
index e7c7dfc5eb1b0..364145d6495b8 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { DeleteSpacesButton } from './delete_spaces_button';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 
 const space = {
   id: 'my-space',
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
index 216dd7c41f124..56a858eb4ccf6 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
@@ -7,10 +7,9 @@
 import { EuiButton, EuiButtonIcon, EuiButtonIconProps } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
-// @ts-ignore
 import { toastNotifications } from 'ui/notify';
-import { Space } from '../../../../common/model/space';
-import { SpacesManager } from '../../../lib/spaces_manager';
+import { Space } from '../../../common/model/space';
+import { SpacesManager } from '../../spaces_manager';
 import { ConfirmDeleteModal } from '../components/confirm_delete_modal';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/_index.scss b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/_index.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/_index.scss
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/_index.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
index f8bd4b889394a..f770857d9313d 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
@@ -7,8 +7,8 @@
 import { EuiLink } from '@elastic/eui';
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { Feature } from '../../../../../../../../plugins/features/public';
-import { Space } from '../../../../../common/model/space';
+import { Feature } from '../../../../../../../plugins/features/public';
+import { Space } from '../../../../common/model/space';
 import { SectionPanel } from '../section_panel';
 import { EnabledFeatures } from './enabled_features';
 
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
index 628be759b7c5c..70312296f757b 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
@@ -8,8 +8,8 @@ import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer, EuiText, EuiTitle } from
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { Component, Fragment, ReactNode } from 'react';
 import { Capabilities } from 'src/core/public';
-import { Feature } from '../../../../../../../../plugins/features/public';
-import { Space } from '../../../../../common/model/space';
+import { Feature } from '../../../../../../../plugins/features/public';
+import { Space } from '../../../../common/model/space';
 import { getEnabledFeatures } from '../../lib/feature_utils';
 import { SectionPanel } from '../section_panel';
 import { FeatureTable } from './feature_table';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
similarity index 92%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
index b3654b4d35bd3..2866d0bfa8cf3 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
@@ -3,13 +3,13 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-// @ts-ignore
-import { EuiCheckbox, EuiIcon, EuiInMemoryTable, EuiSwitch, EuiText, IconType } from '@elastic/eui';
+
+import { EuiIcon, EuiInMemoryTable, EuiSwitch, EuiText, IconType } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { ChangeEvent, Component } from 'react';
-import { Feature } from '../../../../../../../../plugins/features/public';
-import { Space } from '../../../../../common/model/space';
+import { Feature } from '../../../../../../../plugins/features/public';
+import { Space } from '../../../../common/model/space';
 import { ToggleAllFeatures } from './toggle_all_features';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/toggle_all_features.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/toggle_all_features.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/toggle_all_features.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/toggle_all_features.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
index c69a885ae0587..d24e932bce112 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
@@ -6,7 +6,7 @@
 jest.mock('ui/kfetch', () => ({
   kfetch: () => Promise.resolve([{ id: 'feature-1', name: 'feature 1', icon: 'spacesApp' }]),
 }));
-import '../../../__mocks__/xpack_info';
+import '../../__mocks__/xpack_info';
 import { EuiButton, EuiLink, EuiSwitch } from '@elastic/eui';
 import { ReactWrapper } from 'enzyme';
 import React from 'react';
@@ -14,8 +14,8 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal';
 import { ManageSpacePage } from './manage_space_page';
 import { SectionPanel } from './section_panel';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 
 const space = {
   id: 'my-space',
@@ -65,21 +65,28 @@ describe('ManageSpacePage', () => {
   });
 
   it('allows a space to be updated', async () => {
-    const spacesManager = spacesManagerMock.create();
-    spacesManager.getSpace = jest.fn().mockResolvedValue({
+    const spaceToUpdate = {
       id: 'existing-space',
       name: 'Existing Space',
       description: 'hey an existing space',
       color: '#aabbcc',
       initials: 'AB',
       disabledFeatures: [],
+    };
+
+    const spacesManager = spacesManagerMock.create();
+    spacesManager.getSpace = jest.fn().mockResolvedValue({
+      ...spaceToUpdate,
     });
     spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
 
+    const onLoadSpace = jest.fn();
+
     const wrapper = mountWithIntl(
       <ManageSpacePage.WrappedComponent
         spaceId={'existing-space'}
         spacesManager={(spacesManager as unknown) as SpacesManager}
+        onLoadSpace={onLoadSpace}
         intl={null as any}
         capabilities={{
           navLinks: {},
@@ -93,6 +100,9 @@ describe('ManageSpacePage', () => {
     await waitForDataLoad(wrapper);
 
     expect(spacesManager.getSpace).toHaveBeenCalledWith('existing-space');
+    expect(onLoadSpace).toHaveBeenCalledWith({
+      ...spaceToUpdate,
+    });
 
     await Promise.resolve();
 
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.tsx
similarity index 93%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.tsx
index a5d60d1a731ba..6bbb32ccd654f 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.tsx
@@ -17,17 +17,15 @@ import {
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { Component, Fragment } from 'react';
-import { Breadcrumb } from 'ui/chrome';
 import { kfetch } from 'ui/kfetch';
 import { toastNotifications } from 'ui/notify';
 import { Capabilities } from 'src/core/public';
-import { Feature } from '../../../../../../../plugins/features/public';
-import { isReservedSpace } from '../../../../common';
-import { Space } from '../../../../common/model/space';
-import { SpacesManager } from '../../../lib';
-import { SecureSpaceMessage } from '../components/secure_space_message';
-import { UnauthorizedPrompt } from '../components/unauthorized_prompt';
-import { getEditBreadcrumbs, toSpaceIdentifier } from '../lib';
+import { Feature } from '../../../../../../plugins/features/public';
+import { isReservedSpace } from '../../../common';
+import { Space } from '../../../common/model/space';
+import { SpacesManager } from '../../spaces_manager';
+import { SecureSpaceMessage, UnauthorizedPrompt } from '../components';
+import { toSpaceIdentifier } from '../lib';
 import { SpaceValidator } from '../lib/validate_space';
 import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal';
 import { CustomizeSpace } from './customize_space';
@@ -39,7 +37,7 @@ interface Props {
   spacesManager: SpacesManager;
   spaceId?: string;
   intl: InjectedIntl;
-  setBreadcrumbs?: (breadcrumbs: Breadcrumb[]) => void;
+  onLoadSpace?: (space: Space) => void;
   capabilities: Capabilities;
 }
 
@@ -76,7 +74,7 @@ class ManageSpacePageUI extends Component<Props, State> {
       return;
     }
 
-    const { spaceId, spacesManager, intl, setBreadcrumbs } = this.props;
+    const { spaceId, spacesManager, intl, onLoadSpace } = this.props;
 
     const getFeatures = kfetch({ method: 'get', pathname: '/api/features' });
 
@@ -84,8 +82,8 @@ class ManageSpacePageUI extends Component<Props, State> {
       try {
         const [space, features] = await Promise.all([spacesManager.getSpace(spaceId), getFeatures]);
         if (space) {
-          if (setBreadcrumbs) {
-            setBreadcrumbs(getEditBreadcrumbs(space));
+          if (onLoadSpace) {
+            onLoadSpace(space);
           }
 
           this.setState({
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.tsx
similarity index 89%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.tsx
index e4b2dda3a668b..38bf351902096 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.tsx
@@ -8,8 +8,8 @@ import React from 'react';
 
 import { EuiIcon, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { isReservedSpace } from '../../../../common';
-import { Space } from '../../../../common/model/space';
+import { isReservedSpace } from '../../../common';
+import { Space } from '../../../common/model/space';
 
 interface Props {
   space?: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/_section_panel.scss b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/_section_panel.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/_section_panel.scss
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/_section_panel.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/management/index.ts b/x-pack/legacy/plugins/spaces/public/management/index.ts
new file mode 100644
index 0000000000000..ad3cc6b245619
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { ManagementService } from './management_service';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/page_routes.tsx b/x-pack/legacy/plugins/spaces/public/management/legacy_page_routes.tsx
similarity index 75%
rename from x-pack/legacy/plugins/spaces/public/views/management/page_routes.tsx
rename to x-pack/legacy/plugins/spaces/public/management/legacy_page_routes.tsx
index d8fd0298df2fc..8cf4a129e5b8f 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/page_routes.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/legacy_page_routes.tsx
@@ -4,30 +4,59 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 // @ts-ignore
-import template from 'plugins/spaces/views/management/template.html';
+import template from 'plugins/spaces/management/template.html';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nContext } from 'ui/i18n';
 // @ts-ignore
 import routes from 'ui/routes';
+import { MANAGEMENT_BREADCRUMB } from 'ui/management/breadcrumbs';
 import { npStart } from 'ui/new_platform';
 import { ManageSpacePage } from './edit_space';
-import { getCreateBreadcrumbs, getEditBreadcrumbs, getListBreadcrumbs } from './lib';
 import { SpacesGridPage } from './spaces_grid';
 
-import { start as spacesNPStart } from '../../legacy';
+import { start as spacesNPStart } from '../legacy';
+import { Space } from '../../common/model/space';
 
 const reactRootNodeId = 'manageSpacesReactRoot';
 
+function getListBreadcrumbs() {
+  return [
+    MANAGEMENT_BREADCRUMB,
+    {
+      text: 'Spaces',
+      href: '#/management/spaces/list',
+    },
+  ];
+}
+
+function getCreateBreadcrumbs() {
+  return [
+    ...getListBreadcrumbs(),
+    {
+      text: 'Create',
+    },
+  ];
+}
+
+function getEditBreadcrumbs(space?: Space) {
+  return [
+    ...getListBreadcrumbs(),
+    {
+      text: space ? space.name : '...',
+    },
+  ];
+}
+
 routes.when('/management/spaces/list', {
   template,
   k7Breadcrumbs: getListBreadcrumbs,
   requireUICapability: 'management.kibana.spaces',
   controller($scope: any) {
-    $scope.$$postDigest(async () => {
+    $scope.$$postDigest(() => {
       const domNode = document.getElementById(reactRootNodeId);
 
-      const { spacesManager } = await spacesNPStart;
+      const { spacesManager } = spacesNPStart;
 
       render(
         <I18nContext>
@@ -54,10 +83,10 @@ routes.when('/management/spaces/create', {
   k7Breadcrumbs: getCreateBreadcrumbs,
   requireUICapability: 'management.kibana.spaces',
   controller($scope: any) {
-    $scope.$$postDigest(async () => {
+    $scope.$$postDigest(() => {
       const domNode = document.getElementById(reactRootNodeId);
 
-      const { spacesManager } = await spacesNPStart;
+      const { spacesManager } = spacesNPStart;
 
       render(
         <I18nContext>
@@ -100,7 +129,9 @@ routes.when('/management/spaces/edit/:spaceId', {
           <ManageSpacePage
             spaceId={spaceId}
             spacesManager={spacesManager!}
-            setBreadcrumbs={npStart.core.chrome.setBreadcrumbs}
+            onLoadSpace={space => {
+              npStart.core.chrome.setBreadcrumbs(getEditBreadcrumbs(space));
+            }}
             capabilities={npStart.core.application.capabilities}
           />
         </I18nContext>,
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.test.ts b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.test.ts
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.test.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.test.ts
index 8621ec5614368..ce874956d0ef2 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.test.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.test.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Feature } from '../../../../../../../plugins/features/public';
 import { getEnabledFeatures } from './feature_utils';
+import { Feature } from '../../../../../../plugins/features/public';
 
 const buildFeatures = () =>
   [
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.ts b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.ts
similarity index 74%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.ts
index ef46a53967744..ff1688637ef73 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Feature } from '../../../../../../../plugins/features/public';
+import { Feature } from '../../../../../../plugins/features/common';
 
-import { Space } from '../../../../common/model/space';
+import { Space } from '../../../../../../plugins/spaces/common/model/space';
 
 export function getEnabledFeatures(features: Feature[], space: Partial<Space>) {
   return features.filter(feature => !(space.disabledFeatures || []).includes(feature.id));
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/index.ts b/x-pack/legacy/plugins/spaces/public/management/lib/index.ts
similarity index 80%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/index.ts
index f65757f5dba26..4a158168febd8 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/index.ts
@@ -7,5 +7,3 @@
 export { toSpaceIdentifier, isValidSpaceIdentifier } from './space_identifier_utils';
 
 export { SpaceValidator } from './validate_space';
-
-export { getCreateBreadcrumbs, getEditBreadcrumbs, getListBreadcrumbs } from './breadcrumbs';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.test.ts b/x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.test.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.test.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.ts b/x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.test.ts b/x-pack/legacy/plugins/spaces/public/management/lib/validate_space.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.test.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/validate_space.test.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.ts b/x-pack/legacy/plugins/spaces/public/management/lib/validate_space.ts
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/validate_space.ts
index e7b9116131431..43d42dacdd36d 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/validate_space.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { i18n } from '@kbn/i18n';
-import { isReservedSpace } from '../../../../common/is_reserved_space';
-import { Space } from '../../../../common/model/space';
+import { isReservedSpace } from '../../../common/is_reserved_space';
+import { Space } from '../../../common/model/space';
 import { isValidSpaceIdentifier } from './space_identifier_utils';
 
 interface SpaceValidatorOptions {
diff --git a/x-pack/legacy/plugins/spaces/public/management/management_service.test.ts b/x-pack/legacy/plugins/spaces/public/management/management_service.test.ts
new file mode 100644
index 0000000000000..fa8ae64168673
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/management_service.test.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ManagementService } from '.';
+
+describe('ManagementService', () => {
+  describe('#start', () => {
+    it('registers the spaces management page under the kibana section', () => {
+      const mockKibanaSection = {
+        hasItem: jest.fn().mockReturnValue(false),
+        register: jest.fn(),
+      };
+
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(mockKibanaSection),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      expect(deps.managementStart.legacy.getSection).toHaveBeenCalledTimes(1);
+      expect(deps.managementStart.legacy.getSection).toHaveBeenCalledWith('kibana');
+
+      expect(mockKibanaSection.register).toHaveBeenCalledTimes(1);
+      expect(mockKibanaSection.register).toHaveBeenCalledWith('spaces', {
+        name: 'spacesManagementLink',
+        order: 10,
+        display: 'Spaces',
+        url: `#/management/spaces/list`,
+      });
+    });
+
+    it('will not register the spaces management page twice', () => {
+      const mockKibanaSection = {
+        hasItem: jest.fn().mockReturnValue(true),
+        register: jest.fn(),
+      };
+
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(mockKibanaSection),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      expect(mockKibanaSection.register).toHaveBeenCalledTimes(0);
+    });
+
+    it('will not register the spaces management page if the kibana section is missing', () => {
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(undefined),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      expect(deps.managementStart.legacy.getSection).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('#stop', () => {
+    it('deregisters the spaces management page', () => {
+      const mockKibanaSection = {
+        hasItem: jest
+          .fn()
+          .mockReturnValueOnce(false)
+          .mockReturnValueOnce(true),
+        register: jest.fn(),
+        deregister: jest.fn(),
+      };
+
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(mockKibanaSection),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      service.stop();
+
+      expect(mockKibanaSection.register).toHaveBeenCalledTimes(1);
+      expect(mockKibanaSection.deregister).toHaveBeenCalledTimes(1);
+      expect(mockKibanaSection.deregister).toHaveBeenCalledWith('spaces');
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/management/management_service.ts b/x-pack/legacy/plugins/spaces/public/management/management_service.ts
new file mode 100644
index 0000000000000..ada38f5cf3387
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/management_service.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { i18n } from '@kbn/i18n';
+import { ManagementStart } from 'src/plugins/management/public';
+
+interface StartDeps {
+  managementStart: ManagementStart;
+}
+
+const MANAGE_SPACES_KEY = 'spaces';
+
+export class ManagementService {
+  private kibanaSection!: any;
+
+  public start({ managementStart }: StartDeps) {
+    this.kibanaSection = managementStart.legacy.getSection('kibana');
+    if (this.kibanaSection && !this.kibanaSection.hasItem(MANAGE_SPACES_KEY)) {
+      this.kibanaSection.register(MANAGE_SPACES_KEY, {
+        name: 'spacesManagementLink',
+        order: 10,
+        display: i18n.translate('xpack.spaces.displayName', {
+          defaultMessage: 'Spaces',
+        }),
+        url: `#/management/spaces/list`,
+      });
+    }
+  }
+
+  public stop() {
+    if (this.kibanaSection && this.kibanaSection.hasItem(MANAGE_SPACES_KEY)) {
+      this.kibanaSection.deregister(MANAGE_SPACES_KEY);
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/index.ts b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index 9fa03b1a9b74a..6ca1877642bdc 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -22,13 +22,13 @@ import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { kfetch } from 'ui/kfetch';
 import { toastNotifications } from 'ui/notify';
 import { Capabilities } from 'src/core/public';
-import { Feature } from '../../../../../../../plugins/features/public';
-import { isReservedSpace } from '../../../../common';
-import { DEFAULT_SPACE_ID } from '../../../../common/constants';
-import { Space } from '../../../../common/model/space';
-import { SpaceAvatar } from '../../../components';
-import { getSpacesFeatureDescription } from '../../../lib/constants';
-import { SpacesManager } from '../../../lib/spaces_manager';
+import { Feature } from '../../../../../../plugins/features/public';
+import { isReservedSpace } from '../../../common';
+import { DEFAULT_SPACE_ID } from '../../../common/constants';
+import { Space } from '../../../common/model/space';
+import { SpaceAvatar } from '../../space_avatar';
+import { getSpacesFeatureDescription } from '../../constants';
+import { SpacesManager } from '../..//spaces_manager';
 import { ConfirmDeleteModal } from '../components/confirm_delete_modal';
 import { SecureSpaceMessage } from '../components/secure_space_message';
 import { UnauthorizedPrompt } from '../components/unauthorized_prompt';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_pages.test.tsx b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_pages.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
index 4add607707b24..7856d2e7bee01 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_pages.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
@@ -6,12 +6,12 @@
 jest.mock('ui/kfetch', () => ({
   kfetch: () => Promise.resolve([]),
 }));
-import '../../../__mocks__/xpack_info';
+import '../../__mocks__/xpack_info';
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { SpaceAvatar } from '../../../components';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { SpaceAvatar } from '../../space_avatar';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 import { SpacesGridPage } from './spaces_grid_page';
 
 const spaces = [
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/template.html b/x-pack/legacy/plugins/spaces/public/management/template.html
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/template.html
rename to x-pack/legacy/plugins/spaces/public/management/template.html
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/__snapshots__/nav_control_popover.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/_index.scss b/x-pack/legacy/plugins/spaces/public/nav_control/_index.scss
similarity index 55%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/_index.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/_index.scss
index 192091fb04e3c..d0471da325cec 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/_index.scss
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/_index.scss
@@ -1 +1,2 @@
 @import './components/index';
+@import './nav_control';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/_nav_control.scss b/x-pack/legacy/plugins/spaces/public/nav_control/_nav_control.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/_nav_control.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/_nav_control.scss
diff --git a/x-pack/legacy/plugins/spaces/public/components/__snapshots__/manage_spaces_button.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/manage_spaces_button.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/__snapshots__/manage_spaces_button.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/manage_spaces_button.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/__snapshots__/spaces_description.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/spaces_description.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/__snapshots__/spaces_description.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/spaces_description.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/_index.scss b/x-pack/legacy/plugins/spaces/public/nav_control/components/_index.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/_index.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/_index.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_description.scss b/x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_description.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_description.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_description.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_menu.scss b/x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_menu.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_menu.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_menu.scss
diff --git a/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.test.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.test.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
index 91a0803c20bc9..857d0c1f828a6 100644
--- a/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
@@ -8,7 +8,7 @@ import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component, CSSProperties } from 'react';
 import { Capabilities } from 'src/core/public';
-import { getManageSpacesUrl } from '../lib/constants';
+import { getManageSpacesUrl } from '../../constants';
 
 interface Props {
   isDisabled?: boolean;
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.test.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.test.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.tsx
similarity index 89%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.tsx
index 043fc656a571e..abf3c636b839e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.tsx
@@ -7,8 +7,8 @@
 import { EuiContextMenuPanel, EuiText } from '@elastic/eui';
 import React, { FC } from 'react';
 import { Capabilities } from 'src/core/public';
-import { ManageSpacesButton } from '../../../components';
-import { getSpacesFeatureDescription } from '../../../lib/constants';
+import { ManageSpacesButton } from './manage_spaces_button';
+import { getSpacesFeatureDescription } from '../../constants';
 
 interface Props {
   onManageSpacesClick: () => void;
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_menu.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_menu.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_menu.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_menu.tsx
index 9a26f6802abdf..96ce18896b426 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_menu.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_menu.tsx
@@ -14,9 +14,10 @@ import {
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { Component, ReactElement } from 'react';
 import { Capabilities } from 'src/core/public';
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../common/constants';
-import { Space } from '../../../../common/model/space';
-import { ManageSpacesButton, SpaceAvatar } from '../../../components';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../common/constants';
+import { Space } from '../../../common/model/space';
+import { ManageSpacesButton } from './manage_spaces_button';
+import { SpaceAvatar } from '../../space_avatar';
 
 interface Props {
   spaces: Space[];
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/index.ts b/x-pack/legacy/plugins/spaces/public/nav_control/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/index.ts
rename to x-pack/legacy/plugins/spaces/public/nav_control/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/nav_control.tsx
index 0df077e0d2da0..9ec070eff3fed 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control.tsx
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SpacesManager } from 'plugins/spaces/lib/spaces_manager';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { CoreStart } from 'src/core/public';
+import { SpacesManager } from '../spaces_manager';
 import { NavControlPopover } from './nav_control_popover';
 
 export function initSpacesNavControl(spacesManager: SpacesManager, core: CoreStart) {
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.test.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.test.tsx
similarity index 91%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.test.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.test.tsx
index a04f28242f984..5ce141abb713e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.test.tsx
@@ -7,9 +7,9 @@
 import * as Rx from 'rxjs';
 import { shallow } from 'enzyme';
 import React from 'react';
-import { SpaceAvatar } from '../../components';
-import { spacesManagerMock } from '../../lib/mocks';
-import { SpacesManager } from '../../lib';
+import { SpaceAvatar } from '../space_avatar';
+import { spacesManagerMock } from '../spaces_manager/mocks';
+import { SpacesManager } from '../spaces_manager';
 import { NavControlPopover } from './nav_control_popover';
 import { EuiHeaderSectionItemButton } from '@elastic/eui';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
@@ -42,6 +42,7 @@ describe('NavControlPopover', () => {
         disabledFeatures: [],
       },
     ]);
+    // @ts-ignore readonly check
     spacesManager.onActiveSpaceChange$ = Rx.of({
       id: 'foo-space',
       name: 'foo',
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.tsx
index b37458aace2a2..f291027e15232 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.tsx
@@ -13,9 +13,9 @@ import {
 import React, { Component } from 'react';
 import { Capabilities } from 'src/core/public';
 import { Subscription } from 'rxjs';
-import { Space } from '../../../common/model/space';
-import { SpaceAvatar } from '../../components';
-import { SpacesManager } from '../../lib/spaces_manager';
+import { Space } from '../../common/model/space';
+import { SpaceAvatar } from '../space_avatar';
+import { SpacesManager } from '../spaces_manager';
 import { SpacesDescription } from './components/spaces_description';
 import { SpacesMenu } from './components/spaces_menu';
 
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/types.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/types.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/types.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/types.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/plugin.tsx b/x-pack/legacy/plugins/spaces/public/plugin.tsx
index 4e070c3cee3df..1ddb69a5b595c 100644
--- a/x-pack/legacy/plugins/spaces/public/plugin.tsx
+++ b/x-pack/legacy/plugins/spaces/public/plugin.tsx
@@ -6,9 +6,14 @@
 
 import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import { HomePublicPluginSetup } from 'src/plugins/home/public';
-import { SpacesManager } from './lib';
-import { initSpacesNavControl } from './views/nav_control';
+import { ManagementSetup } from 'src/legacy/core_plugins/management/public';
+import { ManagementStart } from 'src/plugins/management/public';
+import { SpacesManager } from './spaces_manager';
+import { initSpacesNavControl } from './nav_control';
 import { createSpacesFeatureCatalogueEntry } from './create_feature_catalogue_entry';
+import { CopySavedObjectsToSpaceService } from './copy_saved_objects_to_space';
+import { AdvancedSettingsService } from './advanced_settings';
+import { ManagementService } from './management';
 
 export interface SpacesPluginStart {
   spacesManager: SpacesManager | null;
@@ -16,25 +21,61 @@ export interface SpacesPluginStart {
 
 export interface PluginsSetup {
   home?: HomePublicPluginSetup;
+  management: ManagementSetup;
+  __managementLegacyCompat: {
+    registerSettingsComponent: (
+      id: string,
+      component: string | React.FC<any>,
+      allowOverride: boolean
+    ) => void;
+  };
+}
+
+export interface PluginsStart {
+  management: ManagementStart;
 }
 
 export class SpacesPlugin implements Plugin<void, SpacesPluginStart, PluginsSetup> {
-  private spacesManager: SpacesManager | null = null;
+  private spacesManager!: SpacesManager;
 
-  public async start(core: CoreStart) {
-    const serverBasePath = core.injectedMetadata.getInjectedVar('serverBasePath') as string;
+  private managementService?: ManagementService;
 
+  public setup(core: CoreSetup, plugins: PluginsSetup) {
+    const serverBasePath = core.injectedMetadata.getInjectedVar('serverBasePath') as string;
     this.spacesManager = new SpacesManager(serverBasePath, core.http);
+
+    const copySavedObjectsToSpaceService = new CopySavedObjectsToSpaceService();
+    copySavedObjectsToSpaceService.setup({
+      spacesManager: this.spacesManager,
+      managementSetup: plugins.management,
+    });
+
+    const advancedSettingsService = new AdvancedSettingsService();
+    advancedSettingsService.setup({
+      getActiveSpace: () => this.spacesManager.getActiveSpace(),
+      registerSettingsComponent: plugins.__managementLegacyCompat.registerSettingsComponent,
+    });
+
+    if (plugins.home) {
+      plugins.home.featureCatalogue.register(createSpacesFeatureCatalogueEntry());
+    }
+  }
+
+  public start(core: CoreStart, plugins: PluginsStart) {
     initSpacesNavControl(this.spacesManager, core);
 
+    this.managementService = new ManagementService();
+    this.managementService.start({ managementStart: plugins.management });
+
     return {
       spacesManager: this.spacesManager,
     };
   }
 
-  public async setup(core: CoreSetup, plugins: PluginsSetup) {
-    if (plugins.home) {
-      plugins.home.featureCatalogue.register(createSpacesFeatureCatalogueEntry());
+  public stop() {
+    if (this.managementService) {
+      this.managementService.stop();
+      this.managementService = undefined;
     }
   }
 }
diff --git a/x-pack/legacy/plugins/spaces/public/components/__snapshots__/space_avatar.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/space_avatar/__snapshots__/space_avatar.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/__snapshots__/space_avatar.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/space_avatar/__snapshots__/space_avatar.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/components/index.ts b/x-pack/legacy/plugins/spaces/public/space_avatar/index.ts
similarity index 82%
rename from x-pack/legacy/plugins/spaces/public/components/index.ts
rename to x-pack/legacy/plugins/spaces/public/space_avatar/index.ts
index 2e73f0c704f8c..1525f2c8c6186 100644
--- a/x-pack/legacy/plugins/spaces/public/components/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/space_avatar/index.ts
@@ -5,4 +5,4 @@
  */
 
 export { SpaceAvatar } from './space_avatar';
-export { ManageSpacesButton } from './manage_spaces_button';
+export * from './space_attributes';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/space_attributes.test.ts b/x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/space_attributes.test.ts
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.test.ts
diff --git a/x-pack/legacy/plugins/spaces/public/lib/space_attributes.ts b/x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/space_attributes.ts
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.ts
diff --git a/x-pack/legacy/plugins/spaces/public/components/space_avatar.test.tsx b/x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/space_avatar.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/components/space_avatar.tsx b/x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.tsx
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/components/space_avatar.tsx
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.tsx
index 0d9751ca43db9..c89f492a8fc99 100644
--- a/x-pack/legacy/plugins/spaces/public/components/space_avatar.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.tsx
@@ -8,7 +8,7 @@ import { EuiAvatar, isValidHex } from '@elastic/eui';
 import React, { FC } from 'react';
 import { MAX_SPACE_INITIALS } from '../../common';
 import { Space } from '../../common/model/space';
-import { getSpaceColor, getSpaceInitials, getSpaceImageUrl } from '../lib/space_attributes';
+import { getSpaceColor, getSpaceInitials, getSpaceImageUrl } from './space_attributes';
 
 interface Props {
   space: Partial<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/__snapshots__/space_selector.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/__snapshots__/space_selector.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/space_selector/_index.scss b/x-pack/legacy/plugins/spaces/public/space_selector/_index.scss
new file mode 100644
index 0000000000000..0621aa2a3efd7
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/_index.scss
@@ -0,0 +1,2 @@
+@import './space_selector';
+@import './components/index';
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/_space_selector.scss b/x-pack/legacy/plugins/spaces/public/space_selector/_space_selector.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/_space_selector.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/_space_selector.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/_index.scss b/x-pack/legacy/plugins/spaces/public/space_selector/components/_index.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/_index.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/_index.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/_space_card.scss b/x-pack/legacy/plugins/spaces/public/space_selector/components/_space_card.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/_space_card.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/_space_card.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/_space_cards.scss b/x-pack/legacy/plugins/spaces/public/space_selector/components/_space_cards.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/_space_cards.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/_space_cards.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/index.ts b/x-pack/legacy/plugins/spaces/public/space_selector/components/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/index.ts
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_card.test.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_card.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_card.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_card.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.tsx
index 2386f6a6fe9d0..f898ba87c60bd 100644
--- a/x-pack/legacy/plugins/spaces/public/views/components/space_card.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.tsx
@@ -4,14 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  // FIXME: need updated typedefs
-  // @ts-ignore
-  EuiCard,
-} from '@elastic/eui';
+import { EuiCard } from '@elastic/eui';
 import React from 'react';
 import { Space } from '../../../common/model/space';
-import { SpaceAvatar } from '../../components';
+import { SpaceAvatar } from '../../space_avatar';
 
 interface Props {
   space: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_cards.test.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_cards.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_cards.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_cards.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/index.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/index.tsx
similarity index 82%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/index.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/index.tsx
index c520c2683c965..c1c1b6dc3a2f3 100644
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/index.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/index.tsx
@@ -5,7 +5,7 @@
  */
 
 // @ts-ignore
-import template from 'plugins/spaces/views/space_selector/space_selector.html';
+import template from 'plugins/spaces/space_selector/space_selector.html';
 import chrome from 'ui/chrome';
 import { I18nContext } from 'ui/i18n';
 // @ts-ignore
@@ -15,14 +15,14 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { SpaceSelector } from './space_selector';
 
-import { start as spacesNPStart } from '../../legacy';
+import { start as spacesNPStart } from '../legacy';
 
 const module = uiModules.get('spaces_selector', []);
 module.controller('spacesSelectorController', ($scope: any) => {
-  $scope.$$postDigest(async () => {
+  $scope.$$postDigest(() => {
     const domNode = document.getElementById('spaceSelectorRoot');
 
-    const { spacesManager } = await spacesNPStart;
+    const { spacesManager } = spacesNPStart;
 
     render(
       <I18nContext>
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.html b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.html
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.html
rename to x-pack/legacy/plugins/spaces/public/space_selector/space_selector.html
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.test.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.test.tsx
similarity index 92%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/space_selector.test.tsx
index 829312061ca98..b4d0f96307500 100644
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.test.tsx
@@ -6,8 +6,8 @@
 
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { Space } from '../../../common/model/space';
-import { spacesManagerMock } from '../../lib/mocks';
+import { Space } from '../../common/model/space';
+import { spacesManagerMock } from '../spaces_manager/mocks';
 import { SpaceSelector } from './space_selector';
 
 function getSpacesManager(spaces: Space[] = []) {
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/space_selector.tsx
index d665752b3c8a6..206d38454fa8c 100644
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.tsx
@@ -19,11 +19,11 @@ import {
   EuiLoadingSpinner,
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
-import { SpacesManager } from 'plugins/spaces/lib';
 import React, { Component, Fragment } from 'react';
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../common/constants';
-import { Space } from '../../../common/model/space';
-import { SpaceCards } from '../components/space_cards';
+import { SpacesManager } from '../spaces_manager';
+import { Space } from '../../common/model/space';
+import { SpaceCards } from './components';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../common/constants';
 
 interface Props {
   spacesManager: SpacesManager;
diff --git a/x-pack/legacy/plugins/spaces/public/lib/index.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/index.ts
similarity index 76%
rename from x-pack/legacy/plugins/spaces/public/lib/index.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/index.ts
index 56ac7b8ff37f4..538dd77e053f5 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/spaces_manager/index.ts
@@ -5,4 +5,3 @@
  */
 
 export { SpacesManager } from './spaces_manager';
-export { getSpaceInitials, getSpaceColor, getSpaceImageUrl } from './space_attributes';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/mocks.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/mocks.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/mocks.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/mocks.ts
diff --git a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.mock.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
similarity index 87%
rename from x-pack/legacy/plugins/spaces/public/lib/spaces_manager.mock.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
index 69c6f7a452fdd..56879af33916f 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.mock.ts
+++ b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
@@ -6,9 +6,10 @@
 
 import { of, Observable } from 'rxjs';
 import { Space } from '../../common/model/space';
+import { SpacesManager } from './spaces_manager';
 
 function createSpacesManagerMock() {
-  return {
+  return ({
     onActiveSpaceChange$: (of(undefined) as unknown) as Observable<Space>,
     getSpaces: jest.fn().mockResolvedValue([]),
     getSpace: jest.fn().mockResolvedValue(undefined),
@@ -19,7 +20,8 @@ function createSpacesManagerMock() {
     copySavedObjects: jest.fn().mockResolvedValue(undefined),
     resolveCopySavedObjectsErrors: jest.fn().mockResolvedValue(undefined),
     redirectToSpaceSelector: jest.fn().mockResolvedValue(undefined),
-  };
+    changeSelectedSpace: jest.fn(),
+  } as unknown) as jest.Mocked<SpacesManager>;
 }
 
 export const spacesManagerMock = {
diff --git a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.test.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/spaces_manager.test.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
diff --git a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.ts
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/lib/spaces_manager.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.ts
index ccc1b00dabb29..e9c738cf40c69 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.ts
+++ b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.ts
@@ -9,9 +9,9 @@ import { HttpSetup } from 'src/core/public';
 import { SavedObjectsManagementRecord } from '../../../../../../src/legacy/core_plugins/management/public';
 import { Space } from '../../common/model/space';
 import { GetSpacePurpose } from '../../common/model/types';
-import { CopySavedObjectsToSpaceResponse } from './copy_saved_objects_to_space/types';
 import { ENTER_SPACE_PATH } from '../../common/constants';
 import { addSpaceIdToPath } from '../../../../../plugins/spaces/common';
+import { CopySavedObjectsToSpaceResponse } from '../copy_saved_objects_to_space/types';
 
 export class SpacesManager {
   private activeSpace$: BehaviorSubject<Space | null> = new BehaviorSubject<Space | null>(null);
diff --git a/x-pack/legacy/plugins/spaces/public/views/_index.scss b/x-pack/legacy/plugins/spaces/public/views/_index.scss
deleted file mode 100644
index 0cc8ccb10246b..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/_index.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import './components/index';
-@import './management/index';
-@import './nav_control/index';
-@import './space_selector/index'
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/_index.scss b/x-pack/legacy/plugins/spaces/public/views/management/_index.scss
deleted file mode 100644
index e7cbdfe2de7e8..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './components/confirm_delete_modal';
-@import './edit_space/enabled_features/index';
-@import './components/copy_saved_objects_to_space/index';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/index.tsx b/x-pack/legacy/plugins/spaces/public/views/management/index.tsx
deleted file mode 100644
index bf33273c614d6..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/index.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { i18n } from '@kbn/i18n';
-import 'plugins/spaces/views/management/page_routes';
-import React from 'react';
-import {
-  management,
-  PAGE_SUBTITLE_COMPONENT,
-  PAGE_TITLE_COMPONENT,
-  registerSettingsComponent,
-} from 'ui/management';
-// @ts-ignore
-import routes from 'ui/routes';
-import { setup as managementSetup } from '../../../../../../../src/legacy/core_plugins/management/public/legacy';
-import { AdvancedSettingsSubtitle } from './components/advanced_settings_subtitle';
-import { AdvancedSettingsTitle } from './components/advanced_settings_title';
-import { start as spacesNPStart } from '../../legacy';
-import { CopyToSpaceSavedObjectsManagementAction } from '../../lib/copy_saved_objects_to_space';
-
-const MANAGE_SPACES_KEY = 'spaces';
-
-routes.defaults(/\/management/, {
-  resolve: {
-    spacesManagementSection() {
-      function getKibanaSection() {
-        return management.getSection('kibana');
-      }
-
-      function deregisterSpaces() {
-        getKibanaSection().deregister(MANAGE_SPACES_KEY);
-      }
-
-      function ensureSpagesRegistered() {
-        const kibanaSection = getKibanaSection();
-
-        if (!kibanaSection.hasItem(MANAGE_SPACES_KEY)) {
-          kibanaSection.register(MANAGE_SPACES_KEY, {
-            name: 'spacesManagementLink',
-            order: 10,
-            display: i18n.translate('xpack.spaces.displayName', {
-              defaultMessage: 'Spaces',
-            }),
-            url: `#/management/spaces/list`,
-          });
-        }
-
-        // Customize Saved Objects Management
-        spacesNPStart.then(({ spacesManager }) => {
-          const action = new CopyToSpaceSavedObjectsManagementAction(spacesManager!);
-          // This route resolve function executes any time the management screen is loaded, and we want to ensure
-          // that this action is only registered once.
-          if (!managementSetup.savedObjects.registry.has(action.id)) {
-            managementSetup.savedObjects.registry.register(action);
-          }
-        });
-
-        const getActiveSpace = async () => {
-          const { spacesManager } = await spacesNPStart;
-          return spacesManager!.getActiveSpace();
-        };
-
-        const PageTitle = () => <AdvancedSettingsTitle getActiveSpace={getActiveSpace} />;
-        registerSettingsComponent(PAGE_TITLE_COMPONENT, PageTitle, true);
-
-        const SubTitle = () => <AdvancedSettingsSubtitle getActiveSpace={getActiveSpace} />;
-        registerSettingsComponent(PAGE_SUBTITLE_COMPONENT, SubTitle, true);
-      }
-
-      deregisterSpaces();
-
-      ensureSpagesRegistered();
-    },
-  },
-});
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/breadcrumbs.ts b/x-pack/legacy/plugins/spaces/public/views/management/lib/breadcrumbs.ts
deleted file mode 100644
index a4e8ba508b617..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/breadcrumbs.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { MANAGEMENT_BREADCRUMB } from 'ui/management/breadcrumbs';
-import { Space } from '../../../../common/model/space';
-
-export function getListBreadcrumbs() {
-  return [
-    MANAGEMENT_BREADCRUMB,
-    {
-      text: 'Spaces',
-      href: '#/management/spaces/list',
-    },
-  ];
-}
-
-export function getCreateBreadcrumbs() {
-  return [
-    ...getListBreadcrumbs(),
-    {
-      text: 'Create',
-    },
-  ];
-}
-
-export function getEditBreadcrumbs(space?: Space) {
-  return [
-    ...getListBreadcrumbs(),
-    {
-      text: space ? space.name : '...',
-    },
-  ];
-}
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/_index.scss b/x-pack/legacy/plugins/spaces/public/views/space_selector/_index.scss
deleted file mode 100644
index f23ac662dce1d..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './space_selector';