diff --git a/src/component/mxgraph/StyleUtils.ts b/src/component/mxgraph/StyleUtils.ts
index 3460f4e6eb..c8c0c34719 100644
--- a/src/component/mxgraph/StyleUtils.ts
+++ b/src/component/mxgraph/StyleUtils.ts
@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ShapeBpmnEventKind } from '../../model/bpmn/shape/ShapeBpmnEventKind';
-import { ShapeBpmnSubProcessKind } from '../../model/bpmn/shape/ShapeBpmnSubProcessKind';
+import { ShapeBpmnEventKind, ShapeBpmnSubProcessKind } from '../../model/bpmn/shape';
 import { MessageVisibleKind } from '../../model/bpmn/edge/MessageVisibleKind';
 
 export enum MarkerIdentifier {
diff --git a/src/component/mxgraph/config/StyleConfigurator.ts b/src/component/mxgraph/config/StyleConfigurator.ts
index 2622492704..0fd27bb954 100644
--- a/src/component/mxgraph/config/StyleConfigurator.ts
+++ b/src/component/mxgraph/config/StyleConfigurator.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ShapeBpmnElementKind } from '../../../model/bpmn/shape/ShapeBpmnElementKind';
+import { ShapeBpmnElementKind, ShapeBpmnMarkerKind } from '../../../model/bpmn/shape';
 import ShapeUtil from '../../../model/bpmn/shape/ShapeUtil';
 import { SequenceFlowKind } from '../../../model/bpmn/edge/SequenceFlowKind';
 import { MarkerIdentifier, StyleDefault, StyleIdentifier } from '../StyleUtils';
@@ -32,7 +32,6 @@ import { Font } from '../../../model/bpmn/Label';
 import { FlowKind } from '../../../model/bpmn/edge/FlowKind';
 import { AssociationFlow, SequenceFlow } from '../../../model/bpmn/edge/Flow';
 import { AssociationDirectionKind } from '../../../model/bpmn/edge/AssociationDirectionKind';
