microsoft · JiuqingSong · May 2, 2024 · Apr 25, 2024 · May 2, 2024 · May 2, 2024
diff --git a/...content-model-types/lib/enum/BlockType.ts → ...types/lib/contentModel/block/BlockType.ts b/...content-model-types/lib/enum/BlockType.ts → ...types/lib/contentModel/block/BlockType.ts
diff --git a/...odel-types/lib/block/ContentModelBlock.ts → ...b/contentModel/block/ContentModelBlock.ts b/...odel-types/lib/block/ContentModelBlock.ts → ...b/contentModel/block/ContentModelBlock.ts
@@ -1,8 +1,8 @@
 import type { ContentModelDivider } from './ContentModelDivider';
 import type { ContentModelEntity } from '../entity/ContentModelEntity';
-import type { ContentModelFormatContainer } from '../group/ContentModelFormatContainer';
-import type { ContentModelGeneralBlock } from '../group/ContentModelGeneralBlock';
-import type { ContentModelListItem } from '../group/ContentModelListItem';
+import type { ContentModelFormatContainer } from '../blockGroup/ContentModelFormatContainer';
+import type { ContentModelGeneralBlock } from '../blockGroup/ContentModelGeneralBlock';
+import type { ContentModelListItem } from '../blockGroup/ContentModelListItem';
 import type { ContentModelParagraph } from './ContentModelParagraph';
 import type { ContentModelTable } from './ContentModelTable';
 

diff --git a/...-types/lib/block/ContentModelBlockBase.ts → ...ntentModel/block/ContentModelBlockBase.ts b/...-types/lib/block/ContentModelBlockBase.ts → ...ntentModel/block/ContentModelBlockBase.ts
@@ -1,5 +1,5 @@
 import type { ContentModelBlockFormat } from '../format/ContentModelBlockFormat';
