diff --git a/packages/richtext-lexical/src/field/features/Heading/index.ts b/packages/richtext-lexical/src/field/features/Heading1/index.ts
similarity index 93%
rename from packages/richtext-lexical/src/field/features/Heading/index.ts
rename to packages/richtext-lexical/src/field/features/Heading1/index.ts
index f4211d0b3..1bf073342 100644
--- a/packages/richtext-lexical/src/field/features/Heading/index.ts
+++ b/packages/richtext-lexical/src/field/features/Heading1/index.ts
@@ -4,12 +4,12 @@ import { $createHeadingNode, HeadingNode } from '@lexical/rich-text'
 import { $setBlocksType } from '@lexical/selection'
 import { $getSelection } from 'lexical'
 
-import type { HTMLConverter } from '../converters/html/converter/types'
+import type { HTMLConverter } from '../converters5/html/converter/types'
 import type { FeatureProvider } from '../types'
 
 import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types'
-import { TextDropdownSectionWithEntries } from '../common/floatingSelectToolbarTextDropdownSection'
-import { convertLexicalNodesToHTML } from '../converters/html/converter'
+import { TextDropdownSectionWithEntries } from '../common4/floatingSelectToolbarTextDropdownSection'
+import { convertLexicalNodesToHTML } from '../converters5/html/converter'
 import { MarkdownTransformer } from './markdownTransformer'
 
 const setHeading = (headingSize: HeadingTagType) => {
diff --git a/packages/richtext-lexical/src/field/features/Heading/markdownTransformer.ts b/packages/richtext-lexical/src/field/features/Heading1/markdownTransformer.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Heading/markdownTransformer.ts
rename to packages/richtext-lexical/src/field/features/Heading1/markdownTransformer.ts
diff --git a/packages/richtext-lexical/src/field/features/Paragraph/Component.tsx b/packages/richtext-lexical/src/field/features/Paragraph1/Component.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Paragraph/Component.tsx
rename to packages/richtext-lexical/src/field/features/Paragraph1/Component.tsx
diff --git a/packages/richtext-lexical/src/field/features/Paragraph/index.ts b/packages/richtext-lexical/src/field/features/Paragraph1/index.ts
similarity index 94%
rename from packages/richtext-lexical/src/field/features/Paragraph/index.ts
rename to packages/richtext-lexical/src/field/features/Paragraph1/index.ts
index e0bd9a2df..150b67a5d 100644
--- a/packages/richtext-lexical/src/field/features/Paragraph/index.ts
+++ b/packages/richtext-lexical/src/field/features/Paragraph1/index.ts
@@ -4,7 +4,7 @@ import { $createParagraphNode, $getSelection } from 'lexical'
 import type { FeatureProvider } from '../types'
 
 import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types'
-import { TextDropdownSectionWithEntries } from '../common/floatingSelectToolbarTextDropdownSection'
+import { TextDropdownSectionWithEntries } from '../common4/floatingSelectToolbarTextDropdownSection'
 import { ParagraphFeatureComponent } from './Component'
 
 export const key = 'paragraph' as const
@@ -61,6 +61,6 @@ export const ParagraphFeature = (): FeatureProvider => {
         },
       }
     },
-    key: key,
+    key,
   }
 }
diff --git a/packages/richtext-lexical/src/field/features/Relationship/drawer/commands.ts b/packages/richtext-lexical/src/field/features/Relationship1/drawer/commands.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Relationship/drawer/commands.ts
rename to packages/richtext-lexical/src/field/features/Relationship1/drawer/commands.ts
diff --git a/packages/richtext-lexical/src/field/features/Relationship/drawer/index.tsx b/packages/richtext-lexical/src/field/features/Relationship1/drawer/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Relationship/drawer/index.tsx
rename to packages/richtext-lexical/src/field/features/Relationship1/drawer/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/Relationship/index.ts b/packages/richtext-lexical/src/field/features/Relationship1/index.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Relationship/index.ts
rename to packages/richtext-lexical/src/field/features/Relationship1/index.ts
diff --git a/packages/richtext-lexical/src/field/features/Relationship/nodes/RelationshipNode.tsx b/packages/richtext-lexical/src/field/features/Relationship1/nodes/RelationshipNode.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Relationship/nodes/RelationshipNode.tsx
rename to packages/richtext-lexical/src/field/features/Relationship1/nodes/RelationshipNode.tsx
diff --git a/packages/richtext-lexical/src/field/features/Relationship/nodes/components/RelationshipComponent.tsx b/packages/richtext-lexical/src/field/features/Relationship1/nodes/components/RelationshipComponent.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Relationship/nodes/components/RelationshipComponent.tsx
rename to packages/richtext-lexical/src/field/features/Relationship1/nodes/components/RelationshipComponent.tsx
diff --git a/packages/richtext-lexical/src/field/features/Relationship/nodes/components/index.scss b/packages/richtext-lexical/src/field/features/Relationship1/nodes/components/index.scss
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Relationship/nodes/components/index.scss
rename to packages/richtext-lexical/src/field/features/Relationship1/nodes/components/index.scss
diff --git a/packages/richtext-lexical/src/field/features/Relationship/plugins/index.tsx b/packages/richtext-lexical/src/field/features/Relationship1/plugins/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Relationship/plugins/index.tsx
rename to packages/richtext-lexical/src/field/features/Relationship1/plugins/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/Relationship/populationPromise.ts b/packages/richtext-lexical/src/field/features/Relationship1/populationPromise.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Relationship/populationPromise.ts
rename to packages/richtext-lexical/src/field/features/Relationship1/populationPromise.ts
diff --git a/packages/richtext-lexical/src/field/features/Relationship/utils/EnabledRelationshipsCondition.tsx b/packages/richtext-lexical/src/field/features/Relationship1/utils/EnabledRelationshipsCondition.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Relationship/utils/EnabledRelationshipsCondition.tsx
rename to packages/richtext-lexical/src/field/features/Relationship1/utils/EnabledRelationshipsCondition.tsx
diff --git a/packages/richtext-lexical/src/field/features/Upload/component/ExtraFieldsDrawer/index.tsx b/packages/richtext-lexical/src/field/features/Upload1/component/ExtraFieldsDrawer/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Upload/component/ExtraFieldsDrawer/index.tsx
rename to packages/richtext-lexical/src/field/features/Upload1/component/ExtraFieldsDrawer/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/Upload/component/index.scss b/packages/richtext-lexical/src/field/features/Upload1/component/index.scss
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Upload/component/index.scss
rename to packages/richtext-lexical/src/field/features/Upload1/component/index.scss
diff --git a/packages/richtext-lexical/src/field/features/Upload/component/index.tsx b/packages/richtext-lexical/src/field/features/Upload1/component/index.tsx
similarity index 99%
rename from packages/richtext-lexical/src/field/features/Upload/component/index.tsx
rename to packages/richtext-lexical/src/field/features/Upload1/component/index.tsx
index b201f1187..c07acaf87 100644
--- a/packages/richtext-lexical/src/field/features/Upload/component/index.tsx
+++ b/packages/richtext-lexical/src/field/features/Upload1/component/index.tsx
@@ -22,7 +22,7 @@ import type { UploadFeatureProps } from '..'
 import type { UploadData } from '../nodes/UploadNode'
 
 import { useEditorConfigContext } from '../../../lexical/config/client/EditorConfigProvider'