-import { ShapeBpmnMarkerKind } from '../../../model/bpmn/shape/ShapeBpmnMarkerKind';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 export default class StyleConfigurator {
diff --git a/src/component/mxgraph/shape/activity-shapes.ts b/src/component/mxgraph/shape/activity-shapes.ts
index cf6ff79e03..a3f36be2ba 100644
--- a/src/component/mxgraph/shape/activity-shapes.ts
+++ b/src/component/mxgraph/shape/activity-shapes.ts
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 import StyleUtils, { StyleDefault } from '../StyleUtils';
-import { buildPaintParameter, IconPainterProvider, PaintParameter } from './render/IconPainter';
-import { ShapeBpmnSubProcessKind } from '../../../model/bpmn/shape/ShapeBpmnSubProcessKind';
-import { ShapeBpmnMarkerKind } from '../../../model/bpmn/shape/ShapeBpmnMarkerKind';
+import { buildPaintParameter, IconPainterProvider, PaintParameter } from './render';
+import { ShapeBpmnSubProcessKind, ShapeBpmnMarkerKind } from '../../../model/bpmn/shape';
 import BpmnCanvas from './render/BpmnCanvas';
 
 function paintEnvelopeIcon(paintParameter: PaintParameter, isFilled: boolean): void {
diff --git a/src/component/mxgraph/shape/event-shapes.ts b/src/component/mxgraph/shape/event-shapes.ts
index 0ac43233fb..55b6ebed4a 100644
--- a/src/component/mxgraph/shape/event-shapes.ts
+++ b/src/component/mxgraph/shape/event-shapes.ts
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ShapeBpmnEventKind } from '../../../model/bpmn/shape/ShapeBpmnEventKind';
-import { PaintParameter, buildPaintParameter, IconPainterProvider } from './render/IconPainter';
+import { ShapeBpmnEventKind } from '../../../model/bpmn/shape';
+import { PaintParameter, buildPaintParameter, IconPainterProvider } from './render';
 import StyleUtils, { StyleDefault } from '../StyleUtils';
 import BpmnCanvas from './render/BpmnCanvas';
 
diff --git a/src/component/mxgraph/shape/flow-shapes.ts b/src/component/mxgraph/shape/flow-shapes.ts
index 3d02fc7e65..7c3b0e475e 100644
--- a/src/component/mxgraph/shape/flow-shapes.ts
+++ b/src/component/mxgraph/shape/flow-shapes.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { buildPaintParameter, IconPainterProvider } from './render/IconPainter';
+import { buildPaintParameter, IconPainterProvider } from './render';
 import StyleUtils from '../StyleUtils';
 import { MessageVisibleKind } from '../../../model/bpmn/edge/MessageVisibleKind';
 
diff --git a/src/component/mxgraph/shape/gateway-shapes.ts b/src/component/mxgraph/shape/gateway-shapes.ts
index c14ece4b95..82dfb6f159 100644
--- a/src/component/mxgraph/shape/gateway-shapes.ts
+++ b/src/component/mxgraph/shape/gateway-shapes.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { StyleDefault } from '../StyleUtils';
-import { PaintParameter, buildPaintParameter, IconPainterProvider } from './render/IconPainter';
+import { PaintParameter, buildPaintParameter, IconPainterProvider } from './render';
 import BpmnCanvas from './render/BpmnCanvas';
 
 abstract class GatewayShape extends mxRhombus {
diff --git a/src/component/parser/json/converter/EventDefinitionConverter.ts b/src/component/parser/json/converter/EventDefinitionConverter.ts
index fa01dcc44c..91df1f432b 100644
--- a/src/component/parser/json/converter/EventDefinitionConverter.ts
+++ b/src/component/parser/json/converter/EventDefinitionConverter.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { TDefinitions } from '../../xml/bpmn-json-model/BPMN20';
-import { ShapeBpmnEventKind } from '../../../../model/bpmn/shape/ShapeBpmnEventKind';
+import { ShapeBpmnEventKind } from '../../../../model/bpmn/shape';
 import { TEventDefinition } from '../../xml/bpmn-json-model/baseElement/rootElement/eventDefinition';
 import { ensureIsArray } from './ConverterUtil';
 
diff --git a/src/component/parser/json/converter/ProcessConverter.ts b/src/component/parser/json/converter/ProcessConverter.ts
index 5dd507f442..150bb98e83 100644
--- a/src/component/parser/json/converter/ProcessConverter.ts
+++ b/src/component/parser/json/converter/ProcessConverter.ts
@@ -22,12 +22,17 @@ import ShapeBpmnElement, {
   ShapeBpmnStartEvent,
   ShapeBpmnSubProcess,
 } from '../../../../model/bpmn/shape/ShapeBpmnElement';
-import { ShapeBpmnElementKind } from '../../../../model/bpmn/shape/ShapeBpmnElementKind';
+import {
+  ShapeBpmnElementKind,
+  ShapeBpmnCallActivityKind,
+  ShapeBpmnMarkerKind,
+  ShapeBpmnSubProcessKind,
+  ShapeBpmnEventKind,
+  supportedBpmnEventKinds,
+} from '../../../../model/bpmn/shape';
 import { AssociationFlow, SequenceFlow } from '../../../../model/bpmn/edge/Flow';
-import { ShapeBpmnEventKind, supportedBpmnEventKinds } from '../../../../model/bpmn/shape/ShapeBpmnEventKind';
 import ShapeUtil, { BpmnEventKind } from '../../../../model/bpmn/shape/ShapeUtil';
 import { SequenceFlowKind } from '../../../../model/bpmn/edge/SequenceFlowKind';
-import { ShapeBpmnSubProcessKind } from '../../../../model/bpmn/shape/ShapeBpmnSubProcessKind';
 import { FlowKind } from '../../../../model/bpmn/edge/FlowKind';
 import { TProcess } from '../../xml/bpmn-json-model/baseElement/rootElement/rootElement';
 import { TBoundaryEvent, TCatchEvent, TThrowEvent } from '../../xml/bpmn-json-model/baseElement/flowNode/event';
@@ -38,10 +43,8 @@ import { TAssociation, TTextAnnotation } from '../../xml/bpmn-json-model/baseEle
 import { AssociationDirectionKind } from '../../../../model/bpmn/edge/AssociationDirectionKind';
 import { bpmnEventKinds, findEventDefinitionOfDefinitions } from './EventDefinitionConverter';
 import { ensureIsArray } from './ConverterUtil';
-import { ShapeBpmnMarkerKind } from '../../../../model/bpmn/shape/ShapeBpmnMarkerKind';
 import { TEventBasedGateway } from '../../xml/bpmn-json-model/baseElement/flowNode/gateway';
 import { TReceiveTask } from '../../xml/bpmn-json-model/baseElement/flowNode/activity/task';
-import { ShapeBpmnCallActivityKind } from '../../../../model/bpmn/shape/ShapeBpmnCallActivityKind';
 import { isGlobalTask } from './GlobalTaskConverter';
 
 const convertedFlowNodeBpmnElements: Map<string, ShapeBpmnElement> = new Map();
diff --git a/test/unit/component/mxgraph/config/StyleConfigurator.test.ts b/test/unit/component/mxgraph/config/StyleConfigurator.test.ts
index fae78a60da..a131d80c5e 100644
--- a/test/unit/component/mxgraph/config/StyleConfigurator.test.ts
+++ b/test/unit/component/mxgraph/config/StyleConfigurator.test.ts
@@ -24,21 +24,17 @@ import ShapeBpmnElement, {
   ShapeBpmnStartEvent,
   ShapeBpmnSubProcess,
 } from '../../../../../src/model/bpmn/shape/ShapeBpmnElement';
-import { ShapeBpmnElementKind } from '../../../../../src/model/bpmn/shape/ShapeBpmnElementKind';
+import { ShapeBpmnElementKind, ShapeBpmnCallActivityKind, ShapeBpmnMarkerKind, ShapeBpmnSubProcessKind, ShapeBpmnEventKind } from '../../../../../src/model/bpmn/shape';
 import Label, { Font } from '../../../../../src/model/bpmn/Label';
 import { ExpectedFont } from '../../parser/json/JsonTestUtils';
 import Edge from '../../../../../src/model/bpmn/edge/Edge';
 import { AssociationFlow, MessageFlow, SequenceFlow } from '../../../../../src/model/bpmn/edge/Flow';
 import { SequenceFlowKind } from '../../../../../src/model/bpmn/edge/SequenceFlowKind';
 import Bounds from '../../../../../src/model/bpmn/Bounds';
-import { ShapeBpmnEventKind } from '../../../../../src/model/bpmn/shape/ShapeBpmnEventKind';
 import { BpmnEventKind } from '../../../../../src/model/bpmn/shape/ShapeUtil';
-import { ShapeBpmnSubProcessKind } from '../../../../../src/model/bpmn/shape/ShapeBpmnSubProcessKind';
 import each from 'jest-each';
 import { MessageVisibleKind } from '../../../../../src/model/bpmn/edge/MessageVisibleKind';
 import { AssociationDirectionKind } from '../../../../../src/model/bpmn/edge/AssociationDirectionKind';
-import { ShapeBpmnMarkerKind } from '../../../../../src/model/bpmn/shape/ShapeBpmnMarkerKind';
-import { ShapeBpmnCallActivityKind } from '../../../../../src/model/bpmn/shape/ShapeBpmnCallActivityKind';
 
 function toFont(font: ExpectedFont): Font {
   return new Font(font.name, font.size, font.isBold, font.isItalic, font.isUnderline, font.isStrikeThrough);
diff --git a/test/unit/component/mxgraph/render/BpmnCanvas.test.ts b/test/unit/component/mxgraph/render/BpmnCanvas.test.ts
index ca53580e70..074fbaf38d 100644
--- a/test/unit/component/mxgraph/render/BpmnCanvas.test.ts
+++ b/test/unit/component/mxgraph/render/BpmnCanvas.test.ts
@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IconStyleConfiguration, ShapeConfiguration, Size } from '../../../../../src/component/mxgraph/shape/render/render-types';
-import { computeScaledIconSize } from '../../../../../src/component/mxgraph/shape/render/BpmnCanvas';
+import { IconStyleConfiguration, ShapeConfiguration, Size, computeScaledIconSize } from '../../../../../src/component/mxgraph/shape/render';
 
 describe('compute scaled icon size', () => {
   function newIconStyleConfiguration(strokeWidth = 0): IconStyleConfiguration {
diff --git a/test/unit/component/parser/json/JsonTestUtils.ts b/test/unit/component/parser/json/JsonTestUtils.ts
index d223488629..d4ed136838 100644
--- a/test/unit/component/parser/json/JsonTestUtils.ts
+++ b/test/unit/component/parser/json/JsonTestUtils.ts
@@ -13,23 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ShapeBpmnElementKind } from '../../../../../src/model/bpmn/shape/ShapeBpmnElementKind';
+import { ShapeBpmnElementKind, ShapeBpmnCallActivityKind, ShapeBpmnMarkerKind, ShapeBpmnSubProcessKind, ShapeBpmnEventKind } from '../../../../../src/model/bpmn/shape';
 import Shape from '../../../../../src/model/bpmn/shape/Shape';
 import { defaultBpmnJsonParser } from '../../../../../src/component/parser/json/BpmnJsonParser';
 import Edge from '../../../../../src/model/bpmn/edge/Edge';
 import BpmnModel from '../../../../../src/model/bpmn/BpmnModel';
 import Waypoint from '../../../../../src/model/bpmn/edge/Waypoint';
 import { ShapeBpmnActivity, ShapeBpmnCallActivity, ShapeBpmnEvent, ShapeBpmnSubProcess } from '../../../../../src/model/bpmn/shape/ShapeBpmnElement';
-import { ShapeBpmnEventKind } from '../../../../../src/model/bpmn/shape/ShapeBpmnEventKind';
 import { SequenceFlowKind } from '../../../../../src/model/bpmn/edge/SequenceFlowKind';
 import Label from '../../../../../src/model/bpmn/Label';
-import { ShapeBpmnSubProcessKind } from '../../../../../src/model/bpmn/shape/ShapeBpmnSubProcessKind';
 import { SequenceFlow } from '../../../../../src/model/bpmn/edge/Flow';
 import { FlowKind } from '../../../../../src/model/bpmn/edge/FlowKind';
 import { MessageVisibleKind } from '../../../../../src/model/bpmn/edge/MessageVisibleKind';
 import { BpmnJsonModel } from '../../../../../src/component/parser/xml/bpmn-json-model/BPMN20';
-import { ShapeBpmnMarkerKind } from '../../../../../src/model/bpmn/shape/ShapeBpmnMarkerKind';
-import { ShapeBpmnCallActivityKind } from '../../../../../src/model/bpmn/shape/ShapeBpmnCallActivityKind';
 
 export interface ExpectedShape {
   shapeId: string;
diff --git a/test/unit/model/bpmn/shape/ShapeUtil.test.ts b/test/unit/model/bpmn/shape/ShapeUtil.test.ts
index 5df739b3bd..e6d98fbb37 100644
--- a/test/unit/model/bpmn/shape/ShapeUtil.test.ts
+++ b/test/unit/model/bpmn/shape/ShapeUtil.test.ts
@@ -15,7 +15,7 @@
  */
 
 import ShapeUtil from '../../../../../src/model/bpmn/shape/ShapeUtil';
-import { ShapeBpmnElementKind } from '../../../../../src/model/bpmn/shape/ShapeBpmnElementKind';
+import { ShapeBpmnElementKind } from '../../../../../src/model/bpmn/shape';
 
 describe('ShapeUtil', () => {
   it('top level bpmn event kinds', () => {