-import type { ContentModelBlockType } from '../enum/BlockType';
+import type { ContentModelBlockType } from './BlockType';
 import type { ContentModelWithFormat } from '../format/ContentModelWithFormat';
 
 /**

diff --git a/...el-types/lib/block/ContentModelDivider.ts → ...contentModel/block/ContentModelDivider.ts b/...el-types/lib/block/ContentModelDivider.ts → ...contentModel/block/ContentModelDivider.ts
@@ -1,7 +1,7 @@
 import type { ContentModelBlockBase } from './ContentModelBlockBase';
-import type { ContentModelBlockWithCache } from './ContentModelBlockWithCache';
+import type { ContentModelBlockWithCache } from '../common/ContentModelBlockWithCache';
 import type { ContentModelDividerFormat } from '../format/ContentModelDividerFormat';
-import type { Selectable } from '../selection/Selectable';
+import type { Selectable } from '../common/Selectable';
 
 /**
  * Content Model of horizontal divider

diff --git a/...-types/lib/block/ContentModelParagraph.ts → ...ntentModel/block/ContentModelParagraph.ts b/...-types/lib/block/ContentModelParagraph.ts → ...ntentModel/block/ContentModelParagraph.ts
@@ -1,5 +1,5 @@
 import type { ContentModelBlockBase } from './ContentModelBlockBase';
-import type { ContentModelBlockWithCache } from './ContentModelBlockWithCache';
+import type { ContentModelBlockWithCache } from '../common/ContentModelBlockWithCache';
 import type { ContentModelParagraphDecorator } from '../decorator/ContentModelParagraphDecorator';
 import type { ContentModelSegment } from '../segment/ContentModelSegment';
 import type { ContentModelSegmentFormat } from '../format/ContentModelSegmentFormat';

diff --git a/...odel-types/lib/block/ContentModelTable.ts → ...b/contentModel/block/ContentModelTable.ts b/...odel-types/lib/block/ContentModelTable.ts → ...b/contentModel/block/ContentModelTable.ts
@@ -1,5 +1,5 @@
 import type { ContentModelBlockBase } from './ContentModelBlockBase';
-import type { ContentModelBlockWithCache } from './ContentModelBlockWithCache';
+import type { ContentModelBlockWithCache } from '../common/ContentModelBlockWithCache';
 import type { ContentModelTableFormat } from '../format/ContentModelTableFormat';
 import type { ContentModelTableRow } from './ContentModelTableRow';
 import type { ContentModelWithDataset } from '../format/ContentModelWithDataset';

diff --git a/...l-types/lib/block/ContentModelTableRow.ts → ...ontentModel/block/ContentModelTableRow.ts b/...l-types/lib/block/ContentModelTableRow.ts → ...ontentModel/block/ContentModelTableRow.ts
@@ -1,6 +1,6 @@
 import type { ContentModelBlockFormat } from '../format/ContentModelBlockFormat';
-import type { ContentModelBlockWithCache } from './ContentModelBlockWithCache';
-import type { ContentModelTableCell } from '../group/ContentModelTableCell';
+import type { ContentModelBlockWithCache } from '../common/ContentModelBlockWithCache';
+import type { ContentModelTableCell } from '../blockGroup/ContentModelTableCell';
 import type { ContentModelWithFormat } from '../format/ContentModelWithFormat';
 
 /**

diff --git a/...nt-model-types/lib/enum/BlockGroupType.ts → ...contentModel/blockGroup/BlockGroupType.ts b/...nt-model-types/lib/enum/BlockGroupType.ts → ...contentModel/blockGroup/BlockGroupType.ts
diff --git a/...types/lib/group/ContentModelBlockGroup.ts → ...odel/blockGroup/ContentModelBlockGroup.ts b/...types/lib/group/ContentModelBlockGroup.ts → ...odel/blockGroup/ContentModelBlockGroup.ts
diff --git a/...s/lib/group/ContentModelBlockGroupBase.ts → .../blockGroup/ContentModelBlockGroupBase.ts b/...s/lib/group/ContentModelBlockGroupBase.ts → .../blockGroup/ContentModelBlockGroupBase.ts
@@ -1,5 +1,5 @@
 import type { ContentModelBlock } from '../block/ContentModelBlock';
-import type { ContentModelBlockGroupType } from '../enum/BlockGroupType';
+import type { ContentModelBlockGroupType } from './BlockGroupType';
 
 /**
  * Base type of Content Model Block Group

diff --git a/...l-types/lib/group/ContentModelDocument.ts → ...tModel/blockGroup/ContentModelDocument.ts b/...l-types/lib/group/ContentModelDocument.ts → ...tModel/blockGroup/ContentModelDocument.ts
diff --git a/.../lib/group/ContentModelFormatContainer.ts → ...blockGroup/ContentModelFormatContainer.ts b/.../lib/group/ContentModelFormatContainer.ts → ...blockGroup/ContentModelFormatContainer.ts
@@ -1,6 +1,6 @@
 import type { ContentModelBlockBase } from '../block/ContentModelBlockBase';
 import type { ContentModelBlockGroupBase } from './ContentModelBlockGroupBase';
-import type { ContentModelBlockWithCache } from '../block/ContentModelBlockWithCache';
+import type { ContentModelBlockWithCache } from '../common/ContentModelBlockWithCache';
 import type { ContentModelFormatContainerFormat } from '../format/ContentModelFormatContainerFormat';
 
 /**

diff --git a/...pes/lib/group/ContentModelGeneralBlock.ts → ...el/blockGroup/ContentModelGeneralBlock.ts b/...pes/lib/group/ContentModelGeneralBlock.ts → ...el/blockGroup/ContentModelGeneralBlock.ts
@@ -2,7 +2,7 @@ import type { ContentModelBlockBase } from '../block/ContentModelBlockBase';
 import type { ContentModelBlockFormat } from '../format/ContentModelBlockFormat';
 import type { ContentModelBlockGroupBase } from './ContentModelBlockGroupBase';
 import type { ContentModelSegmentFormat } from '../format/ContentModelSegmentFormat';
-import type { Selectable } from '../selection/Selectable';
+import type { Selectable } from '../common/Selectable';
 
 /**
  * Content Model for general Block element

diff --git a/...l-types/lib/group/ContentModelListItem.ts → ...tModel/blockGroup/ContentModelListItem.ts b/...l-types/lib/group/ContentModelListItem.ts → ...tModel/blockGroup/ContentModelListItem.ts
diff --git a/...-types/lib/group/ContentModelTableCell.ts → ...Model/blockGroup/ContentModelTableCell.ts b/...-types/lib/group/ContentModelTableCell.ts → ...Model/blockGroup/ContentModelTableCell.ts
@@ -1,10 +1,10 @@
 import type { TableCellMetadataFormat } from '../format/metadata/TableCellMetadataFormat';
 import type { ContentModelBlockGroupBase } from './ContentModelBlockGroupBase';
-import type { ContentModelBlockWithCache } from '../block/ContentModelBlockWithCache';
+import type { ContentModelBlockWithCache } from '../common/ContentModelBlockWithCache';
 import type { ContentModelTableCellFormat } from '../format/ContentModelTableCellFormat';
 import type { ContentModelWithDataset } from '../format/ContentModelWithDataset';
 import type { ContentModelWithFormat } from '../format/ContentModelWithFormat';
-import type { Selectable } from '../selection/Selectable';
+import type { Selectable } from '../common/Selectable';
 
 /**
  * Content Model of Table Cell

diff --git a/...s/lib/block/ContentModelBlockWithCache.ts → ...odel/common/ContentModelBlockWithCache.ts b/...s/lib/block/ContentModelBlockWithCache.ts → ...odel/common/ContentModelBlockWithCache.ts
diff --git a/...t-model-types/lib/selection/Selectable.ts → ...pes/lib/contentModel/common/Selectable.ts b/...t-model-types/lib/selection/Selectable.ts → ...pes/lib/contentModel/common/Selectable.ts
diff --git a/...l-types/lib/decorator/ContentModelCode.ts → ...ontentModel/decorator/ContentModelCode.ts b/...l-types/lib/decorator/ContentModelCode.ts → ...ontentModel/decorator/ContentModelCode.ts
diff --git a/...es/lib/decorator/ContentModelDecorator.ts → ...tModel/decorator/ContentModelDecorator.ts b/...es/lib/decorator/ContentModelDecorator.ts → ...tModel/decorator/ContentModelDecorator.ts
diff --git a/...l-types/lib/decorator/ContentModelLink.ts → ...ontentModel/decorator/ContentModelLink.ts b/...l-types/lib/decorator/ContentModelLink.ts → ...ontentModel/decorator/ContentModelLink.ts
diff --git a/...es/lib/decorator/ContentModelListLevel.ts → ...tModel/decorator/ContentModelListLevel.ts b/...es/lib/decorator/ContentModelListLevel.ts → ...tModel/decorator/ContentModelListLevel.ts
diff --git a/...corator/ContentModelParagraphDecorator.ts → ...corator/ContentModelParagraphDecorator.ts b/...corator/ContentModelParagraphDecorator.ts → ...corator/ContentModelParagraphDecorator.ts
diff --git a/...el-types/lib/entity/ContentModelEntity.ts → ...contentModel/entity/ContentModelEntity.ts b/...el-types/lib/entity/ContentModelEntity.ts → ...contentModel/entity/ContentModelEntity.ts
diff --git a/...pes/lib/format/ContentModelBlockFormat.ts → ...ntModel/format/ContentModelBlockFormat.ts b/...pes/lib/format/ContentModelBlockFormat.ts → ...ntModel/format/ContentModelBlockFormat.ts
diff --git a/...ypes/lib/format/ContentModelCodeFormat.ts → ...entModel/format/ContentModelCodeFormat.ts b/...ypes/lib/format/ContentModelCodeFormat.ts → ...entModel/format/ContentModelCodeFormat.ts
diff --git a/...s/lib/format/ContentModelDividerFormat.ts → ...Model/format/ContentModelDividerFormat.ts b/...s/lib/format/ContentModelDividerFormat.ts → ...Model/format/ContentModelDividerFormat.ts
diff --git a/...es/lib/format/ContentModelEntityFormat.ts → ...tModel/format/ContentModelEntityFormat.ts b/...es/lib/format/ContentModelEntityFormat.ts → ...tModel/format/ContentModelEntityFormat.ts
diff --git a/...ypes/lib/format/ContentModelFormatBase.ts → ...entModel/format/ContentModelFormatBase.ts b/...ypes/lib/format/ContentModelFormatBase.ts → ...entModel/format/ContentModelFormatBase.ts
diff --git a/...rmat/ContentModelFormatContainerFormat.ts → ...rmat/ContentModelFormatContainerFormat.ts b/...rmat/ContentModelFormatContainerFormat.ts → ...rmat/ContentModelFormatContainerFormat.ts
diff --git a/...types/lib/format/ContentModelFormatMap.ts → ...tentModel/format/ContentModelFormatMap.ts b/...types/lib/format/ContentModelFormatMap.ts → ...tentModel/format/ContentModelFormatMap.ts
diff --git a/...lib/format/ContentModelHyperLinkFormat.ts → ...del/format/ContentModelHyperLinkFormat.ts b/...lib/format/ContentModelHyperLinkFormat.ts → ...del/format/ContentModelHyperLinkFormat.ts
diff --git a/...pes/lib/format/ContentModelImageFormat.ts → ...ntModel/format/ContentModelImageFormat.ts b/...pes/lib/format/ContentModelImageFormat.ts → ...ntModel/format/ContentModelImageFormat.ts
diff --git a/.../lib/format/ContentModelListItemFormat.ts → ...odel/format/ContentModelListItemFormat.ts b/.../lib/format/ContentModelListItemFormat.ts → ...odel/format/ContentModelListItemFormat.ts
diff --git a/...format/ContentModelListItemLevelFormat.ts → ...format/ContentModelListItemLevelFormat.ts b/...format/ContentModelListItemLevelFormat.ts → ...format/ContentModelListItemLevelFormat.ts
diff --git a/...s/lib/format/ContentModelSegmentFormat.ts → ...Model/format/ContentModelSegmentFormat.ts b/...s/lib/format/ContentModelSegmentFormat.ts → ...Model/format/ContentModelSegmentFormat.ts
diff --git a/...lib/format/ContentModelTableCellFormat.ts → ...del/format/ContentModelTableCellFormat.ts b/...lib/format/ContentModelTableCellFormat.ts → ...del/format/ContentModelTableCellFormat.ts
diff --git a/...pes/lib/format/ContentModelTableFormat.ts → ...ntModel/format/ContentModelTableFormat.ts b/...pes/lib/format/ContentModelTableFormat.ts → ...ntModel/format/ContentModelTableFormat.ts
diff --git a/...pes/lib/format/ContentModelWithDataset.ts → ...ntModel/format/ContentModelWithDataset.ts b/...pes/lib/format/ContentModelWithDataset.ts → ...ntModel/format/ContentModelWithDataset.ts
diff --git a/...ypes/lib/format/ContentModelWithFormat.ts → ...entModel/format/ContentModelWithFormat.ts b/...ypes/lib/format/ContentModelWithFormat.ts → ...entModel/format/ContentModelWithFormat.ts
diff --git a/...-types/lib/format/FormatHandlerTypeMap.ts → ...ntentModel/format/FormatHandlerTypeMap.ts b/...-types/lib/format/FormatHandlerTypeMap.ts → ...ntentModel/format/FormatHandlerTypeMap.ts
diff --git a/...rmat/formatParts/BackgroundColorFormat.ts → ...rmat/formatParts/BackgroundColorFormat.ts b/...rmat/formatParts/BackgroundColorFormat.ts → ...rmat/formatParts/BackgroundColorFormat.ts
diff --git a/...ypes/lib/format/formatParts/BoldFormat.ts → ...entModel/format/formatParts/BoldFormat.ts b/...ypes/lib/format/formatParts/BoldFormat.ts → ...entModel/format/formatParts/BoldFormat.ts
diff --git a/...lib/format/formatParts/BorderBoxFormat.ts → ...del/format/formatParts/BorderBoxFormat.ts b/...lib/format/formatParts/BorderBoxFormat.ts → ...del/format/formatParts/BorderBoxFormat.ts
diff --git a/...es/lib/format/formatParts/BorderFormat.ts → ...tModel/format/formatParts/BorderFormat.ts b/...es/lib/format/formatParts/BorderFormat.ts → ...tModel/format/formatParts/BorderFormat.ts
diff --git a/...lib/format/formatParts/BoxShadowFormat.ts → ...del/format/formatParts/BoxShadowFormat.ts b/...lib/format/formatParts/BoxShadowFormat.ts → ...del/format/formatParts/BoxShadowFormat.ts
diff --git a/...lib/format/formatParts/DirectionFormat.ts → ...del/format/formatParts/DirectionFormat.ts b/...lib/format/formatParts/DirectionFormat.ts → ...del/format/formatParts/DirectionFormat.ts
diff --git a/...s/lib/format/formatParts/DisplayFormat.ts → ...Model/format/formatParts/DisplayFormat.ts b/...s/lib/format/formatParts/DisplayFormat.ts → ...Model/format/formatParts/DisplayFormat.ts
diff --git a/...ib/format/formatParts/EntityInfoFormat.ts → ...el/format/formatParts/EntityInfoFormat.ts b/...ib/format/formatParts/EntityInfoFormat.ts → ...el/format/formatParts/EntityInfoFormat.ts
diff --git a/...pes/lib/format/formatParts/FloatFormat.ts → ...ntModel/format/formatParts/FloatFormat.ts b/...pes/lib/format/formatParts/FloatFormat.ts → ...ntModel/format/formatParts/FloatFormat.ts
diff --git a/...ib/format/formatParts/FontFamilyFormat.ts → ...el/format/formatParts/FontFamilyFormat.ts b/...ib/format/formatParts/FontFamilyFormat.ts → ...el/format/formatParts/FontFamilyFormat.ts
diff --git a/.../lib/format/formatParts/FontSizeFormat.ts → ...odel/format/formatParts/FontSizeFormat.ts b/.../lib/format/formatParts/FontSizeFormat.ts → ...odel/format/formatParts/FontSizeFormat.ts
diff --git a/...lib/format/formatParts/HtmlAlignFormat.ts → ...del/format/formatParts/HtmlAlignFormat.ts b/...lib/format/formatParts/HtmlAlignFormat.ts → ...del/format/formatParts/HtmlAlignFormat.ts
diff --git a/...-types/lib/format/formatParts/IdFormat.ts → ...ntentModel/format/formatParts/IdFormat.ts b/...-types/lib/format/formatParts/IdFormat.ts → ...ntentModel/format/formatParts/IdFormat.ts
diff --git a/...es/lib/format/formatParts/ItalicFormat.ts → ...tModel/format/formatParts/ItalicFormat.ts b/...es/lib/format/formatParts/ItalicFormat.ts → ...tModel/format/formatParts/ItalicFormat.ts
diff --git a/...format/formatParts/LetterSpacingFormat.ts → ...format/formatParts/LetterSpacingFormat.ts b/...format/formatParts/LetterSpacingFormat.ts → ...format/formatParts/LetterSpacingFormat.ts
diff --git a/...ib/format/formatParts/LineHeightFormat.ts → ...el/format/formatParts/LineHeightFormat.ts b/...ib/format/formatParts/LineHeightFormat.ts → ...el/format/formatParts/LineHeightFormat.ts
diff --git a/...ypes/lib/format/formatParts/LinkFormat.ts → ...entModel/format/formatParts/LinkFormat.ts b/...ypes/lib/format/formatParts/LinkFormat.ts → ...entModel/format/formatParts/LinkFormat.ts
diff --git a/...lib/format/formatParts/ListStyleFormat.ts → ...del/format/formatParts/ListStyleFormat.ts b/...lib/format/formatParts/ListStyleFormat.ts → ...del/format/formatParts/ListStyleFormat.ts
diff --git a/...ib/format/formatParts/ListThreadFormat.ts → ...el/format/formatParts/ListThreadFormat.ts b/...ib/format/formatParts/ListThreadFormat.ts → ...el/format/formatParts/ListThreadFormat.ts
diff --git a/...es/lib/format/formatParts/MarginFormat.ts → ...tModel/format/formatParts/MarginFormat.ts b/...es/lib/format/formatParts/MarginFormat.ts → ...tModel/format/formatParts/MarginFormat.ts
diff --git a/...s/lib/format/formatParts/PaddingFormat.ts → ...Model/format/formatParts/PaddingFormat.ts b/...s/lib/format/formatParts/PaddingFormat.ts → ...Model/format/formatParts/PaddingFormat.ts
diff --git a/...ypes/lib/format/formatParts/SizeFormat.ts → ...entModel/format/formatParts/SizeFormat.ts b/...ypes/lib/format/formatParts/SizeFormat.ts → ...entModel/format/formatParts/SizeFormat.ts
diff --git a/...s/lib/format/formatParts/SpacingFormat.ts → ...Model/format/formatParts/SpacingFormat.ts b/...s/lib/format/formatParts/SpacingFormat.ts → ...Model/format/formatParts/SpacingFormat.ts
diff --git a/...es/lib/format/formatParts/StrikeFormat.ts → ...tModel/format/formatParts/StrikeFormat.ts b/...es/lib/format/formatParts/StrikeFormat.ts → ...tModel/format/formatParts/StrikeFormat.ts
diff --git a/...mat/formatParts/SuperOrSubScriptFormat.ts → ...mat/formatParts/SuperOrSubScriptFormat.ts b/...mat/formatParts/SuperOrSubScriptFormat.ts → ...mat/formatParts/SuperOrSubScriptFormat.ts
diff --git a/...b/format/formatParts/TableLayoutFormat.ts → ...l/format/formatParts/TableLayoutFormat.ts b/...b/format/formatParts/TableLayoutFormat.ts → ...l/format/formatParts/TableLayoutFormat.ts
diff --git a/...lib/format/formatParts/TextAlignFormat.ts → ...del/format/formatParts/TextAlignFormat.ts b/...lib/format/formatParts/TextAlignFormat.ts → ...del/format/formatParts/TextAlignFormat.ts
diff --git a/...lib/format/formatParts/TextColorFormat.ts → ...del/format/formatParts/TextColorFormat.ts b/...lib/format/formatParts/TextColorFormat.ts → ...del/format/formatParts/TextColorFormat.ts
diff --git a/...ib/format/formatParts/TextIndentFormat.ts → ...el/format/formatParts/TextIndentFormat.ts b/...ib/format/formatParts/TextIndentFormat.ts → ...el/format/formatParts/TextIndentFormat.ts
diff --git a/...lib/format/formatParts/UnderlineFormat.ts → ...del/format/formatParts/UnderlineFormat.ts b/...lib/format/formatParts/UnderlineFormat.ts → ...del/format/formatParts/UnderlineFormat.ts
diff --git a/...format/formatParts/VerticalAlignFormat.ts → ...format/formatParts/VerticalAlignFormat.ts b/...format/formatParts/VerticalAlignFormat.ts → ...format/formatParts/VerticalAlignFormat.ts
diff --git a/...ib/format/formatParts/WhiteSpaceFormat.ts → ...el/format/formatParts/WhiteSpaceFormat.ts b/...ib/format/formatParts/WhiteSpaceFormat.ts → ...el/format/formatParts/WhiteSpaceFormat.ts
diff --git a/...lib/format/formatParts/WordBreakFormat.ts → ...del/format/formatParts/WordBreakFormat.ts b/...lib/format/formatParts/WordBreakFormat.ts → ...del/format/formatParts/WordBreakFormat.ts
diff --git a/...ypes/lib/format/metadata/DatasetFormat.ts → ...entModel/format/metadata/DatasetFormat.ts b/...ypes/lib/format/metadata/DatasetFormat.ts → ...entModel/format/metadata/DatasetFormat.ts
diff --git a/...ib/format/metadata/ImageMetadataFormat.ts → ...el/format/metadata/ImageMetadataFormat.ts b/...ib/format/metadata/ImageMetadataFormat.ts → ...el/format/metadata/ImageMetadataFormat.ts
diff --git a/...lib/format/metadata/ListMetadataFormat.ts → ...del/format/metadata/ListMetadataFormat.ts b/...lib/format/metadata/ListMetadataFormat.ts → ...del/format/metadata/ListMetadataFormat.ts
diff --git a/...ormat/metadata/TableCellMetadataFormat.ts → ...ormat/metadata/TableCellMetadataFormat.ts b/...ormat/metadata/TableCellMetadataFormat.ts → ...ormat/metadata/TableCellMetadataFormat.ts
diff --git a/...ib/format/metadata/TableMetadataFormat.ts → ...el/format/metadata/TableMetadataFormat.ts b/...ib/format/metadata/TableMetadataFormat.ts → ...el/format/metadata/TableMetadataFormat.ts
diff --git a/...model-types/lib/segment/ContentModelBr.ts → ...ib/contentModel/segment/ContentModelBr.ts b/...model-types/lib/segment/ContentModelBr.ts → ...ib/contentModel/segment/ContentModelBr.ts
diff --git a/...lib/segment/ContentModelGeneralSegment.ts → ...del/segment/ContentModelGeneralSegment.ts b/...lib/segment/ContentModelGeneralSegment.ts → ...del/segment/ContentModelGeneralSegment.ts
@@ -1,5 +1,5 @@
 import type { ContentModelBlockFormat } from '../format/ContentModelBlockFormat';
-import type { ContentModelGeneralBlock } from '../group/ContentModelGeneralBlock';
+import type { ContentModelGeneralBlock } from '../blockGroup/ContentModelGeneralBlock';
 import type { ContentModelSegmentBase } from './ContentModelSegmentBase';
 import type { ContentModelSegmentFormat } from '../format/ContentModelSegmentFormat';
 

diff --git a/...el-types/lib/segment/ContentModelImage.ts → ...contentModel/segment/ContentModelImage.ts b/...el-types/lib/segment/ContentModelImage.ts → ...contentModel/segment/ContentModelImage.ts
diff --git a/...-types/lib/segment/ContentModelSegment.ts → ...ntentModel/segment/ContentModelSegment.ts b/...-types/lib/segment/ContentModelSegment.ts → ...ntentModel/segment/ContentModelSegment.ts
diff --git a/...es/lib/segment/ContentModelSegmentBase.ts → ...tModel/segment/ContentModelSegmentBase.ts b/...es/lib/segment/ContentModelSegmentBase.ts → ...tModel/segment/ContentModelSegmentBase.ts
@@ -1,9 +1,9 @@
 import type { ContentModelCode } from '../decorator/ContentModelCode';
 import type { ContentModelLink } from '../decorator/ContentModelLink';
 import type { ContentModelSegmentFormat } from '../format/ContentModelSegmentFormat';
-import type { ContentModelSegmentType } from '../enum/SegmentType';
+import type { ContentModelSegmentType } from './SegmentType';
 import type { ContentModelWithFormat } from '../format/ContentModelWithFormat';
-import type { Selectable } from '../selection/Selectable';
+import type { Selectable } from '../common/Selectable';
 
 /**
  * Base type of Content Model Segment

diff --git a/...ib/segment/ContentModelSelectionMarker.ts → ...el/segment/ContentModelSelectionMarker.ts b/...ib/segment/ContentModelSelectionMarker.ts → ...el/segment/ContentModelSelectionMarker.ts
diff --git a/...del-types/lib/segment/ContentModelText.ts → .../contentModel/segment/ContentModelText.ts b/...del-types/lib/segment/ContentModelText.ts → .../contentModel/segment/ContentModelText.ts
diff --git a/...ntent-model-types/lib/enum/SegmentType.ts → ...s/lib/contentModel/segment/SegmentType.ts b/...ntent-model-types/lib/enum/SegmentType.ts → ...s/lib/contentModel/segment/SegmentType.ts
diff --git a/packages/roosterjs-content-model-types/lib/context/ContentModelHandler.ts b/packages/roosterjs-content-model-types/lib/context/ContentModelHandler.ts
@@ -1,7 +1,7 @@
-import type { ContentModelBlock } from '../block/ContentModelBlock';
-import type { ContentModelBlockGroup } from '../group/ContentModelBlockGroup';
-import type { ContentModelDecorator } from '../decorator/ContentModelDecorator';
-import type { ContentModelSegment } from '../segment/ContentModelSegment';
+import type { ContentModelBlock } from '../contentModel/block/ContentModelBlock';
+import type { ContentModelBlockGroup } from '../contentModel/blockGroup/ContentModelBlockGroup';
+import type { ContentModelDecorator } from '../contentModel/decorator/ContentModelDecorator';
+import type { ContentModelSegment } from '../contentModel/segment/ContentModelSegment';
 import type { ModelToDomContext } from './ModelToDomContext';
 
 /**

diff --git a/packages/roosterjs-content-model-types/lib/context/DomIndexer.ts b/packages/roosterjs-content-model-types/lib/context/DomIndexer.ts
@@ -1,8 +1,8 @@
 import type { CacheSelection } from '../pluginState/CachePluginState';
-import type { ContentModelDocument } from '../group/ContentModelDocument';
-import type { ContentModelParagraph } from '../block/ContentModelParagraph';
-import type { ContentModelSegment } from '../segment/ContentModelSegment';
-import type { ContentModelTable } from '../block/ContentModelTable';
+import type { ContentModelDocument } from '../contentModel/blockGroup/ContentModelDocument';
+import type { ContentModelParagraph } from '../contentModel/block/ContentModelParagraph';
+import type { ContentModelSegment } from '../contentModel/segment/ContentModelSegment';
+import type { ContentModelTable } from '../contentModel/block/ContentModelTable';
 import type { DOMSelection } from '../selection/DOMSelection';
 
 /**

diff --git a/packages/roosterjs-content-model-types/lib/context/DomToModelFormatContext.ts b/packages/roosterjs-content-model-types/lib/context/DomToModelFormatContext.ts
@@ -1,10 +1,10 @@
-import type { ContentModelBlockFormat } from '../format/ContentModelBlockFormat';
-import type { ContentModelBlockGroup } from '../group/ContentModelBlockGroup';
-import type { ContentModelCode } from '../decorator/ContentModelCode';
-import type { ContentModelLink } from '../decorator/ContentModelLink';
-import type { ContentModelListLevel } from '../decorator/ContentModelListLevel';
-import type { ContentModelParagraphDecorator } from '../decorator/ContentModelParagraphDecorator';
-import type { ContentModelSegmentFormat } from '../format/ContentModelSegmentFormat';
+import type { ContentModelBlockFormat } from '../contentModel/format/ContentModelBlockFormat';
+import type { ContentModelBlockGroup } from '../contentModel/blockGroup/ContentModelBlockGroup';
+import type { ContentModelCode } from '../contentModel/decorator/ContentModelCode';
+import type { ContentModelLink } from '../contentModel/decorator/ContentModelLink';
+import type { ContentModelListLevel } from '../contentModel/decorator/ContentModelListLevel';
+import type { ContentModelParagraphDecorator } from '../contentModel/decorator/ContentModelParagraphDecorator';
+import type { ContentModelSegmentFormat } from '../contentModel/format/ContentModelSegmentFormat';
 
 /**
  * Represents the context object used when do DOM to Content Model conversion and processing a List

diff --git a/packages/roosterjs-content-model-types/lib/context/DomToModelSettings.ts b/packages/roosterjs-content-model-types/lib/context/DomToModelSettings.ts
@@ -1,9 +1,9 @@
-import type { ContentModelSegmentFormat } from '../format/ContentModelSegmentFormat';
-import type { ContentModelFormatBase } from '../format/ContentModelFormatBase';
-import type { ContentModelFormatMap } from '../format/ContentModelFormatMap';
+import type { ContentModelSegmentFormat } from '../contentModel/format/ContentModelSegmentFormat';
+import type { ContentModelFormatBase } from '../contentModel/format/ContentModelFormatBase';
+import type { ContentModelFormatMap } from '../contentModel/format/ContentModelFormatMap';
 import type { DomToModelContext } from './DomToModelContext';
 import type { ElementProcessor } from './ElementProcessor';
-import type { FormatHandlerTypeMap, FormatKey } from '../format/FormatHandlerTypeMap';
+import type { FormatHandlerTypeMap, FormatKey } from '../contentModel/format/FormatHandlerTypeMap';
 
 /**
  * A type of Default style map, from tag name string (in upper case) to a static style object

diff --git a/packages/roosterjs-content-model-types/lib/context/EditorContext.ts b/packages/roosterjs-content-model-types/lib/context/EditorContext.ts
@@ -1,6 +1,6 @@
 import type { DarkColorHandler } from './DarkColorHandler';
 import type { DomIndexer } from './DomIndexer';
-import type { ContentModelSegmentFormat } from '../format/ContentModelSegmentFormat';
+import type { ContentModelSegmentFormat } from '../contentModel/format/ContentModelSegmentFormat';
 import type { PendingFormat } from '../pluginState/FormatPluginState';
 
 /**

diff --git a/packages/roosterjs-content-model-types/lib/context/ElementProcessor.ts b/packages/roosterjs-content-model-types/lib/context/ElementProcessor.ts
@@ -1,4 +1,4 @@
-import type { ContentModelBlockGroup } from '../group/ContentModelBlockGroup';
+import type { ContentModelBlockGroup } from '../contentModel/blockGroup/ContentModelBlockGroup';
 import type { DomToModelContext } from './DomToModelContext';
 
 /**

diff --git a/packages/roosterjs-content-model-types/lib/context/ModelToDomFormatContext.ts b/packages/roosterjs-content-model-types/lib/context/ModelToDomFormatContext.ts
@@ -1,6 +1,6 @@
-import type { ContentModelBlockFormat } from '../format/ContentModelBlockFormat';
-import type { ContentModelListLevel } from '../decorator/ContentModelListLevel';
-import type { ContentModelSegmentFormat } from '../format/ContentModelSegmentFormat';
+import type { ContentModelBlockFormat } from '../contentModel/format/ContentModelBlockFormat';
+import type { ContentModelListLevel } from '../contentModel/decorator/ContentModelListLevel';
+import type { ContentModelSegmentFormat } from '../contentModel/format/ContentModelSegmentFormat';
 
 /**
  * Represents a list stack item used by Content Model to DOM conversion

diff --git a/packages/roosterjs-content-model-types/lib/context/ModelToDomSettings.ts b/packages/roosterjs-content-model-types/lib/context/ModelToDomSettings.ts
@@ -1,29 +1,29 @@
 import type { Definition } from '../metadata/Definition';
-import type { ContentModelBlock } from '../block/ContentModelBlock';
-import type { ContentModelBlockFormat } from '../format/ContentModelBlockFormat';
-import type { ContentModelBlockGroup } from '../group/ContentModelBlockGroup';
-import type { ContentModelBr } from '../segment/ContentModelBr';
-import type { ContentModelDecorator } from '../decorator/ContentModelDecorator';
-import type { ContentModelDivider } from '../block/ContentModelDivider';
-import type { ContentModelEntity } from '../entity/ContentModelEntity';
-import type { ContentModelFormatBase } from '../format/ContentModelFormatBase';
-import type { ContentModelFormatContainer } from '../group/ContentModelFormatContainer';
-import type { ContentModelFormatMap } from '../format/ContentModelFormatMap';
-import type { ContentModelGeneralBlock } from '../group/ContentModelGeneralBlock';
-import type { ContentModelGeneralSegment } from '../segment/ContentModelGeneralSegment';
-import type { ContentModelImage } from '../segment/ContentModelImage';
-import type { ContentModelListItem } from '../group/ContentModelListItem';
-import type { ContentModelListItemFormat } from '../format/ContentModelListItemFormat';
-import type { ContentModelListItemLevelFormat } from '../format/ContentModelListItemLevelFormat';
-import type { ContentModelParagraph } from '../block/ContentModelParagraph';
-import type { ContentModelSegment } from '../segment/ContentModelSegment';
-import type { ContentModelSegmentFormat } from '../format/ContentModelSegmentFormat';
-import type { ContentModelTable } from '../block/ContentModelTable';
-import type { ContentModelTableRow } from '../block/ContentModelTableRow';
-import type { ContentModelText } from '../segment/ContentModelText';
-import type { FormatHandlerTypeMap, FormatKey } from '../format/FormatHandlerTypeMap';
+import type { ContentModelBlock } from '../contentModel/block/ContentModelBlock';
+import type { ContentModelBlockFormat } from '../contentModel/format/ContentModelBlockFormat';
+import type { ContentModelBlockGroup } from '../contentModel/blockGroup/ContentModelBlockGroup';
+import type { ContentModelBr } from '../contentModel/segment/ContentModelBr';
+import type { ContentModelDecorator } from '../contentModel/decorator/ContentModelDecorator';
+import type { ContentModelDivider } from '../contentModel/block/ContentModelDivider';
+import type { ContentModelEntity } from '../contentModel/entity/ContentModelEntity';
+import type { ContentModelFormatBase } from '../contentModel/format/ContentModelFormatBase';
+import type { ContentModelFormatContainer } from '../contentModel/blockGroup/ContentModelFormatContainer';
+import type { ContentModelFormatMap } from '../contentModel/format/ContentModelFormatMap';
+import type { ContentModelGeneralBlock } from '../contentModel/blockGroup/ContentModelGeneralBlock';
+import type { ContentModelGeneralSegment } from '../contentModel/segment/ContentModelGeneralSegment';
+import type { ContentModelImage } from '../contentModel/segment/ContentModelImage';
+import type { ContentModelListItem } from '../contentModel/blockGroup/ContentModelListItem';
+import type { ContentModelListItemFormat } from '../contentModel/format/ContentModelListItemFormat';
+import type { ContentModelListItemLevelFormat } from '../contentModel/format/ContentModelListItemLevelFormat';
+import type { ContentModelParagraph } from '../contentModel/block/ContentModelParagraph';
+import type { ContentModelSegment } from '../contentModel/segment/ContentModelSegment';
+import type { ContentModelSegmentFormat } from '../contentModel/format/ContentModelSegmentFormat';
+import type { ContentModelTable } from '../contentModel/block/ContentModelTable';
+import type { ContentModelTableRow } from '../contentModel/block/ContentModelTableRow';
+import type { ContentModelText } from '../contentModel/segment/ContentModelText';
+import type { FormatHandlerTypeMap, FormatKey } from '../contentModel/format/FormatHandlerTypeMap';
 import type { ModelToDomContext } from './ModelToDomContext';
-import type { ListMetadataFormat } from '../format/metadata/ListMetadataFormat';
+import type { ListMetadataFormat } from '../contentModel/format/metadata/ListMetadataFormat';
 import type {
     ContentModelHandler,
     ContentModelBlockHandler,

diff --git a/packages/roosterjs-content-model-types/lib/editor/EditorCore.ts b/packages/roosterjs-content-model-types/lib/editor/EditorCore.ts
@@ -7,7 +7,7 @@ import type { DOMEventRecord } from '../parameter/DOMEventRecord';
 import type { Snapshot } from '../parameter/Snapshot';
 import type { EntityState } from '../parameter/FormatContentModelContext';
 import type { DarkColorHandler } from '../context/DarkColorHandler';
-import type { ContentModelDocument } from '../group/ContentModelDocument';
+import type { ContentModelDocument } from '../contentModel/blockGroup/ContentModelDocument';
 import type { DOMSelection } from '../selection/DOMSelection';
 import type { DomToModelOptionForCreateModel } from '../context/DomToModelOption';
 import type { EditorContext } from '../context/EditorContext';

diff --git a/packages/roosterjs-content-model-types/lib/editor/EditorOptions.ts b/packages/roosterjs-content-model-types/lib/editor/EditorOptions.ts
@@ -2,11 +2,11 @@ import type { KnownAnnounceStrings } from '../parameter/AnnounceData';
 import type { PasteType } from '../enum/PasteType';
 import type { Colors, ColorTransformFunction } from '../context/DarkColorHandler';
 import type { EditorPlugin } from './EditorPlugin';
-import type { ContentModelSegmentFormat } from '../format/ContentModelSegmentFormat';
+import type { ContentModelSegmentFormat } from '../contentModel/format/ContentModelSegmentFormat';
 import type { CoreApiMap } from './EditorCore';
 import type { DomToModelOption } from '../context/DomToModelOption';
 import type { ModelToDomOption } from '../context/ModelToDomOption';
-import type { ContentModelDocument } from '../group/ContentModelDocument';
+import type { ContentModelDocument } from '../contentModel/blockGroup/ContentModelDocument';
 import type { Snapshots } from '../parameter/Snapshot';
 import type { TrustedHTMLHandler } from '../parameter/TrustedHTMLHandler';
 

diff --git a/packages/roosterjs-content-model-types/lib/editor/IEditor.ts b/packages/roosterjs-content-model-types/lib/editor/IEditor.ts
@@ -6,8 +6,8 @@ import type { PluginEventType } from '../event/PluginEventType';
 import type { DOMEventRecord } from '../parameter/DOMEventRecord';
 import type { SnapshotsManager } from '../parameter/SnapshotsManager';
 import type { Snapshot } from '../parameter/Snapshot';
-import type { ContentModelDocument } from '../group/ContentModelDocument';
-import type { ContentModelSegmentFormat } from '../format/ContentModelSegmentFormat';
+import type { ContentModelDocument } from '../contentModel/blockGroup/ContentModelDocument';
+import type { ContentModelSegmentFormat } from '../contentModel/format/ContentModelSegmentFormat';
 import type { DOMSelection } from '../selection/DOMSelection';
 import type { EditorEnvironment } from '../parameter/EditorEnvironment';
 import type {

diff --git a/packages/roosterjs-content-model-types/lib/event/BeforePasteEvent.ts b/packages/roosterjs-content-model-types/lib/event/BeforePasteEvent.ts
@@ -2,7 +2,7 @@ import type { DomToModelOptionForSanitizing } from '../context/DomToModelOption'
 import type { PasteType } from '../enum/PasteType';
 import type { ClipboardData } from '../parameter/ClipboardData';
 import type { BasePluginEvent } from './BasePluginEvent';
-import type { ContentModelDocument } from '../group/ContentModelDocument';
+import type { ContentModelDocument } from '../contentModel/blockGroup/ContentModelDocument';
 import type { InsertPoint } from '../selection/InsertPoint';
 
 /**

diff --git a/packages/roosterjs-content-model-types/lib/event/ContentChangedEvent.ts b/packages/roosterjs-content-model-types/lib/event/ContentChangedEvent.ts
@@ -1,9 +1,9 @@
 import type { AnnounceData } from '../parameter/AnnounceData';
 import type { BasePluginEvent } from './BasePluginEvent';
 import type { EntityState } from '../parameter/FormatContentModelContext';
-import type { ContentModelEntity } from '../entity/ContentModelEntity';
+import type { ContentModelEntity } from '../contentModel/entity/ContentModelEntity';
 import type { EntityRemovalOperation } from '../enum/EntityOperation';
-import type { ContentModelDocument } from '../group/ContentModelDocument';
+import type { ContentModelDocument } from '../contentModel/blockGroup/ContentModelDocument';
 import type { DOMSelection } from '../selection/DOMSelection';
 
 /**