diff --git a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.story.tsx b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.story.tsx
index 14efa8fc69588..9fc5ba22f78ce 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.story.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.story.tsx
@@ -30,7 +30,7 @@ import { YamlSupportedResourceKind } from 'teleport/services/yaml/types';
 import { Access } from 'teleport/services/user';
 import useResources from 'teleport/components/useResources';
 
-import { withDefaults } from './withDefaults';
+import { withDefaults } from './StandardEditor/withDefaults';
 import { RoleEditor } from './RoleEditor';
 import { RoleEditorDialog } from './RoleEditorDialog';
 
diff --git a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.test.tsx b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.test.tsx
index 0fa38219bd398..aeec6288e2431 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.test.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.test.tsx
@@ -31,7 +31,7 @@ import {
 import { CaptureEvent, userEventService } from 'teleport/services/userEvent';
 
 import { RoleEditor, RoleEditorProps } from './RoleEditor';
-import { defaultOptions, withDefaults } from './withDefaults';
+import { defaultOptions, withDefaults } from './StandardEditor/withDefaults';
 
 // The Ace editor is very difficult to deal with in tests, especially that for
 // handling its state, we are using input event, which is asynchronous. Thus,
diff --git a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.tsx b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.tsx
index 729360ecb4254..2eeb3dc9cc9ad 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.tsx
@@ -32,11 +32,11 @@ import {
   newRole,
   StandardEditorModel,
   roleToRoleEditorModel as roleToRoleEditorModel,
-} from './standardmodel';
+} from './StandardEditor/standardmodel';
 import { YamlEditorModel } from './yamlmodel';
 import { EditorTab } from './EditorTabs';
 import { EditorHeader } from './EditorHeader';
-import { StandardEditor } from './StandardEditor';
+import { StandardEditor } from './StandardEditor/StandardEditor';
 import { YamlEditor } from './YamlEditor';
 
 export type RoleEditorProps = {
diff --git a/web/packages/teleport/src/Roles/RoleEditor/RequiresResetToStandard.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/RequiresResetToStandard.tsx
similarity index 100%
rename from web/packages/teleport/src/Roles/RoleEditor/RequiresResetToStandard.tsx
rename to web/packages/teleport/src/Roles/RoleEditor/StandardEditor/RequiresResetToStandard.tsx
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor.test.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.test.tsx
similarity index 100%
rename from web/packages/teleport/src/Roles/RoleEditor/StandardEditor.test.tsx
rename to web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.test.tsx
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.tsx
similarity index 99%
rename from web/packages/teleport/src/Roles/RoleEditor/StandardEditor.tsx
rename to web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.tsx
index 49c5c5e30feb8..1661eb14974f4 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.tsx
@@ -46,13 +46,12 @@ import {
 import { SlideTabs } from 'design/SlideTabs';
 import { RadioGroup } from 'design/RadioGroup';
 import Select from 'shared/components/Select';
-
 import { components, MultiValueProps } from 'react-select';
-
 import { Role, RoleWithYaml } from 'teleport/services/resources';
 import { LabelsInput } from 'teleport/components/LabelsInput';
+import { FieldMultiInput } from 'shared/components/FieldMultiInput/FieldMultiInput';
 
-import { FieldMultiInput } from '../../../../shared/components/FieldMultiInput/FieldMultiInput';
+import { EditorSaveCancelButton } from '../Shared';
 
 import {
   roleEditorModelToRole,
@@ -96,7 +95,6 @@ import {
   WindowsDesktopSpecValidationResult,
   AccessRuleValidationResult,
 } from './validation';
-import { EditorSaveCancelButton } from './Shared';
 import { RequiresResetToStandard } from './RequiresResetToStandard';
 
 export type StandardEditorProps = {
diff --git a/web/packages/teleport/src/Roles/RoleEditor/standardmodel.test.ts b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.test.ts
similarity index 100%
rename from web/packages/teleport/src/Roles/RoleEditor/standardmodel.test.ts
rename to web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.test.ts
diff --git a/web/packages/teleport/src/Roles/RoleEditor/standardmodel.ts b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.ts
similarity index 100%
rename from web/packages/teleport/src/Roles/RoleEditor/standardmodel.ts
rename to web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.ts
diff --git a/web/packages/teleport/src/Roles/RoleEditor/validation.ts b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/validation.ts
similarity index 100%
rename from web/packages/teleport/src/Roles/RoleEditor/validation.ts
rename to web/packages/teleport/src/Roles/RoleEditor/StandardEditor/validation.ts
diff --git a/web/packages/teleport/src/Roles/RoleEditor/withDefaults.ts b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/withDefaults.ts
similarity index 100%
rename from web/packages/teleport/src/Roles/RoleEditor/withDefaults.ts
rename to web/packages/teleport/src/Roles/RoleEditor/StandardEditor/withDefaults.ts