-import { EnabledRelationshipsCondition } from '../../Relationship/utils/EnabledRelationshipsCondition'
+import { EnabledRelationshipsCondition } from '../../Relationship1/utils/EnabledRelationshipsCondition'
 import { INSERT_UPLOAD_WITH_DRAWER_COMMAND } from '../drawer/commands'
 import { ExtraFieldsUploadDrawer } from './ExtraFieldsDrawer'
 import './index.scss'
diff --git a/packages/richtext-lexical/src/field/features/Upload/drawer/commands.ts b/packages/richtext-lexical/src/field/features/Upload1/drawer/commands.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Upload/drawer/commands.ts
rename to packages/richtext-lexical/src/field/features/Upload1/drawer/commands.ts
diff --git a/packages/richtext-lexical/src/field/features/Upload/drawer/index.tsx b/packages/richtext-lexical/src/field/features/Upload1/drawer/index.tsx
similarity index 98%
rename from packages/richtext-lexical/src/field/features/Upload/drawer/index.tsx
rename to packages/richtext-lexical/src/field/features/Upload1/drawer/index.tsx
index 95a94b328..868617d5e 100644
--- a/packages/richtext-lexical/src/field/features/Upload/drawer/index.tsx
+++ b/packages/richtext-lexical/src/field/features/Upload1/drawer/index.tsx
@@ -4,7 +4,7 @@ import { useListDrawer } from '@payloadcms/ui'
 import { $getNodeByKey, COMMAND_PRIORITY_EDITOR, type LexicalEditor } from 'lexical'
 import React, { useCallback, useEffect, useState } from 'react'
 
-import { EnabledRelationshipsCondition } from '../../Relationship/utils/EnabledRelationshipsCondition'
+import { EnabledRelationshipsCondition } from '../../Relationship1/utils/EnabledRelationshipsCondition'
 import { $createUploadNode } from '../nodes/UploadNode'
 import { INSERT_UPLOAD_COMMAND } from '../plugin'
 import { INSERT_UPLOAD_WITH_DRAWER_COMMAND } from './commands'
diff --git a/packages/richtext-lexical/src/field/features/Upload/index.ts b/packages/richtext-lexical/src/field/features/Upload1/index.ts
similarity index 98%
rename from packages/richtext-lexical/src/field/features/Upload/index.ts
rename to packages/richtext-lexical/src/field/features/Upload1/index.ts
index 182fca298..50d57704d 100644
--- a/packages/richtext-lexical/src/field/features/Upload/index.ts
+++ b/packages/richtext-lexical/src/field/features/Upload1/index.ts
@@ -2,7 +2,7 @@ import type { Field } from 'payload/types'
 
 import payload from 'payload'
 
-import type { HTMLConverter } from '../converters/html/converter/types'
+import type { HTMLConverter } from '../converters5/html/converter/types'
 import type { FeatureProvider } from '../types'
 import type { SerializedUploadNode } from './nodes/UploadNode'
 
@@ -104,7 +104,7 @@ export const UploadFeature = (props?: UploadFeatureProps): FeatureProvider => {
             position: 'normal',
           },
         ],
