diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/get_supported_response_actions.ts b/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/get_supported_response_actions.ts
index 95fc300a3fe57..fdce9f4d1e682 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/get_supported_response_actions.ts
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/get_supported_response_actions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { EnabledFeatures } from '@kbn/spaces-plugin/public/management/edit_space/enabled_features';
+import type { EnabledFeatures } from '@kbn/spaces-plugin/public/management/components/enabled_features';
 import {
   ResponseActionTypes,
   ResponseActionTypesEnum,
diff --git a/x-pack/plugins/spaces/public/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap b/x-pack/plugins/spaces/public/management/components/__snapshots__/delete_spaces_button.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
rename to x-pack/plugins/spaces/public/management/components/__snapshots__/delete_spaces_button.test.tsx.snap
diff --git a/x-pack/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap b/x-pack/plugins/spaces/public/management/components/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
rename to x-pack/plugins/spaces/public/management/components/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
diff --git a/x-pack/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx b/x-pack/plugins/spaces/public/management/components/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
rename to x-pack/plugins/spaces/public/management/components/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx b/x-pack/plugins/spaces/public/management/components/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
rename to x-pack/plugins/spaces/public/management/components/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/index.ts b/x-pack/plugins/spaces/public/management/components/confirm_alter_active_space_modal/index.ts
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/index.ts
rename to x-pack/plugins/spaces/public/management/components/confirm_alter_active_space_modal/index.ts
diff --git a/x-pack/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space.test.tsx.snap b/x-pack/plugins/spaces/public/management/components/customize_space/__snapshots__/customize_space.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space.test.tsx.snap
rename to x-pack/plugins/spaces/public/management/components/customize_space/__snapshots__/customize_space.test.tsx.snap
diff --git a/x-pack/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap b/x-pack/plugins/spaces/public/management/components/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
rename to x-pack/plugins/spaces/public/management/components/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
diff --git a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.test.tsx b/x-pack/plugins/spaces/public/management/components/customize_space/customize_space.test.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.test.tsx
rename to x-pack/plugins/spaces/public/management/components/customize_space/customize_space.test.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx b/x-pack/plugins/spaces/public/management/components/customize_space/customize_space.tsx
similarity index 99%
rename from x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
rename to x-pack/plugins/spaces/public/management/components/customize_space/customize_space.tsx
index 33113f3338960..2c619be56a766 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
+++ b/x-pack/plugins/spaces/public/management/components/customize_space/customize_space.tsx
@@ -22,9 +22,9 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { CustomizeSpaceAvatar } from './customize_space_avatar';
 import { getSpaceAvatarComponent, getSpaceColor, getSpaceInitials } from '../../../space_avatar';
+import type { FormValues } from '../../edit_space/manage_space_page';
 import type { SpaceValidator } from '../../lib';
 import { toSpaceIdentifier } from '../../lib';
-import type { FormValues } from '../manage_space_page';
 import { SectionPanel } from '../section_panel';
 
 // No need to wrap LazySpaceAvatar in an error boundary, because it is one of the first chunks loaded when opening Kibana.
diff --git a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx b/x-pack/plugins/spaces/public/management/components/customize_space/customize_space_avatar.test.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx
rename to x-pack/plugins/spaces/public/management/components/customize_space/customize_space_avatar.test.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx b/x-pack/plugins/spaces/public/management/components/customize_space/customize_space_avatar.tsx
similarity index 98%
rename from x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx
rename to x-pack/plugins/spaces/public/management/components/customize_space/customize_space_avatar.tsx
index 827ef592459f7..4faa29d77e037 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx
+++ b/x-pack/plugins/spaces/public/management/components/customize_space/customize_space_avatar.tsx
@@ -19,8 +19,8 @@ import { i18n } from '@kbn/i18n';
 
 import { MAX_SPACE_INITIALS } from '../../../../common';
 import { encode, imageTypes } from '../../../../common/lib/dataurl';
+import type { FormValues } from '../../edit_space/manage_space_page';
 import type { SpaceValidator } from '../../lib';
-import type { FormValues } from '../manage_space_page';
 
 interface Props {
   space: FormValues;
diff --git a/x-pack/plugins/spaces/public/management/edit_space/customize_space/index.ts b/x-pack/plugins/spaces/public/management/components/customize_space/index.ts
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/customize_space/index.ts
rename to x-pack/plugins/spaces/public/management/components/customize_space/index.ts
diff --git a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx b/x-pack/plugins/spaces/public/management/components/delete_spaces_button.test.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
rename to x-pack/plugins/spaces/public/management/components/delete_spaces_button.test.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx b/x-pack/plugins/spaces/public/management/components/delete_spaces_button.tsx
similarity index 97%
rename from x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
rename to x-pack/plugins/spaces/public/management/components/delete_spaces_button.tsx
index 1395867d724d0..99c65eb5aafa8 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
+++ b/x-pack/plugins/spaces/public/management/components/delete_spaces_button.tsx
@@ -13,9 +13,9 @@ import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { ConfirmDeleteModal } from './confirm_delete_modal';
 import type { Space } from '../../../common';
 import type { SpacesManager } from '../../spaces_manager';
-import { ConfirmDeleteModal } from '../components/confirm_delete_modal';
 
 interface Props {
   style?: 'button' | 'icon';
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap b/x-pack/plugins/spaces/public/management/components/enabled_features/__snapshots__/enabled_features.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
rename to x-pack/plugins/spaces/public/management/components/enabled_features/__snapshots__/enabled_features.test.tsx.snap
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx b/x-pack/plugins/spaces/public/management/components/enabled_features/enabled_features.test.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
rename to x-pack/plugins/spaces/public/management/components/enabled_features/enabled_features.test.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx b/x-pack/plugins/spaces/public/management/components/enabled_features/enabled_features.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
rename to x-pack/plugins/spaces/public/management/components/enabled_features/enabled_features.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx b/x-pack/plugins/spaces/public/management/components/enabled_features/feature_table.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
rename to x-pack/plugins/spaces/public/management/components/enabled_features/feature_table.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/index.ts b/x-pack/plugins/spaces/public/management/components/enabled_features/index.ts
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/enabled_features/index.ts
rename to x-pack/plugins/spaces/public/management/components/enabled_features/index.ts
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/toggle_all_features.scss b/x-pack/plugins/spaces/public/management/components/enabled_features/toggle_all_features.scss
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/enabled_features/toggle_all_features.scss
rename to x-pack/plugins/spaces/public/management/components/enabled_features/toggle_all_features.scss
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/toggle_all_features.tsx b/x-pack/plugins/spaces/public/management/components/enabled_features/toggle_all_features.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/enabled_features/toggle_all_features.tsx
rename to x-pack/plugins/spaces/public/management/components/enabled_features/toggle_all_features.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap b/x-pack/plugins/spaces/public/management/components/section_panel/__snapshots__/section_panel.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
rename to x-pack/plugins/spaces/public/management/components/section_panel/__snapshots__/section_panel.test.tsx.snap
diff --git a/x-pack/plugins/spaces/public/management/edit_space/section_panel/index.ts b/x-pack/plugins/spaces/public/management/components/section_panel/index.ts
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/section_panel/index.ts
rename to x-pack/plugins/spaces/public/management/components/section_panel/index.ts
diff --git a/x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.scss b/x-pack/plugins/spaces/public/management/components/section_panel/section_panel.scss
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.scss
rename to x-pack/plugins/spaces/public/management/components/section_panel/section_panel.scss
diff --git a/x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx b/x-pack/plugins/spaces/public/management/components/section_panel/section_panel.test.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx
rename to x-pack/plugins/spaces/public/management/components/section_panel/section_panel.test.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx b/x-pack/plugins/spaces/public/management/components/section_panel/section_panel.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx
rename to x-pack/plugins/spaces/public/management/components/section_panel/section_panel.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/solution_view/index.ts b/x-pack/plugins/spaces/public/management/components/solution_view/index.ts
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/solution_view/index.ts
rename to x-pack/plugins/spaces/public/management/components/solution_view/index.ts
diff --git a/x-pack/plugins/spaces/public/management/edit_space/solution_view/solution_view.tsx b/x-pack/plugins/spaces/public/management/components/solution_view/solution_view.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/edit_space/solution_view/solution_view.tsx
rename to x-pack/plugins/spaces/public/management/components/solution_view/solution_view.tsx
diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
index ac60902920fa9..d5096c4cf7b2a 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
@@ -18,13 +18,13 @@ import { KibanaFeature } from '@kbn/features-plugin/public';
 import { featuresPluginMock } from '@kbn/features-plugin/public/mocks';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
 
-import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal';
-import { EnabledFeatures } from './enabled_features';
 import { ManageSpacePage } from './manage_space_page';
 import type { SolutionView, Space } from '../../../common/types/latest';
 import { EventTracker } from '../../analytics';
 import type { SpacesManager } from '../../spaces_manager';
 import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { ConfirmAlterActiveSpaceModal } from '../components/confirm_alter_active_space_modal';
+import { EnabledFeatures } from '../components/enabled_features';
 
 // To be resolved by EUI team.
 // https://github.com/elastic/eui/issues/3712
diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
index 4f45b55fb1630..5077f88387c1b 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
@@ -26,11 +26,6 @@ import type { FeaturesPluginStart, KibanaFeature } from '@kbn/features-plugin/pu
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal';
-import { CustomizeSpace } from './customize_space';
-import { DeleteSpacesButton } from './delete_spaces_button';
-import { EnabledFeatures } from './enabled_features';
-import { SolutionView } from './solution_view';
 import type { Space } from '../../../common';
 import { isReservedSpace } from '../../../common';
 import type { EventTracker } from '../../analytics';
@@ -38,6 +33,11 @@ import { getSpacesFeatureDescription } from '../../constants';
 import { getSpaceColor, getSpaceInitials } from '../../space_avatar';
 import type { SpacesManager } from '../../spaces_manager';
 import { UnauthorizedPrompt } from '../components';
+import { ConfirmAlterActiveSpaceModal } from '../components/confirm_alter_active_space_modal';
+import { CustomizeSpace } from '../components/customize_space';
+import { DeleteSpacesButton } from '../components/delete_spaces_button';
+import { EnabledFeatures } from '../components/enabled_features';
+import { SolutionView } from '../components/solution_view';
 import { toSpaceIdentifier } from '../lib';
 import { SpaceValidator } from '../lib/validate_space';