-        props: props,
+        props,
         slashMenu: {
           options: [
             {
diff --git a/packages/richtext-lexical/src/field/features/Upload/nodes/UploadNode.tsx b/packages/richtext-lexical/src/field/features/Upload1/nodes/UploadNode.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Upload/nodes/UploadNode.tsx
rename to packages/richtext-lexical/src/field/features/Upload1/nodes/UploadNode.tsx
diff --git a/packages/richtext-lexical/src/field/features/Upload/plugin/index.tsx b/packages/richtext-lexical/src/field/features/Upload1/plugin/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Upload/plugin/index.tsx
rename to packages/richtext-lexical/src/field/features/Upload1/plugin/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/Upload/populationPromise.ts b/packages/richtext-lexical/src/field/features/Upload1/populationPromise.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Upload/populationPromise.ts
rename to packages/richtext-lexical/src/field/features/Upload1/populationPromise.ts
diff --git a/packages/richtext-lexical/src/field/features/Upload/validate.ts b/packages/richtext-lexical/src/field/features/Upload1/validate.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Upload/validate.ts
rename to packages/richtext-lexical/src/field/features/Upload1/validate.ts
diff --git a/packages/richtext-lexical/src/field/features/align/feature.client.tsx b/packages/richtext-lexical/src/field/features/align1/feature.client.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/align/feature.client.tsx
rename to packages/richtext-lexical/src/field/features/align1/feature.client.tsx
diff --git a/packages/richtext-lexical/src/field/features/align/feature.server.ts b/packages/richtext-lexical/src/field/features/align1/feature.server.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/align/feature.server.ts
rename to packages/richtext-lexical/src/field/features/align1/feature.server.ts
diff --git a/packages/richtext-lexical/src/field/features/align/floatingSelectToolbarAlignDropdownSection.ts b/packages/richtext-lexical/src/field/features/align1/floatingSelectToolbarAlignDropdownSection.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/align/floatingSelectToolbarAlignDropdownSection.ts
rename to packages/richtext-lexical/src/field/features/align1/floatingSelectToolbarAlignDropdownSection.ts
diff --git a/packages/richtext-lexical/src/field/features/blockquote/feature.client.tsx b/packages/richtext-lexical/src/field/features/blockquote2/feature.client.tsx
similarity index 95%
rename from packages/richtext-lexical/src/field/features/blockquote/feature.client.tsx
rename to packages/richtext-lexical/src/field/features/blockquote2/feature.client.tsx
index 5de1b2016..e700a97bf 100644
--- a/packages/richtext-lexical/src/field/features/blockquote/feature.client.tsx
+++ b/packages/richtext-lexical/src/field/features/blockquote2/feature.client.tsx
@@ -8,7 +8,7 @@ import type { FeatureProviderProviderClient } from '../types'
 
 import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types'
 import { BlockquoteIcon } from '../../lexical/ui/icons/Blockquote'
-import { TextDropdownSectionWithEntries } from '../common/floatingSelectToolbarTextDropdownSection'
+import { TextDropdownSectionWithEntries } from '../common4/floatingSelectToolbarTextDropdownSection'
 import { createClientComponent } from '../createClientComponent'
 import { MarkdownTransformer } from './markdownTransformer'
 
diff --git a/packages/richtext-lexical/src/field/features/blockquote/feature.server.ts b/packages/richtext-lexical/src/field/features/blockquote2/feature.server.ts
similarity index 90%
rename from packages/richtext-lexical/src/field/features/blockquote/feature.server.ts
rename to packages/richtext-lexical/src/field/features/blockquote2/feature.server.ts
index 64699bf8d..1a92b6f32 100644
--- a/packages/richtext-lexical/src/field/features/blockquote/feature.server.ts
+++ b/packages/richtext-lexical/src/field/features/blockquote2/feature.server.ts
@@ -1,9 +1,9 @@
 import { QuoteNode, type SerializedQuoteNode } from '@lexical/rich-text'
 
-import type { HTMLConverter } from '../converters/html/converter/types'
+import type { HTMLConverter } from '../converters5/html/converter/types'
 import type { FeatureProviderProviderServer } from '../types'
 
-import { convertLexicalNodesToHTML } from '../converters/html/converter'
+import { convertLexicalNodesToHTML } from '../converters5/html/converter'
 import { BlockQuoteFeatureClientComponent } from './feature.client'
 import { MarkdownTransformer } from './markdownTransformer'
 
diff --git a/packages/richtext-lexical/src/field/features/blockquote/markdownTransformer.ts b/packages/richtext-lexical/src/field/features/blockquote2/markdownTransformer.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/blockquote/markdownTransformer.ts
rename to packages/richtext-lexical/src/field/features/blockquote2/markdownTransformer.ts
diff --git a/packages/richtext-lexical/src/field/features/Blocks/component/BlockContent.tsx b/packages/richtext-lexical/src/field/features/blocks3/component/BlockContent.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/component/BlockContent.tsx
rename to packages/richtext-lexical/src/field/features/blocks3/component/BlockContent.tsx
diff --git a/packages/richtext-lexical/src/field/features/Blocks/component/FormSavePlugin.tsx b/packages/richtext-lexical/src/field/features/blocks3/component/FormSavePlugin.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/component/FormSavePlugin.tsx
rename to packages/richtext-lexical/src/field/features/blocks3/component/FormSavePlugin.tsx
diff --git a/packages/richtext-lexical/src/field/features/Blocks/component/index.scss b/packages/richtext-lexical/src/field/features/blocks3/component/index.scss
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/component/index.scss
rename to packages/richtext-lexical/src/field/features/blocks3/component/index.scss
diff --git a/packages/richtext-lexical/src/field/features/Blocks/component/index.tsx b/packages/richtext-lexical/src/field/features/blocks3/component/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/component/index.tsx
rename to packages/richtext-lexical/src/field/features/blocks3/component/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/Blocks/drawer/index.tsx b/packages/richtext-lexical/src/field/features/blocks3/drawer/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/drawer/index.tsx
rename to packages/richtext-lexical/src/field/features/blocks3/drawer/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/Blocks/feature.client.tsx b/packages/richtext-lexical/src/field/features/blocks3/feature.client.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/feature.client.tsx
rename to packages/richtext-lexical/src/field/features/blocks3/feature.client.tsx
diff --git a/packages/richtext-lexical/src/field/features/Blocks/feature.server.ts b/packages/richtext-lexical/src/field/features/blocks3/feature.server.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/feature.server.ts
rename to packages/richtext-lexical/src/field/features/blocks3/feature.server.ts
diff --git a/packages/richtext-lexical/src/field/features/Blocks/nodes/BlocksNode.tsx b/packages/richtext-lexical/src/field/features/blocks3/nodes/BlocksNode.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/nodes/BlocksNode.tsx
rename to packages/richtext-lexical/src/field/features/blocks3/nodes/BlocksNode.tsx
diff --git a/packages/richtext-lexical/src/field/features/Blocks/plugin/commands.ts b/packages/richtext-lexical/src/field/features/blocks3/plugin/commands.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/plugin/commands.ts
rename to packages/richtext-lexical/src/field/features/blocks3/plugin/commands.ts
diff --git a/packages/richtext-lexical/src/field/features/Blocks/plugin/index.tsx b/packages/richtext-lexical/src/field/features/blocks3/plugin/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/plugin/index.tsx
rename to packages/richtext-lexical/src/field/features/blocks3/plugin/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/Blocks/populationPromise.ts b/packages/richtext-lexical/src/field/features/blocks3/populationPromise.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/populationPromise.ts
rename to packages/richtext-lexical/src/field/features/blocks3/populationPromise.ts
diff --git a/packages/richtext-lexical/src/field/features/Blocks/validate.ts b/packages/richtext-lexical/src/field/features/blocks3/validate.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/Blocks/validate.ts
rename to packages/richtext-lexical/src/field/features/blocks3/validate.ts
diff --git a/packages/richtext-lexical/src/field/features/common/floatingSelectToolbarFeaturesButtonsSection/index.ts b/packages/richtext-lexical/src/field/features/common4/floatingSelectToolbarFeaturesButtonsSection/index.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/common/floatingSelectToolbarFeaturesButtonsSection/index.ts
rename to packages/richtext-lexical/src/field/features/common4/floatingSelectToolbarFeaturesButtonsSection/index.ts
diff --git a/packages/richtext-lexical/src/field/features/common/floatingSelectToolbarTextDropdownSection/index.ts b/packages/richtext-lexical/src/field/features/common4/floatingSelectToolbarTextDropdownSection/index.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/common/floatingSelectToolbarTextDropdownSection/index.ts
rename to packages/richtext-lexical/src/field/features/common4/floatingSelectToolbarTextDropdownSection/index.ts
diff --git a/packages/richtext-lexical/src/field/features/converters/html/converter/converters/linebreak.ts b/packages/richtext-lexical/src/field/features/converters5/html/converter/converters/linebreak.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/converters/html/converter/converters/linebreak.ts
rename to packages/richtext-lexical/src/field/features/converters5/html/converter/converters/linebreak.ts
diff --git a/packages/richtext-lexical/src/field/features/converters/html/converter/converters/paragraph.ts b/packages/richtext-lexical/src/field/features/converters5/html/converter/converters/paragraph.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/converters/html/converter/converters/paragraph.ts
rename to packages/richtext-lexical/src/field/features/converters5/html/converter/converters/paragraph.ts
diff --git a/packages/richtext-lexical/src/field/features/converters/html/converter/converters/text.ts b/packages/richtext-lexical/src/field/features/converters5/html/converter/converters/text.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/converters/html/converter/converters/text.ts
rename to packages/richtext-lexical/src/field/features/converters5/html/converter/converters/text.ts
diff --git a/packages/richtext-lexical/src/field/features/converters/html/converter/defaultConverters.ts b/packages/richtext-lexical/src/field/features/converters5/html/converter/defaultConverters.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/converters/html/converter/defaultConverters.ts
rename to packages/richtext-lexical/src/field/features/converters5/html/converter/defaultConverters.ts
diff --git a/packages/richtext-lexical/src/field/features/converters/html/converter/index.ts b/packages/richtext-lexical/src/field/features/converters5/html/converter/index.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/converters/html/converter/index.ts
rename to packages/richtext-lexical/src/field/features/converters5/html/converter/index.ts
diff --git a/packages/richtext-lexical/src/field/features/converters/html/converter/types.ts b/packages/richtext-lexical/src/field/features/converters5/html/converter/types.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/converters/html/converter/types.ts
rename to packages/richtext-lexical/src/field/features/converters5/html/converter/types.ts
diff --git a/packages/richtext-lexical/src/field/features/converters/html/field/index.ts b/packages/richtext-lexical/src/field/features/converters5/html/field/index.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/converters/html/field/index.ts
rename to packages/richtext-lexical/src/field/features/converters5/html/field/index.ts
diff --git a/packages/richtext-lexical/src/field/features/converters/html/index.ts b/packages/richtext-lexical/src/field/features/converters5/html/index.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/converters/html/index.ts
rename to packages/richtext-lexical/src/field/features/converters5/html/index.ts
diff --git a/packages/richtext-lexical/src/field/features/debug/TestRecorder/index.ts b/packages/richtext-lexical/src/field/features/debug/TestRecorder6/index.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/debug/TestRecorder/index.ts
rename to packages/richtext-lexical/src/field/features/debug/TestRecorder6/index.ts
diff --git a/packages/richtext-lexical/src/field/features/debug/TestRecorder/plugin/index.scss b/packages/richtext-lexical/src/field/features/debug/TestRecorder6/plugin/index.scss
similarity index 100%
rename from packages/richtext-lexical/src/field/features/debug/TestRecorder/plugin/index.scss
rename to packages/richtext-lexical/src/field/features/debug/TestRecorder6/plugin/index.scss
diff --git a/packages/richtext-lexical/src/field/features/debug/TestRecorder/plugin/index.tsx b/packages/richtext-lexical/src/field/features/debug/TestRecorder6/plugin/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/debug/TestRecorder/plugin/index.tsx
rename to packages/richtext-lexical/src/field/features/debug/TestRecorder6/plugin/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/debug/TreeView/index.scss b/packages/richtext-lexical/src/field/features/debug/TreeView7/index.scss
similarity index 100%
rename from packages/richtext-lexical/src/field/features/debug/TreeView/index.scss
rename to packages/richtext-lexical/src/field/features/debug/TreeView7/index.scss
diff --git a/packages/richtext-lexical/src/field/features/debug/TreeView/index.ts b/packages/richtext-lexical/src/field/features/debug/TreeView7/index.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/debug/TreeView/index.ts
rename to packages/richtext-lexical/src/field/features/debug/TreeView7/index.ts
diff --git a/packages/richtext-lexical/src/field/features/debug/TreeView/plugin.tsx b/packages/richtext-lexical/src/field/features/debug/TreeView7/plugin.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/debug/TreeView/plugin.tsx
rename to packages/richtext-lexical/src/field/features/debug/TreeView7/plugin.tsx
diff --git a/packages/richtext-lexical/src/field/features/format/Bold/index.ts b/packages/richtext-lexical/src/field/features/format/Bold8/index.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/format/Bold/index.ts
rename to packages/richtext-lexical/src/field/features/format/Bold8/index.ts
diff --git a/packages/richtext-lexical/src/field/features/format/Bold/markdownTransformers.ts b/packages/richtext-lexical/src/field/features/format/Bold8/markdownTransformers.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/format/Bold/markdownTransformers.ts
rename to packages/richtext-lexical/src/field/features/format/Bold8/markdownTransformers.ts
diff --git a/packages/richtext-lexical/src/field/features/format/InlineCode/index.ts b/packages/richtext-lexical/src/field/features/format/InlineCode1/index.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/format/InlineCode/index.ts
rename to packages/richtext-lexical/src/field/features/format/InlineCode1/index.ts
diff --git a/packages/richtext-lexical/src/field/features/format/InlineCode/markdownTransformers.ts b/packages/richtext-lexical/src/field/features/format/InlineCode1/markdownTransformers.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/format/InlineCode/markdownTransformers.ts
rename to packages/richtext-lexical/src/field/features/format/InlineCode1/markdownTransformers.ts
diff --git a/packages/richtext-lexical/src/field/features/format/Italic/index.ts b/packages/richtext-lexical/src/field/features/format/Italic1/index.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/format/Italic/index.ts
rename to packages/richtext-lexical/src/field/features/format/Italic1/index.ts
diff --git a/packages/richtext-lexical/src/field/features/format/Italic/markdownTransformers.ts b/packages/richtext-lexical/src/field/features/format/Italic1/markdownTransformers.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/format/Italic/markdownTransformers.ts
rename to packages/richtext-lexical/src/field/features/format/Italic1/markdownTransformers.ts
diff --git a/packages/richtext-lexical/src/field/features/link/drawer/baseFields.ts b/packages/richtext-lexical/src/field/features/link1/drawer/baseFields.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/drawer/baseFields.ts
rename to packages/richtext-lexical/src/field/features/link1/drawer/baseFields.ts
diff --git a/packages/richtext-lexical/src/field/features/link/drawer/index.scss b/packages/richtext-lexical/src/field/features/link1/drawer/index.scss
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/drawer/index.scss
rename to packages/richtext-lexical/src/field/features/link1/drawer/index.scss
diff --git a/packages/richtext-lexical/src/field/features/link/drawer/index.tsx b/packages/richtext-lexical/src/field/features/link1/drawer/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/drawer/index.tsx
rename to packages/richtext-lexical/src/field/features/link1/drawer/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/link/drawer/types.ts b/packages/richtext-lexical/src/field/features/link1/drawer/types.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/drawer/types.ts
rename to packages/richtext-lexical/src/field/features/link1/drawer/types.ts
diff --git a/packages/richtext-lexical/src/field/features/link/feature.client.tsx b/packages/richtext-lexical/src/field/features/link1/feature.client.tsx
similarity index 96%
rename from packages/richtext-lexical/src/field/features/link/feature.client.tsx
rename to packages/richtext-lexical/src/field/features/link1/feature.client.tsx
index 220c6d062..d01743652 100644
--- a/packages/richtext-lexical/src/field/features/link/feature.client.tsx
+++ b/packages/richtext-lexical/src/field/features/link1/feature.client.tsx
@@ -9,7 +9,7 @@ import type { LinkFields } from './nodes/types'
 
 import { LinkIcon } from '../../lexical/ui/icons/Link'
 import { getSelectedNode } from '../../lexical/utils/getSelectedNode'
-import { FeaturesSectionWithEntries } from '../common/floatingSelectToolbarFeaturesButtonsSection'
+import { FeaturesSectionWithEntries } from '../common4/floatingSelectToolbarFeaturesButtonsSection'
 import { createClientComponent } from '../createClientComponent'
 import { AutoLinkNode } from './nodes/AutoLinkNode'
 import { $isLinkNode, LinkNode, TOGGLE_LINK_COMMAND } from './nodes/LinkNode'
diff --git a/packages/richtext-lexical/src/field/features/link/feature.server.ts b/packages/richtext-lexical/src/field/features/link1/feature.server.ts
similarity index 97%
rename from packages/richtext-lexical/src/field/features/link/feature.server.ts
rename to packages/richtext-lexical/src/field/features/link1/feature.server.ts
index fddfc7c09..03938f49f 100644
--- a/packages/richtext-lexical/src/field/features/link/feature.server.ts
+++ b/packages/richtext-lexical/src/field/features/link1/feature.server.ts
@@ -6,12 +6,12 @@ import type React from 'react'
 import { initI18n } from '@payloadcms/translations'
 import { translations } from '@payloadcms/translations/client'
 
-import type { HTMLConverter } from '../converters/html/converter/types'
+import type { HTMLConverter } from '../converters5/html/converter/types'
 import type { FeatureProviderProviderServer } from '../types'
 import type { ClientProps } from './feature.client'
 import type { SerializedAutoLinkNode, SerializedLinkNode } from './nodes/types'
 
-import { convertLexicalNodesToHTML } from '../converters/html/converter'
+import { convertLexicalNodesToHTML } from '../converters5/html/converter'
 import { LinkFeatureClientComponent } from './feature.client'
 import { AutoLinkNode } from './nodes/AutoLinkNode'
 import { LinkNode } from './nodes/LinkNode'
diff --git a/packages/richtext-lexical/src/field/features/link/nodes/AutoLinkNode.ts b/packages/richtext-lexical/src/field/features/link1/nodes/AutoLinkNode.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/nodes/AutoLinkNode.ts
rename to packages/richtext-lexical/src/field/features/link1/nodes/AutoLinkNode.ts
diff --git a/packages/richtext-lexical/src/field/features/link/nodes/LinkNode.ts b/packages/richtext-lexical/src/field/features/link1/nodes/LinkNode.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/nodes/LinkNode.ts
rename to packages/richtext-lexical/src/field/features/link1/nodes/LinkNode.ts
diff --git a/packages/richtext-lexical/src/field/features/link/nodes/types.ts b/packages/richtext-lexical/src/field/features/link1/nodes/types.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/nodes/types.ts
rename to packages/richtext-lexical/src/field/features/link1/nodes/types.ts
diff --git a/packages/richtext-lexical/src/field/features/link/plugins/autoLink/index.tsx b/packages/richtext-lexical/src/field/features/link1/plugins/autoLink/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/plugins/autoLink/index.tsx
rename to packages/richtext-lexical/src/field/features/link1/plugins/autoLink/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/link/plugins/clickableLink/index.tsx b/packages/richtext-lexical/src/field/features/link1/plugins/clickableLink/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/plugins/clickableLink/index.tsx
rename to packages/richtext-lexical/src/field/features/link1/plugins/clickableLink/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/commands.ts b/packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/LinkEditor/commands.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/commands.ts
rename to packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/LinkEditor/commands.ts
diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx b/packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/LinkEditor/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx
rename to packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/LinkEditor/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/index.scss b/packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/index.scss
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/index.scss
rename to packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/index.scss
diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/index.tsx b/packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/index.tsx
rename to packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/types.ts b/packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/types.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/types.ts
rename to packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/types.ts
diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/utilities.ts b/packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/utilities.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/utilities.ts
rename to packages/richtext-lexical/src/field/features/link1/plugins/floatingLinkEditor/utilities.ts
diff --git a/packages/richtext-lexical/src/field/features/link/plugins/link/index.tsx b/packages/richtext-lexical/src/field/features/link1/plugins/link/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/plugins/link/index.tsx
rename to packages/richtext-lexical/src/field/features/link1/plugins/link/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/link/populationPromise.ts b/packages/richtext-lexical/src/field/features/link1/populationPromise.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/link/populationPromise.ts
rename to packages/richtext-lexical/src/field/features/link1/populationPromise.ts
diff --git a/packages/richtext-lexical/src/field/features/lists/CheckList/index.ts b/packages/richtext-lexical/src/field/features/lists1/CheckList1/index.ts
similarity index 96%
rename from packages/richtext-lexical/src/field/features/lists/CheckList/index.ts
rename to packages/richtext-lexical/src/field/features/lists1/CheckList1/index.ts
index 96e5ead1f..a34477a29 100644
--- a/packages/richtext-lexical/src/field/features/lists/CheckList/index.ts
+++ b/packages/richtext-lexical/src/field/features/lists1/CheckList1/index.ts
@@ -3,7 +3,7 @@ import { INSERT_CHECK_LIST_COMMAND, ListItemNode, ListNode } from '@lexical/list
 import type { FeatureProvider } from '../../types'
 
 import { SlashMenuOption } from '../../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types'
-import { TextDropdownSectionWithEntries } from '../../common/floatingSelectToolbarTextDropdownSection'
+import { TextDropdownSectionWithEntries } from '../../common4/floatingSelectToolbarTextDropdownSection'
 import { ListHTMLConverter, ListItemHTMLConverter } from '../htmlConverter'
 import { CHECK_LIST } from './markdownTransformers'
 
diff --git a/packages/richtext-lexical/src/field/features/lists/CheckList/markdownTransformers.ts b/packages/richtext-lexical/src/field/features/lists1/CheckList1/markdownTransformers.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/lists/CheckList/markdownTransformers.ts
rename to packages/richtext-lexical/src/field/features/lists1/CheckList1/markdownTransformers.ts
diff --git a/packages/richtext-lexical/src/field/features/lists/CheckList/plugin/index.tsx b/packages/richtext-lexical/src/field/features/lists1/CheckList1/plugin/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/lists/CheckList/plugin/index.tsx
rename to packages/richtext-lexical/src/field/features/lists1/CheckList1/plugin/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/lists/OrderedList/index.ts b/packages/richtext-lexical/src/field/features/lists1/OrderedList1/index.ts
similarity index 96%
rename from packages/richtext-lexical/src/field/features/lists/OrderedList/index.ts
rename to packages/richtext-lexical/src/field/features/lists1/OrderedList1/index.ts
index 845fd99bc..1eff90caf 100644
--- a/packages/richtext-lexical/src/field/features/lists/OrderedList/index.ts
+++ b/packages/richtext-lexical/src/field/features/lists1/OrderedList1/index.ts
@@ -3,7 +3,7 @@ import { INSERT_ORDERED_LIST_COMMAND, ListItemNode, ListNode } from '@lexical/li
 import type { FeatureProvider } from '../../types'
 
 import { SlashMenuOption } from '../../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types'
-import { TextDropdownSectionWithEntries } from '../../common/floatingSelectToolbarTextDropdownSection'
+import { TextDropdownSectionWithEntries } from '../../common4/floatingSelectToolbarTextDropdownSection'
 import { ListHTMLConverter, ListItemHTMLConverter } from '../htmlConverter'
 import { ORDERED_LIST } from './markdownTransformer'
 
diff --git a/packages/richtext-lexical/src/field/features/lists/OrderedList/markdownTransformer.ts b/packages/richtext-lexical/src/field/features/lists1/OrderedList1/markdownTransformer.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/lists/OrderedList/markdownTransformer.ts
rename to packages/richtext-lexical/src/field/features/lists1/OrderedList1/markdownTransformer.ts
diff --git a/packages/richtext-lexical/src/field/features/lists/UnorderedList/index.ts b/packages/richtext-lexical/src/field/features/lists1/UnorderedList1/index.ts
similarity index 96%
rename from packages/richtext-lexical/src/field/features/lists/UnorderedList/index.ts
rename to packages/richtext-lexical/src/field/features/lists1/UnorderedList1/index.ts
index 85c969102..819e64e47 100644
--- a/packages/richtext-lexical/src/field/features/lists/UnorderedList/index.ts
+++ b/packages/richtext-lexical/src/field/features/lists1/UnorderedList1/index.ts
@@ -3,7 +3,7 @@ import { INSERT_UNORDERED_LIST_COMMAND, ListItemNode, ListNode } from '@lexical/
 import type { FeatureProvider } from '../../types'
 
 import { SlashMenuOption } from '../../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types'
-import { TextDropdownSectionWithEntries } from '../../common/floatingSelectToolbarTextDropdownSection'
+import { TextDropdownSectionWithEntries } from '../../common4/floatingSelectToolbarTextDropdownSection'
 import { ListHTMLConverter, ListItemHTMLConverter } from '../htmlConverter'
 import { UNORDERED_LIST } from './markdownTransformer'
 
diff --git a/packages/richtext-lexical/src/field/features/lists/UnorderedList/markdownTransformer.ts b/packages/richtext-lexical/src/field/features/lists1/UnorderedList1/markdownTransformer.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/lists/UnorderedList/markdownTransformer.ts
rename to packages/richtext-lexical/src/field/features/lists1/UnorderedList1/markdownTransformer.ts
diff --git a/packages/richtext-lexical/src/field/features/lists/common/markdown.ts b/packages/richtext-lexical/src/field/features/lists1/common/markdown.ts
similarity index 100%
rename from packages/richtext-lexical/src/field/features/lists/common/markdown.ts
rename to packages/richtext-lexical/src/field/features/lists1/common/markdown.ts
diff --git a/packages/richtext-lexical/src/field/features/lists/htmlConverter.ts b/packages/richtext-lexical/src/field/features/lists1/htmlConverter.ts
similarity index 90%
rename from packages/richtext-lexical/src/field/features/lists/htmlConverter.ts
rename to packages/richtext-lexical/src/field/features/lists1/htmlConverter.ts
index 3482b0412..276448e1f 100644
--- a/packages/richtext-lexical/src/field/features/lists/htmlConverter.ts
+++ b/packages/richtext-lexical/src/field/features/lists1/htmlConverter.ts
@@ -2,9 +2,9 @@ import type { SerializedListItemNode, SerializedListNode } from '@lexical/list'
 
 import { ListItemNode, ListNode } from '@lexical/list'
 
-import type { HTMLConverter } from '../converters/html/converter/types'
+import type { HTMLConverter } from '../converters5/html/converter/types'
 
-import { convertLexicalNodesToHTML } from '../converters/html/converter'
+import { convertLexicalNodesToHTML } from '../converters5/html/converter'
 
 export const ListHTMLConverter: HTMLConverter<SerializedListNode> = {
   converter: async ({ converters, node, parent }) => {
diff --git a/packages/richtext-lexical/src/field/features/lists/plugin/index.tsx b/packages/richtext-lexical/src/field/features/lists1/plugin/index.tsx
similarity index 100%
rename from packages/richtext-lexical/src/field/features/lists/plugin/index.tsx
rename to packages/richtext-lexical/src/field/features/lists1/plugin/index.tsx
diff --git a/packages/richtext-lexical/src/field/features/migrations/LexicalPluginToLexical/converter/converters/link.ts b/packages/richtext-lexical/src/field/features/migrations/LexicalPluginToLexical/converter/converters/link.ts
index 6e2f91090..70bc9fc4f 100644
--- a/packages/richtext-lexical/src/field/features/migrations/LexicalPluginToLexical/converter/converters/link.ts
+++ b/packages/richtext-lexical/src/field/features/migrations/LexicalPluginToLexical/converter/converters/link.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { SerializedLinkNode } from '../../../../link/nodes/LinkNode'
+import type { SerializedLinkNode } from '../../../../link1/nodes/LinkNode'
 import type { LexicalPluginNodeConverter } from '../types'
 
 import { convertLexicalPluginNodesToLexical } from '..'
diff --git a/packages/richtext-lexical/src/field/features/migrations/SlateToLexical/converter/converters/link.ts b/packages/richtext-lexical/src/field/features/migrations/SlateToLexical/converter/converters/link.ts
index 285fce3ca..a1cee8e70 100644
--- a/packages/richtext-lexical/src/field/features/migrations/SlateToLexical/converter/converters/link.ts
+++ b/packages/richtext-lexical/src/field/features/migrations/SlateToLexical/converter/converters/link.ts
@@ -1,4 +1,4 @@
-import type { SerializedLinkNode } from '../../../../link/nodes/LinkNode'
+import type { SerializedLinkNode } from '../../../../link1/nodes/LinkNode'
 import type { SlateNodeConverter } from '../types'
 
 import { convertSlateNodesToLexical } from '..'
diff --git a/packages/richtext-lexical/src/field/features/types.ts b/packages/richtext-lexical/src/field/features/types.ts
index 8ec9b1fc2..573eecb14 100644
--- a/packages/richtext-lexical/src/field/features/types.ts
+++ b/packages/richtext-lexical/src/field/features/types.ts
@@ -12,7 +12,7 @@ import type { AdapterProps } from '../../types'
 import type { ClientEditorConfig, ServerEditorConfig } from '../lexical/config/types'
 import type { FloatingToolbarSection } from '../lexical/plugins/FloatingSelectToolbar/types'
 import type { SlashMenuGroup } from '../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types'
-import type { HTMLConverter } from './converters/html/converter/types'
+import type { HTMLConverter } from './converters5/html/converter/types'
 
 export type PopulationPromise<T extends SerializedLexicalNode = SerializedLexicalNode> = ({
   context,
diff --git a/packages/richtext-lexical/src/field/lexical/config/server/default.ts b/packages/richtext-lexical/src/field/lexical/config/server/default.ts
index 357b6030c..774411587 100644
--- a/packages/richtext-lexical/src/field/lexical/config/server/default.ts
+++ b/packages/richtext-lexical/src/field/lexical/config/server/default.ts
@@ -3,24 +3,24 @@ import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor'
 import type { FeatureProviderServer } from '../../../features/types'
 import type { SanitizedServerEditorConfig, ServerEditorConfig } from '../types'
 
-import { HeadingFeature } from '../../../features/Heading'
-import { ParagraphFeature } from '../../../features/Paragraph'
-import { RelationshipFeature } from '../../../features/Relationship'
-import { UploadFeature } from '../../../features/Upload'
-import { AlignFeature } from '../../../features/align/feature.server'
-import { BlockQuoteFeature } from '../../../features/blockquote/feature.server'
-import { BoldTextFeature } from '../../../features/format/Bold'
-import { InlineCodeTextFeature } from '../../../features/format/InlineCode'
-import { ItalicTextFeature } from '../../../features/format/Italic'
+import { HeadingFeature } from '../../../features/Heading1'
+import { ParagraphFeature } from '../../../features/Paragraph1'
+import { RelationshipFeature } from '../../../features/Relationship1'
+import { UploadFeature } from '../../../features/Upload1'
+import { AlignFeature } from '../../../features/align1/feature.server'
+import { BlockQuoteFeature } from '../../../features/blockquote2/feature.server'
+import { BoldTextFeature } from '../../../features/format/Bold8'
+import { InlineCodeTextFeature } from '../../../features/format/InlineCode1'
+import { ItalicTextFeature } from '../../../features/format/Italic1'
 import { StrikethroughTextFeature } from '../../../features/format/strikethrough'
 import { SubscriptTextFeature } from '../../../features/format/subscript'
 import { SuperscriptTextFeature } from '../../../features/format/superscript'
 import { UnderlineTextFeature } from '../../../features/format/underline'
 import { IndentFeature } from '../../../features/indent'
-import { LinkFeature } from '../../../features/link/feature.server'
-import { CheckListFeature } from '../../../features/lists/CheckList'
-import { OrderedListFeature } from '../../../features/lists/OrderedList'
-import { UnorderedListFeature } from '../../../features/lists/UnorderedList'
+import { LinkFeature } from '../../../features/link1/feature.server'
+import { CheckListFeature } from '../../../features/lists1/CheckList1'
+import { OrderedListFeature } from '../../../features/lists1/OrderedList1'
+import { UnorderedListFeature } from '../../../features/lists1/UnorderedList1'
 import { LexicalEditorTheme } from '../../theme/EditorTheme'
 import { sanitizeServerEditorConfig } from './sanitize'
 
diff --git a/packages/richtext-lexical/src/index.ts b/packages/richtext-lexical/src/index.ts
index a72b650db..c844283d8 100644
--- a/packages/richtext-lexical/src/index.ts
+++ b/packages/richtext-lexical/src/index.ts
@@ -232,20 +232,20 @@ export function lexicalEditor(props?: LexicalEditorProps): LexicalRichTextAdapte
   }
 }
 
-export { HeadingFeature } from './field/features/Heading'
-export { ParagraphFeature } from './field/features/Paragraph'
-export { RelationshipFeature } from './field/features/Relationship'
+export { HeadingFeature } from './field/features/Heading1'
+export { ParagraphFeature } from './field/features/Paragraph1'
+export { RelationshipFeature } from './field/features/Relationship1'
 export {
   $createRelationshipNode,
   $isRelationshipNode,
   type RelationshipData,
   RelationshipNode,
   type SerializedRelationshipNode,
-} from './field/features/Relationship/nodes/RelationshipNode'
+} from './field/features/Relationship1/nodes/RelationshipNode'
 
-export { UploadFeature } from './field/features/Upload'
-export type { UploadFeatureProps } from './field/features/Upload'
-export type { RawUploadPayload } from './field/features/Upload/nodes/UploadNode'
+export { UploadFeature } from './field/features/Upload1'
+export type { UploadFeatureProps } from './field/features/Upload1'
+export type { RawUploadPayload } from './field/features/Upload1/nodes/UploadNode'
 
 export {
   $createUploadNode,
@@ -253,39 +253,39 @@ export {
   type SerializedUploadNode,
   type UploadData,
   UploadNode,
-} from './field/features/Upload/nodes/UploadNode'
-export { AlignFeature } from './field/features/align/feature.server'
-export { BlockQuoteFeature } from './field/features/blockquote/feature.server'
-export { BlocksFeature, type BlocksFeatureProps } from './field/features/blocks/feature.server'
+} from './field/features/Upload1/nodes/UploadNode'
+export { AlignFeature } from './field/features/align1/feature.server'
+export { BlockQuoteFeature } from './field/features/blockquote2/feature.server'
+export { BlocksFeature, type BlocksFeatureProps } from './field/features/blocks3/feature.server'
 export {
   $createBlockNode,
   $isBlockNode,
   type BlockFields,
   BlockNode,
   type SerializedBlockNode,
-} from './field/features/blocks/nodes/BlocksNode'
-export { TextDropdownSectionWithEntries } from './field/features/common/floatingSelectToolbarTextDropdownSection'
+} from './field/features/blocks3/nodes/BlocksNode'
+export { TextDropdownSectionWithEntries } from './field/features/common4/floatingSelectToolbarTextDropdownSection'
 export {
   HTMLConverterFeature,
   type HTMLConverterFeatureProps,
-} from './field/features/converters/html'
+} from './field/features/converters5/html'
 export {
   convertLexicalNodesToHTML,
   convertLexicalToHTML,
-} from './field/features/converters/html/converter'
-export { LinebreakHTMLConverter } from './field/features/converters/html/converter/converters/linebreak'
-export { ParagraphHTMLConverter } from './field/features/converters/html/converter/converters/paragraph'
-export { TextHTMLConverter } from './field/features/converters/html/converter/converters/text'
-export { defaultHTMLConverters } from './field/features/converters/html/converter/defaultConverters'
-export type { HTMLConverter } from './field/features/converters/html/converter/types'
-export { consolidateHTMLConverters } from './field/features/converters/html/field'
-export { lexicalHTML } from './field/features/converters/html/field'
-export { TestRecorderFeature } from './field/features/debug/TestRecorder'
-export { TreeViewFeature } from './field/features/debug/TreeView'
-export { BoldTextFeature } from './field/features/format/Bold'
+} from './field/features/converters5/html/converter'
+export { LinebreakHTMLConverter } from './field/features/converters5/html/converter/converters/linebreak'
+export { ParagraphHTMLConverter } from './field/features/converters5/html/converter/converters/paragraph'
+export { TextHTMLConverter } from './field/features/converters5/html/converter/converters/text'
+export { defaultHTMLConverters } from './field/features/converters5/html/converter/defaultConverters'
+export type { HTMLConverter } from './field/features/converters5/html/converter/types'
+export { consolidateHTMLConverters } from './field/features/converters5/html/field'
+export { lexicalHTML } from './field/features/converters5/html/field'
+export { TestRecorderFeature } from './field/features/debug/TestRecorder6'
+export { TreeViewFeature } from './field/features/debug/TreeView7'
+export { BoldTextFeature } from './field/features/format/Bold8'
 
-export { InlineCodeTextFeature } from './field/features/format/InlineCode'
-export { ItalicTextFeature } from './field/features/format/Italic'
+export { InlineCodeTextFeature } from './field/features/format/InlineCode1'
+export { ItalicTextFeature } from './field/features/format/Italic1'
 
 export { SectionWithEntries as FormatSectionWithEntries } from './field/features/format/common/floatingSelectToolbarSection'
 export { StrikethroughTextFeature } from './field/features/format/strikethrough'
@@ -293,26 +293,26 @@ export { SubscriptTextFeature } from './field/features/format/subscript'
 export { SuperscriptTextFeature } from './field/features/format/superscript'
 export { UnderlineTextFeature } from './field/features/format/underline'
 export { IndentFeature } from './field/features/indent'
-export { LinkFeature, type LinkFeatureServerProps } from './field/features/link/feature.server'
+export { LinkFeature, type LinkFeatureServerProps } from './field/features/link1/feature.server'
 export {
   $createAutoLinkNode,
   $isAutoLinkNode,
   AutoLinkNode,
-} from './field/features/link/nodes/AutoLinkNode'
+} from './field/features/link1/nodes/AutoLinkNode'
 export {
   $createLinkNode,
   $isLinkNode,
   LinkNode,
   TOGGLE_LINK_COMMAND,
-} from './field/features/link/nodes/LinkNode'
+} from './field/features/link1/nodes/LinkNode'
 export type {
   LinkFields,
   SerializedAutoLinkNode,
   SerializedLinkNode,
-} from './field/features/link/nodes/types'
-export { CheckListFeature } from './field/features/lists/CheckList'
-export { OrderedListFeature } from './field/features/lists/OrderedList'
-export { UnorderedListFeature } from './field/features/lists/UnorderedList'
+} from './field/features/link1/nodes/types'
+export { CheckListFeature } from './field/features/lists1/CheckList1'
+export { OrderedListFeature } from './field/features/lists1/OrderedList1'
+export { UnorderedListFeature } from './field/features/lists1/UnorderedList1'
 export { LexicalPluginToLexicalFeature } from './field/features/migrations/LexicalPluginToLexical'
 export { SlateToLexicalFeature } from './field/features/migrations/SlateToLexical'
 export { SlateBlockquoteConverter } from './field/features/migrations/SlateToLexical/converter/converters/blockquote'
diff --git a/test/fields/collections/RichText/index.ts b/test/fields/collections/RichText/index.ts
index 9c93e2846..66be857ff 100644
--- a/test/fields/collections/RichText/index.ts
+++ b/test/fields/collections/RichText/index.ts
@@ -8,7 +8,7 @@ import {
   UploadFeature,
   lexicalEditor,
 } from '../../../../packages/richtext-lexical/src'
-import { lexicalHTML } from '../../../../packages/richtext-lexical/src/field/features/converters/html/field'
+import { lexicalHTML } from '../../../../packages/richtext-lexical/src/field/features/converters5/html/field'
 import { slateEditor } from '../../../../packages/richtext-slate/src'
 import { richTextFieldsSlug } from '../../slugs'
 import { RelationshipBlock, SelectFieldBlock, TextBlock, UploadAndRichTextBlock } from './blocks'